From 4a3e80a858923af98abc33789ebc3bba780aa9fd Mon Sep 17 00:00:00 2001 From: Glasir Date: Tue, 31 Dec 2024 03:23:24 -0500 Subject: [PATCH 01/44] Implementation of Special Buff Fields (Buff Level, Positive vs Negative, Dispellable) * Core: Updated buff tooltips to show green/red for positive/negative, and to show the spell level for leveled spells * AB: Updated existing spells with negative and dispellable flags * AB: Add double heal prevention (though the timing needs work) * AB: Set healing spells to be universal (allows casting on magic immune) * AB: Updated AB spells to reflect unit cast points * AB: Added ability to override the cast time of a spell * Core: Partial work on ongoing action ability notifications (mostly on builds and harvests) --- core/assets/abilityBehaviors/RaiseDead.json | 16 + .../compatibility/rejuvenation.json | 262 +++++ .../abilityBehaviors/humanHeroActives.json | 9 + .../abilityBehaviors/humanUnitActives.json | 47 +- core/assets/abilityBehaviors/itemSimple.json | 900 ++++++++++++++++++ .../neutralHeroUnitActives.json | 4 + .../nightElfHeroUnitActives.json | 8 + .../abilityBehaviors/nightElfUnitActives.json | 12 +- .../undeadHeroUnitActives.json | 24 + .../abilityBehaviors/undeadUnitActives.json | 12 + .../warsmash/util/WarsmashConstants.java | 1 + .../commandbuttons/CommandButtonListener.java | 2 +- .../CommandCardPopulatingAbilityVisitor.java | 2 +- .../abilities/generic/AbstractCBuff.java | 15 + .../simulation/abilities/generic/CBuff.java | 6 + .../abilities/generic/CDestructableBuff.java | 2 + .../ability/AbilityBuilderAbility.java | 2 + ...AbilityAbilityBuilderActiveFlexTarget.java | 2 +- ...yAbilityBuilderActiveFlexTargetSimple.java | 2 +- .../CAbilityAbilityBuilderActivePairing.java | 2 +- .../CAbilityAbilityBuilderActiveSmart.java | 357 ------- .../CAbilityAbilityBuilderActiveToggle.java | 2 +- .../CAbilityAbilityBuilderGenericActive.java | 19 +- .../ability/CAbilityAbilityBuilderNoIcon.java | 14 + .../CAbilityAbilityBuilderPassive.java | 14 + ...AbilityAbilityBuilderStatAuraTemplate.java | 9 +- ...lityAbilityBuilderStatPassiveTemplate.java | 3 +- .../behavior/CBehaviorAbilityBuilderBase.java | 108 ++- .../CBehaviorAbilityBuilderNoTarget.java | 50 +- .../ABActionActivateToggledAbility.java | 2 +- .../ABActionDeactivateToggledAbility.java | 2 +- .../ability/ABActionSetAbilityCastRange.java | 2 +- .../buff/ABActionCreatePassiveBuff.java | 27 +- .../buff/ABActionCreateTimedArtBuff.java | 30 +- .../action/buff/ABActionCreateTimedBuff.java | 25 +- .../buff/ABActionCreateTimedTickingBuff.java | 25 +- .../ABActionCreateTimedTickingPausedBuff.java | 25 +- ...ActionCreateTimedTickingPostDeathBuff.java | 33 +- .../ABActionCreateDestructableBuff.java | 9 +- .../ABCallbackEvaluateCondition.java | 18 + ...BConditionIsFlexAbilityNonPointTarget.java | 2 +- .../ABConditionIsFlexAbilityNonTargeted.java | 2 +- .../ABConditionIsFlexAbilityPointTarget.java | 2 +- .../ABConditionIsFlexAbilityTargeted.java | 2 +- .../unit/ABConditionIsUnitShareSpells.java | 29 + .../buff/ABDestructableBuff.java | 10 +- .../buff/ABGenericAuraBuff.java | 19 +- .../buff/ABGenericPermanentBuff.java | 22 +- .../buff/ABGenericTimedBuff.java | 30 +- .../buff/ABPermanentPassiveBuff.java | 27 +- .../abilitybuilder/buff/ABTimedArtBuff.java | 16 +- .../abilitybuilder/buff/ABTimedBuff.java | 31 +- .../ABTimedInstantTransformationBuff.java | 12 +- .../buff/ABTimedTargetingBuff.java | 2 +- .../buff/ABTimedTickingBuff.java | 22 +- .../buff/ABTimedTickingPausedBuff.java | 20 +- .../buff/ABTimedTickingPostDeathBuff.java | 20 +- .../buff/ABTimedTransformationBuff.java | 35 +- .../abilitybuilder/core/ABLocalStoreKeys.java | 9 +- .../core/AbilityBuilderGsonBuilder.java | 3 + .../parser/AbilityBuilderOverrideFields.java | 7 + .../behaviors/build/CBehaviorHumanRepair.java | 2 +- .../behaviors/build/CBehaviorRepair.java | 2 +- .../harvest/CBehaviorAcolyteHarvest.java | 12 + .../behaviors/harvest/CBehaviorHarvest.java | 1 + .../harvest/CBehaviorWispHarvest.java | 1 + .../w3x/simulation/data/CAbilityData.java | 7 + .../viewer5/handlers/w3x/ui/BuffBarIcon.java | 31 +- .../viewer5/handlers/w3x/ui/MeleeUI.java | 4 +- 69 files changed, 1914 insertions(+), 572 deletions(-) create mode 100644 core/assets/abilityBehaviors/compatibility/rejuvenation.json delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveSmart.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackEvaluateCondition.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java diff --git a/core/assets/abilityBehaviors/RaiseDead.json b/core/assets/abilityBehaviors/RaiseDead.json index 28cc08f5e..603db1e9a 100644 --- a/core/assets/abilityBehaviors/RaiseDead.json +++ b/core/assets/abilityBehaviors/RaiseDead.json @@ -283,6 +283,10 @@ "buffId": { "type": "getFirstBuffId" }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, "duration": { "type": "getAbilityDuration" }, @@ -416,6 +420,10 @@ "buffId": { "type": "getFirstBuffId" }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, "duration": { "type": "getAbilityDuration" }, @@ -705,6 +713,10 @@ "buffId": { "type": "getFirstBuffId" }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, "duration": { "type": "getAbilityDuration" }, @@ -866,6 +878,10 @@ "buffId": { "type": "getFirstBuffId" }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, "duration": { "type": "getAbilityDuration" }, diff --git a/core/assets/abilityBehaviors/compatibility/rejuvenation.json b/core/assets/abilityBehaviors/compatibility/rejuvenation.json new file mode 100644 index 000000000..a4c2151d4 --- /dev/null +++ b/core/assets/abilityBehaviors/compatibility/rejuvenation.json @@ -0,0 +1,262 @@ +{ + "abilityList": [{ + "ids": [{"id":"Arej", "castId": "rejuvination"}], + "type": "NORMAL_UNITTARGET", + "extraTargetConditions": [{ + "type": "not", + "condition": { + "type": "and", + "condition1": { + "type": "not", + "condition": { + "type": "or", + "condition1": { + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }, + "condition2": { + "type": "or", + "condition1": { + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + }, + "condition2": { + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "reason": "ALREADY_AT_FULL_MANA" + } + } + } + }, + "condition2": { + "type": "not", + "condition": { + "type": "or", + "condition1": { + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "condition2": { + "type": "or", + "condition1": { + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + }, + "condition2": { + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "iOdd", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + } + } + } + } + } + }], + "onEndCasting": [{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getAbilityTargetedUnit" + }, + "onHitActions": [{ + "type": "createTimedTickingPausedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + }, + "onAddActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "hpPerSec" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getBuffedUnit" + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mpPerSec" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getBuffedUnit" + } + } + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "heal", + "target": { + "type": "getBuffedUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "hpPerSec" + } + } + },{ + "type": "addMp", + "target": { + "type": "getBuffedUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "mpPerSec" + } + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }], + "onRemoveActions": [{ + "type": "cleanUpCastInstance" + }] + },{ + "type": "addNonStackingDisplayBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + }, + "key": { + "type": "getCodeAsString" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "regenBuff" + }, + "valueToStore": { + "type": "getLastCreatedBuff" + } + },{ + "type": "if", + "condition": { + "type": "bool", + "bool": { + "type": "getAbilityDataAsBoolean", + "dataField": "E" + } + }, + "thenActions": [{ + "type": "createDamageTakenListener", + "actions": [{ + "type": "removeDamageTakenListener", + "targetUnit": { + "type": "getListenerUnit" + }, + "listener": { + "type": "getStoredDamageTakenListenerByKey", + "key": { + "type": "rawString", + "value": "breakHeal" + } + } + + },{ + "type": "removeBuff", + "target": { + "type": "getListenerUnit" + }, + "buff": { + "type": "getStoredBuffByKey", + "key": { + "type": "rawString", + "value": "regenBuff" + } + } + }] + },{ + "type": "addDamageTakenListener", + "targetUnit": { + "type": "getAbilityTargetedUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenListener" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "breakHeal" + }, + "valueToStore": { + "type": "getLastCreatedDamageTakenListener" + } + }] + }], + "elseActions": [] + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/humanHeroActives.json b/core/assets/abilityBehaviors/humanHeroActives.json index 2eb6585cb..5f67e00bc 100644 --- a/core/assets/abilityBehaviors/humanHeroActives.json +++ b/core/assets/abilityBehaviors/humanHeroActives.json @@ -693,6 +693,15 @@ "type": "getAbilityTargetedUnit" } }, + "positive": { + "type": "evaluateCondition", + "condition": { + "type": "isUnitShareSpells", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + }, "onAddActions": [{ "type": "addStateModBuff", "targetUnit": { diff --git a/core/assets/abilityBehaviors/humanUnitActives.json b/core/assets/abilityBehaviors/humanUnitActives.json index b47647447..827257cd4 100644 --- a/core/assets/abilityBehaviors/humanUnitActives.json +++ b/core/assets/abilityBehaviors/humanUnitActives.json @@ -106,6 +106,10 @@ "type": "getAbilityTargetedUnit" } }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, "onAddActions": [{ "type": "addNonStackingStatBuff", "targetUnit": { @@ -671,18 +675,39 @@ },{ "ids": [{"id":"Ahea", "castId": "heal", "autoCastOnId": "healon", "autoCastOffId": "healoff", "autoCastType": "NEARESTVALID"}], "type": "NORMAL_UNITTARGET", + "overrideFields": { + "universalSpell": { + "type": "rawBoolean", + "value": "true" + } + }, "extraTargetConditions": [{ - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "not", + "type": "setCantUseReasonOnFailure", "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getAbilityTargetedUnit" + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getAbilityTargetedUnit" + } } - } - }, - "reason": "ALREADY_AT_FULL_HEALTH" + }, + "reason": "ALREADY_AT_FULL_HEALTH" + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "not", + "condition": { + "type": "doesUnitHaveBuff", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + } + }, + "reason": "TARGET_IS_ALREADY_BEING_HEALED" }], "onEndCasting": [{ "type": "checkAbilityEffectReaction", @@ -714,6 +739,10 @@ }, "duration": { "type": "getAbilityCooldown" + }, + "dispellable": { + "type": "rawBoolean", + "value": "false" } },{ "type": "addBuff", diff --git a/core/assets/abilityBehaviors/itemSimple.json b/core/assets/abilityBehaviors/itemSimple.json index efa3acada..619e88c2e 100644 --- a/core/assets/abilityBehaviors/itemSimple.json +++ b/core/assets/abilityBehaviors/itemSimple.json @@ -84,6 +84,14 @@ "type": "getEnumUnit" } }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, "onAddActions": [{ "type": "addStateModBuff", "targetUnit": { @@ -120,5 +128,897 @@ } }] }] + },{ + "ids": [{"id":"AIrg", "castId": "itemregeneration"}], + "type": "NORMAL_FLEXTARGET", + "overrideFields": { + "universalSpell": { + "type": "rawBoolean", + "value": "true" + } + }, + "specialFields": { + "targetedSpell": [{ + "type": "not", + "condition": { + "type": "bool", + "bool": { + "type": "getAbilityDataAsBoolean", + "dataField": "D" + } + } + }] + }, + "extraCastConditions": [{ + "type": "or", + "condition1": { + "type": "isFlexAbilityTargeted" + }, + "condition2": { + "type": "or", + "condition1": { + "type": "f!=0", + "value": { + "type": "getAbilityArea" + } + }, + "condition2": { + "type": "not", + "condition": { + "type": "and", + "condition1": { + "type": "not", + "condition": { + "type": "or", + "condition1": { + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }, + "condition2": { + "type": "or", + "condition1": { + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "getCastingUnit" + } + } + }, + "condition2": { + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "reason": "ALREADY_AT_FULL_MANA" + } + } + } + }, + "condition2": { + "type": "not", + "condition": { + "type": "or", + "condition1": { + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "condition2": { + "type": "or", + "condition1": { + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getCastingUnit" + } + } + }, + "condition2": { + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "iOdd", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + } + } + } + } + } + } + } + }], + "extraTargetConditions": [{ + "type": "not", + "condition": { + "type": "and", + "condition1": { + "type": "not", + "condition": { + "type": "or", + "condition1": { + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }, + "condition2": { + "type": "or", + "condition1": { + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + }, + "condition2": { + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "reason": "ALREADY_AT_FULL_MANA" + } + } + } + }, + "condition2": { + "type": "not", + "condition": { + "type": "or", + "condition1": { + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "condition2": { + "type": "or", + "condition1": { + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + }, + "condition2": { + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "iOdd", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + } + } + } + } + } + }], + "onEndCasting": [{ + "type": "if", + "condition": { + "type": "isFlexAbilityTargeted" + }, + "thenActions": [{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getAbilityTargetedUnit" + }, + "onHitActions": [{ + "type": "createTimedTickingPausedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, + "onAddActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "hpPerSec" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getBuffedUnit" + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mpPerSec" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getBuffedUnit" + } + } + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "heal", + "target": { + "type": "getBuffedUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "hpPerSec" + } + } + },{ + "type": "addMp", + "target": { + "type": "getBuffedUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "mpPerSec" + } + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }], + "onRemoveActions": [{ + "type": "cleanUpCastInstance" + }] + },{ + "type": "addNonStackingDisplayBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + }, + "key": { + "type": "getCodeAsString" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "regenBuff" + }, + "valueToStore": { + "type": "getLastCreatedBuff" + } + },{ + "type": "if", + "condition": { + "type": "bool", + "bool": { + "type": "getAbilityDataAsBoolean", + "dataField": "E" + } + }, + "thenActions": [{ + "type": "createDamageTakenListener", + "actions": [{ + "type": "removeDamageTakenListener", + "targetUnit": { + "type": "getListenerUnit" + }, + "listener": { + "type": "getStoredDamageTakenListenerByKey", + "key": { + "type": "rawString", + "value": "breakHeal" + } + } + + },{ + "type": "removeBuff", + "target": { + "type": "getListenerUnit" + }, + "buff": { + "type": "getStoredBuffByKey", + "key": { + "type": "rawString", + "value": "regenBuff" + } + } + }] + },{ + "type": "addDamageTakenListener", + "targetUnit": { + "type": "getAbilityTargetedUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenListener" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "breakHeal" + }, + "valueToStore": { + "type": "getLastCreatedDamageTakenListener" + } + }] + }], + "elseActions": [] + }], + "elseActions": [{ + "type": "if", + "condition": { + "type": "f>", + "value1": { + "type": "getAbilityArea" + }, + "value2": { + "type": "rawFloat", + "value": 0 + } + }, + "thenActions": [{ + "type": "iterateUnitsInRangeOfUnitMatchingCondition", + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + }, + "iterationActions": [{ + "type": "if", + "condition": { + "type": "not", + "condition": { + "type": "and", + "condition1": { + "type": "not", + "condition": { + "type": "or", + "condition1": { + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }, + "condition2": { + "type": "or", + "condition1": { + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "getEnumUnit" + } + } + }, + "condition2": { + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "reason": "ALREADY_AT_FULL_MANA" + } + } + } + }, + "condition2": { + "type": "not", + "condition": { + "type": "or", + "condition1": { + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "condition2": { + "type": "or", + "condition1": { + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getEnumUnit" + } + } + }, + "condition2": { + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "iOdd", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + } + } + } + } + } + }, + "thenActions": [{ + "type": "createTimedTickingPausedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getEnumUnit" + } + }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, + "onAddActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "hpPerSec" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getBuffedUnit" + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mpPerSec" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getBuffedUnit" + } + } + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "heal", + "target": { + "type": "getBuffedUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "hpPerSec" + } + } + },{ + "type": "addMp", + "target": { + "type": "getBuffedUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "mpPerSec" + } + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }] + },{ + "type": "addNonStackingDisplayBuff", + "target": { + "type": "getEnumUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + }, + "key": { + "type": "getCodeAsString" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "regenBuff" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getEnumUnit" + } + }] + }, + "valueToStore": { + "type": "getLastCreatedBuff" + } + },{ + "type": "if", + "condition": { + "type": "bool", + "bool": { + "type": "getAbilityDataAsBoolean", + "dataField": "E" + } + }, + "thenActions": [{ + "type": "createDamageTakenListener", + "actions": [{ + "type": "removeDamageTakenListener", + "targetUnit": { + "type": "getListenerUnit" + }, + "listener": { + "type": "getStoredDamageTakenListenerByKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "breakHeal" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getListenerUnit" + } + }] + } + } + + },{ + "type": "removeBuff", + "target": { + "type": "getListenerUnit" + }, + "buff": { + "type": "getStoredBuffByKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "regenBuff" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getListenerUnit" + } + }] + } + } + }] + },{ + "type": "addDamageTakenListener", + "targetUnit": { + "type": "getEnumUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenListener" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "breakHeal" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getEnumUnit" + } + }] + }, + "valueToStore": { + "type": "getLastCreatedDamageTakenListener" + } + }], + "elseActions": [] + }], + "elseActions": [] + }], + "originUnit": { + "type": "getCastingUnit" + }, + "range": { + "type": "getAbilityArea" + } + },{ + "type": "createTimer", + "timeout": { + "type": "f+", + "value1": { + "type": "fMax", + "value1": { + "type": "getAbilityDuration" + }, + "value2": { + "type": "getAbilityHeroDuration" + } + }, + "value2": { + "type": "rawFloat", + "value": 1 + } + }, + "actions": [{ + "type": "cleanUpCastInstance" + }] + }], + "elseActions": [{ + "type": "createTimedTickingPausedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getCastingUnit" + } + }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, + "onAddActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "hpPerSec" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getBuffedUnit" + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mpPerSec" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getBuffedUnit" + } + } + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "heal", + "target": { + "type": "getBuffedUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "hpPerSec" + } + } + },{ + "type": "addMp", + "target": { + "type": "getBuffedUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "mpPerSec" + } + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }], + "onRemoveActions": [{ + "type": "cleanUpCastInstance" + }] + },{ + "type": "addNonStackingDisplayBuff", + "target": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + }, + "key": { + "type": "getCodeAsString" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "regenBuff" + }, + "valueToStore": { + "type": "getLastCreatedBuff" + } + },{ + "type": "if", + "condition": { + "type": "bool", + "bool": { + "type": "getAbilityDataAsBoolean", + "dataField": "E" + } + }, + "thenActions": [{ + "type": "createDamageTakenListener", + "actions": [{ + "type": "removeDamageTakenListener", + "targetUnit": { + "type": "getListenerUnit" + }, + "listener": { + "type": "getStoredDamageTakenListenerByKey", + "key": { + "type": "rawString", + "value": "breakHeal" + } + } + + },{ + "type": "removeBuff", + "target": { + "type": "getListenerUnit" + }, + "buff": { + "type": "getStoredBuffByKey", + "key": { + "type": "rawString", + "value": "regenBuff" + } + } + }] + },{ + "type": "addDamageTakenListener", + "targetUnit": { + "type": "getCastingUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenListener" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "breakHeal" + }, + "valueToStore": { + "type": "getLastCreatedDamageTakenListener" + } + }], + "elseActions": [] + }] + }] + }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/neutralHeroUnitActives.json b/core/assets/abilityBehaviors/neutralHeroUnitActives.json index 4e1c320c2..1347cad37 100644 --- a/core/assets/abilityBehaviors/neutralHeroUnitActives.json +++ b/core/assets/abilityBehaviors/neutralHeroUnitActives.json @@ -354,6 +354,10 @@ "type": "getEnumUnit" } }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, "onAddActions": [{ "type": "addAttackPreDamageListener", "targetUnit": { diff --git a/core/assets/abilityBehaviors/nightElfHeroUnitActives.json b/core/assets/abilityBehaviors/nightElfHeroUnitActives.json index 4dbb60482..4455812c6 100644 --- a/core/assets/abilityBehaviors/nightElfHeroUnitActives.json +++ b/core/assets/abilityBehaviors/nightElfHeroUnitActives.json @@ -37,6 +37,10 @@ "type": "getProjectileHitUnit" } }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, "onAddActions": [{ "type": "damageTarget", "source": { @@ -276,6 +280,10 @@ "value": "slowDur" } }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, "showIcon": { "type": "rawBoolean", "value": "false" diff --git a/core/assets/abilityBehaviors/nightElfUnitActives.json b/core/assets/abilityBehaviors/nightElfUnitActives.json index 56cabc205..fefeec75e 100644 --- a/core/assets/abilityBehaviors/nightElfUnitActives.json +++ b/core/assets/abilityBehaviors/nightElfUnitActives.json @@ -379,8 +379,14 @@ } }] },{ - "ids": [{"id":"Arej", "castId": "rejuvination"},{"id":"AIrg", "castId": "itemregeneration"}], + "ids": [{"id":"Arej", "castId": "rejuvination"}], "type": "NORMAL_FLEXTARGET", + "overrideFields": { + "universalSpell": { + "type": "rawBoolean", + "value": "true" + } + }, "specialFields": { "targetedSpell": [{ "type": "not", @@ -1589,6 +1595,10 @@ "type": "getAbilityTargetedUnit" } }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, "onAddActions": [{ "type": "addNonStackingStatBuff", "targetUnit": { diff --git a/core/assets/abilityBehaviors/undeadHeroUnitActives.json b/core/assets/abilityBehaviors/undeadHeroUnitActives.json index c880b5c11..93d949dd3 100644 --- a/core/assets/abilityBehaviors/undeadHeroUnitActives.json +++ b/core/assets/abilityBehaviors/undeadHeroUnitActives.json @@ -58,6 +58,10 @@ "type": "getAbilityDataAsFloat", "dataField": "A" }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, "showIcon": { "type": "rawBoolean", "value": "false" @@ -115,6 +119,10 @@ "type": "getAbilityTargetedUnit" } }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, "onAddActions": [{ "type": "addStateModBuff", "targetUnit": { @@ -633,6 +641,14 @@ "buffId": { "type": "getFirstBuffId" }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, "artType": "EFFECT", "duration": { "type": "getAbilityDataAsFloat", @@ -819,6 +835,14 @@ "buffId": { "type": "getFirstBuffId" }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, "duration": { "type": "getAbilityDuration", "target": { diff --git a/core/assets/abilityBehaviors/undeadUnitActives.json b/core/assets/abilityBehaviors/undeadUnitActives.json index f7fa96aba..7364ce864 100644 --- a/core/assets/abilityBehaviors/undeadUnitActives.json +++ b/core/assets/abilityBehaviors/undeadUnitActives.json @@ -478,6 +478,10 @@ "buffId": { "type": "getFirstBuffId" }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, "duration": { "type": "getAbilityDuration" } @@ -696,6 +700,10 @@ "buffId": { "type": "getFirstBuffId" }, + "dispellable": { + "type": "rawBoolean", + "value": "false" + }, "duration": { "type": "getAbilityDuration" } @@ -786,6 +794,10 @@ "buffId": { "type": "getFirstBuffId" }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, "duration": { "type": "getAbilityDuration", "target": { diff --git a/core/src/com/etheller/warsmash/util/WarsmashConstants.java b/core/src/com/etheller/warsmash/util/WarsmashConstants.java index 2ac750f63..f17ea6b05 100644 --- a/core/src/com/etheller/warsmash/util/WarsmashConstants.java +++ b/core/src/com/etheller/warsmash/util/WarsmashConstants.java @@ -57,6 +57,7 @@ public class WarsmashConstants { public static final String[] JASS_FILE_LIST = { "Scripts\\common.j", "Scripts\\Blizzard.j", "Scripts\\war3map.j" }; public static final float GAME_SPEED_TIME_FACTOR = 0.5f; + public static final int ONGOING_BEHAVIOR_NOTIFICATION_TICKS = (int) (0.5f / SIMULATION_STEP_TIME); public static void loadConstants(final GameObject emulatorConstants, final DataTable warsmashIni) { MAX_PLAYERS = emulatorConstants.getFieldValue("MaxPlayers"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandButtonListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandButtonListener.java index a2404c01a..b458ddfe8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandButtonListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandButtonListener.java @@ -39,7 +39,7 @@ void commandButton(int buttonPositionX, int buttonPositionY, Texture icon, int a char hotkey, int goldCost, int lumberCost, int foodCost, int manaCost, float cooldownRemaining, float cooldownMax, int numberOverlay); - void buff(Texture icon, int level, String tip, String uberTip); + void buff(Texture icon, int level, String tip, String uberTip, boolean positive, boolean leveled); void timedLifeBar(int level, String toolTip, float durationRemaining, float durationMax); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java index 9556ccb30..3281fe785 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java @@ -417,7 +417,7 @@ private void addBuffIcon(final CBuff buff, final IconUI iconUI) { } else { if (buff.isIconShowing()) { this.commandButtonListener.buff(iconUI.getIcon(), buff.getLevel(), iconUI.getToolTip(), - iconUI.getUberTip()); + iconUI.getUberTip(), buff.isPositive(), buff.isLeveled()); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java index 0bac68c51..9310eea77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java @@ -29,5 +29,20 @@ public boolean isUniversal() { public CAbilityCategory getAbilityCategory() { return CAbilityCategory.BUFF; } + + @Override + public boolean isPositive() { + return true; + } + + @Override + public boolean isLeveled() { + return false; + } + + @Override + public boolean isDispellable() { + return false; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java index 5266e15c2..7a5a8a865 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java @@ -9,4 +9,10 @@ public interface CBuff extends CAliasedLevelingAbility { float getDurationMax(); boolean isTimedLifeBar(); + + boolean isLeveled(); + + boolean isPositive(); + + boolean isDispellable(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java index 0ad330608..b9c204a21 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java @@ -17,4 +17,6 @@ public interface CDestructableBuff extends CHandle, Aliased { int getLevel(); void setLevel(int level); + + boolean isDispellable(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java index cd709d05d..0941536f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java @@ -24,6 +24,8 @@ public interface AbilityBuilderAbility extends CLevelingAbility, Aliased { public float getCastRange(); + public float getCastTime(); + public void startCooldown(CSimulation game, CUnit unit); public void resetCooldown(CSimulation game, CUnit unit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java index 4c6149652..4f307207d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java @@ -93,7 +93,7 @@ public void setLevel(CSimulation game, CUnit unit, int level) { @Override public void onAddDisabled(CSimulation game, CUnit unit) { - localStore.put(ABLocalStoreKeys.FLEXABILITY, this); + localStore.put(ABLocalStoreKeys.ISFLEXABILITY, this); super.onAddDisabled(game, unit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java index aaa484643..2f15ee226 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java @@ -141,7 +141,7 @@ public Map getLocalStore() { @Override public void onAdd(CSimulation game, CUnit unit) { - localStore.put(ABLocalStoreKeys.FLEXABILITY, this); + localStore.put(ABLocalStoreKeys.ISFLEXABILITY, this); this.setTargeted(game, unit); this.setPointTarget(game, unit); this.setBehavior(unit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java index 6055745d3..569a495ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java @@ -110,7 +110,7 @@ private void setPairingValues(CSimulation game, CUnit unit) { @Override public void onAdd(CSimulation game, CUnit unit) { - localStore.put(ABLocalStoreKeys.PAIRABILITY, this); + localStore.put(ABLocalStoreKeys.ISPAIRABILITY, this); this.behavior = this.createRangedBehavior(unit); this.behavior.setInstant(true); super.onAdd(game, unit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveSmart.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveSmart.java deleted file mode 100644 index 0ca42eb83..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveSmart.java +++ /dev/null @@ -1,357 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; - -import java.util.EnumSet; -import java.util.List; -import java.util.Map; - -import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; -import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractGenericSingleIconActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; - -//TODO: Figure out if we need smart? Not implemented -@Deprecated -public class CAbilityAbilityBuilderActiveSmart extends AbstractGenericSingleIconActiveAbility implements AbilityBuilderActiveAbility { - - List levelData; - private AbilityBuilderConfiguration config; - private Map localStore; - private CBehaviorAbilityBuilderBase behavior; - - private int castId = 0; - - public CAbilityAbilityBuilderActiveSmart(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, Map localStore) { - super(handleId, code, alias); - this.levelData = levelData; - this.config = config; - this.localStore = localStore; - } - - @Override - public void setLevel(CSimulation game, CUnit unit, int level) { - super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); - } - - @Override - public void onAdd(CSimulation game, CUnit unit) { - this.behavior = new CBehaviorAbilityBuilderBase(unit, localStore, this); - if (config.getOnAddAbility() != null) { - for (ABAction action : config.getOnAddAbility()) { - action.runAction(game, unit, localStore, castId); - } - } - } - - @Override - public void onRemove(CSimulation game, CUnit unit) { - if (config.getOnRemoveAbility() != null) { - for (ABAction action : config.getOnRemoveAbility()) { - action.runAction(game, unit, localStore, castId); - } - } - } - - @Override - public void onTick(CSimulation game, CUnit unit) { - } - - @Override - public void onDeath(CSimulation game, CUnit unit) { - if (config.getOnDeathPreCast() != null) { - for (ABAction action : config.getOnDeathPreCast()) { - action.runAction(game, unit, localStore, castId); - } - } - } - - @Override - public void onCancelFromQueue(CSimulation game, CUnit unit, int orderId) { - // TODO Auto-generated method stub - - } - - @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { - this.castId++; - return this.behavior.reset(); - } - - @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { - // TODO Auto-generated method stub - return null; - } - - @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { - // TODO Auto-generated method stub - return null; - } - - @Override - protected void innerCheckCanTarget(CSimulation game, CUnit unit, int orderId, CWidget target, - AbilityTargetCheckReceiver receiver) { - // TODO Auto-generated method stub - - } - - @Override - protected void innerCheckCanSmartTarget(CSimulation game, CUnit unit, int orderId, CWidget target, - AbilityTargetCheckReceiver receiver) { - // TODO Auto-generated method stub - - } - - @Override - protected void innerCheckCanTarget(CSimulation game, CUnit unit, int orderId, AbilityPointTarget target, - AbilityTargetCheckReceiver receiver) { - // TODO Auto-generated method stub - - } - - @Override - protected void innerCheckCanSmartTarget(CSimulation game, CUnit unit, int orderId, AbilityPointTarget target, - AbilityTargetCheckReceiver receiver) { - // TODO Auto-generated method stub - - } - - @Override - protected void innerCheckCanTargetNoTarget(CSimulation game, CUnit unit, int orderId, - AbilityTargetCheckReceiver receiver) { - // TODO Auto-generated method stub - - } - - @Override - protected void innerCheckCanUse(CSimulation game, CUnit unit, int orderId, AbilityActivationReceiver receiver) { - // TODO Auto-generated method stub - - } - - @Override - public boolean isToggleOn() { - // TODO Auto-generated method stub - return false; - } - - @Override - public int getBaseOrderId() { - // TODO Auto-generated method stub - return 0; - } - - public PrimaryTag getCastingPrimaryTag() { - return null; - } - - public EnumSet getCastingSecondaryTags() { - return null; - } - - @Override - public List getLevelData() { - return levelData; - } - - @Override - public AbilityBuilderConfiguration getConfig() { - return config; - } - - @Override - public Map getLocalStore() { - return localStore; - } - - public void startCooldown(CSimulation game, CUnit unit) { - // TODO Auto-generated method stub - } - - @Override - public int getChargedManaCost() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public void activate(CSimulation game, CUnit caster) { - // TODO Auto-generated method stub - - } - - @Override - public void deactivate(CSimulation game, CUnit caster) { - // TODO Auto-generated method stub - - } - - @Override - public int getOffOrderId() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public boolean isSeparateOnAndOff() { - // TODO Auto-generated method stub - return false; - } - - @Override - public void runBeginCastingActions(CSimulation game, CUnit caster, int orderId) { - // TODO Auto-generated method stub - - } - - @Override - public void runEndCastingActions(CSimulation game, CUnit caster, int orderId) { - // TODO Auto-generated method stub - - } - - @Override - public void runChannelTickActions(CSimulation game, CUnit caster, int orderId) { - // TODO Auto-generated method stub - - } - - @Override - public void runEndChannelActions(CSimulation game, CUnit caster, int orderId) { - // TODO Auto-generated method stub - - } - - @Override - public void runCancelPreCastActions(CSimulation game, CUnit caster, int orderId) { - // TODO Auto-generated method stub - - } - - @Override - public float getArea() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public float getCastRange() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public War3ID getOnTooltipOverride() { - // TODO Auto-generated method stub - return null; - } - - @Override - public War3ID getOffTooltipOverride() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void resetCooldown(CSimulation game, CUnit unit) { - // TODO Auto-generated method stub - - } - - @Override - public void setCastRange(float castRange) { - // TODO Auto-generated method stub - - } - - @Override - public void runOnOrderIssuedActions(CSimulation game, CUnit caster, int orderId) { - // TODO Auto-generated method stub - - } - - @Override - public AutocastType getAutocastType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void checkCanAutoTarget(CSimulation game, CUnit unit, int orderId, CWidget target, - AbilityTargetCheckReceiver receiver) { - // TODO Auto-generated method stub - - } - - @Override - public void checkCanAutoTarget(CSimulation game, CUnit unit, int orderId, AbilityPointTarget target, - AbilityTargetCheckReceiver receiver) { - // TODO Auto-generated method stub - - } - - @Override - public void checkCanAutoTargetNoTarget(CSimulation game, CUnit unit, int orderId, - AbilityTargetCheckReceiver receiver) { - // TODO Auto-generated method stub - - } - - @Override - public float getCooldown() { - // TODO Auto-generated method stub - return 0; - } - - @Override - public void setAutoCastOff() { - // TODO Auto-generated method stub - - } - - @Override - public boolean isPhysical() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isUniversal() { - // TODO Auto-generated method stub - return false; - } - - @Override - public CAbilityCategory getAbilityCategory() { - // TODO Auto-generated method stub - return null; - } - - @Override - public float getCooldownRemainingTicks(CSimulation game, CUnit unit) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int getAbilityIntField(String field) { - // TODO Auto-generated method stub - return 0; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java index 3b7d575e4..33f894494 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java @@ -83,7 +83,7 @@ public boolean isToggleOn() { @Override public void onAdd(CSimulation game, CUnit unit) { timer = new ManaDepletedCheckTimer(unit, this); - localStore.put(ABLocalStoreKeys.TOGGLEDABILITY, this); + localStore.put(ABLocalStoreKeys.ISTOGGLEDABILITY, this); if (config.getSpecialFields() != null) { if (config.getSpecialFields().getBufferManaRequired() != null) { this.bufferMana = config.getSpecialFields().getBufferManaRequired().callback(game, unit, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index d0a196217..84f34d80d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -68,6 +68,7 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri protected int manaCost = 0; protected float area = 0; protected float range = 0; + protected float castTime = 0; protected boolean hideAreaCursor = false; @@ -118,6 +119,8 @@ public CAbilityAbilityBuilderGenericActive(int handleId, War3ID code, War3ID ali if (this.castingSecondaryTags.isEmpty()) { this.castingSecondaryTags = SequenceUtils.SPELL; } + final int levels = editorData.getFieldAsInteger(AbilityFields.LEVELS, 0); + localStore.put(ABLocalStoreKeys.ISABILITYLEVELED, levels > 1); } @Override @@ -199,7 +202,7 @@ private void determineToggleableFields(CSimulation game, CUnit unit) { castId); } if (this.toggleable) { - localStore.put(ABLocalStoreKeys.TOGGLEDABILITY, this); + localStore.put(ABLocalStoreKeys.ISTOGGLEDABILITY, this); int manaPerSec = 0; if (config.getSpecialFields() != null && config.getSpecialFields().getManaDrainedPerSecond() != null) { manaPerSec = config.getSpecialFields().getManaDrainedPerSecond().callback(game, unit, localStore, @@ -235,6 +238,7 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.cooldown = levelDataLevel.getCooldown(); this.range = levelDataLevel.getCastRange(); this.area = levelDataLevel.getArea(); + this.castTime = levelDataLevel.getCastTime(); if (this.config.getOverrideFields() != null) { if (this.config.getOverrideFields().getAreaOverride() != null) { this.area = this.config.getOverrideFields().getAreaOverride().callback(game, unit, localStore, castId); @@ -243,6 +247,10 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.range = this.config.getOverrideFields().getRangeOverride().callback(game, unit, localStore, castId); } + if (this.config.getOverrideFields().getCastTimeOverride() != null) { + this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(game, unit, localStore, + castId); + } if (this.config.getOverrideFields().getCooldownOverride() != null) { this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(game, unit, localStore, castId); @@ -288,6 +296,7 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.hideAreaCursor = this.config.getDisplayFields().getHideAreaCursor().callback(game, unit, localStore, this.getLevel()); } + localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, this.physical); } @Override @@ -411,6 +420,14 @@ public void setCastRange(float range) { this.range = range; } + public float getCastTime() { + return castTime; + } + + public void setCastTime(float castTime) { + this.castTime = castTime; + } + @Override public boolean isSeparateOnAndOff() { return separateOnAndOff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java index 0662efec0..0664f5f94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java @@ -13,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractGenericNoIconAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; @@ -33,6 +34,7 @@ public class CAbilityAbilityBuilderNoIcon extends AbstractGenericNoIconAbility i protected float cooldown = 0; protected float area = 0; protected float range = 0; + protected float castTime = 0; public CAbilityAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, Map localStore) { @@ -41,6 +43,10 @@ public CAbilityAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, Lis this.config = config; this.localStore = localStore; localStore.put(ABLocalStoreKeys.ABILITY, this); + GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + final int levels = editorData.getFieldAsInteger(AbilityFields.LEVELS, 0); + localStore.put(ABLocalStoreKeys.ISABILITYLEVELED, levels > 1); + localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, true); } protected void setSpellFields(CSimulation game, CUnit unit) { @@ -56,6 +62,10 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.range = this.config.getOverrideFields().getRangeOverride().callback(game, unit, localStore, 0); } + if (this.config.getOverrideFields().getCastTimeOverride() != null) { + this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(game, unit, localStore, + 0); + } if (this.config.getOverrideFields().getCooldownOverride() != null) { this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(game, unit, localStore, 0); @@ -94,6 +104,10 @@ public float getCastRange() { return range; } + public float getCastTime() { + return castTime; + } + @Override public float getCooldown() { return cooldown; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java index e0c52f219..8adb7a3d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java @@ -12,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitTypeRequirement; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; @@ -30,6 +31,7 @@ public class CAbilityAbilityBuilderPassive extends AbilityGenericSingleIconPassi protected float cooldown = 0; protected float area = 0; protected float range = 0; + private float castTime = 0; private War3ID onTooltipOverride = null; @@ -41,6 +43,10 @@ public CAbilityAbilityBuilderPassive(int handleId, War3ID code, War3ID alias, this.config = config; this.localStore = localStore; localStore.put(ABLocalStoreKeys.ABILITY, this); + GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + final int levels = editorData.getFieldAsInteger(AbilityFields.LEVELS, 0); + localStore.put(ABLocalStoreKeys.ISABILITYLEVELED, levels > 1); + localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, true); } protected void setSpellFields(CSimulation game, CUnit unit) { @@ -58,6 +64,10 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.range = this.config.getOverrideFields().getRangeOverride().callback(game, unit, localStore, 0); } + if (this.config.getOverrideFields().getCastTimeOverride() != null) { + this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(game, unit, localStore, + 0); + } if (this.config.getOverrideFields().getCooldownOverride() != null) { this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(game, unit, localStore, 0); @@ -100,6 +110,10 @@ public float getCastRange() { return range; } + public float getCastTime() { + return castTime; + } + @Override public float getCooldown() { return cooldown; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java index 465eb5da3..a4769273a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java @@ -55,6 +55,7 @@ public class CAbilityAbilityBuilderStatAuraTemplate extends AbilityGenericSingle private final int LEAVE_GROUP_TICKS = (int) (3 / WarsmashConstants.SIMULATION_STEP_TIME); private final int ENTER_GROUP_TICKS = (int) (0.4 / WarsmashConstants.SIMULATION_STEP_TIME); private final int RESET_GROUP_TICKS = LEAVE_GROUP_TICKS * 2; + private boolean leveled; public CAbilityAbilityBuilderStatAuraTemplate(int handleId, War3ID code, War3ID alias, List levelData, Map localStore, @@ -85,6 +86,8 @@ public CAbilityAbilityBuilderStatAuraTemplate(int handleId, War3ID code, War3ID this.targetMelee = this.rangeOverride.isTargetMelee(); this.targetRange = this.rangeOverride.isTargetRange(); } + + this.leveled = levelData.size() > 1; } private void removeExistingBuffs(StatBuffFromDataField statBuff) { @@ -95,7 +98,7 @@ private void removeExistingBuffs(StatBuffFromDataField statBuff) { } } } - + private void addNewBuffs(StatBuffFromDataField statBuff) { for (CUnit unit : auraGroup) { unit.addNonStackingStatBuff(statBuff.getBuff()); @@ -156,6 +159,7 @@ private void createNewBuffs(StatBuffFromDataField parsedBuff) { public void setLevel(CSimulation game, CUnit unit, int level) { super.setLevel(game, unit, level); localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); + this.buff.setLevel(game, unit, level); targetsAllowed = levelData.get(getLevel() - 1).getTargetsAllowed(); range = levelData.get(getLevel() - 1).getArea(); this.targetMelee = false; @@ -233,7 +237,8 @@ public void setLevel(CSimulation game, CUnit unit, int level) { @Override public void onAdd(CSimulation game, CUnit unit) { if (this.buffId != null) { - this.buff = new ABGenericAuraBuff(game.getHandleIdAllocator().createId(), this.buffId, unit); + this.buff = new ABGenericAuraBuff(game.getHandleIdAllocator().createId(), this.buffId, unit, this.leveled, + true); } game.getAbilityData().createAbility(getAlias(), game.getHandleIdAllocator().createId()); auraGroup = new HashSet<>(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java index c952747b5..31dc20ebf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java @@ -149,7 +149,8 @@ public void setLevel(CSimulation game, CUnit unit, int level) { @Override public void onAdd(CSimulation game, CUnit unit) { if (this.buffId != null) { - this.buff = new ABPermanentPassiveBuff(game.getHandleIdAllocator().createId(), this.buffId, localStore, null, null, 0); + this.buff = new ABPermanentPassiveBuff(game.getHandleIdAllocator().createId(), this.buffId, localStore, + null, null, 0, false, true); unit.addNonStackingDisplayBuff(game, auraStackingKey, buff); } this.caster = unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java index d3d5b1637..264aa8822 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java @@ -21,32 +21,34 @@ public class CBehaviorAbilityBuilderBase extends CAbstractRangedBehavior impleme private Map localStore; private AbilityBuilderActiveAbility ability; private ABAbilityTargetStillTargetableVisitor preCastTargetableVisitor; - + private int castStartTick = 0; private int castBehaviorNotifyTick = 0; + private int castPointTicks = 0; + private int backswingTicks = 0; private boolean doneEffect = false; private boolean channeling = false; private boolean preventReInterrupt = false; - + private int castId = 0; private int orderId; - + private boolean instant = false; private CBehaviorCategory behaviorCategory = null; - public CBehaviorAbilityBuilderBase(final CUnit unit, - final Map localStore, AbilityBuilderActiveAbility ability) { + public CBehaviorAbilityBuilderBase(final CUnit unit, final Map localStore, + AbilityBuilderActiveAbility ability) { super(unit); this.localStore = localStore; this.ability = ability; this.preCastTargetableVisitor = new ABAbilityTargetStillTargetableVisitor(); - + } - + public void setInstant(boolean instant) { this.instant = instant; } - + public void setBehaviorCategory(CBehaviorCategory behaviorCategory) { this.behaviorCategory = behaviorCategory; } @@ -54,6 +56,10 @@ public void setBehaviorCategory(CBehaviorCategory behaviorCategory) { public CBehavior reset(final CSimulation game, final CWidget target) { this.doneEffect = false; this.castStartTick = 0; + this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = this.ability.getBaseOrderId(); this.preventReInterrupt = false; @@ -63,6 +69,10 @@ public CBehavior reset(final CSimulation game, final CWidget target) { public CBehavior reset(final CSimulation game, final CWidget target, int orderId) { this.doneEffect = false; this.castStartTick = 0; + this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = orderId; this.preventReInterrupt = false; @@ -72,6 +82,10 @@ public CBehavior reset(final CSimulation game, final CWidget target, int orderId public CBehavior reset(final CSimulation game, final AbilityPointTarget target) { this.doneEffect = false; this.castStartTick = 0; + this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = this.ability.getBaseOrderId(); this.preventReInterrupt = false; @@ -81,6 +95,10 @@ public CBehavior reset(final CSimulation game, final AbilityPointTarget target) public CBehavior reset(final CSimulation game, final AbilityPointTarget target, int orderId) { this.doneEffect = false; this.castStartTick = 0; + this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = orderId; this.preventReInterrupt = false; @@ -100,27 +118,21 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { boolean wasChanneling = this.channeling; if (this.castStartTick == 0) { CBehavior prevBeh = this.unit.getCurrentBehavior(); - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, this.target); - if (this.unit.getCurrentBehavior() != prevBeh) { - return this.unit.getCurrentBehavior(); - } else if (this.unit.isPaused()) { - return this; - } - + this.castStartTick = game.getGameTurnTick(); - this.castBehaviorNotifyTick = (int) (this.castStartTick + 0.5/WarsmashConstants.SIMULATION_STEP_TIME); - + this.castBehaviorNotifyTick = (int) (this.castStartTick + 0.5 / WarsmashConstants.SIMULATION_STEP_TIME); + if (!this.target.visit(this.preCastTargetableVisitor.reset(game, this.unit, ability, false, orderId))) { return this.unit.pollNextOrderBehavior(game); } - + if (!this.unit.chargeMana(this.ability.getChargedManaCost())) { game.getCommandErrorListener().showInterfaceError(this.unit.getPlayerIndex(), CommandStringErrorKeys.NOT_ENOUGH_MANA); return this.unit.pollNextOrderBehavior(game); } this.ability.startCooldown(game, this.unit); - + this.ability.runBeginCastingActions(game, unit, orderId); CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); @@ -134,8 +146,14 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { this.ability.getCastingSecondaryTags(), 1.0f, true); } this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, this.ability, this.target); + if (this.unit.getCurrentBehavior() != prevBeh) { + return this.unit.getCurrentBehavior(); + } else if (this.unit.isPaused()) { + return this; + } } - if (instant) { CBehavior beh = tryDoEffect(game, wasChanneling); @@ -148,17 +166,13 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); return newBehavior; } - + if (!this.channeling) { cleanupInputs(); return this.unit.pollNextOrderBehavior(game); } } else { final int ticksSinceCast = game.getGameTurnTick() - this.castStartTick; - final int castPointTicks = (int) (this.unit.getUnitType().getCastPoint() - / WarsmashConstants.SIMULATION_STEP_TIME); - final int backswingTicks = (int) (this.unit.getUnitType().getCastBackswingPoint() - / WarsmashConstants.SIMULATION_STEP_TIME); if ((ticksSinceCast >= castPointTicks) || (ticksSinceCast >= backswingTicks)) { CBehavior beh = tryDoEffect(game, wasChanneling); if (beh != null) { @@ -178,41 +192,42 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { } return this; } - + private void cleanupInputs() { this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + castId); } - + private CBehavior tryDoEffect(CSimulation game, boolean wasChanneling) { boolean wasEffectDone = this.doneEffect; if (!wasEffectDone) { CBehavior prevBeh = this.unit.getCurrentBehavior(); - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this.ability, this.target); - if (this.unit.getCurrentBehavior() != prevBeh) { - return this.unit.getCurrentBehavior(); - } else if (this.unit.isPaused()) { - return this; - } if (this.channeling) { - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, this.ability, this.target); - if (this.unit.getCurrentBehavior() != prevBeh) { - return this.unit.getCurrentBehavior(); - } else if (this.unit.isPaused()) { - return this; - } game.unitLoopSoundEffectEvent(this.unit, this.ability.getAlias()); - } - else { + } else { game.unitSoundEffectEvent(this.unit, this.ability.getAlias()); } this.doneEffect = true; + + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, this.target); + if (this.unit.getCurrentBehavior() != prevBeh) { + return this.unit.getCurrentBehavior(); + } else if (this.unit.isPaused()) { + return this; + } this.ability.runEndCastingActions(game, unit, orderId); this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this.ability, this.target); + if (this.unit.getCurrentBehavior() != prevBeh) { + return this.unit.getCurrentBehavior(); + } else if (this.unit.isPaused()) { + return this; + } + } this.channeling = this.channeling && this.doChannelTick(game, this.unit, this.target); if (wasEffectDone && wasChanneling && !this.channeling) { @@ -233,8 +248,10 @@ public boolean doChannelTick(CSimulation game, CUnit caster, AbilityTarget targe @Override public void end(final CSimulation game, boolean interrupted) { checkEndChannel(game, interrupted); + if (!interrupted) { + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); + } this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.ability, this.target); - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, this.target); } private void checkEndChannel(final CSimulation game, final boolean interrupted) { @@ -278,14 +295,15 @@ protected CBehavior updateOnInvalidTarget(CSimulation simulation) { @Override protected boolean checkTargetStillValid(CSimulation simulation) { - return this.doneEffect || this.target.visit(this.preCastTargetableVisitor.reset(simulation, this.unit, this.ability, this.channeling, orderId)); + return this.doneEffect || this.target.visit( + this.preCastTargetableVisitor.reset(simulation, this.unit, this.ability, this.channeling, orderId)); } @Override protected void resetBeforeMoving(CSimulation simulation) { this.castStartTick = 0; } - + public void setCastId(int castId) { this.castId = castId; } @@ -298,7 +316,7 @@ public boolean interruptable() { @Override public CBehaviorCategory getBehaviorCategory() { if (this.behaviorCategory != null) { - return this.behaviorCategory ; + return this.behaviorCategory; } return CBehaviorCategory.SPELL; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java index fce1d117e..02d2cb06a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java @@ -21,6 +21,8 @@ public class CBehaviorAbilityBuilderNoTarget implements ABBehavior { private AbilityBuilderActiveAbility ability; private int castStartTick = 0; + private int castPointTicks = 0; + private int backswingTicks = 0; private boolean doneEffect = false; private boolean channeling = false; @@ -69,6 +71,10 @@ public ABBehavior reset(final CSimulation game, AbilityPointTarget target, int o public ABBehavior reset() { this.doneEffect = false; this.castStartTick = 0; + this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = this.ability.getBaseOrderId(); return this; @@ -78,6 +84,10 @@ public ABBehavior reset() { public ABBehavior reset(int orderId) { this.doneEffect = false; this.castStartTick = 0; + this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) + / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = orderId; return this; @@ -87,12 +97,6 @@ public ABBehavior reset(int orderId) { public CBehavior update(final CSimulation game) { boolean wasChanneling = this.channeling; if (this.castStartTick == 0) { - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, null); - if (this.unit.getCurrentBehavior() != this) { - return this.unit.getCurrentBehavior(); - } else if (this.unit.isPaused()) { - return this; - } this.castStartTick = game.getGameTurnTick(); if (!this.unit.chargeMana(this.ability.getChargedManaCost())) { @@ -113,6 +117,13 @@ public CBehavior update(final CSimulation game) { this.ability.getCastingSecondaryTags(), 1.0f, true); } this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, this.ability, null); + if (this.unit.getCurrentBehavior() != this) { + return this.unit.getCurrentBehavior(); + } else if (this.unit.isPaused()) { + return this; + } } if (instant) { @@ -130,10 +141,6 @@ public CBehavior update(final CSimulation game) { } } else { final int ticksSinceCast = game.getGameTurnTick() - this.castStartTick; - final int castPointTicks = (int) (this.unit.getUnitType().getCastPoint() - / WarsmashConstants.SIMULATION_STEP_TIME); - final int backswingTicks = (int) (this.unit.getUnitType().getCastBackswingPoint() - / WarsmashConstants.SIMULATION_STEP_TIME); if ((ticksSinceCast >= castPointTicks) || (ticksSinceCast >= backswingTicks)) { CBehavior beh = tryDoEffect(game, wasChanneling); if (beh != null) { @@ -155,19 +162,7 @@ public CBehavior update(final CSimulation game) { private CBehavior tryDoEffect(CSimulation game, boolean wasChanneling) { boolean wasEffectDone = this.doneEffect; if (!wasEffectDone) { - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this.ability, null); - if (this.unit.getCurrentBehavior() != this) { - return this.unit.getCurrentBehavior(); - } else if (this.unit.isPaused()) { - return this; - } if (this.channeling) { - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, this.ability, null); - if (this.unit.getCurrentBehavior() != this) { - return this.unit.getCurrentBehavior(); - } else if (this.unit.isPaused()) { - return this; - } game.unitLoopSoundEffectEvent(this.unit, this.ability.getAlias()); } else { @@ -177,6 +172,13 @@ private CBehavior tryDoEffect(CSimulation game, boolean wasChanneling) { this.ability.runEndCastingActions(game, unit, orderId); this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, null); + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this.ability, null); + if (this.unit.getCurrentBehavior() != this) { + return this.unit.getCurrentBehavior(); + } else if (this.unit.isPaused()) { + return this; + } } this.channeling = this.channeling && this.doChannelTick(game, this.unit); @@ -198,8 +200,10 @@ public boolean doChannelTick(CSimulation game, CUnit caster) { @Override public void end(final CSimulation game, boolean interrupted) { checkEndChannel(game, interrupted); + if (!interrupted) { + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); + } this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.ability, null); - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); } private void checkEndChannel(final CSimulation game, final boolean interrupted) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java index 586efaeb3..c102d575b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java @@ -11,7 +11,7 @@ public class ABActionActivateToggledAbility implements ABAction { public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.TOGGLEDABILITY); + AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ISTOGGLEDABILITY); ability.activate(game, caster); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java index 29c218a49..d5f5c31fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java @@ -11,7 +11,7 @@ public class ABActionDeactivateToggledAbility implements ABAction { public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.TOGGLEDABILITY); + AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ISTOGGLEDABILITY); ability.deactivate(game, caster); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java index 61f2e96ef..95d392ca2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java @@ -14,7 +14,7 @@ public class ABActionSetAbilityCastRange implements ABAction { private ABFloatCallback range; public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.TOGGLEDABILITY); + AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ISTOGGLEDABILITY); ability.setCastRange(range.callback(game, caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java index cd33b909c..390b07380 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -19,20 +19,37 @@ public class ABActionCreatePassiveBuff implements ABAction { private List onAddActions; private List onRemoveActions; private CEffectType artType; - + private ABBooleanCallback showFx; private ABBooleanCallback playSfx; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + private ABBooleanCallback leveled; + private ABBooleanCallback positive; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { ABPermanentPassiveBuff ability = null; + boolean isLeveled = false; + if (leveled != null) { + isLeveled = leveled.callback(game, caster, localStore, castId); + } else { + isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + } + boolean isPositive = true; + if (positive != null) { + isPositive = positive.callback(game, caster, localStore, castId); + } + if (showIcon != null) { ability = new ABPermanentPassiveBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, onAddActions, onRemoveActions, showIcon.callback(game, caster, localStore, castId), castId); + buffId.callback(game, caster, localStore, castId), localStore, onAddActions, onRemoveActions, + showIcon.callback(game, caster, localStore, castId), castId, isLeveled, isPositive); localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); } else { ability = new ABPermanentPassiveBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, onAddActions, onRemoveActions, true, castId); - + buffId.callback(game, caster, localStore, castId), localStore, onAddActions, onRemoveActions, true, + castId, isLeveled, isPositive); + localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); } if (artType != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java index 015696e81..ef7ba6d7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -19,12 +19,34 @@ public class ABActionCreateTimedArtBuff implements ABAction { private ABBooleanCallback showIcon; private CEffectType artType; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + private ABBooleanCallback leveled; + private ABBooleanCallback positive; + private ABBooleanCallback dispellable; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + boolean isLeveled = false; + if (leveled != null) { + isLeveled = leveled.callback(game, caster, localStore, castId); + } else { + isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + } + boolean isPositive = true; + if (positive != null) { + isPositive = positive.callback(game, caster, localStore, castId); + } + boolean isDispellable = true; + if (dispellable != null) { + isDispellable = dispellable.callback(game, caster, localStore, castId); + } else { + isDispellable = !((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); + } if (showIcon != null) { ABTimedArtBuff ability = new ABTimedArtBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), duration.callback(game, caster, localStore, castId), - showIcon.callback(game, caster, localStore, castId)); + buffId.callback(game, caster, localStore, castId), + duration.callback(game, caster, localStore, castId), + showIcon.callback(game, caster, localStore, castId), isLeveled, isPositive, isDispellable); if (artType != null) { ability.setArtType(artType); } @@ -32,7 +54,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { boolean showTimedLife = false; if (showTimedLifeBar != null) { showTimedLife = showTimedLifeBar.callback(game, caster, localStore, castId); } + boolean isLeveled = false; + if (leveled != null) { + isLeveled = leveled.callback(game, caster, localStore, castId); + } else { + isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + } + boolean isPositive = true; + if (positive != null) { + isPositive = positive.callback(game, caster, localStore, castId); + } + boolean isDispellable = true; + if (dispellable != null) { + isDispellable = dispellable.callback(game, caster, localStore, castId); + } else { + isDispellable = !((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); + } if (showIcon != null) { ABTimedBuff ability = new ABTimedBuff(game.getHandleIdAllocator().createId(), buffId.callback(game, caster, localStore, castId), duration.callback(game, caster, localStore, castId), showTimedLife, localStore, onAddActions, - onRemoveActions, onExpireActions, showIcon.callback(game, caster, localStore, castId), castId); + onRemoveActions, onExpireActions, showIcon.callback(game, caster, localStore, castId), castId, + isLeveled, isPositive, isDispellable); if (artType != null) { ability.setArtType(artType); } @@ -48,7 +69,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { boolean showTimedLife = false; if (showTimedLifeBar != null) { showTimedLife = showTimedLifeBar.callback(game, caster, localStore, castId); } + boolean isLeveled = false; + if (leveled != null) { + isLeveled = leveled.callback(game, caster, localStore, castId); + } else { + isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + } + boolean isPositive = true; + if (positive != null) { + isPositive = positive.callback(game, caster, localStore, castId); + } + boolean isDispellable = true; + if (dispellable != null) { + isDispellable = dispellable.callback(game, caster, localStore, castId); + } else { + isDispellable = !((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); + } if (showIcon != null) { ABTimedTickingBuff ability = new ABTimedTickingBuff(game.getHandleIdAllocator().createId(), buffId.callback(game, caster, localStore, castId), duration.callback(game, caster, localStore, castId), showTimedLife, localStore, onAddActions, - onRemoveActions, onExpireActions, onTickActions, showIcon.callback(game, caster, localStore, castId), castId); + onRemoveActions, onExpireActions, onTickActions, + showIcon.callback(game, caster, localStore, castId), castId, isLeveled, isPositive, isDispellable); if (artType != null) { ability.setArtType(artType); } @@ -45,7 +66,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { boolean showTimedLife = false; if (showTimedLifeBar != null) { showTimedLife = showTimedLifeBar.callback(game, caster, localStore, castId); } + boolean isLeveled = false; + if (leveled != null) { + isLeveled = leveled.callback(game, caster, localStore, castId); + } else { + isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + } + boolean isPositive = true; + if (positive != null) { + isPositive = positive.callback(game, caster, localStore, castId); + } + boolean isDispellable = true; + if (dispellable != null) { + isDispellable = dispellable.callback(game, caster, localStore, castId); + } else { + isDispellable = !((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); + } if (showIcon != null) { ABTimedTickingPausedBuff ability = new ABTimedTickingPausedBuff(game.getHandleIdAllocator().createId(), buffId.callback(game, caster, localStore, castId), duration.callback(game, caster, localStore, castId), showTimedLife, localStore, onAddActions, - onRemoveActions, onExpireActions, onTickActions, showIcon.callback(game, caster, localStore, castId), castId); + onRemoveActions, onExpireActions, onTickActions, + showIcon.callback(game, caster, localStore, castId), castId, isLeveled, isPositive, isDispellable); if (artType != null) { ability.setArtType(artType); } @@ -45,7 +66,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { boolean showTimedLife = false; if (showTimedLifeBar != null) { showTimedLife = showTimedLifeBar.callback(game, caster, localStore, castId); } + boolean isLeveled = false; + if (leveled != null) { + isLeveled = leveled.callback(game, caster, localStore, castId); + } else { + isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + } + boolean isPositive = true; + if (positive != null) { + isPositive = positive.callback(game, caster, localStore, castId); + } + boolean isDispellable = true; + if (dispellable != null) { + isDispellable = dispellable.callback(game, caster, localStore, castId); + } else { + isDispellable = !((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); + } if (showIcon != null) { - ABTimedTickingPostDeathBuff ability = new ABTimedTickingPostDeathBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), + ABTimedTickingPostDeathBuff ability = new ABTimedTickingPostDeathBuff( + game.getHandleIdAllocator().createId(), buffId.callback(game, caster, localStore, castId), duration.callback(game, caster, localStore, castId), showTimedLife, localStore, onAddActions, - onRemoveActions, onExpireActions, onTickActions, showIcon.callback(game, caster, localStore, castId), castId); + onRemoveActions, onExpireActions, onTickActions, + showIcon.callback(game, caster, localStore, castId), castId, isLeveled, isPositive, isDispellable); if (artType != null) { ability.setArtType(artType); } localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); } else { - ABTimedTickingPostDeathBuff ability = new ABTimedTickingPostDeathBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), + ABTimedTickingPostDeathBuff ability = new ABTimedTickingPostDeathBuff( + game.getHandleIdAllocator().createId(), buffId.callback(game, caster, localStore, castId), duration.callback(game, caster, localStore, castId), showTimedLife, localStore, onAddActions, - onRemoveActions, onExpireActions, onTickActions, castId); + onRemoveActions, onExpireActions, onTickActions, castId, isLeveled, isPositive, isDispellable); if (artType != null) { ability.setArtType(artType); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java index 2c5587985..b7ea03483 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -18,11 +19,17 @@ public class ABActionCreateDestructableBuff implements ABAction { private List onRemoveActions; private List onDeathActions; + private ABBooleanCallback dispellable; + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + boolean isDispellable = false; + if (dispellable != null) { + isDispellable = dispellable.callback(game, caster, localStore, castId); + } CDestructableBuff ability = new ABDestructableBuff(game.getHandleIdAllocator().createId(), buffId.callback(game, caster, localStore, castId), (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL), - localStore, onAddActions, onRemoveActions, onDeathActions, castId, caster); + localStore, onAddActions, onRemoveActions, onDeathActions, castId, caster, isDispellable); localStore.put(ABLocalStoreKeys.LASTCREATEDDESTBUFF, ability); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackEvaluateCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackEvaluateCondition.java new file mode 100644 index 000000000..c5d57154d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackEvaluateCondition.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackEvaluateCondition extends ABBooleanCallback { + + private ABCondition condition; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return condition.evaluate(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java index 8fffe15be..c6f195ac0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java @@ -13,7 +13,7 @@ public class ABConditionIsFlexAbilityNonPointTarget implements ABCondition { @Override public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { - CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.FLEXABILITY); + CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return !ability.isPointTarget(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java index ba282bf3d..23310b96a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java @@ -13,7 +13,7 @@ public class ABConditionIsFlexAbilityNonTargeted implements ABCondition { @Override public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { - CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.FLEXABILITY); + CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return !ability.isTargetedSpell(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java index 96a94c532..378c6d834 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java @@ -13,7 +13,7 @@ public class ABConditionIsFlexAbilityPointTarget implements ABCondition { @Override public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { - CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.FLEXABILITY); + CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return ability.isPointTarget(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java index 1662a1918..6d569224f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java @@ -13,7 +13,7 @@ public class ABConditionIsFlexAbilityTargeted implements ABCondition { @Override public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { - CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.FLEXABILITY); + CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return ability.isTargetedSpell(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java new file mode 100644 index 000000000..ccc2c1f80 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java @@ -0,0 +1,29 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; + +public class ABConditionIsUnitShareSpells implements ABCondition { + + private ABUnitCallback caster; + private ABUnitCallback unit; + + @Override + public boolean evaluate(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); + CUnit theCaster = casterUnit; + if (caster != null) { + theCaster = caster.callback(game, casterUnit, localStore, castId); + } + + if (theUnit != null) { + return game.getPlayer(theUnit.getPlayerIndex()).hasAlliance(theCaster.getPlayerIndex(), CAllianceType.SHARED_SPELLS); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java index 3e9795efe..be7be1583 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java @@ -24,9 +24,11 @@ public class ABDestructableBuff implements CDestructableBuff { private List onAddActions; private List onRemoveActions; private List onDeathActions; + + private boolean dispellable; public ABDestructableBuff(int handleId, War3ID alias, int level, Map localStore, List onAddActions, - List onRemoveActions, List onDeathActions, final int castId, CUnit caster) { + List onRemoveActions, List onDeathActions, final int castId, CUnit caster, boolean dispellable) { this.handleId = handleId; this.alias = alias; this.level = level; @@ -36,6 +38,7 @@ public ABDestructableBuff(int handleId, War3ID alias, int level, Map(); + this.positive = positive; + this.leveled = leveled; + this.setLevel(null, null, 1); } @Override @@ -59,4 +66,14 @@ public void onTick(CSimulation game, CUnit unit) { public void onDeath(CSimulation game, CUnit cUnit) { } + @Override + public boolean isPositive() { + return this.positive; + } + + @Override + public boolean isLeveled() { + return this.leveled; + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java index 52cdb7061..db9ee53ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java @@ -6,13 +6,20 @@ public abstract class ABGenericPermanentBuff extends ABBuff { - public ABGenericPermanentBuff(int handleId, War3ID alias, boolean showIcon) { + private boolean leveled; + private boolean positive; + + public ABGenericPermanentBuff(int handleId, War3ID alias, boolean showIcon, boolean leveled, boolean positive) { super(handleId, alias, alias); this.setIconShowing(showIcon); + this.leveled = leveled; + this.positive = positive; } - - public ABGenericPermanentBuff(int handleId, War3ID alias) { + + public ABGenericPermanentBuff(int handleId, War3ID alias, boolean leveled, boolean positive) { super(handleId, alias, alias); + this.leveled = leveled; + this.positive = positive; } protected abstract void onBuffAdd(CSimulation game, CUnit unit); @@ -52,5 +59,14 @@ public void onTick(CSimulation game, CUnit unit) { public void onDeath(CSimulation game, CUnit cUnit) { } + @Override + public boolean isPositive() { + return this.positive; + } + + @Override + public boolean isLeveled() { + return this.leveled; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java index 52ffa1875..d325579b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java @@ -10,11 +10,18 @@ public abstract class ABGenericTimedBuff extends ABBuff { private final float duration; private int currentTick = 0; private int expireTick; - - public ABGenericTimedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar) { + private boolean leveled; + private boolean positive; + private boolean dispellable; + + public ABGenericTimedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, boolean leveled, + boolean positive, boolean dispellable) { super(handleId, alias, alias); this.showTimedLifeBar = showTimedLifeBar; this.duration = duration; + this.leveled = leveled; + this.positive = positive; + this.dispellable = dispellable; } @Override @@ -39,7 +46,7 @@ public void onAdd(CSimulation game, CUnit unit) { public void onRemove(CSimulation game, CUnit unit) { this.onBuffRemove(game, unit); } - + protected abstract void onBuffRemove(CSimulation game, CUnit unit); protected abstract void onBuffExpire(CSimulation game, CUnit unit); @@ -68,9 +75,24 @@ public void onTick(final CSimulation game, final CUnit caster) { public void onDeath(final CSimulation game, final CUnit cUnit) { cUnit.remove(game, this); } - + public void updateExpiration(final CSimulation game, final CUnit unit) { final int durationTicks = (int) (this.duration / WarsmashConstants.SIMULATION_STEP_TIME); expireTick = game.getGameTurnTick() + durationTicks; } + + @Override + public boolean isPositive() { + return this.positive; + } + + @Override + public boolean isLeveled() { + return this.leveled; + } + + @Override + public boolean isDispellable() { + return this.dispellable; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java index e5cc97059..7eb3ba50b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java @@ -16,47 +16,49 @@ public class ABPermanentPassiveBuff extends ABGenericPermanentBuff { protected Map localStore; private List onAddActions; private List onRemoveActions; - + private boolean showFx = true; private boolean playSfx = false; - + private CEffectType artType = CEffectType.TARGET; private NonStackingFx fx; private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - + protected int castId = 0; public ABPermanentPassiveBuff(int handleId, War3ID alias, Map localStore, - List onAddActions, List onRemoveActions, boolean showIcon, final int castId) { - this(handleId, alias, localStore, onAddActions, onRemoveActions, castId); + List onAddActions, List onRemoveActions, boolean showIcon, final int castId, + boolean leveled, boolean positive) { + this(handleId, alias, localStore, onAddActions, onRemoveActions, castId, leveled, positive); this.setIconShowing(showIcon); } public ABPermanentPassiveBuff(int handleId, War3ID alias, Map localStore, - List onAddActions, List onRemoveActions, final int castId) { - super(handleId, alias); + List onAddActions, List onRemoveActions, final int castId, boolean leveled, + boolean positive) { + super(handleId, alias, leveled, positive); this.localStore = localStore; this.onAddActions = onAddActions; this.onRemoveActions = onRemoveActions; this.castId = castId; } - + public void setArtType(CEffectType artType) { this.artType = artType; } - + public void setShowFx(boolean showFx) { this.showFx = showFx; } - + public void setPlaySfx(boolean playSfx) { this.playSfx = playSfx; } @Override protected void onBuffAdd(CSimulation game, CUnit unit) { - if(this.fx != null) { + if (this.fx != null) { unit.removeNonStackingFx(game, this.fx); } if (this.getAlias() != null) { @@ -93,7 +95,4 @@ protected void onBuffRemove(CSimulation game, CUnit unit) { } } - - - } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java index 77e1efd9f..b25027fea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java @@ -12,23 +12,25 @@ public class ABTimedArtBuff extends ABGenericTimedBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; private CEffectType artType = CEffectType.TARGET; - - public ABTimedArtBuff(int handleId, War3ID alias, float duration, boolean showIcon) { - this(handleId, alias, duration); + + public ABTimedArtBuff(int handleId, War3ID alias, float duration, boolean showIcon, boolean leveled, + boolean positive, boolean dispellable) { + this(handleId, alias, duration, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedArtBuff(int handleId, War3ID alias, float duration) { - super(handleId, alias, duration, false); + public ABTimedArtBuff(int handleId, War3ID alias, float duration, boolean leveled, boolean positive, + boolean dispellable) { + super(handleId, alias, duration, false, leveled, positive, dispellable); } - + public void setArtType(CEffectType artType) { this.artType = artType; } @Override protected void onBuffAdd(CSimulation game, CUnit unit) { - if(this.fx != null) { + if (this.fx != null) { unit.removeNonStackingFx(game, this.fx); this.fx = null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java index 2219c8876..051a683ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java @@ -7,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -17,37 +18,44 @@ public class ABTimedBuff extends ABGenericTimedBuff { private List onAddActions; private List onRemoveActions; private List onExpireActions; - + private CEffectType artType = CEffectType.TARGET; private NonStackingFx fx; private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - + protected int castId = 0; - public ABTimedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, Map localStore, - List onAddActions, List onRemoveActions, List onExpireActions, boolean showIcon, final int castId) { - this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, castId); + public ABTimedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + Map localStore, List onAddActions, List onRemoveActions, + List onExpireActions, boolean showIcon, final int castId, final boolean leveled, + final boolean positive, final boolean dispellable) { + this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, Map localStore, - List onAddActions, List onRemoveActions, List onExpireActions, final int castId) { - super(handleId, alias, duration, showTimedLifeBar); + public ABTimedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + Map localStore, List onAddActions, List onRemoveActions, + List onExpireActions, final int castId, final boolean leveled, final boolean positive, + final boolean dispellable) { + super(handleId, alias, duration, showTimedLifeBar, leveled, positive, dispellable); this.localStore = localStore; this.onAddActions = onAddActions; this.onRemoveActions = onRemoveActions; this.onExpireActions = onExpireActions; this.castId = castId; + + this.setLevel(null, null, (int) localStore.getOrDefault(ABLocalStoreKeys.CURRENTLEVEL, 1)); } - + public void setArtType(CEffectType artType) { this.artType = artType; } @Override protected void onBuffAdd(CSimulation game, CUnit unit) { - if(this.fx != null) { + if (this.fx != null) { unit.removeNonStackingFx(game, this.fx); } if (this.getAlias() != null) { @@ -91,7 +99,4 @@ protected void onBuffExpire(CSimulation game, CUnit unit) { } } - - - } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java index 50736010a..cfb4b1c38 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java @@ -22,9 +22,10 @@ public class ABTimedInstantTransformationBuff extends ABGenericTimedBuff { private float dur; private float transTime; - public ABTimedInstantTransformationBuff(int handleId, Map localStore, OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderPassiveAbility ability, + public ABTimedInstantTransformationBuff(int handleId, Map localStore, + OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderPassiveAbility ability, CUnitType newType, boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { - super(handleId, alias, duration, true); + super(handleId, alias, duration, true, false, true, false); this.setIconShowing(false); this.localStore = localStore; this.actions = actions; @@ -47,10 +48,11 @@ protected void onBuffRemove(CSimulation game, CUnit unit) { protected void onBuffExpire(CSimulation game, CUnit unit) { if (dur > 0) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); - new DelayInstantTransformationTimer(game, localStore, unit, actions, addAlternateTagAfter, transTime, null, targetType, abil, - null, transTime, 0).start(game); + new DelayInstantTransformationTimer(game, localStore, unit, actions, addAlternateTagAfter, transTime, null, + targetType, abil, null, transTime, 0).start(game); } else { - TransformationHandler.instantTransformation(game, localStore, unit, targetType, actions, abil, addAlternateTagAfter, perm, true); + TransformationHandler.instantTransformation(game, localStore, unit, targetType, actions, abil, + addAlternateTagAfter, perm, true); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java index 051ee90d8..2a08ea777 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java @@ -6,7 +6,7 @@ public class ABTimedTargetingBuff extends ABGenericTimedBuff { public ABTimedTargetingBuff(int handleId, War3ID alias, float duration) { - super(handleId, alias, duration, false); + super(handleId, alias, duration, false, false, true, false); this.setIconShowing(false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java index 6a64244a9..74c6c9b30 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java @@ -9,18 +9,24 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; public class ABTimedTickingBuff extends ABTimedBuff { - + private List onTickActions; - public ABTimedTickingBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, Map localStore, - List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId) { - this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId); + public ABTimedTickingBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + Map localStore, List onAddActions, List onRemoveActions, + List onExpireActions, List onTickActions, boolean showIcon, final int castId, + final boolean leveled, final boolean positive, final boolean dispellable) { + this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + onTickActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - - public ABTimedTickingBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, Map localStore, - List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId) { - super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, castId); + + public ABTimedTickingBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + Map localStore, List onAddActions, List onRemoveActions, + List onExpireActions, List onTickActions, final int castId, final boolean leveled, + final boolean positive, final boolean dispellable) { + super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + castId, leveled, positive, dispellable); this.onTickActions = onTickActions; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java index 9e35b5e64..c75019361 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java @@ -12,15 +12,21 @@ public class ABTimedTickingPausedBuff extends ABTimedBuff { private List onTickActions; - public ABTimedTickingPausedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, Map localStore, - List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId) { - this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId); + public ABTimedTickingPausedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + Map localStore, List onAddActions, List onRemoveActions, + List onExpireActions, List onTickActions, boolean showIcon, final int castId, + final boolean leveled, final boolean positive, final boolean dispellable) { + this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + onTickActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - - public ABTimedTickingPausedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, Map localStore, - List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId) { - super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, castId); + + public ABTimedTickingPausedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + Map localStore, List onAddActions, List onRemoveActions, + List onExpireActions, List onTickActions, final int castId, final boolean leveled, + final boolean positive, final boolean dispellable) { + super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + castId, leveled, positive, dispellable); this.onTickActions = onTickActions; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java index 08c4423b0..452b0be38 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java @@ -10,15 +10,21 @@ public class ABTimedTickingPostDeathBuff extends ABTimedTickingBuff { - public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, Map localStore, - List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId) { - this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId); + public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + Map localStore, List onAddActions, List onRemoveActions, + List onExpireActions, List onTickActions, boolean showIcon, final int castId, + final boolean leveled, final boolean positive, final boolean dispellable) { + this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + onTickActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - - public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, Map localStore, - List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId) { - super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId); + + public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + Map localStore, List onAddActions, List onRemoveActions, + List onExpireActions, List onTickActions, final int castId, final boolean leveled, + final boolean positive, final boolean dispellable) { + super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + onTickActions, castId, leveled, positive, dispellable); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java index 2ea3d79bd..48014a500 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java @@ -30,11 +30,12 @@ public class ABTimedTransformationBuff extends ABGenericTimedBuff { private boolean imTakeOff; private boolean instantTransformation; - public ABTimedTransformationBuff(int handleId, Map localStore, OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderActiveAbility ability, - CUnitType newType, boolean addAlternateTagAfter, boolean permanent, float transformationDuration, - float transformationTime, float landingDelay, float altitudeAdjustmentDelay, - float altitudeAdjustmentDuration, boolean immediateLanding, boolean immediateTakeoff) { - super(handleId, alias, duration, true); + public ABTimedTransformationBuff(int handleId, Map localStore, OnTransformationActions actions, + War3ID alias, float duration, AbilityBuilderActiveAbility ability, CUnitType newType, + boolean addAlternateTagAfter, boolean permanent, float transformationDuration, float transformationTime, + float landingDelay, float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, + boolean immediateLanding, boolean immediateTakeoff) { + super(handleId, alias, duration, true, false, true, false); this.setIconShowing(false); this.localStore = localStore; this.actions = actions; @@ -52,9 +53,10 @@ public ABTimedTransformationBuff(int handleId, Map localStore, O this.instantTransformation = false; } - public ABTimedTransformationBuff(int handleId, Map localStore, OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderActiveAbility ability, - CUnitType newType, boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { - super(handleId, alias, duration, true); + public ABTimedTransformationBuff(int handleId, Map localStore, OnTransformationActions actions, + War3ID alias, float duration, AbilityBuilderActiveAbility ability, CUnitType newType, + boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { + super(handleId, alias, duration, true, false, true, false); this.setIconShowing(false); this.localStore = localStore; this.actions = actions; @@ -82,17 +84,20 @@ protected void onBuffExpire(CSimulation game, CUnit unit) { if (instantTransformation) { if (dur > 0) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); - new DelayInstantTransformationTimer(game, localStore, unit, actions, addAlternateTagAfter, transTime, null, targetType, abil, - null, transTime, 0).start(game); + new DelayInstantTransformationTimer(game, localStore, unit, actions, addAlternateTagAfter, transTime, + null, targetType, abil, null, transTime, 0).start(game); } else { - TransformationHandler.instantTransformation(game, localStore, unit, targetType, actions, abil, addAlternateTagAfter, perm, true); + TransformationHandler.instantTransformation(game, localStore, unit, targetType, actions, abil, + addAlternateTagAfter, perm, true); } } else { - unit.order(game, new COrderStartTransformation( - new CBehaviorFinishTransformation(localStore, unit, abil, targetType, actions, addAlternateTagAfter, + unit.order(game, + new COrderStartTransformation(new CBehaviorFinishTransformation(localStore, unit, abil, targetType, + actions, addAlternateTagAfter, addAlternateTagAfter ? abil.getBaseOrderId() : abil.getOffOrderId(), perm, dur, transTime, - landTime, atlAdDelay, altAdTime, imLand, imTakeOff, this.getAlias(), targetType, instantTransformation), - abil.getBaseOrderId()), false); + landTime, atlAdDelay, altAdTime, imLand, imTakeOff, this.getAlias(), targetType, + instantTransformation), abil.getBaseOrderId()), + false); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index d4f31fdc3..5b3a726e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -28,9 +28,12 @@ public class ABLocalStoreKeys { public static final String CANTUSEREASON = "_cantUseReason"; - public static final String TOGGLEDABILITY = "_toggledAbility"; - public static final String FLEXABILITY = "_flexAbility"; - public static final String PAIRABILITY = "_pairAbility"; + public static final String ISTOGGLEDABILITY = "_toggledAbility"; + public static final String ISFLEXABILITY = "_flexAbility"; + public static final String ISPAIRABILITY = "_pairAbility"; + public static final String ISABILITYLEVELED = "_isAbilityLeveld"; + public static final String ISABILITYPHYSICAL = "_isAbilityPhysical"; + // Aura Template public static final String AURAGROUP = "_auraGroup"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index ef289bef6..0bc2141c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -135,6 +135,8 @@ private static void registerBooleanCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackIsProjectileReflected.class, "isProjectileReflected") + .registerSubtype(ABCallbackEvaluateCondition.class, "evaluateCondition") + .registerSubtype(ABCallbackIntegerToBoolean.class, "i2b") ; } @@ -533,6 +535,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory co .registerSubtype(ABConditionIsUnitEnemy.class, "isUnitEnemy") .registerSubtype(ABConditionIsUnitDead.class, "isUnitDead") .registerSubtype(ABConditionIsUnitTraining.class, "isUnitTraining") + .registerSubtype(ABConditionIsUnitShareSpells.class, "isUnitShareSpells") .registerSubtype(ABConditionIsItemAbility.class, "isItemAbility") .registerSubtype(ABConditionItemHasCharges.class, "itemHasCharges") diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java index b03fab75d..a17e0ec44 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java @@ -10,6 +10,7 @@ public class AbilityBuilderOverrideFields { private ABFloatCallback areaOverride; private ABFloatCallback rangeOverride; + private ABFloatCallback castTimeOverride; private ABFloatCallback cooldownOverride; private ABIntegerCallback manaCostOverride; @@ -33,6 +34,12 @@ public ABFloatCallback getRangeOverride() { public void setRangeOverride(ABFloatCallback rangeOverride) { this.rangeOverride = rangeOverride; } + public ABFloatCallback getCastTimeOverride() { + return castTimeOverride; + } + public void setCastTimeOverride(ABFloatCallback castTimeOverride) { + this.castTimeOverride = castTimeOverride; + } public ABFloatCallback getCooldownOverride() { return cooldownOverride; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanRepair.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanRepair.java index ae323845a..6c7354aae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanRepair.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanRepair.java @@ -120,7 +120,7 @@ protected CBehavior update(final CSimulation simulation, final boolean withinFac if (this.nextNotifyTick == 0 || simulation.getGameTurnTick() >= this.nextNotifyTick) { if (this.nextNotifyTick == 0) { this.nextNotifyTick = (int) (simulation.getGameTurnTick() - + 0.5 / WarsmashConstants.SIMULATION_STEP_TIME); + + WarsmashConstants.ONGOING_BEHAVIOR_NOTIFICATION_TICKS / WarsmashConstants.SIMULATION_STEP_TIME); } else { this.unit.fireBehaviorChangeEvent(simulation, this, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorRepair.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorRepair.java index 105d97643..b6054e3ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorRepair.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorRepair.java @@ -94,7 +94,7 @@ protected CBehavior update(final CSimulation simulation, final boolean withinFac if (this.nextNotifyTick == 0 || simulation.getGameTurnTick() >= this.nextNotifyTick) { if (this.nextNotifyTick == 0) { this.nextNotifyTick = (int) (simulation.getGameTurnTick() - + 0.5 / WarsmashConstants.SIMULATION_STEP_TIME); + + WarsmashConstants.ONGOING_BEHAVIOR_NOTIFICATION_TICKS); } else { this.unit.fireBehaviorChangeEvent(simulation, this, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorAcolyteHarvest.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorAcolyteHarvest.java index 763e86d8e..a71aac76f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorAcolyteHarvest.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorAcolyteHarvest.java @@ -2,6 +2,7 @@ import com.badlogic.gdx.math.Vector2; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; +import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -21,12 +22,15 @@ public class CBehaviorAcolyteHarvest extends CAbstractRangedBehavior { private boolean harvesting = false; private float harvestStandX, harvestStandY; + private int nextNotifyTick = 0; + public CBehaviorAcolyteHarvest(final CUnit unit, final CAbilityAcolyteHarvest abilityWispHarvest) { super(unit); this.abilityAcolyteHarvest = abilityWispHarvest; } public CBehavior reset(CSimulation game, final CWidget target) { + this.nextNotifyTick = 0; return innerReset(game, target, false); } @@ -53,6 +57,14 @@ else if (result == HarvestStartResult.ACCEPTED) { simulation.unitRepositioned(this.unit); // dont interpolate, instant jump } this.unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.STAND, SequenceUtils.WORK, 1.0f, true); + if (this.nextNotifyTick == 0 || simulation.getGameTurnTick() >= this.nextNotifyTick) { + if (this.nextNotifyTick == 0) { + this.nextNotifyTick = (int) (simulation.getGameTurnTick() + + WarsmashConstants.ONGOING_BEHAVIOR_NOTIFICATION_TICKS); + } else { + this.unit.fireBehaviorChangeEvent(simulation, this, true); + } + } } return this; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorHarvest.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorHarvest.java index 038ffd26d..7b180b5f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorHarvest.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorHarvest.java @@ -77,6 +77,7 @@ public CBehavior accept(final CUnit target) { final CAbilityGoldMinable abilityGoldMine = (CAbilityGoldMinable) ability; final int activeMiners = abilityGoldMine.getActiveMinerCount(); if (activeMiners < abilityGoldMine.getMiningCapacity()) { + this.unit.fireBehaviorChangeEvent(simulation, this, true); abilityGoldMine.addMiner(this); this.unit.setHidden(true); this.unit.setInvulnerable(true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorWispHarvest.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorWispHarvest.java index b91d3f055..26c6e6dcb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorWispHarvest.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/harvest/CBehaviorWispHarvest.java @@ -45,6 +45,7 @@ protected CBehavior update(final CSimulation simulation, final boolean withinFac player.setLumber(player.getLumber() + this.abilityWispHarvest.getLumberPerInterval()); simulation.unitGainResourceEvent(this.unit, player.getId(), ResourceType.LUMBER, abilityWispHarvest.getLumberPerInterval()); + this.unit.fireBehaviorChangeEvent(simulation, this, true); } if (!harvesting) { onStartHarvesting(simulation); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java index 61be91daf..1ad3eb510 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java @@ -1,6 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.data; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileReader; import java.util.HashMap; import java.util.Map; @@ -297,6 +298,9 @@ private void registerCodes() { File[] abilityBehaviorFiles = abilityBehaviorsDir.listFiles(); if (abilityBehaviorFiles != null) { for (File abilityBehaviorFile : abilityBehaviorFiles) { + if (abilityBehaviorFile == null || abilityBehaviorFile.isDirectory()) { + continue; + } try { behaviors = gson.fromJson(new FileReader(abilityBehaviorFile), AbilityBuilderFile.class); for (AbilityBuilderParser behavior : behaviors.getAbilityList()) { @@ -319,6 +323,9 @@ private void registerCodes() { } catch (IllegalArgumentException e) { System.err.println("Failed to load Ability Builder config file: " + abilityBehaviorFile.getName()); e.printStackTrace(); + } catch (FileNotFoundException e) { + System.err.println("Failed to find Ability Builder config file: " + abilityBehaviorFile.getName()); + e.printStackTrace(); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/BuffBarIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/BuffBarIcon.java index aba19c21d..3103d8f7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/BuffBarIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/BuffBarIcon.java @@ -16,6 +16,8 @@ public class BuffBarIcon extends AbstractClickableActionFrame implements Clickab private String toolTip; private String uberTip; + private boolean positive; + private boolean leveled; public BuffBarIcon(final String name, final UIFrame parent) { super(name, parent); @@ -25,10 +27,13 @@ public void setIconFrame(final TextureFrame iconFrame) { this.iconFrame = iconFrame; } - public void set(final Texture texture, final String toolTip, final String uberTip) { + public void set(final Texture texture, final String toolTip, final String uberTip, final boolean positive, final boolean leveled, final int level) { this.iconFrame.setTexture(texture); - this.toolTip = toolTip; - this.uberTip = uberTip; + this.positive = positive; + this.leveled = leveled; + this.setLevel(level); + this.setToolTip(toolTip); + this.setUberTip(uberTip); setVisible(true); } @@ -67,11 +72,27 @@ public UIFrame getFrameChildUnderMouse(final float screenX, final float screenY) } public void setToolTip(final String toolTip) { - this.toolTip = toolTip; + if (toolTip != null && !toolTip.isBlank()) { + if (this.positive) { + this.toolTip = "|c0000FF00" + toolTip + "|r"; + } else { + this.toolTip = "|c00FF0000" + toolTip + "|r"; + } + } else { + this.toolTip = toolTip; + } } public void setUberTip(final String uberTip) { - this.uberTip = uberTip; + if (uberTip != null) { + if (this.leveled) { + this.uberTip = "|c007d7d7dLevel:|r " + this.level + "|n|n" + uberTip; + } else { + this.uberTip = uberTip; + } + } else { + this.uberTip = "|c007d7d7dLevel:|r " + this.level; + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java index 13e682dcb..46d52295a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java @@ -3362,10 +3362,10 @@ public void commandButton(final int buttonPositionX, final int buttonPositionY, } @Override - public void buff(final Texture icon, final int level, final String tip, final String uberTip) { + public void buff(final Texture icon, final int level, final String tip, final String uberTip, final boolean positive, final boolean leveled) { if ((this.selectedUnit == null) || !this.selectedUnit.getSimulationUnit().isBuilding()) { if (this.currentBuffBarIconIndex < this.buffBarIcons.length) { - this.buffBarIcons[this.currentBuffBarIconIndex++].set(icon, tip, uberTip); + this.buffBarIcons[this.currentBuffBarIconIndex++].set(icon, tip, uberTip, positive, leveled, level); } } } From 47bbaa733eaf29492f5a15cfbc4d7708d4ba2f2e Mon Sep 17 00:00:00 2001 From: Glasir Date: Fri, 7 Feb 2025 07:48:03 -0500 Subject: [PATCH 02/44] Quick Refactor of And and Or conditions to use lists * AB: Refactor the And/Or calls to take a list of conditions rather than a 1/2 --- core/assets/abilityBehaviors/RaiseDead.json | 7 +- .../compatibility/rejuvenation.json | 97 ++-- .../abilityBehaviors/generalPassives.json | 21 +- core/assets/abilityBehaviors/itemSimple.json | 305 +++++------ .../abilityBehaviors/nightElfUnitActives.json | 338 ++++++------ core/assets/abilityBehaviors/reactions.json | 482 ++++++++---------- .../undeadHeroUnitActives.json | 7 +- .../abilityBehaviors/undeadUnitActives.json | 49 +- .../condition/logical/ABConditionAnd.java | 14 +- .../condition/logical/ABConditionOr.java | 14 +- 10 files changed, 596 insertions(+), 738 deletions(-) diff --git a/core/assets/abilityBehaviors/RaiseDead.json b/core/assets/abilityBehaviors/RaiseDead.json index 603db1e9a..104c321ff 100644 --- a/core/assets/abilityBehaviors/RaiseDead.json +++ b/core/assets/abilityBehaviors/RaiseDead.json @@ -1037,7 +1037,7 @@ "type": "while", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "i>", "value1": { "type": "i+", @@ -1060,8 +1060,7 @@ "type": "getAbilityDataAsInteger", "dataField": "E" } - }, - "condition2": { + },{ "type": "i!=0", "value": { "type": "getUnitQueueSize", @@ -1070,7 +1069,7 @@ "name": "summons2" } } - } + }] }, "loopActions": [{ "type": "killUnit", diff --git a/core/assets/abilityBehaviors/compatibility/rejuvenation.json b/core/assets/abilityBehaviors/compatibility/rejuvenation.json index a4c2151d4..3f5beb2b8 100644 --- a/core/assets/abilityBehaviors/compatibility/rejuvenation.json +++ b/core/assets/abilityBehaviors/compatibility/rejuvenation.json @@ -6,82 +6,71 @@ "type": "not", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "not", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "f=0", "value": { "type": "getAbilityDataAsFloat", "dataField": "B" } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getAbilityTargetedUnit" - } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "getAbilityTargetedUnit" } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "i>", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - }, - "value2": { - "type": "rawInteger", - "value": 1 - } - }, - "reason": "ALREADY_AT_FULL_MANA" } - } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "reason": "ALREADY_AT_FULL_MANA" + }] } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "f=0", "value": { "type": "getAbilityDataAsFloat", "dataField": "A" } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getAbilityTargetedUnit" - } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getAbilityTargetedUnit" } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "iOdd", - "value": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - } - }, - "reason": "ALREADY_AT_FULL_HEALTH" } - } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "iOdd", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + }] } - } + }] } }], "onEndCasting": [{ diff --git a/core/assets/abilityBehaviors/generalPassives.json b/core/assets/abilityBehaviors/generalPassives.json index 17a2b8056..1893bbc88 100644 --- a/core/assets/abilityBehaviors/generalPassives.json +++ b/core/assets/abilityBehaviors/generalPassives.json @@ -91,7 +91,7 @@ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "isDamageTypeEqual", "damageType1": { "type": "getTriggeringDamageType" @@ -103,8 +103,7 @@ "value": "NORMAL" } } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "bool", @@ -112,7 +111,7 @@ "type": "isTriggeringDamageRanged" } } - } + }] }, "thenActions": [{ "type": "multiplyDamageTakenMultiplier", @@ -233,13 +232,12 @@ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "isUnitValidTarget", "target": { "type": "getAttackedUnit" } - }, - "condition2": { + },{ "type": "f<", "value1": { "type": "randomBoundedFloat", @@ -252,7 +250,7 @@ "type": "getAbilityDataAsFloat", "dataField": "A" } - } + }] }, "thenActions": [{ "type": "if", @@ -576,12 +574,11 @@ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "isItemAbility" - }, - "condition2": { + },{ "type": "itemHasCharges" - } + }] }, "thenActions": [{ "type": "setReincarnating" diff --git a/core/assets/abilityBehaviors/itemSimple.json b/core/assets/abilityBehaviors/itemSimple.json index 619e88c2e..e5c15fa4f 100644 --- a/core/assets/abilityBehaviors/itemSimple.json +++ b/core/assets/abilityBehaviors/itemSimple.json @@ -151,181 +151,157 @@ }, "extraCastConditions": [{ "type": "or", - "condition1": { + "conditions": [{ "type": "isFlexAbilityTargeted" - }, - "condition2": { + },{ "type": "or", - "condition1": { + "conditions": [{ "type": "f!=0", "value": { "type": "getAbilityArea" } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "not", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "f=0", "value": { "type": "getAbilityDataAsFloat", "dataField": "B" } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getCastingUnit" - } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "getCastingUnit" } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "i>", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - }, - "value2": { - "type": "rawInteger", - "value": 1 - } - }, - "reason": "ALREADY_AT_FULL_MANA" } - } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "reason": "ALREADY_AT_FULL_MANA" + }] } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "f=0", "value": { "type": "getAbilityDataAsFloat", "dataField": "A" } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getCastingUnit" - } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getCastingUnit" } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "iOdd", - "value": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - } - }, - "reason": "ALREADY_AT_FULL_HEALTH" } - } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "iOdd", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + }] } - } + }] } - } - } + }] + }] }], "extraTargetConditions": [{ "type": "not", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "not", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "f=0", "value": { "type": "getAbilityDataAsFloat", "dataField": "B" } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getAbilityTargetedUnit" - } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "getAbilityTargetedUnit" } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "i>", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - }, - "value2": { - "type": "rawInteger", - "value": 1 - } - }, - "reason": "ALREADY_AT_FULL_MANA" } - } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "reason": "ALREADY_AT_FULL_MANA" + }] } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "f=0", "value": { "type": "getAbilityDataAsFloat", "dataField": "A" } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getAbilityTargetedUnit" - } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getAbilityTargetedUnit" } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "iOdd", - "value": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - } - }, - "reason": "ALREADY_AT_FULL_HEALTH" } - } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "iOdd", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + }] } - } + }] } }], "onEndCasting": [{ @@ -537,82 +513,71 @@ "type": "not", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "not", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "f=0", "value": { "type": "getAbilityDataAsFloat", "dataField": "B" } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getEnumUnit" - } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "getEnumUnit" } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "i>", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - }, - "value2": { - "type": "rawInteger", - "value": 1 - } - }, - "reason": "ALREADY_AT_FULL_MANA" } - } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "reason": "ALREADY_AT_FULL_MANA" + }] } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "f=0", "value": { "type": "getAbilityDataAsFloat", "dataField": "A" } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getEnumUnit" - } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getEnumUnit" } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "iOdd", - "value": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - } - }, - "reason": "ALREADY_AT_FULL_HEALTH" } - } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "iOdd", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + }] } - } + }] } }, "thenActions": [{ diff --git a/core/assets/abilityBehaviors/nightElfUnitActives.json b/core/assets/abilityBehaviors/nightElfUnitActives.json index fefeec75e..de4e05039 100644 --- a/core/assets/abilityBehaviors/nightElfUnitActives.json +++ b/core/assets/abilityBehaviors/nightElfUnitActives.json @@ -401,128 +401,36 @@ }, "extraCastConditions": [{ "type": "or", - "condition1": { + "conditions": [{ "type": "isFlexAbilityTargeted" - }, - "condition2": { - "type": "or", - "condition1": { - "type": "f!=0", - "value": { - "type": "getAbilityArea" - } - }, - "condition2": { - "type": "not", - "condition": { - "type": "and", - "condition1": { - "type": "not", - "condition": { - "type": "or", - "condition1": { - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getCastingUnit" - } - } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "i>", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - }, - "value2": { - "type": "rawInteger", - "value": 1 - } - }, - "reason": "ALREADY_AT_FULL_MANA" - } - } - } - }, - "condition2": { - "type": "not", - "condition": { - "type": "or", - "condition1": { - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getCastingUnit" - } - } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "iOdd", - "value": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - } - }, - "reason": "ALREADY_AT_FULL_HEALTH" - } - } - } - } - } + },{ + "type": "f!=0", + "value": { + "type": "getAbilityArea" } - } - }], - "extraTargetConditions": [{ - "type": "not", - "condition": { - "type": "and", - "condition1": { - "type": "not", - "condition": { - "type": "or", - "condition1": { - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - }, - "condition2": { + },{ + "type": "not", + "condition": { + "type": "and", + "conditions": [{ + "type": "not", + "condition": { "type": "or", - "condition1": { + "conditions": [{ + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ "type": "not", "condition": { "type": "isUnitMaxMp", "unit": { - "type": "getAbilityTargetedUnit" + "type": "getCastingUnit" } } - }, - "condition2": { + },{ "type": "setCantUseReasonOnFailure", "condition": { "type": "i>", @@ -536,33 +444,27 @@ } }, "reason": "ALREADY_AT_FULL_MANA" - } + }] } - } - }, - "condition2": { - "type": "not", - "condition": { - "type": "or", - "condition1": { - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - }, - "condition2": { + },{ + "type": "not", + "condition": { "type": "or", - "condition1": { + "conditions": [{ + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ "type": "not", "condition": { "type": "isUnitMaxHp", "unit": { - "type": "getAbilityTargetedUnit" + "type": "getCastingUnit" } } - }, - "condition2": { + },{ "type": "setCantUseReasonOnFailure", "condition": { "type": "iOdd", @@ -572,10 +474,81 @@ } }, "reason": "ALREADY_AT_FULL_HEALTH" - } + }] } - } + }] } + }] + }], + "extraTargetConditions": [{ + "type": "not", + "condition": { + "type": "and", + "conditions": [{ + "type": "not", + "condition": { + "type": "or", + "conditions": [{ + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "reason": "ALREADY_AT_FULL_MANA" + }] + } + },{ + "type": "not", + "condition": { + "type": "or", + "conditions": [{ + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "iOdd", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + }] + } + }] } }], "onEndCasting": [{ @@ -783,82 +756,71 @@ "type": "not", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "not", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "f=0", "value": { "type": "getAbilityDataAsFloat", "dataField": "B" } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getEnumUnit" - } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "getEnumUnit" } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "i>", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - }, - "value2": { - "type": "rawInteger", - "value": 1 - } - }, - "reason": "ALREADY_AT_FULL_MANA" } - } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "reason": "ALREADY_AT_FULL_MANA" + }] } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "f=0", "value": { "type": "getAbilityDataAsFloat", "dataField": "A" } - }, - "condition2": { - "type": "or", - "condition1": { - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getEnumUnit" - } + },{ + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getEnumUnit" } - }, - "condition2": { - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "iOdd", - "value": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - } - }, - "reason": "ALREADY_AT_FULL_HEALTH" } - } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "iOdd", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + }] } - } + }] } }, "thenActions": [{ diff --git a/core/assets/abilityBehaviors/reactions.json b/core/assets/abilityBehaviors/reactions.json index 112f44c6c..c1efba41e 100644 --- a/core/assets/abilityBehaviors/reactions.json +++ b/core/assets/abilityBehaviors/reactions.json @@ -8,18 +8,17 @@ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "not", "condition": { "type": "isOnCooldown" } - }, - "condition2": { + },{ "type": "isUnitEnemy", "unit": { "type": "getReactionAbilityCastingUnit" } - } + }] }, "thenActions": [{ "type": "reactionPreventHit" @@ -51,18 +50,17 @@ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "not", "condition": { "type": "isOnCooldown" } - }, - "condition2": { + },{ "type": "isUnitEnemy", "unit": { "type": "getReactionAbilityCastingUnit" } - } + }] }, "thenActions": [{ "type": "reactionPreventHit" @@ -333,7 +331,7 @@ "type": "if", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "isAttackTypeEqual", "attackType1": { "type": "getTriggeringAttackType" @@ -345,8 +343,7 @@ "value": "MAGIC" } } - }, - "condition2": { + },{ "type": "isAttackTypeEqual", "attackType1": { "type": "getTriggeringAttackType" @@ -358,7 +355,7 @@ "value": "SPELLS" } } - } + }] }, "thenActions": [{ "type": "multiplyDamageTakenMultiplier", @@ -458,52 +455,43 @@ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "gameplayConstantIsDefendCanDeflect" - }, - "condition2": { - "type": "and", - "condition1": { - "type": "not", - "condition": { - "type": "bool", - "bool": { - "type": "isProjectileReflected", - "projectile": { - "type": "getReactionAttackProjectile" - } + },{ + "type": "not", + "condition": { + "type": "bool", + "bool": { + "type": "isProjectileReflected", + "projectile": { + "type": "getReactionAttackProjectile" } } + } + },{ + "type": "f<", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "G" }, - "condition2": { - "type": "and", - "condition1": { - "type": "f<", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "G" - }, - "value2": { - "type": "rawFloat", - "value": 1 - } - }, - "condition2": { - "type": "f<", - "value1": { - "type": "randomBoundedFloat", - "bound": { - "type": "rawFloat", - "value": 100 - } - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "F" - } + "value2": { + "type": "rawFloat", + "value": 1 + } + },{ + "type": "f<", + "value1": { + "type": "randomBoundedFloat", + "bound": { + "type": "rawFloat", + "value": 100 } + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "F" } - } + }] }, "thenActions": [{ "type": "reactionPreventHit" @@ -569,7 +557,7 @@ "type": "if", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "isAttackTypeEqual", "attackType1": { "type": "getReactionAttackProjectileAttackType" @@ -581,8 +569,7 @@ "value": "MAGIC" } } - }, - "condition2": { + },{ "type": "isAttackTypeEqual", "attackType1": { "type": "getReactionAttackProjectileAttackType" @@ -594,58 +581,49 @@ "value": "SPELLS" } } - } + }] }, "thenActions": [{ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "gameplayConstantIsDefendCanDeflect" - }, - "condition2": { - "type": "and", - "condition1": { - "type": "not", - "condition": { - "type": "bool", - "bool": { - "type": "isProjectileReflected", - "projectile": { - "type": "getReactionAttackProjectile" - } + },{ + "type": "not", + "condition": { + "type": "bool", + "bool": { + "type": "isProjectileReflected", + "projectile": { + "type": "getReactionAttackProjectile" } } + } + },{ + "type": "f<", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "H" }, - "condition2": { - "type": "and", - "condition1": { - "type": "f<", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "H" - }, - "value2": { - "type": "rawFloat", - "value": 1 - } - }, - "condition2": { - "type": "f<", - "value1": { - "type": "randomBoundedFloat", - "bound": { - "type": "rawFloat", - "value": 100 - } - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "F" - } + "value2": { + "type": "rawFloat", + "value": 1 + } + },{ + "type": "f<", + "value1": { + "type": "randomBoundedFloat", + "bound": { + "type": "rawFloat", + "value": 100 } + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "F" } - } + }] }, "thenActions": [{ "type": "reactionPreventHit" @@ -860,7 +838,7 @@ "type": "if", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "isAttackTypeEqual", "attackType1": { "type": "getTriggeringAttackType" @@ -872,8 +850,7 @@ "value": "MAGIC" } } - }, - "condition2": { + },{ "type": "isAttackTypeEqual", "attackType1": { "type": "getTriggeringAttackType" @@ -885,7 +862,7 @@ "value": "SPELLS" } } - } + }] }, "thenActions": [{ "type": "multiplyDamageTakenMultiplier", @@ -969,52 +946,43 @@ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "gameplayConstantIsDefendCanDeflect" - }, - "condition2": { - "type": "and", - "condition1": { - "type": "not", - "condition": { - "type": "bool", - "bool": { - "type": "isProjectileReflected", - "projectile": { - "type": "getReactionAttackProjectile" - } + },{ + "type": "not", + "condition": { + "type": "bool", + "bool": { + "type": "isProjectileReflected", + "projectile": { + "type": "getReactionAttackProjectile" } } + } + },{ + "type": "f<", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "G" }, - "condition2": { - "type": "and", - "condition1": { - "type": "f<", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "G" - }, - "value2": { - "type": "rawFloat", - "value": 1 - } - }, - "condition2": { - "type": "f<", - "value1": { - "type": "randomBoundedFloat", - "bound": { - "type": "rawFloat", - "value": 100 - } - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "F" - } + "value2": { + "type": "rawFloat", + "value": 1 + } + },{ + "type": "f<", + "value1": { + "type": "randomBoundedFloat", + "bound": { + "type": "rawFloat", + "value": 100 } + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "F" } - } + }] }, "thenActions": [{ "type": "reactionPreventHit" @@ -1080,7 +1048,7 @@ "type": "if", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "isAttackTypeEqual", "attackType1": { "type": "getReactionAttackProjectileAttackType" @@ -1092,8 +1060,7 @@ "value": "MAGIC" } } - }, - "condition2": { + },{ "type": "isAttackTypeEqual", "attackType1": { "type": "getReactionAttackProjectileAttackType" @@ -1105,58 +1072,49 @@ "value": "SPELLS" } } - } + }] }, "thenActions": [{ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "gameplayConstantIsDefendCanDeflect" - }, - "condition2": { - "type": "and", - "condition1": { - "type": "not", - "condition": { - "type": "bool", - "bool": { - "type": "isProjectileReflected", - "projectile": { - "type": "getReactionAttackProjectile" - } + },{ + "type": "not", + "condition": { + "type": "bool", + "bool": { + "type": "isProjectileReflected", + "projectile": { + "type": "getReactionAttackProjectile" } } + } + },{ + "type": "f<", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "H" }, - "condition2": { - "type": "and", - "condition1": { - "type": "f<", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "H" - }, - "value2": { - "type": "rawFloat", - "value": 1 - } - }, - "condition2": { - "type": "f<", - "value1": { - "type": "randomBoundedFloat", - "bound": { - "type": "rawFloat", - "value": 100 - } - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "F" - } + "value2": { + "type": "rawFloat", + "value": 1 + } + },{ + "type": "f<", + "value1": { + "type": "randomBoundedFloat", + "bound": { + "type": "rawFloat", + "value": 100 } + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "F" } - } + }] }, "thenActions": [{ "type": "reactionPreventHit" @@ -1501,7 +1459,7 @@ "type": "if", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "isAttackTypeEqual", "attackType1": { "type": "getTriggeringAttackType" @@ -1513,8 +1471,7 @@ "value": "MAGIC" } } - }, - "condition2": { + },{ "type": "isAttackTypeEqual", "attackType1": { "type": "getTriggeringAttackType" @@ -1526,7 +1483,7 @@ "value": "SPELLS" } } - } + }] }, "thenActions": [{ "type": "multiplyDamageTakenMultiplier", @@ -1610,52 +1567,43 @@ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "gameplayConstantIsDefendCanDeflect" - }, - "condition2": { - "type": "and", - "condition1": { - "type": "not", - "condition": { - "type": "bool", - "bool": { - "type": "isProjectileReflected", - "projectile": { - "type": "getReactionAttackProjectile" - } + },{ + "type": "not", + "condition": { + "type": "bool", + "bool": { + "type": "isProjectileReflected", + "projectile": { + "type": "getReactionAttackProjectile" } } + } + },{ + "type": "f<", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "G" }, - "condition2": { - "type": "and", - "condition1": { - "type": "f<", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "G" - }, - "value2": { - "type": "rawFloat", - "value": 1 - } - }, - "condition2": { - "type": "f<", - "value1": { - "type": "randomBoundedFloat", - "bound": { - "type": "rawFloat", - "value": 100 - } - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "F" - } + "value2": { + "type": "rawFloat", + "value": 1 + } + },{ + "type": "f<", + "value1": { + "type": "randomBoundedFloat", + "bound": { + "type": "rawFloat", + "value": 100 } + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "F" } - } + }] }, "thenActions": [{ "type": "reactionPreventHit" @@ -1721,7 +1669,7 @@ "type": "if", "condition": { "type": "or", - "condition1": { + "conditions": [{ "type": "isAttackTypeEqual", "attackType1": { "type": "getReactionAttackProjectileAttackType" @@ -1733,8 +1681,7 @@ "value": "MAGIC" } } - }, - "condition2": { + },{ "type": "isAttackTypeEqual", "attackType1": { "type": "getReactionAttackProjectileAttackType" @@ -1746,58 +1693,49 @@ "value": "SPELLS" } } - } + }] }, "thenActions": [{ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "gameplayConstantIsDefendCanDeflect" - }, - "condition2": { - "type": "and", - "condition1": { - "type": "not", - "condition": { - "type": "bool", - "bool": { - "type": "isProjectileReflected", - "projectile": { - "type": "getReactionAttackProjectile" - } + },{ + "type": "not", + "condition": { + "type": "bool", + "bool": { + "type": "isProjectileReflected", + "projectile": { + "type": "getReactionAttackProjectile" } } + } + },{ + "type": "f<", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "H" }, - "condition2": { - "type": "and", - "condition1": { - "type": "f<", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "H" - }, - "value2": { - "type": "rawFloat", - "value": 1 - } - }, - "condition2": { - "type": "f<", - "value1": { - "type": "randomBoundedFloat", - "bound": { - "type": "rawFloat", - "value": 100 - } - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "F" - } + "value2": { + "type": "rawFloat", + "value": 1 + } + },{ + "type": "f<", + "value1": { + "type": "randomBoundedFloat", + "bound": { + "type": "rawFloat", + "value": 100 } + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "F" } - } + }] }, "thenActions": [{ "type": "reactionPreventHit" diff --git a/core/assets/abilityBehaviors/undeadHeroUnitActives.json b/core/assets/abilityBehaviors/undeadHeroUnitActives.json index 93d949dd3..a117a21ad 100644 --- a/core/assets/abilityBehaviors/undeadHeroUnitActives.json +++ b/core/assets/abilityBehaviors/undeadHeroUnitActives.json @@ -344,18 +344,17 @@ }], "canHitTarget": [{ "type": "and", - "condition1": { + "conditions": [{ "type": "isValidTarget", "target": { "type": "getProjectileHitWidget" } - }, - "condition2": { + },{ "type": "isUnitEnemy", "unit": { "type": "getProjectileHitUnit" } - } + }] }], "onHit": [{ "type": "storeValueLocally", diff --git a/core/assets/abilityBehaviors/undeadUnitActives.json b/core/assets/abilityBehaviors/undeadUnitActives.json index 7364ce864..fe943cbd2 100644 --- a/core/assets/abilityBehaviors/undeadUnitActives.json +++ b/core/assets/abilityBehaviors/undeadUnitActives.json @@ -43,13 +43,12 @@ "type": "setCantUseReasonOnFailure", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "isUnitValidTarget", "target": { "type": "getAbilityTargetedUnit" } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "doesUnitHaveBuff", @@ -60,7 +59,7 @@ "type": "getAlias" } } - } + }] }, "reason": "THERE_ARE_NO_USABLE_CORPSES_NEARBY" }], @@ -327,13 +326,12 @@ }, "conditions": [{ "type": "and", - "condition1": { + "conditions": [{ "type": "isUnitValidTarget", "target": { "type": "getMatchingUnit" } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "isUnitMaxHp", @@ -341,7 +339,7 @@ "type": "getMatchingUnit" } } - } + }] }] }], "onEndCasting": [{ @@ -382,13 +380,12 @@ }, "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "isUnitValidTarget", "target": { "type": "getMatchingUnit" } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "isUnitMaxHp", @@ -396,7 +393,7 @@ "type": "getMatchingUnit" } } - } + }] }, "iterationActions": [{ "type": "if", @@ -417,7 +414,7 @@ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "i!=0", "value": { "type": "getStoredIntegerByKey", @@ -426,8 +423,7 @@ "value": "cnt" } } - }, - "condition2": { + },{ "type": "i<", "value1": { "type": "getStoredIntegerByKey", @@ -440,7 +436,7 @@ "type": "getAbilityDataAsInteger", "dataField": "E" } - } + }] }, "thenActions": [{ "type": "subtractMp", @@ -549,13 +545,12 @@ }, "conditions": [{ "type": "and", - "condition1": { + "conditions": [{ "type": "isUnitValidTarget", "target": { "type": "getMatchingUnit" } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "isUnitMaxMp", @@ -563,7 +558,7 @@ "type": "getMatchingUnit" } } - } + }] }] }], "onEndCasting": [{ @@ -604,13 +599,12 @@ }, "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "isUnitValidTarget", "target": { "type": "getMatchingUnit" } - }, - "condition2": { + },{ "type": "not", "condition": { "type": "isUnitMaxMp", @@ -618,7 +612,7 @@ "type": "getMatchingUnit" } } - } + }] }, "iterationActions": [{ "type": "if", @@ -639,7 +633,7 @@ "type": "if", "condition": { "type": "and", - "condition1": { + "conditions": [{ "type": "i!=0", "value": { "type": "getStoredIntegerByKey", @@ -648,8 +642,7 @@ "value": "cnt" } } - }, - "condition2": { + },{ "type": "i<", "value1": { "type": "getStoredIntegerByKey", @@ -662,7 +655,7 @@ "type": "getAbilityDataAsInteger", "dataField": "E" } - } + }] }, "thenActions": [{ "type": "subtractMp", diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java index 0515cfb58..275f9585b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; +import java.util.List; import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -8,12 +9,19 @@ public class ABConditionAnd implements ABCondition { - private ABCondition condition1; - private ABCondition condition2; + private List conditions; @Override public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { - return condition1.evaluate(game, caster, localStore, castId) && condition2.evaluate(game, caster, localStore, castId); + boolean result = true; + if (conditions != null) { + for (ABCondition cond : conditions) { + if (result) { + result = result && cond.evaluate(game, caster, localStore, castId); + } + } + } + return result; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java index 86bd9ff74..4c80734af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; +import java.util.List; import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -8,12 +9,19 @@ public class ABConditionOr implements ABCondition { - private ABCondition condition1; - private ABCondition condition2; + private List conditions; @Override public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { - return condition1.evaluate(game, caster, localStore, castId) || condition2.evaluate(game, caster, localStore, castId); + boolean result = false; + if (conditions != null) { + for (ABCondition cond : conditions) { + if (!result) { + result = result || cond.evaluate(game, caster, localStore, castId); + } + } + } + return result; } } From 617221e06f6611a597a4fc48bb3e9bfaab9c0aab Mon Sep 17 00:00:00 2001 From: Glasir Date: Tue, 11 Feb 2025 08:17:51 -0500 Subject: [PATCH 03/44] Quick refactor to combine ABCondition and ABBooleanCallback * AB: ABCondition is now a subclass of ABBooleanCallback and can be used in any boolean callback --- .../abilityBehaviors/humanHeroActives.json | 9 +++------ ...CAbilityAbilityBuilderActiveFlexTarget.java | 4 ++-- ...tyAbilityBuilderActiveFlexTargetSimple.java | 10 +++++----- ...lityAbilityBuilderActiveNoTargetSimple.java | 2 +- ...yAbilityBuilderActivePointTargetSimple.java | 4 ++-- ...tyAbilityBuilderActiveUnitTargetSimple.java | 4 ++-- .../CAbilityAbilityBuilderGenericActive.java | 10 +++++----- .../behavior/action/structural/ABActionIf.java | 2 +- ...nitsInRangeOfLocationMatchingCondition.java | 2 +- ...ateUnitsInRangeOfUnitMatchingCondition.java | 2 +- .../action/structural/ABActionWhile.java | 2 +- ...ABConditionIsNewBehaviorCategoryInList.java | 4 ++-- .../ABCallbackEvaluateCondition.java | 18 ------------------ .../ABCallbackConditionalAutocastType.java | 2 +- .../idcallbacks/ABCallbackNullIfFalse.java | 2 +- .../integercallbacks/ABCallbackIntegerIf.java | 2 +- ...BCallbackGetNearestCorpseInRangeOfUnit.java | 2 +- .../ABCallbackGetNearestUnitInRangeOfUnit.java | 2 +- .../ABConditionIsDestructableValidTarget.java | 4 ++-- ...BConditionIsPassAllAbilityTargetChecks.java | 4 ++-- .../condition/ABConditionIsUnitInGroup.java | 4 ++-- .../ABConditionIsUnitInRangeOfUnit.java | 4 ++-- ...ditionIsUnitPassAllAbilityTargetChecks.java | 4 ++-- .../ABConditionIsUnitValidTarget.java | 4 ++-- .../condition/ABConditionIsValidTarget.java | 4 ++-- ...itionMatchingCorpseExistsInRangeOfUnit.java | 6 +++--- ...nditionMatchingUnitExistsInRangeOfUnit.java | 6 +++--- .../ABConditionSetCantUseReasonOnFailure.java | 6 +++--- ...ABConditionIsFlexAbilityNonPointTarget.java | 5 ++--- .../ABConditionIsFlexAbilityNonTargeted.java | 5 ++--- .../ABConditionIsFlexAbilityPointTarget.java | 5 ++--- .../ABConditionIsFlexAbilityTargeted.java | 5 ++--- .../ability/ABConditionIsOnCooldown.java | 4 ++-- .../ABConditionIsToggleAbilityActive.java | 4 ++-- .../ABConditionIsTransformingToAlternate.java | 4 ++-- .../ABConditionIsAttackTypeEqual.java | 4 ++-- .../ABConditionIsDamageTypeEqual.java | 4 ++-- .../comparison/ABConditionIsUnitEqual.java | 4 ++-- ...tionGameplayConstantIsDefendCanDeflect.java | 4 ++-- ...GameplayConstantIsRelativeUpgradeCosts.java | 4 ++-- .../game/ABConditionIsTimeOfDayInRange.java | 4 ++-- .../item/ABConditionIsItemAbility.java | 4 ++-- .../item/ABConditionItemHasCharges.java | 4 ++-- .../condition/logical/ABConditionAnd.java | 6 +++--- .../condition/logical/ABConditionBool.java | 4 ++-- .../condition/logical/ABConditionNot.java | 6 +++--- .../condition/logical/ABConditionNotNull.java | 4 ++-- .../condition/logical/ABConditionOr.java | 6 +++--- .../condition/numeric/ABConditionFloatEq0.java | 4 ++-- .../numeric/ABConditionFloatEqual.java | 4 ++-- .../condition/numeric/ABConditionFloatGt.java | 4 ++-- .../condition/numeric/ABConditionFloatGte.java | 4 ++-- .../condition/numeric/ABConditionFloatLt.java | 4 ++-- .../condition/numeric/ABConditionFloatLte.java | 4 ++-- .../condition/numeric/ABConditionFloatNe.java | 4 ++-- .../condition/numeric/ABConditionFloatNe0.java | 4 ++-- .../numeric/ABConditionIntegerEq.java | 4 ++-- .../numeric/ABConditionIntegerEq0.java | 4 ++-- .../numeric/ABConditionIntegerGt.java | 4 ++-- .../numeric/ABConditionIntegerGte.java | 4 ++-- .../numeric/ABConditionIntegerIsEven.java | 4 ++-- .../numeric/ABConditionIntegerIsOdd.java | 4 ++-- .../numeric/ABConditionIntegerLt.java | 4 ++-- .../numeric/ABConditionIntegerLte.java | 4 ++-- .../numeric/ABConditionIntegerNe.java | 4 ++-- .../numeric/ABConditionIntegerNe0.java | 4 ++-- .../timer/ABConditionIsTimerActive.java | 4 ++-- .../unit/ABConditionDoesUnitHaveBuff.java | 4 ++-- .../unit/ABConditionIsUnitBuilding.java | 4 ++-- .../condition/unit/ABConditionIsUnitDead.java | 4 ++-- .../condition/unit/ABConditionIsUnitEnemy.java | 4 ++-- .../condition/unit/ABConditionIsUnitMaxHp.java | 4 ++-- .../condition/unit/ABConditionIsUnitMaxMp.java | 4 ++-- .../unit/ABConditionIsUnitShareSpells.java | 4 ++-- .../unit/ABConditionIsUnitTraining.java | 4 ++-- .../abilitybuilder/core/ABCondition.java | 5 +++-- .../core/AbilityBuilderGsonBuilder.java | 6 +++--- .../event/ABGlobalWidgetEvent.java | 2 +- .../abilitybuilder/event/ABPlayerEvent.java | 4 ++-- .../abilitybuilder/event/ABWidgetEvent.java | 2 +- .../listener/ABAttackEvasionListener.java | 2 +- .../ABCollisionProjectileListener.java | 2 +- 82 files changed, 163 insertions(+), 187 deletions(-) delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackEvaluateCondition.java diff --git a/core/assets/abilityBehaviors/humanHeroActives.json b/core/assets/abilityBehaviors/humanHeroActives.json index 5f67e00bc..2d62c10f0 100644 --- a/core/assets/abilityBehaviors/humanHeroActives.json +++ b/core/assets/abilityBehaviors/humanHeroActives.json @@ -694,12 +694,9 @@ } }, "positive": { - "type": "evaluateCondition", - "condition": { - "type": "isUnitShareSpells", - "unit": { - "type": "getAbilityTargetedUnit" - } + "type": "isUnitShareSpells", + "unit": { + "type": "getAbilityTargetedUnit" } }, "onAddActions": [{ diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java index 4f307207d..af7c5920b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java @@ -38,7 +38,7 @@ private void setTargeted(CSimulation game, CUnit unit) { if (config.getSpecialFields() != null && config.getSpecialFields().getTargetedSpell() != null) { boolean result = true; for (ABCondition condition : config.getSpecialFields().getTargetedSpell()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } this.targetedSpell = result; } @@ -47,7 +47,7 @@ private void setPointTarget(CSimulation game, CUnit unit) { if (config.getSpecialFields() != null && config.getSpecialFields().getPointTargeted() != null) { boolean result = true; for (ABCondition condition : config.getSpecialFields().getPointTargeted()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } this.pointTarget = result; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java index 2f15ee226..2148b0e1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java @@ -65,7 +65,7 @@ private void setTargeted(CSimulation game, CUnit unit) { if (config.getSpecialFields() != null && config.getSpecialFields().getTargetedSpell() != null) { boolean result = true; for (ABCondition condition : config.getSpecialFields().getTargetedSpell()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } this.targetedSpell = result; } @@ -74,7 +74,7 @@ private void setPointTarget(CSimulation game, CUnit unit) { if (config.getSpecialFields() != null && config.getSpecialFields().getPointTargeted() != null) { boolean result = true; for (ABCondition condition : config.getSpecialFields().getPointTargeted()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } this.pointTarget = result; } @@ -194,7 +194,7 @@ protected void innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderId, if (config.getExtraCastConditions() != null) { boolean result = true; for (ABCondition condition : config.getExtraCastConditions()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } if (result) { receiver.useOk(); @@ -222,7 +222,7 @@ protected void innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderI this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, targetItem); boolean result = true; for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } if (result) { receiver.targetOk(targetUnit); @@ -245,7 +245,7 @@ protected void innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderI localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + this.castId, target); boolean result = true; for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } if (result) { receiver.targetOk(target); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTargetSimple.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTargetSimple.java index d5e8c6cc8..d87cfa389 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTargetSimple.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTargetSimple.java @@ -100,7 +100,7 @@ protected void innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderId, if (config.getExtraCastConditions() != null) { boolean result = true; for (ABCondition condition : config.getExtraCastConditions()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } if (result) { receiver.useOk(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTargetSimple.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTargetSimple.java index bc66414d5..78ec41e9f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTargetSimple.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTargetSimple.java @@ -97,7 +97,7 @@ protected void innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderId, if (config.getExtraCastConditions() != null) { boolean result = true; for (ABCondition condition : config.getExtraCastConditions()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } if (result) { receiver.useOk(); @@ -121,7 +121,7 @@ protected void innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderI localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, target); boolean result = true; for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } if (result) { receiver.targetOk(target); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTargetSimple.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTargetSimple.java index fec1f5f66..fcbebd8a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTargetSimple.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTargetSimple.java @@ -122,7 +122,7 @@ protected void innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderId, if (config.getExtraCastConditions() != null) { boolean result = true; for (ABCondition condition : config.getExtraCastConditions()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } if (result) { receiver.useOk(); @@ -149,7 +149,7 @@ protected void innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderI if (this.config.getExtraTargetConditions() != null) { boolean result = true; for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.evaluate(game, unit, localStore, castId); + result = result && condition.callback(game, unit, localStore, castId); } if (result) { receiver.targetOk(targetUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index 84f34d80d..318977d78 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -544,7 +544,7 @@ protected void innerCheckExtraCastConditions(CSimulation game, CUnit unit, int o if (config.getExtraCastConditions() != null) { boolean result = true; for (ABCondition condition : config.getExtraCastConditions()) { - result = result && condition.evaluate(game, unit, localStore, -1); + result = result && condition.callback(game, unit, localStore, -1); } if (result) { receiver.useOk(); @@ -765,7 +765,7 @@ protected String innerCheckExtraTargetConditions(CSimulation game, CUnit unit, i if (config.getExtraTargetConditions() != null) { boolean result = true; for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.evaluate(game, unit, localStore, -1); + result = result && condition.callback(game, unit, localStore, -1); } if (result) { return null; @@ -787,12 +787,12 @@ protected String innerCheckExtraAutoTargetConditions(CSimulation game, CUnit uni boolean result = true; if (config.getExtraTargetConditions() != null) { for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.evaluate(game, unit, localStore, -1); + result = result && condition.callback(game, unit, localStore, -1); } } if (config.getExtraAutoTargetConditions() != null) { for (ABCondition condition : config.getExtraAutoTargetConditions()) { - result = result && condition.evaluate(game, unit, localStore, -1); + result = result && condition.callback(game, unit, localStore, -1); } } if (result) { @@ -816,7 +816,7 @@ protected String innerCheckExtraAutoNoTargetConditions(CSimulation game, CUnit u boolean result = true; if (config.getExtraAutoNoTargetConditions() != null) { for (ABCondition condition : config.getExtraAutoNoTargetConditions()) { - result = result && condition.evaluate(game, unit, localStore, -1); + result = result && condition.callback(game, unit, localStore, -1); } } if (result) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java index 9e5209ef2..9a13e8348 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java @@ -15,7 +15,7 @@ public class ABActionIf implements ABAction { private List elseActions; public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - if (condition.evaluate(game, caster, localStore, castId)) { + if (condition.callback(game, caster, localStore, castId)) { for (ABAction periodicAction : thenActions) { periodicAction.runAction(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java index 519ab7d19..30db38fa5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java @@ -34,7 +34,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map loopActions; public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - while(condition.evaluate(game, caster, localStore, castId)) { + while(condition.callback(game, caster, localStore, castId)) { for (ABAction periodicAction : loopActions) { periodicAction.runAction(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java index 3ef14cc41..79c7bf89e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java @@ -10,12 +10,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; -public class ABConditionIsNewBehaviorCategoryInList implements ABCondition { +public class ABConditionIsNewBehaviorCategoryInList extends ABCondition { private List list; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, int castId) { CBehavior beh = (CBehavior) localStore.get(ABLocalStoreKeys.POSTCHANGEBEHAVIOR+castId); CBehaviorCategory cat = CBehaviorCategory.IDLE; if (beh != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackEvaluateCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackEvaluateCondition.java deleted file mode 100644 index c5d57154d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackEvaluateCondition.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; - -import java.util.Map; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; - -public class ABCallbackEvaluateCondition extends ABBooleanCallback { - - private ABCondition condition; - - @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return condition.evaluate(game, caster, localStore, castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java index 886cffa71..0ac4d9b07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java @@ -15,7 +15,7 @@ public class ABCallbackConditionalAutocastType extends ABAutocastTypeCallback { @Override public AutocastType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - if (condition.evaluate(game, caster, localStore, castId)) { + if (condition.callback(game, caster, localStore, castId)) { return value1.callback(game, caster, localStore, castId); } return value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java index 2a7265e5c..a0c466565 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java @@ -14,7 +14,7 @@ public class ABCallbackNullIfFalse extends ABIDCallback { @Override public War3ID callback(CSimulation game, CUnit caster, Map localStore, int castId) { - if (condition != null && condition.evaluate(game, caster, localStore, castId)) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { return value.callback(game, caster, localStore, castId); } return null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java index e80fee070..0724ef777 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java @@ -14,7 +14,7 @@ public class ABCallbackIntegerIf extends ABIntegerCallback { @Override public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - if (condition == null || !condition.evaluate(game, caster, localStore, castId)) { + if (condition == null || !condition.callback(game, caster, localStore, castId)) { return value2.callback(game, caster, localStore, castId); } return value1.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java index 2095c2734..2b08c1d4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java @@ -38,7 +38,7 @@ public boolean call(final CUnit enumUnit) { boolean result = true; localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); for (ABCondition condition : conditions) { - result = result && condition.evaluate(game, caster, localStore, castId); + result = result && condition.callback(game, caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); if (result) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java index 8b5b1bb5e..b2662245e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java @@ -38,7 +38,7 @@ public boolean call(final CUnit enumUnit) { boolean result = true; localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); for (ABCondition condition : conditions) { - result = result && condition.evaluate(game, caster, localStore, castId); + result = result && condition.callback(game, caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); if (result) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java index e453885bf..eb92c98e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java @@ -13,14 +13,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; -public class ABConditionIsDestructableValidTarget implements ABCondition { +public class ABConditionIsDestructableValidTarget extends ABCondition { private ABUnitCallback caster; private ABDestructableCallback target; @SuppressWarnings("unchecked") @Override - public boolean evaluate(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theCaster = casterUnit; List levelData = (List) localStore diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java index 3fd549d13..5aeaa4369 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java @@ -12,13 +12,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; -public class ABConditionIsPassAllAbilityTargetChecks implements ABCondition { +public class ABConditionIsPassAllAbilityTargetChecks extends ABCondition { private ABUnitCallback caster; private ABWidgetCallback target; @Override - public boolean evaluate(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theCaster = casterUnit; if (caster != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java index 2306805a3..f983eb839 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java @@ -9,13 +9,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIsUnitInGroup implements ABCondition { +public class ABConditionIsUnitInGroup extends ABCondition { private ABUnitGroupCallback group; private ABUnitCallback unit; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Set groupSet = group.callback(game, caster, localStore, castId); CUnit rUnit = unit.callback(game, caster, localStore, castId); return groupSet.contains(rUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java index 30769d69b..9ea406c51 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java @@ -8,14 +8,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIsUnitInRangeOfUnit implements ABCondition { +public class ABConditionIsUnitInRangeOfUnit extends ABCondition { private ABUnitCallback caster; private ABUnitCallback target; private ABFloatCallback range; @Override - public boolean evaluate(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { return caster.callback(game, casterUnit, localStore, castId).canReach(target.callback(game, casterUnit, localStore, castId), range.callback(game, casterUnit, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java index 69af0e5d0..5ef7a5ab7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -11,13 +11,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; -public class ABConditionIsUnitPassAllAbilityTargetChecks implements ABCondition { +public class ABConditionIsUnitPassAllAbilityTargetChecks extends ABCondition { private ABUnitCallback caster; private ABUnitCallback target; @Override - public boolean evaluate(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theCaster = casterUnit; if (caster != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java index 533f6fa55..6f85e8764 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java @@ -15,7 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; -public class ABConditionIsUnitValidTarget implements ABCondition { +public class ABConditionIsUnitValidTarget extends ABCondition { private ABUnitCallback caster; private ABUnitCallback target; @@ -23,7 +23,7 @@ public class ABConditionIsUnitValidTarget implements ABCondition { @SuppressWarnings("unchecked") @Override - public boolean evaluate(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theCaster = casterUnit; List levelData = (List) localStore diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java index 50bdd37b6..b2e5eb3dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java @@ -13,14 +13,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; -public class ABConditionIsValidTarget implements ABCondition { +public class ABConditionIsValidTarget extends ABCondition { private ABUnitCallback caster; private ABWidgetCallback target; @SuppressWarnings("unchecked") @Override - public boolean evaluate(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theCaster = casterUnit; List levelData = (List) localStore diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java index f7d2bf815..c1b596b01 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java @@ -13,7 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; -public class ABConditionMatchingCorpseExistsInRangeOfUnit implements ABCondition { +public class ABConditionMatchingCorpseExistsInRangeOfUnit extends ABCondition { private static final Rectangle recycleRect = new Rectangle(); private ABUnitCallback originUnit; @@ -21,7 +21,7 @@ public class ABConditionMatchingCorpseExistsInRangeOfUnit implements ABCondition private List conditions; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(game, caster, localStore, castId); Float rangeVal = range.callback(game, caster, localStore, castId); @@ -38,7 +38,7 @@ public boolean call(final CUnit enumUnit) { boolean result = true; localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); for (ABCondition condition : conditions) { - result = result && condition.evaluate(game, caster, localStore, castId); + result = result && condition.callback(game, caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); if (result) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java index 9a2509fd9..0204b5b62 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java @@ -13,7 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; -public class ABConditionMatchingUnitExistsInRangeOfUnit implements ABCondition { +public class ABConditionMatchingUnitExistsInRangeOfUnit extends ABCondition { private static final Rectangle recycleRect = new Rectangle(); private ABUnitCallback originUnit; @@ -21,7 +21,7 @@ public class ABConditionMatchingUnitExistsInRangeOfUnit implements ABCondition { private List conditions; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(game, caster, localStore, castId); Float rangeVal = range.callback(game, caster, localStore, castId); @@ -38,7 +38,7 @@ public boolean call(final CUnit enumUnit) { boolean result = true; localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); for (ABCondition condition : conditions) { - result = result && condition.evaluate(game, caster, localStore, castId); + result = result && condition.callback(game, caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); if (result) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java index ede10b861..b776f90a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java @@ -7,14 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeysEnum; -public class ABConditionSetCantUseReasonOnFailure implements ABCondition { +public class ABConditionSetCantUseReasonOnFailure extends ABCondition { private ABCondition condition; private CommandStringErrorKeysEnum reason; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { - boolean result = condition.evaluate(game, caster, localStore, castId); + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + boolean result = condition.callback(game, caster, localStore, castId); if (!result) { localStore.put(ABLocalStoreKeys.CANTUSEREASON, reason.getKey()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java index c6f195ac0..108f67347 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java @@ -5,14 +5,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTargetSimple; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABConditionIsFlexAbilityNonPointTarget implements ABCondition { +public class ABConditionIsFlexAbilityNonPointTarget extends ABCondition { @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return !ability.isPointTarget(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java index 23310b96a..4fb410696 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java @@ -5,14 +5,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTargetSimple; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABConditionIsFlexAbilityNonTargeted implements ABCondition { +public class ABConditionIsFlexAbilityNonTargeted extends ABCondition { @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return !ability.isTargetedSpell(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java index 378c6d834..07af67935 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java @@ -5,14 +5,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTargetSimple; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABConditionIsFlexAbilityPointTarget implements ABCondition { +public class ABConditionIsFlexAbilityPointTarget extends ABCondition { @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return ability.isPointTarget(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java index 6d569224f..9480c7db1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java @@ -5,14 +5,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTargetSimple; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABConditionIsFlexAbilityTargeted implements ABCondition { +public class ABConditionIsFlexAbilityTargeted extends ABCondition { @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return ability.isTargetedSpell(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java index f973888c6..a6b7c5a45 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java @@ -8,10 +8,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABConditionIsOnCooldown implements ABCondition { +public class ABConditionIsOnCooldown extends ABCondition { @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.getCooldownRemainingTicks(game, caster) > 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java index d3b9d104d..bf923ca2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java @@ -8,10 +8,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABConditionIsToggleAbilityActive implements ABCondition { +public class ABConditionIsToggleAbilityActive extends ABCondition { @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.isToggleOn(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java index 338a1b65e..fd4fc9802 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java @@ -7,10 +7,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABConditionIsTransformingToAlternate implements ABCondition { +public class ABConditionIsTransformingToAlternate extends ABCondition { @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { return (boolean) localStore.get(ABLocalStoreKeys.TRANSFORMINGTOALT +castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java index bc92523ac..dbead1aaf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; -public class ABConditionIsAttackTypeEqual implements ABCondition { +public class ABConditionIsAttackTypeEqual extends ABCondition { private ABAttackTypeCallback attackType1; private ABAttackTypeCallback attackType2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CAttackType lA = attackType1.callback(game, caster, localStore, castId); CAttackType rA = attackType2.callback(game, caster, localStore, castId); if (lA == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java index fc11313b9..cb715ab88 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; -public class ABConditionIsDamageTypeEqual implements ABCondition { +public class ABConditionIsDamageTypeEqual extends ABCondition { private ABDamageTypeCallback damageType1; private ABDamageTypeCallback damageType2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CDamageType lD = damageType1.callback(game, caster, localStore, castId); CDamageType rD = damageType2.callback(game, caster, localStore, castId); if (lD == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java index 37503dbb9..ac7d6fac0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java @@ -6,13 +6,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIsUnitEqual implements ABCondition { +public class ABConditionIsUnitEqual extends ABCondition { private ABUnitCallback unit1; private ABUnitCallback unit2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CUnit lUnit = unit1.callback(game, caster, localStore, castId); CUnit rUnit = unit2.callback(game, caster, localStore, castId); if (lUnit == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java index e6cb8dad4..65c062200 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java @@ -5,10 +5,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionGameplayConstantIsDefendCanDeflect implements ABCondition { +public class ABConditionGameplayConstantIsDefendCanDeflect extends ABCondition { @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { return game.getGameplayConstants().isDefendDeflection(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java index 67a8fe5e5..3d21bb333 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java @@ -5,10 +5,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionGameplayConstantIsRelativeUpgradeCosts implements ABCondition { +public class ABConditionGameplayConstantIsRelativeUpgradeCosts extends ABCondition { @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { return game.getGameplayConstants().isRelativeUpgradeCosts(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java index 0dfbadbff..69f0ab625 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java @@ -6,13 +6,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIsTimeOfDayInRange implements ABCondition { +public class ABConditionIsTimeOfDayInRange extends ABCondition { private ABFloatCallback startTime; private ABFloatCallback endTime; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { float st = 0; float et = Float.MAX_VALUE; if (startTime != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java index fc5e5ccbf..387444712 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java @@ -8,10 +8,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABConditionIsItemAbility implements ABCondition { +public class ABConditionIsItemAbility extends ABCondition { @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.getItem() != null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java index 9464ff0e5..cc86d74cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java @@ -9,12 +9,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABConditionItemHasCharges implements ABCondition { +public class ABConditionItemHasCharges extends ABCondition { private ABItemCallback item; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { if (item == null) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java index 275f9585b..f09bc19e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java @@ -7,17 +7,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionAnd implements ABCondition { +public class ABConditionAnd extends ABCondition { private List conditions; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { boolean result = true; if (conditions != null) { for (ABCondition cond : conditions) { if (result) { - result = result && cond.evaluate(game, caster, localStore, castId); + result = result && cond.callback(game, caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java index c56ea41b5..b9cd884d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionBool implements ABCondition { +public class ABConditionBool extends ABCondition { private ABBooleanCallback bool; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { return bool.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java index 3ef5546d9..1a19e8d86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java @@ -6,13 +6,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionNot implements ABCondition { +public class ABConditionNot extends ABCondition { private ABCondition condition; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { - return !condition.evaluate(game, caster, localStore, castId); + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return !condition.callback(game, caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java index 6084374b2..86586d971 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionNotNull implements ABCondition { +public class ABConditionNotNull extends ABCondition { private ABCallback value; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { return value.callback(game, caster, localStore, castId) != null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java index 4c80734af..6ac22de5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java @@ -7,17 +7,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionOr implements ABCondition { +public class ABConditionOr extends ABCondition { private List conditions; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { boolean result = false; if (conditions != null) { for (ABCondition cond : conditions) { if (!result) { - result = result || cond.evaluate(game, caster, localStore, castId); + result = result || cond.callback(game, caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java index e5b0fde6b..81f3d91b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionFloatEq0 implements ABCondition { +public class ABConditionFloatEq0 extends ABCondition { private ABFloatCallback value; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Float v = value.callback(game, caster, localStore, castId); return v==0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java index ab6dc8c55..55027fb45 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionFloatEqual implements ABCondition { +public class ABConditionFloatEqual extends ABCondition { private ABFloatCallback value1; private ABFloatCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java index 02db1d18e..b4e03e520 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionFloatGt implements ABCondition { +public class ABConditionFloatGt extends ABCondition { private ABFloatCallback value1; private ABFloatCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java index 84fbf332e..79c7a1d2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionFloatGte implements ABCondition { +public class ABConditionFloatGte extends ABCondition { private ABFloatCallback value1; private ABFloatCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java index 9cbcf32d3..effcab044 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionFloatLt implements ABCondition { +public class ABConditionFloatLt extends ABCondition { private ABFloatCallback value1; private ABFloatCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java index b1e023b00..f4d9f14b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionFloatLte implements ABCondition { +public class ABConditionFloatLte extends ABCondition { private ABFloatCallback value1; private ABFloatCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java index e4aee0139..68595280d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionFloatNe implements ABCondition { +public class ABConditionFloatNe extends ABCondition { private ABFloatCallback value1; private ABFloatCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java index dad528589..942a1eb09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionFloatNe0 implements ABCondition { +public class ABConditionFloatNe0 extends ABCondition { private ABFloatCallback value; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Float v = value.callback(game, caster, localStore, castId); return v!=0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java index 15cb48bea..deff563b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIntegerEq implements ABCondition { +public class ABConditionIntegerEq extends ABCondition { private ABIntegerCallback value1; private ABIntegerCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java index b13d2433c..5aaab72b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIntegerEq0 implements ABCondition { +public class ABConditionIntegerEq0 extends ABCondition { private ABIntegerCallback value; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Integer v1 = value.callback(game, caster, localStore, castId); return v1 == 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java index 47c7cf90b..f085c6caf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIntegerGt implements ABCondition { +public class ABConditionIntegerGt extends ABCondition { private ABIntegerCallback value1; private ABIntegerCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); return v1 > v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java index 660b4c00b..42806f3ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIntegerGte implements ABCondition { +public class ABConditionIntegerGte extends ABCondition { private ABIntegerCallback value1; private ABIntegerCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); return v1 >= v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java index afcee0a93..153e9ba54 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIntegerIsEven implements ABCondition { +public class ABConditionIntegerIsEven extends ABCondition { private ABIntegerCallback value; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Integer v1 = value.callback(game, caster, localStore, castId); return (v1 % 2) == 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java index 201696de6..69db176e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIntegerIsOdd implements ABCondition { +public class ABConditionIntegerIsOdd extends ABCondition { private ABIntegerCallback value; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Integer v1 = value.callback(game, caster, localStore, castId); return (v1 % 2) == 1; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java index a3f7b0e5e..5ef0125be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIntegerLt implements ABCondition { +public class ABConditionIntegerLt extends ABCondition { private ABIntegerCallback value1; private ABIntegerCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); return v1 < v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java index a28d8674b..d21ec2958 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIntegerLte implements ABCondition { +public class ABConditionIntegerLte extends ABCondition { private ABIntegerCallback value1; private ABIntegerCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); return v1 <= v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java index 8b9388a5a..dff22ca81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIntegerNe implements ABCondition { +public class ABConditionIntegerNe extends ABCondition { private ABIntegerCallback value1; private ABIntegerCallback value2; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); return v1!=v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java index b3c0d045e..8db9cb602 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIntegerNe0 implements ABCondition { +public class ABConditionIntegerNe0 extends ABCondition { private ABIntegerCallback value; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Integer v1 = value.callback(game, caster, localStore, castId); return v1 != 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java index 5489324ce..c962d0003 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIsTimerActive implements ABCondition { +public class ABConditionIsTimerActive extends ABCondition { private ABTimerCallback timer; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { return timer.callback(game, caster, localStore, castId).isRunning(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java index a7ad5056c..18cc82f2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java @@ -9,13 +9,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionDoesUnitHaveBuff implements ABCondition { +public class ABConditionDoesUnitHaveBuff extends ABCondition { private ABUnitCallback unit; private ABIDCallback id; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CUnit theUnit = unit.callback(game, caster, localStore, castId); if (theUnit != null) { for (CAbility ability : theUnit.getAbilities()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java index 5973f56a6..3964e4409 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIsUnitBuilding implements ABCondition { +public class ABConditionIsUnitBuilding extends ABCondition { private ABUnitCallback unit; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CUnit theUnit = unit.callback(game, caster, localStore, castId); if (theUnit != null) { return theUnit.isBuilding(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java index 596192cec..2486c6fef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIsUnitDead implements ABCondition { +public class ABConditionIsUnitDead extends ABCondition { private ABUnitCallback unit; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CUnit theUnit = unit.callback(game, caster, localStore, castId); if (theUnit != null) { return theUnit.isDead(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java index 7abfd4c48..6eba88633 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; -public class ABConditionIsUnitEnemy implements ABCondition { +public class ABConditionIsUnitEnemy extends ABCondition { private ABUnitCallback caster; private ABUnitCallback unit; @Override - public boolean evaluate(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (caster != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java index 421253fb3..1fd6d738b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIsUnitMaxHp implements ABCondition { +public class ABConditionIsUnitMaxHp extends ABCondition { private ABUnitCallback unit; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CUnit theUnit = unit.callback(game, caster, localStore, castId); if (theUnit != null) { return theUnit.getLife() >= theUnit.getMaximumLife(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java index 62ea9b60c..2755ab658 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIsUnitMaxMp implements ABCondition { +public class ABConditionIsUnitMaxMp extends ABCondition { private ABUnitCallback unit; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CUnit theUnit = unit.callback(game, caster, localStore, castId); if (theUnit != null) { return theUnit.getMana() >= theUnit.getMaximumMana(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java index ccc2c1f80..a086ca1cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; -public class ABConditionIsUnitShareSpells implements ABCondition { +public class ABConditionIsUnitShareSpells extends ABCondition { private ABUnitCallback caster; private ABUnitCallback unit; @Override - public boolean evaluate(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (caster != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java index f0e941448..255bfeddc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionIsUnitTraining implements ABCondition { +public class ABConditionIsUnitTraining extends ABCondition { private ABUnitCallback unit; @Override - public boolean evaluate(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { CUnit theUnit = unit.callback(game, caster, localStore, castId); if (theUnit != null) { return theUnit.isBuildQueueActive(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java index 3f2fd2411..44288a11d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java @@ -4,8 +4,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -public interface ABCondition { +public abstract class ABCondition extends ABBooleanCallback { - public boolean evaluate(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index 0bc2141c0..7d42e43bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -135,8 +135,6 @@ private static void registerBooleanCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackIsProjectileReflected.class, "isProjectileReflected") - .registerSubtype(ABCallbackEvaluateCondition.class, "evaluateCondition") - .registerSubtype(ABCallbackIntegerToBoolean.class, "i2b") ; } @@ -477,7 +475,7 @@ private static void registerWidgetCallbacks(RuntimeTypeAdapterFactory callbackTy ; } - private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFactory) { + private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFactory) { conditionTypeFactory.registerSubtype(ABConditionAnd.class, "and").registerSubtype(ABConditionOr.class, "or") .registerSubtype(ABConditionNot.class, "not").registerSubtype(ABConditionBool.class, "bool") .registerSubtype(ABConditionNotNull.class, "notNull") @@ -808,6 +806,7 @@ public static Gson create() { registerAttackPreDamageListenerCallbacks(callbackTypeFactory); registerBehaviorChangeListenerCallbacks(callbackTypeFactory); registerBooleanCallbacks(callbackTypeFactory); + registerConditions(callbackTypeFactory); // conditions are boolean callbacks now registerBuffCallbacks(callbackTypeFactory); registerDamageTakenListenerCallbacks(callbackTypeFactory); registerDamageTakenModificationListenerCallbacks(callbackTypeFactory); @@ -878,6 +877,7 @@ public static Gson create() { final RuntimeTypeAdapterFactory booleanCallbackTypeFactory = RuntimeTypeAdapterFactory .of(ABBooleanCallback.class, "type"); registerBooleanCallbacks(booleanCallbackTypeFactory); + registerConditions(booleanCallbackTypeFactory); // conditions are boolean callbacks now gsonBuilder.registerTypeAdapterFactory(booleanCallbackTypeFactory); final RuntimeTypeAdapterFactory buffCallbackTypeFactory = RuntimeTypeAdapterFactory diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java index 52a6dea62..aeff12f31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java @@ -38,7 +38,7 @@ public ABGlobalWidgetEvent(CSimulation game, CUnit caster, Map l @Override public void fire(final CWidget triggerWidget, final TriggerExecutionScope scope) { - if (condition == null || condition.evaluate(game, caster, localStore, castId)) { + if (condition == null || condition.callback(game, caster, localStore, castId)) { if (scope instanceof CommonTriggerExecutionScope) { this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId, ((CommonTriggerExecutionScope) scope).getSpellTargetUnit()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java index 9fd35212e..b666e7030 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java @@ -38,7 +38,7 @@ public ABPlayerEvent(CSimulation game, CUnit caster, Map localSt } public void fire(final CUnit hero, final TriggerExecutionScope scope) { - if (condition == null || condition.evaluate(game, caster, localStore, castId)) { + if (condition == null || condition.callback(game, caster, localStore, castId)) { if (scope instanceof CommonTriggerExecutionScope) { this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId, ((CommonTriggerExecutionScope) scope).getSpellTargetUnit()); @@ -71,7 +71,7 @@ public void fire(final CUnit hero, final TriggerExecutionScope scope) { } public void fire(final CPlayer player, final TriggerExecutionScope scope) { - if (condition == null || condition.evaluate(game, caster, localStore, castId)) { + if (condition == null || condition.callback(game, caster, localStore, castId)) { if (actions != null) { for (ABAction action : actions) { action.runAction(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java index bac842515..fe3e95402 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java @@ -38,7 +38,7 @@ public ABWidgetEvent(CSimulation game, CUnit caster, Map localSt @Override public void fire(final CWidget triggerWidget, final TriggerExecutionScope scope) { - if (condition == null || condition.evaluate(game, caster, localStore, castId)) { + if (condition == null || condition.callback(game, caster, localStore, castId)) { if (scope instanceof CommonTriggerExecutionScope) { this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId, ((CommonTriggerExecutionScope) scope).getSpellTargetUnit()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java index cec7b8dce..5f9866fe8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java @@ -38,7 +38,7 @@ public boolean onAttack(CSimulation simulation, CUnit attacker, CUnit target, bo localStore.put(ABLocalStoreKeys.DAMAGETYPE+triggerId, damageType); if (conditions != null) { for (ABCondition condition : conditions) { - evade = evade || condition.evaluate(simulation, target, localStore, triggerId); + evade = evade || condition.callback(simulation, target, localStore, triggerId); } } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java index 0c1d927ef..2f6f71ede 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java @@ -70,7 +70,7 @@ public boolean canHitTarget(CSimulation game, CWidget target) { localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT+castId, targetUnit); localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST+castId, targetDest); for (ABCondition condition : canHitTarget) { - result = result && condition.evaluate(game, caster, localStore, castId); + result = result && condition.callback(game, caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT+castId); localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST+castId); From a638f7797f8bed75434ce727fbdff701eac614c0 Mon Sep 17 00:00:00 2001 From: Glasir Date: Thu, 13 Feb 2025 08:29:41 -0500 Subject: [PATCH 04/44] Refactor of damage methods to pass in flags * Core: Refactored to a new method of passing in flags for damage (isAttack/isRanged) * Core: Added new damage flags for ignoring invulnerable and for explodes on death * Core: Updated artillery attacks to cause units to explode on death --- .../etheller/warsmash/parsers/jass/Jass2.java | 3 +- .../w3x/simulation/CDestructable.java | 16 +- .../handlers/w3x/simulation/CItem.java | 21 +- .../handlers/w3x/simulation/CUnit.java | 550 +++++++----------- .../handlers/w3x/simulation/CWidget.java | 13 +- .../abilities/skills/CAbilitySpellBase.java | 2 + .../human/archmage/CAbilityBlizzard.java | 3 +- .../mountainking/CAbilityThunderBolt.java | 2 +- .../mountainking/CAbilityThunderClap.java | 2 +- .../human/paladin/CAbilityHolyLight.java | 3 +- .../neutral/sappers/CAbilityKaboom.java | 3 +- .../tinker/CAbilityClusterRockets.java | 3 +- .../demonhunter/CAbilityManaBurn.java | 3 +- .../demonhunter/CBuffImmolationCaster.java | 5 +- .../orc/farseer/CAbilityChainLightning.java | 5 +- .../orc/taurenchieftain/CAbilityWarStomp.java | 2 +- .../undead/deathknight/CAbilityDeathCoil.java | 3 +- .../ABActionDamageDestructable.java | 5 +- .../action/unit/ABActionDamageTarget.java | 23 +- .../listener/ABDamageTakenListener.java | 7 +- .../ABDamageTakenModificationListener.java | 7 +- ...BFinalDamageTakenModificationListener.java | 7 +- .../simulation/combat/CAttackDamageFlags.java | 15 + .../simulation/combat/CBaseDamageFlags.java | 53 ++ .../w3x/simulation/combat/CDamageFlags.java | 21 + .../combat/CGenericDamageFlags.java | 11 + .../simulation/combat/CSpellDamageFlags.java | 15 + .../combat/attacks/CUnitAttackInstant.java | 4 +- .../combat/attacks/CUnitAttackMissile.java | 8 +- .../attacks/CUnitAttackMissileLine.java | 11 +- .../attacks/CUnitAttackMissileSplash.java | 17 +- .../combat/attacks/CUnitAttackNormal.java | 4 +- .../CUnitAttackDamageTakenListener.java | 3 +- ...AttackDamageTakenModificationListener.java | 3 +- ...kFinalDamageTakenModificationListener.java | 3 +- ...CUnitDefaultEtherealDamageModListener.java | 3 +- ...itDefaultMagicImmuneDamageModListener.java | 3 +- .../listeners/CUnitDefaultSleepListener.java | 16 +- .../listeners/CUnitDefaultThornsListener.java | 9 +- .../w3x/simulation/data/CUnitData.java | 59 +- 40 files changed, 489 insertions(+), 457 deletions(-) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackDamageFlags.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CGenericDamageFlags.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CSpellDamageFlags.java diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index 6709dacbd..8595a6057 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -110,6 +110,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorAttackListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.jass.CBehaviorJass; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.config.CPlayerAPI; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.config.War3MapConfig; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.item.CItemTypeJass; @@ -1057,7 +1058,7 @@ public JassValue call(final List arguments, final GlobalScope globalS if (damageType == null) { damageType = CDamageType.UNKNOWN; } - target.damage(CommonEnvironment.this.simulation, whichUnit, attack, ranged, attackType, + target.damage(CommonEnvironment.this.simulation, whichUnit, new CGenericDamageFlags(attack, ranged), attackType, damageType, weaponType.name(), (float) amount); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java index 81aed66eb..cf3e618ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java @@ -12,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.pathing.CBuildingPathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -70,9 +71,9 @@ public Rectangle getOrCreateRegisteredEnumRectangle() { } @Override - public float damage(final CSimulation simulation, final CUnit source, final boolean isAttack, - final boolean isRanged, final CAttackType attackType, final CDamageType damageType, - final String weaponSoundType, final float damage) { + public float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, + final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, + final float damage) { if (isInvulnerable()) { return 0; } @@ -86,11 +87,10 @@ public float damage(final CSimulation simulation, final CUnit source, final bool } @Override - public float damage(final CSimulation simulation, final CUnit source, final boolean isAttack, - final boolean isRanged, final CAttackType attackType, final CDamageType damageType, - final String weaponSoundType, final float damage, final float bonusDamage) { - return this.damage(simulation, source, isAttack, isRanged, attackType, damageType, weaponSoundType, - damage + bonusDamage); + public float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, + final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, + final float damage, final float bonusDamage) { + return this.damage(simulation, source, flags, attackType, damageType, weaponSoundType, damage + bonusDamage); } private void kill(final CSimulation simulation) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java index e1a92c465..daa6ec66f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.inventory.CAbilityInventory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; @@ -44,9 +45,10 @@ public float getImpactZ() { } @Override - public float damage(final CSimulation simulation, final CUnit source, final boolean isAttack, final boolean isRanged, final CAttackType attackType, final CDamageType damageType, - final String weaponSoundType, final float damage) { - if (this.invulnerable) { + public float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, + final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, + final float damage) { + if (this.invulnerable && !flags.isIgnoreInvulnerable()) { return 0; } final boolean wasDead = isDead(); @@ -61,9 +63,10 @@ public float damage(final CSimulation simulation, final CUnit source, final bool } @Override - public float damage(final CSimulation simulation, final CUnit source, final boolean isAttack, final boolean isRanged, final CAttackType attackType, final CDamageType damageType, - final String weaponSoundType, final float damage, final float bonusDamage) { - return this.damage(simulation, source, isAttack, isRanged, attackType, damageType, weaponSoundType, damage + bonusDamage); + public float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, + final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, + final float damage, final float bonusDamage) { + return this.damage(simulation, source, flags, attackType, damageType, weaponSoundType, damage + bonusDamage); } public void forceDropIfHeld(final CSimulation simulation) { @@ -75,7 +78,7 @@ public void forceDropIfHeld(final CSimulation simulation) { @Override public boolean canBeTargetedBy(final CSimulation simulation, final CUnit source, - final EnumSet targetsAllowed, AbilityTargetCheckReceiver receiver) { + final EnumSet targetsAllowed, AbilityTargetCheckReceiver receiver) { if (targetsAllowed.contains(CTargetType.ITEM)) { return true; } @@ -190,8 +193,8 @@ public double distance(final float x, final float y) { public Rectangle getOrCreateRegisteredEnumRectangle() { if (this.registeredEnumRectangle == null) { - this.registeredEnumRectangle = new Rectangle(getX() - COLLISION_SIZE, getY() - COLLISION_SIZE, COLLISION_SIZE * 2, - COLLISION_SIZE * 2); + this.registeredEnumRectangle = new Rectangle(getX() - COLLISION_SIZE, getY() - COLLISION_SIZE, + COLLISION_SIZE * 2, COLLISION_SIZE * 2); } return this.registeredEnumRectangle; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index 17a9b2935..1b0a72718 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -69,6 +69,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.build.AbilityDisableWhileUpgradingVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.harvest.CBehaviorReturnResources; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CRegenType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; @@ -249,7 +250,7 @@ public class CUnit extends CWidget { private final List abilityEffectReactionListeners = new ArrayList<>(); private final List behaviorChangeListeners = new ArrayList<>(); - + private transient Set containingRegions = new LinkedHashSet<>(); private transient Set priorContainingRegions = new LinkedHashSet<>(); @@ -265,7 +266,6 @@ public class CUnit extends CWidget { private MovementType movementOverride = null; - public CUnit(final int handleId, final int playerIndex, final float x, final float y, final float life, final War3ID typeId, final float facing, final float mana, final int maximumLife, final float lifeRegen, final int maximumMana, final int speed, final CUnitType unitType) { @@ -297,34 +297,36 @@ public CUnit(final int handleId, final int playerIndex, final float x, final flo this.attackFogMod = new CUnitAttackVisionFogModifier(this, playerIndex); computeAllDerivedFields(); } - + private void beginBehavior(final CSimulation game, final CBehavior behavior) { if (this.currentBehavior != behavior) { - final int lastBehaviorHighlightOrderId = this.currentBehavior != null ? this.currentBehavior.getHighlightOrderId() : -1; + final int lastBehaviorHighlightOrderId = this.currentBehavior != null + ? this.currentBehavior.getHighlightOrderId() + : -1; if (this.currentBehavior != null) { this.currentBehavior.end(game, false); } - + fireBehaviorChangeEvent(game, behavior, false); - + this.currentBehavior = behavior; - + if (this.currentBehavior != null) { this.currentBehavior.begin(game); - + if (this.currentBehavior.getHighlightOrderId() != lastBehaviorHighlightOrderId) { this.stateNotifier.ordersChanged(); } } } } - + public CBehavior finishMoveBehavior(final CSimulation game, final CBehavior behavior) { fireBehaviorChangeEvent(game, behavior, false); - + return behavior.update(game); } - + public void fireBehaviorChangeEvent(final CSimulation game, final CBehavior behavior, final boolean ongoing) { for (CUnitBehaviorChangeListener listener : new ArrayList<>(this.behaviorChangeListeners)) { listener.onChange(game, this, this.currentBehavior, behavior, ongoing); @@ -387,8 +389,7 @@ public void addNonStackingStatBuff(final NonStackingStatBuff buff) { buffKeyMap.put(buff.getStackingKey(), theList); } theList.add(buff); - } - else if (buff.getBuffType() == NonStackingStatBuffType.ALLATKPCT) { + } else if (buff.getBuffType() == NonStackingStatBuffType.ALLATKPCT) { Map> buffKeyMap = this.nonStackingBuffs .get(NonStackingStatBuffType.MELEEATKPCT); if (buffKeyMap == null) { @@ -413,8 +414,7 @@ else if (buff.getBuffType() == NonStackingStatBuffType.ALLATKPCT) { buffKeyMap.put(buff.getStackingKey(), theList); } theList.add(buff); - } - else { + } else { Map> buffKeyMap = this.nonStackingBuffs.get(buff.getBuffType()); if (buffKeyMap == null) { buffKeyMap = new HashMap<>(); @@ -436,8 +436,7 @@ public void removeNonStackingStatBuff(final NonStackingStatBuff buff) { .get(NonStackingStatBuffType.MELEEATK); try { buffKeyMap.get(buff.getStackingKey()).remove(buff); - } - catch (final Exception e) { + } catch (final Exception e) { System.err.println(e.getLocalizedMessage()); System.err.println(e.getStackTrace().toString()); System.err.println("From: " + getTypeId().asStringValue()); @@ -446,20 +445,17 @@ public void removeNonStackingStatBuff(final NonStackingStatBuff buff) { buffKeyMap = this.nonStackingBuffs.get(NonStackingStatBuffType.RNGDATK); try { buffKeyMap.get(buff.getStackingKey()).remove(buff); - } - catch (final Exception e) { + } catch (final Exception e) { System.err.println(e.getLocalizedMessage()); System.err.println(e.getStackTrace().toString()); System.err.println("From: " + getTypeId().asStringValue()); } - } - else if (buff.getBuffType() == NonStackingStatBuffType.ALLATKPCT) { + } else if (buff.getBuffType() == NonStackingStatBuffType.ALLATKPCT) { Map> buffKeyMap = this.nonStackingBuffs .get(NonStackingStatBuffType.MELEEATKPCT); try { buffKeyMap.get(buff.getStackingKey()).remove(buff); - } - catch (final Exception e) { + } catch (final Exception e) { System.err.println(e.getLocalizedMessage()); System.err.println(e.getStackTrace().toString()); System.err.println("From: " + getTypeId().asStringValue()); @@ -468,19 +464,16 @@ else if (buff.getBuffType() == NonStackingStatBuffType.ALLATKPCT) { buffKeyMap = this.nonStackingBuffs.get(NonStackingStatBuffType.RNGDATKPCT); try { buffKeyMap.get(buff.getStackingKey()).remove(buff); - } - catch (final Exception e) { + } catch (final Exception e) { System.err.println(e.getLocalizedMessage()); System.err.println(e.getStackTrace().toString()); System.err.println("From: " + getTypeId().asStringValue()); } - } - else { + } else { final Map> buffKeyMap = this.nonStackingBuffs.get(buff.getBuffType()); try { buffKeyMap.get(buff.getStackingKey()).remove(buff); - } - catch (final Exception e) { + } catch (final Exception e) { System.err.println(e.getLocalizedMessage()); System.err.println(e.getStackTrace().toString()); System.err.println("From: " + getTypeId().asStringValue()); @@ -565,8 +558,7 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type && ((ability.getAbilityCategory() == CAbilityCategory.SPELL) || (ability.getAbilityCategory() == CAbilityCategory.CORE)))) { ability.setDisabled(true, CAbilityDisableType.ATTACKDISABLED); - } - else { + } else { ability.setDisabled(false, CAbilityDisableType.ATTACKDISABLED); } } @@ -646,8 +638,7 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type .contains(CUnitDefaultMagicImmuneDamageModListener.INSTANCE)) { addFinalDamageTakenModificationListener(CUnitDefaultMagicImmuneDamageModListener.INSTANCE); } - } - else { + } else { if (this.finalDamageTakenModificationListeners .contains(CUnitDefaultMagicImmuneDamageModListener.INSTANCE)) { removeFinalDamageTakenModificationListener(CUnitDefaultMagicImmuneDamageModListener.INSTANCE); @@ -704,8 +695,7 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type setDefaultBehavior(this.currentBehavior); this.stateNotifier.ordersChanged(); } - } - else { + } else { if ((this.currentBehavior != null) && (this.currentBehavior.getHighlightOrderId() == OrderIds.stunned)) { // this.setAcceptingOrders(true); @@ -721,8 +711,7 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type if (!this.damageTakenListeners.contains(CUnitDefaultSleepListener.INSTANCE)) { addDamageTakenListener(CUnitDefaultSleepListener.INSTANCE); } - } - else { + } else { if (this.damageTakenListeners.contains(CUnitDefaultSleepListener.INSTANCE)) { removeDamageTakenListener(CUnitDefaultSleepListener.INSTANCE); } @@ -740,8 +729,7 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type if (isSnared) { setFlyHeight(0); this.moveDisabled = true; - } - else { + } else { if (this.moveDisabled) { setFlyHeight(this.unitType.getDefaultFlyingHeight()); this.moveDisabled = false; @@ -819,13 +807,13 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type } } this.invisLevels = invisLevels; - + long detections = 0; for (final StateModBuff buff : stateModBuffs) { if (buff.getBuffType() == StateModBuffType.DETECTED) { if (buff.getValue() != 0) { - if ((((byte)buff.getValue()) & this.invisLevels) == this.invisLevels) { - detections = (detections | (buff.getValue()>>8)); + if ((((byte) buff.getValue()) & this.invisLevels) == this.invisLevels) { + detections = (detections | (buff.getValue() >> 8)); } } } @@ -852,12 +840,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -873,12 +859,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -903,12 +887,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -924,12 +906,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -945,12 +925,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -973,12 +951,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -994,12 +970,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1016,12 +990,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1043,12 +1015,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1064,12 +1034,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1129,12 +1097,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1157,12 +1123,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1174,8 +1138,7 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { } if (this.lifestealListener != null) { this.lifestealListener.setAmount(totalNSVampBuff); - } - else { + } else { this.lifestealListener = new CUnitDefaultLifestealListener(totalNSVampBuff); addPostDamageListener(this.lifestealListener); } @@ -1188,12 +1151,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1205,8 +1166,7 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { } if (this.flatThornsListener != null) { this.flatThornsListener.setAmount(totalNSThornsBuff); - } - else { + } else { this.flatThornsListener = new CUnitDefaultThornsListener(false, totalNSThornsBuff); addDamageTakenListener(this.flatThornsListener); } @@ -1219,12 +1179,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1236,8 +1194,7 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { } if (this.percentThornsListener != null) { this.percentThornsListener.setAmount(totalNSThornsPctBuff); - } - else { + } else { this.percentThornsListener = new CUnitDefaultThornsListener(true, totalNSThornsPctBuff); addDamageTakenListener(this.percentThornsListener); } @@ -1251,12 +1208,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1272,12 +1227,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1291,8 +1244,7 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (newMaxLife > this.maximumLife) { this.life += newMaxLife - this.maximumLife; this.maximumLife = newMaxLife; - } - else { + } else { this.maximumLife = newMaxLife; this.life = Math.min(this.life, this.maximumLife); } @@ -1306,12 +1258,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1327,12 +1277,10 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -1346,8 +1294,7 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (newMaxMana > this.maximumMana) { this.mana += newMaxMana - this.maximumMana; this.maximumMana = newMaxMana; - } - else { + } else { this.maximumMana = newMaxMana; this.mana = Math.min(this.mana, this.maximumMana); } @@ -1368,8 +1315,7 @@ public NonStackingFx addNonStackingFx(final CSimulation game, final String stack if (existingArts.isEmpty()) { final SimulationRenderComponent fx = game.createPersistentSpellEffectOnUnit(this, id, target); newFx.setArt(fx); - } - else { + } else { newFx.setArt(existingArts.iterator().next().getArt()); } existingArts.add(newFx); @@ -1394,14 +1340,12 @@ public void addNonStackingDisplayBuff(final CSimulation game, final String stack } if (existingBuffs.isEmpty()) { this.add(game, buff); - } - else { + } else { final CBuff currentBuff = this.getFirstAbilityOfType(buff.getClass()); if (currentBuff == null) { existingBuffs.clear(); this.add(game, buff); - } - else { + } else { if (buff.getLevel() >= currentBuff.getLevel()) { this.remove(game, currentBuff); this.add(game, buff); @@ -1593,8 +1537,7 @@ public void add(final CSimulation simulation, final CAbility ability) { public void add(final CSimulation simulation, final CBuff ability) { if (this.abilities.contains(ability) && (ability instanceof ABGenericTimedBuff)) { ((ABGenericTimedBuff) ability).updateExpiration(simulation, this); - } - else { + } else { this.abilities.add(ability); simulation.onAbilityAddedToUnit(this, ability); ability.onAdd(simulation, this); @@ -1609,8 +1552,7 @@ public void remove(final CSimulation simulation, final CAbility ability) { simulation.onAbilityRemovedFromUnit(this, ability); ability.onRemoveDisabled(simulation, this); this.stateNotifier.abilitiesChanged(); - } - else { + } else { this.abilities.remove(ability); simulation.onAbilityRemovedFromUnit(this, ability); ability.onRemove(simulation, this); @@ -1644,8 +1586,7 @@ public void checkDisabledAbilities(final CSimulation simulation, final boolean d } } } - } - else { + } else { for (final CAbility ability : new ArrayList<>(this.disabledAbilities)) { if (ability.isRequirementsMet(simulation, this)) { ability.setDisabled(false, CAbilityDisableType.REQUIREMENTS); @@ -1728,8 +1669,7 @@ public void setTypeId(final CSimulation game, final War3ID typeId, final boolean ability.onRemove(game, this); game.onAbilityRemovedFromUnit(this, ability); removedAbilities.add(ability); - } - else { + } else { persistedAbilities.add(ability); } } @@ -1755,8 +1695,7 @@ public void setTypeId(final CSimulation game, final War3ID typeId, final boolean } if (Float.isNaN(manaRatio)) { this.mana = this.unitType.getManaInitial(); - } - else { + } else { this.mana = manaRatio * this.maximumMana; } game.getWorldCollision().addUnit(this); @@ -1848,14 +1787,12 @@ public boolean update(final CSimulation game) { // we just delete the unit return true; } - } - else { + } else { game.heroDeathEvent(this); } this.deathTurnTick = gameTurnTick; } - } - else if (!this.boneCorpse) { + } else if (!this.boneCorpse) { if (game.getGameTurnTick() > (this.deathTurnTick + (int) (game.getGameplayConstants().getDecayTime() / WarsmashConstants.SIMULATION_STEP_TIME))) { this.boneCorpse = true; @@ -1865,8 +1802,7 @@ else if (!this.boneCorpse) { game.getWorldCollision().addUnit(this); } } - } - else if (game.getGameTurnTick() > (this.deathTurnTick + } else if (game.getGameTurnTick() > (this.deathTurnTick + (int) (getEndingDecayTime(game) / WarsmashConstants.SIMULATION_STEP_TIME))) { if (this.unitType.isHero()) { if (!getHeroData().isAwaitingRevive()) { @@ -1879,8 +1815,7 @@ else if (game.getGameTurnTick() > (this.deathTurnTick return true; } } - } - else { + } else { if (!this.paused) { if ((this.rallyPoint != this) && (this.rallyPoint instanceof CUnit) && ((CUnit) this.rallyPoint).isDead()) { @@ -1899,8 +1834,7 @@ else if (game.getGameTurnTick() > (this.deathTurnTick * (this.maximumLife * (1.0f - WarsmashConstants.BUILDING_CONSTRUCT_START_LIFE)); setLife(game, Math.min(this.life + healthGain, this.maximumLife)); } - } - else { + } else { buildTime = game.getUnitData().getUnitType(this.upgradeIdType).getBuildTime(); } if (this.constructionProgress >= buildTime) { @@ -1912,8 +1846,7 @@ else if (game.getGameTurnTick() > (this.deathTurnTick game.removeUnit(this.worker); this.worker = null; } - } - else { + } else { popoutWorker(game); } final Iterator abilityIterator = this.abilities.iterator(); @@ -1921,8 +1854,7 @@ else if (game.getGameTurnTick() > (this.deathTurnTick final CAbility ability = abilityIterator.next(); if (ability instanceof CAbilityBuildInProgress) { abilityIterator.remove(); - } - else { + } else { ability.setDisabled(false, CAbilityDisableType.CONSTRUCTION); ability.setIconShowing(true); } @@ -1944,8 +1876,7 @@ else if (game.getGameTurnTick() > (this.deathTurnTick if (!upgrading) { game.unitConstructFinishEvent(this); fireConstructFinishEvents(game); - } - else { + } else { game.unitUpgradeFinishEvent(this); } if (upgrading || true) { @@ -1955,15 +1886,13 @@ else if (game.getGameTurnTick() > (this.deathTurnTick } this.stateNotifier.ordersChanged(); } - } - else { + } else { final War3ID queuedRawcode = this.buildQueue[0]; if (queuedRawcode != null) { // queue step forward if (this.queuedUnitFoodPaid) { this.constructionProgress += WarsmashConstants.SIMULATION_STEP_TIME; - } - else { + } else { if (this.buildQueueTypes[0] == QueueItemType.UNIT) { final CPlayer player = game.getPlayer(this.playerIndex); final CUnitType trainedUnitType = game.getUnitData().getUnitType(queuedRawcode); @@ -1973,15 +1902,12 @@ else if (game.getGameTurnTick() > (this.deathTurnTick player.setFoodUsed(newFoodUsed); this.queuedUnitFoodPaid = true; } - } - else { + } else { this.queuedUnitFoodPaid = true; } - } - else if (this.buildQueueTypes[0] == QueueItemType.SACRIFICE) { + } else if (this.buildQueueTypes[0] == QueueItemType.SACRIFICE) { this.queuedUnitFoodPaid = true; - } - else if (this.buildQueueTypes[0] == QueueItemType.HERO_REVIVE) { + } else if (this.buildQueueTypes[0] == QueueItemType.HERO_REVIVE) { final CPlayer player = game.getPlayer(this.playerIndex); final CUnitType trainedUnitType = game.getUnit(queuedRawcode.getValue()).getUnitType(); final int newFoodUsed = player.getFoodUsed() + trainedUnitType.getFoodUsed(); @@ -1989,8 +1915,7 @@ else if (this.buildQueueTypes[0] == QueueItemType.HERO_REVIVE) { player.setFoodUsed(newFoodUsed); this.queuedUnitFoodPaid = true; } - } - else { + } else { this.queuedUnitFoodPaid = true; System.err.println( "Unpaid food for non unit queue item ???? Attempting to correct this by setting paid=true"); @@ -2023,8 +1948,7 @@ else if (this.buildQueueTypes[0] == QueueItemType.HERO_REVIVE) { setBuildQueueItem(game, this.buildQueue.length - 1, null, null); this.stateNotifier.queueChanged(); } - } - else if (this.buildQueueTypes[0] == QueueItemType.SACRIFICE) { + } else if (this.buildQueueTypes[0] == QueueItemType.SACRIFICE) { final CUnitType trainedUnitType = game.getUnitData().getUnitType(queuedRawcode); if (this.constructionProgress >= trainedUnitType.getBuildTime()) { this.constructionProgress = 0; @@ -2054,8 +1978,7 @@ else if (this.buildQueueTypes[0] == QueueItemType.SACRIFICE) { setBuildQueueItem(game, this.buildQueue.length - 1, null, null); this.stateNotifier.queueChanged(); } - } - else if (this.buildQueueTypes[0] == QueueItemType.HERO_REVIVE) { + } else if (this.buildQueueTypes[0] == QueueItemType.HERO_REVIVE) { final CUnit revivingHero = game.getUnit(queuedRawcode.getValue()); final CUnitType trainedUnitType = revivingHero.getUnitType(); final CGameplayConstants gameplayConstants = game.getGameplayConstants(); @@ -2100,8 +2023,7 @@ else if (this.buildQueueTypes[0] == QueueItemType.HERO_REVIVE) { setBuildQueueItem(game, this.buildQueue.length - 1, null, null); this.stateNotifier.queueChanged(); } - } - else if (this.buildQueueTypes[0] == QueueItemType.RESEARCH) { + } else if (this.buildQueueTypes[0] == QueueItemType.RESEARCH) { final CUpgradeType trainedUnitType = game.getUpgradeData().getType(queuedRawcode); // TODO the "getBuildTime" math below probably would be better served to have // been cached, for performance, since we are in the update method. But maybe it @@ -2150,8 +2072,7 @@ else if (this.buildQueueTypes[0] == QueueItemType.RESEARCH) { } this.life = lifePlusRegen; this.stateNotifier.lifeChanged(); - } - else { + } else { float lifePlusRegen = (this.life + this.currentLifeRegenPerTick) - this.baseLifeRegenPerTick; if (lifePlusRegen > this.maximumLife) { @@ -2179,8 +2100,7 @@ else if (this.buildQueueTypes[0] == QueueItemType.RESEARCH) { this.attackFogMod.setPlayerIndex(target.getPlayerIndex()); game.getPlayer(target.getPlayerIndex()).addFogModifer(game, this.attackFogMod); } - } - else { + } else { if (this.attackFogMod.getPlayerIndex() != this.playerIndex) { game.getPlayer(this.attackFogMod.getPlayerIndex()).removeFogModifer(game, this.attackFogMod); @@ -2202,8 +2122,7 @@ else if (this.buildQueueTypes[0] == QueueItemType.RESEARCH) { this.abilities.get(i).onTick(game, this); } } - } - else if (!this.constructing) { + } else if (!this.constructing) { // Paused units only allow passives to function. Buffs don't tick (except a few) // Base and bonus life/mana regen function, but regen from Str/Int doesn't if ((this.life < this.maximumLife) @@ -2296,12 +2215,10 @@ public boolean autoAcquireAutocastTargets(final CSimulation game, final boolean if (booleanTargetReceiver.isTargetable()) { return this.order(game, this.autocastAbility.getBaseOrderId(), null); } - } - else if (this.autocastAbility.getAutocastType() != AutocastType.NONE) { + } else if (this.autocastAbility.getAutocastType() != AutocastType.NONE) { if (this.collisionRectangle != null) { tempRect.set(this.collisionRectangle); - } - else { + } else { tempRect.set(getX(), getY(), 0, 0); } final float halfSize = this.acquisitionRange; @@ -2324,8 +2241,7 @@ public boolean autoAcquireAttackTargets(final CSimulation game, final boolean di if (!getCurrentAttacks().isEmpty() && !this.unitType.getClassifications().contains(CUnitClassification.PEON)) { if (this.collisionRectangle != null) { tempRect.set(this.collisionRectangle); - } - else { + } else { tempRect.set(getX(), getY(), 0, 0); } final float halfSize = this.acquisitionRange; @@ -2394,23 +2310,19 @@ public void order(final CSimulation game, final COrder order, final boolean queu this.orderQueue.add(order); this.stateNotifier.ordersChanged(); this.stateNotifier.waypointsChanged(); - } - else if (queue && (this.currentBehavior != this.stopBehavior) + } else if (queue && (this.currentBehavior != this.stopBehavior) && (this.currentBehavior != this.holdPositionBehavior)) { if (order.getOrderId() == OrderIds.patrol) { if (this.defaultBehavior == this.patrolBehavior) { this.patrolBehavior.addPatrolPoint(order.getTarget(game)); - } - else { + } else { this.orderQueue.add(order); } - } - else { + } else { this.orderQueue.add(order); } this.stateNotifier.waypointsChanged(); - } - else { + } else { setDefaultBehavior(this.stopBehavior); this.beginBehavior(game, beginOrder(game, order)); for (final COrder queuedOrder : this.orderQueue) { @@ -2443,8 +2355,7 @@ public boolean order(final CSimulation simulation, final int orderId, final Abil order(simulation, new COrderNoTarget(ability.getHandleId(), orderId, false), false); return true; } - } - else { + } else { final boolean targetable = target.visit(new AbilityTargetVisitor() { @Override public Boolean accept(final AbilityPointTarget target) { @@ -2500,8 +2411,7 @@ private CBehavior beginOrder(final CSimulation game, final COrder order) { CBehavior nextBehavior; if (order != null) { nextBehavior = order.begin(game, this); - } - else { + } else { nextBehavior = this.defaultBehavior; } return nextBehavior; @@ -2600,12 +2510,10 @@ public void setPointAndCheckUnstuck(final float newX, final float newY, final CS tempRect.setSize(this.unitType.getBuildingPathingPixelMap().getWidth() * 32, this.unitType.getBuildingPathingPixelMap().getHeight() * 32); collisionSize = tempRect.getWidth() / 2; - } - else if (this.collisionRectangle != null) { + } else if (this.collisionRectangle != null) { tempRect.set(this.collisionRectangle); collisionSize = this.unitType.getCollisionSize(); - } - else { + } else { tempRect.setSize(16, 16); collisionSize = this.unitType.getCollisionSize(); } @@ -2683,8 +2591,7 @@ public double distance(final AbilityTarget target) { if (target instanceof CUnit) { final CUnitType targetUnitType = ((CUnit) target).getUnitType(); targetCollisionSize = targetUnitType.getCollisionSize(); - } - else { + } else { targetCollisionSize = 0; // TODO destructable collision size here } if (dx < 0) { @@ -2703,7 +2610,7 @@ public double distance(final AbilityTarget target) { @Override public double distance(final float x, final float y) { - return distance((double)x, (double)y); + return distance((double) x, (double) y); } public double distance(final double x, final double y) { @@ -2736,7 +2643,8 @@ public boolean checkForMiss(final CSimulation simulation, final CUnit source, fi return miss; } - public boolean checkForAttackProjReaction(final CSimulation simulation, final CUnit source, final CAttackProjectile projectile) { + public boolean checkForAttackProjReaction(final CSimulation simulation, final CUnit source, + final CAttackProjectile projectile) { boolean allow = true; for (final CUnitAttackProjReactionListener listener : new ArrayList<>(attackProjReactionListeners)) { if (allow) { @@ -2746,7 +2654,8 @@ public boolean checkForAttackProjReaction(final CSimulation simulation, final CU return allow; } - public boolean checkForAbilityProjReaction(final CSimulation simulation, final CUnit source, final CProjectile projectile) { + public boolean checkForAbilityProjReaction(final CSimulation simulation, final CUnit source, + final CProjectile projectile) { boolean allow = true; for (final CUnitAbilityProjReactionListener listener : new ArrayList<>(abilityProjReactionListeners)) { if (allow) { @@ -2756,7 +2665,8 @@ public boolean checkForAbilityProjReaction(final CSimulation simulation, final C return allow; } - public boolean checkForAbilityEffectReaction(final CSimulation simulation, final CUnit source, final CAbility ability) { + public boolean checkForAbilityEffectReaction(final CSimulation simulation, final CUnit source, + final CAbility ability) { boolean allow = true; for (final CUnitAbilityEffectReactionListener listener : new ArrayList<>(abilityEffectReactionListeners)) { if (allow) { @@ -2767,27 +2677,27 @@ public boolean checkForAbilityEffectReaction(final CSimulation simulation, final } @Override - public float damage(final CSimulation simulation, final CUnit source, final boolean isAttack, - final boolean isRanged, final CAttackType attackType, final CDamageType damageType, - final String weaponSoundType, final float damage) { - return this.damage(simulation, source, isAttack, isRanged, attackType, damageType, weaponSoundType, damage, 0); + public float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, + final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, + final float damage) { + return this.damage(simulation, source, flags, attackType, damageType, weaponSoundType, damage, 0); } @Override - public float damage(final CSimulation simulation, final CUnit source, final boolean isAttack, - final boolean isRanged, final CAttackType attackType, final CDamageType damageType, - final String weaponSoundType, final float damage, final float bonusDamage) { + public float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, + final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, + final float damage, final float bonusDamage) { final boolean wasDead = isDead(); if (wasDead) { return 0; } float trueDamage = 0; - if (!this.invulnerable) { + if (!this.invulnerable && !flags.isIgnoreInvulnerable()) { final CUnitAttackDamageTakenModificationListenerDamageModResult result = new CUnitAttackDamageTakenModificationListenerDamageModResult( damage, bonusDamage); for (final CUnitAttackDamageTakenModificationListener listener : this.damageTakenModificationListeners) { - listener.onDamage(simulation, source, this, isAttack, isRanged, attackType, damageType, result); + listener.onDamage(simulation, source, this, flags, attackType, damageType, result); } final float damageRatioFromArmorClass = simulation.getGameplayConstants().getDamageRatioAgainst(attackType, @@ -2796,12 +2706,10 @@ public float damage(final CSimulation simulation, final CUnit source, final bool final float defense = this.currentDefense; if (damageType != CDamageType.NORMAL) { damageRatioFromDefense = 1.0f; - } - else if (defense >= 0) { + } else if (defense >= 0) { damageRatioFromDefense = 1f - ((defense * simulation.getGameplayConstants().getDefenseArmor()) / (1 + (simulation.getGameplayConstants().getDefenseArmor() * defense))); - } - else { + } else { damageRatioFromDefense = 2f - (float) StrictMath.pow(1f - simulation.getGameplayConstants().getDefenseArmor(), -defense); } @@ -2809,8 +2717,7 @@ else if (defense >= 0) { for (final CUnitAttackFinalDamageTakenModificationListener listener : new ArrayList<>( this.finalDamageTakenModificationListeners)) { - trueDamage = listener.onDamage(simulation, source, this, isAttack, isRanged, attackType, damageType, - trueDamage); + trueDamage = listener.onDamage(simulation, source, this, flags, attackType, damageType, trueDamage); } final boolean wasAboveMax = this.life > this.maximumLife; @@ -2824,16 +2731,17 @@ else if (defense >= 0) { this.stateNotifier.lifeChanged(); } for (final CUnitAttackDamageTakenListener listener : new ArrayList<>(this.damageTakenListeners)) { - listener.onDamage(simulation, source, this, isAttack, isRanged, damageType, damage, bonusDamage, - trueDamage); + listener.onDamage(simulation, source, this, flags, damageType, damage, bonusDamage, trueDamage); } simulation.unitDamageEvent(this, weaponSoundType, this.unitType.getArmorType()); if (!this.invulnerable && isDead()) { if (!wasDead) { + if (flags.isExplode()) { + this.setExplodesOnDeath(true); + } kill(simulation, source); } - } - else { + } else { if ((this.currentBehavior == null) || ((this.currentBehavior == this.defaultBehavior) && this.currentBehavior.interruptable())) { boolean foundMatchingReturnFireAttack = false; @@ -2841,8 +2749,8 @@ else if (defense >= 0) { && !this.unitType.getClassifications().contains(CUnitClassification.PEON)) { for (final CUnitAttack attack : getCurrentAttacks()) { if (source.canBeTargetedBy(simulation, this, attack.getTargetsAllowed())) { - this.beginBehavior(simulation, getAttackBehavior().reset(simulation, OrderIds.attack, attack, source, false, - CBehaviorAttackListener.DO_NOTHING)); + this.beginBehavior(simulation, getAttackBehavior().reset(simulation, OrderIds.attack, + attack, source, false, CBehaviorAttackListener.DO_NOTHING)); foundMatchingReturnFireAttack = true; break; } @@ -2852,9 +2760,11 @@ else if (defense >= 0) { && (this.moveBehavior != null) && (this.playerIndex != source.getPlayerIndex())) { final double angleTo = source.angleTo(this); final int distanceToFlee = getSpeed(); - this.beginBehavior(simulation, this.moveBehavior.reset(OrderIds.move, - new AbilityPointTarget((float) (getX() + (distanceToFlee * StrictMath.cos(angleTo))), - (float) (getY() + (distanceToFlee * StrictMath.sin(angleTo)))))); + this.beginBehavior(simulation, + this.moveBehavior.reset(OrderIds.move, + new AbilityPointTarget( + (float) (getX() + (distanceToFlee * StrictMath.cos(angleTo))), + (float) (getY() + (distanceToFlee * StrictMath.sin(angleTo)))))); } } } @@ -2868,7 +2778,8 @@ private void kill(final CSimulation simulation, final CUnit source) { CUnitDeathReplacementStacking allowContinue = new CUnitDeathReplacementStacking(); for (final CUnitDeathReplacementEffectPriority priority : CUnitDeathReplacementEffectPriority.values()) { if (allowContinue.isAllowStacking()) { - for (final CUnitDeathReplacementEffect effect : new ArrayList<>(deathReplacementEffects.get(priority))) { + for (final CUnitDeathReplacementEffect effect : new ArrayList<>( + deathReplacementEffects.get(priority))) { if (allowContinue.isAllowSamePriorityStacking()) { allowContinue = effect.onDeath(simulation, this, source, result); } @@ -2903,8 +2814,7 @@ private void kill(final CSimulation simulation, final CUnit source) { if (this.constructing) { simulation.createDeathExplodeEffect(this, this.explodesOnDeathBuffId); - } - else { + } else { this.deathTurnTick = simulation.getGameTurnTick(); } @@ -2918,8 +2828,7 @@ private void kill(final CSimulation simulation, final CUnit source) { if (getHeroData() == null) { if (this.constructing) { player.removeTechtreeInProgress(this.unitType.getTypeId()); - } - else { + } else { player.removeTechtreeUnlocked(simulation, this.unitType.getTypeId()); } } @@ -2964,8 +2873,7 @@ private void kill(final CSimulation simulation, final CUnit source) { int availableAwardXp; if (killedUnitIsAHero) { availableAwardXp = gameplayConstants.getGrantHeroXP(killedUnitHeroData.getHeroLevel()); - } - else { + } else { availableAwardXp = gameplayConstants.getGrantNormalXP(this.unitType.getLevel()); } final List xpReceivingHeroes = new ArrayList<>(); @@ -3042,8 +2950,7 @@ public boolean canReach(final AbilityTarget target, final float range) { return true; } } - } - else if (target instanceof CDestructable) { + } else if (target instanceof CDestructable) { final CDestructable targetDest = (CDestructable) target; final CDestructableType targetDestType = targetDest.getDestType(); final BufferedImage pathingPixelMap = targetDest.isDead() ? targetDestType.getPathingDeathPixelMap() @@ -3160,7 +3067,7 @@ public boolean canBeTargetedBy(final CSimulation simulation, final CUnit source, final EnumSet targetsAllowed, final AbilityTargetCheckReceiver receiver) { return this.canBeTargetedBy(simulation, source, true, targetsAllowed, receiver); } - + public boolean canBeTargetedBy(final CSimulation simulation, final CUnit source, final boolean targeted, final EnumSet targetsAllowed, final AbilityTargetCheckReceiver receiver) { if ((this == source) && targetsAllowed.contains(CTargetType.NOTSELF) @@ -3209,102 +3116,79 @@ public boolean canBeTargetedBy(final CSimulation simulation, final CUnit source, if (isRaisable() && isDecays() && isBoneCorpse()) { if (targetsAllowed.contains(CTargetType.DEAD)) { return true; - } - else { + } else { receiver.targetCheckFailed( CommandStringErrorKeys.TARGET_MUST_BE_LIVING); } - } - else { + } else { receiver.targetCheckFailed( CommandStringErrorKeys.MUST_TARGET_A_UNIT_WITH_THIS_ACTION); } - } - else { + } else { if (!targetsAllowed.contains(CTargetType.DEAD) || targetsAllowed.contains(CTargetType.ALIVE)) { return true; - } - else { + } else { receiver.targetCheckFailed( CommandStringErrorKeys.MUST_TARGET_A_CORPSE); } } - } - else { + } else { receiver.targetCheckFailed( CommandStringErrorKeys.UNABLE_TO_TARGET_HEROES); } - } - else { + } else { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_HERO); } - } - else { + } else { if (invulnerable) { receiver.targetCheckFailed( CommandStringErrorKeys.THAT_TARGET_IS_INVULNERABLE); - } - else { + } else { receiver.targetCheckFailed( CommandStringErrorKeys.UNABLE_TO_TARGET_THIS_UNIT); } } - } - else { + } else { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_ANCIENTS); } - } - else { + } else { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_AN_ANCIENT); } - } - else { + } else { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_ORGANIC_UNITS); } - } - else { + } else { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_ORGANIC_UNITS); } - } - else { + } else { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_FRIENDLY_UNIT); } - } - else { + } else { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_AN_ENEMY_UNIT); } - } - else { + } else { if (this.unitType.getTargetedAs().contains(CTargetType.GROUND) && !targetsAllowed.contains(CTargetType.GROUND)) { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_GROUND_UNITS); - } - else if (this.unitType.getTargetedAs().contains(CTargetType.STRUCTURE) + } else if (this.unitType.getTargetedAs().contains(CTargetType.STRUCTURE) && !targetsAllowed.contains(CTargetType.STRUCTURE)) { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_BUILDINGS); - } - else if (this.unitType.getTargetedAs().contains(CTargetType.AIR) + } else if (this.unitType.getTargetedAs().contains(CTargetType.AIR) && !targetsAllowed.contains(CTargetType.AIR)) { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_AIR_UNITS); - } - else if (this.unitType.getTargetedAs().contains(CTargetType.WARD) + } else if (this.unitType.getTargetedAs().contains(CTargetType.WARD) && !targetsAllowed.contains(CTargetType.WARD)) { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_WARDS); - } - else if (targetsAllowed.contains(CTargetType.GROUND)) { + } else if (targetsAllowed.contains(CTargetType.GROUND)) { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_GROUND_UNIT); - } - else if (targetsAllowed.contains(CTargetType.STRUCTURE)) { + } else if (targetsAllowed.contains(CTargetType.STRUCTURE)) { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_BUILDING); - } - else if (targetsAllowed.contains(CTargetType.AIR)) { + } else if (targetsAllowed.contains(CTargetType.AIR)) { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_AN_AIR_UNIT); - } - else if (targetsAllowed.contains(CTargetType.WARD)) { + } else if (targetsAllowed.contains(CTargetType.WARD)) { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_WARD); - } - else { + } else { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_THIS_UNIT); } } @@ -3326,8 +3210,9 @@ public MovementType getMovementType() { if (isMovementDisabled()) { return MovementType.DISABLED; } - return this.movementOverride != null ? this.movementOverride : getUnitType().getMovementType(); // later maybe it has unit instance override for windwalk, so this - // wrapper exists to later mod + return this.movementOverride != null ? this.movementOverride : getUnitType().getMovementType(); + // later maybe it has unit instance override for windwalk, so this wrapper + // exists to later mod } public void setNoCollisionMovementType(boolean active) { @@ -3421,8 +3306,7 @@ public boolean call(final CUnit unit) { if (this.currentUnitTarget == null) { this.currentUnitTarget = unit; this.comparisonValue = this.source.distance(unit); - } - else { + } else { final double dist = this.source.distance(unit); if (dist < this.comparisonValue) { this.currentUnitTarget = unit; @@ -3451,8 +3335,7 @@ public boolean call(final CUnit unit) { if (this.currentUnitTarget == null) { this.currentUnitTarget = unit; this.comparisonValue = this.source.distance(unit); - } - else { + } else { final double dist = this.source.distance(unit); if (dist < this.comparisonValue) { this.currentUnitTarget = unit; @@ -3473,8 +3356,7 @@ public boolean call(final CUnit unit) { if (this.currentUnitTarget == null) { this.currentUnitTarget = unit; this.comparisonValue = unit.getLife() / unit.getMaximumLife(); - } - else { + } else { final double ratio = unit.getLife() / unit.getMaximumLife(); if (ratio > this.comparisonValue) { this.currentUnitTarget = unit; @@ -3492,8 +3374,7 @@ public boolean call(final CUnit unit) { if (this.currentUnitTarget == null) { this.currentUnitTarget = unit; this.comparisonValue = unit.getLife() / unit.getMaximumLife(); - } - else { + } else { final double ratio = unit.getLife() / unit.getMaximumLife(); if (ratio < this.comparisonValue) { this.currentUnitTarget = unit; @@ -3511,8 +3392,7 @@ public boolean call(final CUnit unit) { if (this.currentUnitTarget == null) { this.currentUnitTarget = unit; this.comparisonValue = this.source.distance(unit); - } - else { + } else { final double dist = this.source.distance(unit); if (dist < this.comparisonValue) { this.currentUnitTarget = unit; @@ -3530,8 +3410,7 @@ public boolean call(final CUnit unit) { if (this.currentUnitTarget == null) { this.currentUnitTarget = unit; this.comparisonValue = this.source.distance(unit); - } - else { + } else { final double dist = this.source.distance(unit); if (dist < this.comparisonValue) { this.currentUnitTarget = unit; @@ -3587,8 +3466,9 @@ public boolean call(final CUnit unit) { && !(this.game.getGameplayConstants().isMagicImmuneResistsDamage() && unit.isUnitType(CUnitTypeJass.MAGIC_IMMUNE) && attack.getAttackType() == CAttackType.MAGIC)) { - this.source.beginBehavior(game, this.source.getAttackBehavior().reset(game, OrderIds.attack, - attack, unit, this.disableMove, CBehaviorAttackListener.DO_NOTHING)); + this.source.beginBehavior(game, + this.source.getAttackBehavior().reset(game, OrderIds.attack, attack, unit, + this.disableMove, CBehaviorAttackListener.DO_NOTHING)); this.foundAnyTarget = true; return true; } @@ -3756,15 +3636,15 @@ public void setWorker(final CUnit unit, final boolean inside) { public CUnit getWorker() { return this.worker; } - + public void addPowerWorker() { this.powerWorkers++; } - + public void removePowerWorker() { this.powerWorkers--; } - + public int getPowerWorkers() { return this.powerWorkers; } @@ -3923,23 +3803,20 @@ public void setBuildQueueItem(final CSimulation game, final int index, final War final int newFoodUsed = player.getFoodUsed() + unitType.getFoodUsed(); if (newFoodUsed <= player.getFoodCap()) { player.setFoodUsed(newFoodUsed); - } - else { + } else { this.queuedUnitFoodPaid = false; game.getCommandErrorListener().showInterfaceError(this.playerIndex, CommandStringErrorKeys.NOT_ENOUGH_FOOD); player.removeTechtreeInProgress(rawcode); } } - } - else if (queueItemType == QueueItemType.HERO_REVIVE) { + } else if (queueItemType == QueueItemType.HERO_REVIVE) { final CUnitType unitType = game.getUnit(this.buildQueue[index].getValue()).getUnitType(); if (unitType.getFoodUsed() != 0) { final int newFoodUsed = player.getFoodUsed() + unitType.getFoodUsed(); if (newFoodUsed <= player.getFoodCap()) { player.setFoodUsed(newFoodUsed); - } - else { + } else { this.queuedUnitFoodPaid = false; game.getCommandErrorListener().showInterfaceError(this.playerIndex, CommandStringErrorKeys.NOT_ENOUGH_FOOD); @@ -3957,8 +3834,7 @@ public void queueTrainingUnit(final CSimulation game, final War3ID rawcode) { final boolean isHeroType = unitType.isHero(); if (isHeroType && (player.getHeroTokens() > 0)) { player.setHeroTokens(player.getHeroTokens() - 1); - } - else { + } else { player.chargeFor(unitType); } } @@ -3974,8 +3850,7 @@ public void queueSacrificingUnit(final CSimulation game, final War3ID rawcode, f final boolean isHeroType = unitType.isHero(); if (isHeroType && (player.getHeroTokens() > 0)) { player.setHeroTokens(player.getHeroTokens() - 1); - } - else { + } else { player.chargeFor(unitType); } } @@ -4319,13 +4194,11 @@ public void onRemove(final CSimulation simulation) { // in melee games. // (See "Remove creeps and critters from used start locations" implementation) setLife(simulation, 0); - } - else { + } else { if (!isDead()) { if (this.constructing) { player.removeTechtreeInProgress(this.unitType.getTypeId()); - } - else { + } else { player.removeTechtreeUnlocked(simulation, this.unitType.getTypeId()); } } // else techtree was removed upon death @@ -4366,8 +4239,7 @@ public void cancelUpgrade(final CSimulation game) { if (game.getGameplayConstants().isRelativeUpgradeCosts()) { goldCost = newUpgradeUnitType.getGoldCost() - this.unitType.getGoldCost(); lumberCost = newUpgradeUnitType.getLumberCost() - this.unitType.getLumberCost(); - } - else { + } else { goldCost = newUpgradeUnitType.getGoldCost(); lumberCost = newUpgradeUnitType.getLumberCost(); } @@ -4378,8 +4250,7 @@ public void cancelUpgrade(final CSimulation game) { final CAbility ability = abilityIterator.next(); if (ability instanceof CAbilityBuildInProgress) { abilityIterator.remove(); - } - else { + } else { ability.setDisabled(false, CAbilityDisableType.CONSTRUCTION); ability.setIconShowing(true); } @@ -4405,8 +4276,7 @@ public void beginUpgrade(final CSimulation game, final War3ID rawcode) { if (game.getGameplayConstants().isRelativeUpgradeCosts()) { goldCost = newUpgradeUnitType.getGoldCost() - this.unitType.getGoldCost(); lumberCost = newUpgradeUnitType.getLumberCost() - this.unitType.getLumberCost(); - } - else { + } else { goldCost = newUpgradeUnitType.getGoldCost(); lumberCost = newUpgradeUnitType.getLumberCost(); } @@ -4591,8 +4461,7 @@ public int getAbilityLevel(final War3ID abilityId) { final CLevelingAbility ability = getAbility(GetAbilityByRawcodeVisitor.getInstance().reset(abilityId)); if (ability == null) { return 0; - } - else { + } else { return ability.getLevel(); } } @@ -4831,8 +4700,7 @@ public ResourceType backToWork(final CSimulation game, final ResourceType defaul abilityHarvest.getBehaviorReturnResources().reset(game); this.order(game, OrderIds.returnresources, abilityHarvest.getBehaviorReturnResources().findNearestDropoffPoint(game)); - } - else { + } else { this.order(game, OrderIds.harvest, CBehaviorReturnResources.findNearestMine(this, game)); } return ResourceType.GOLD; @@ -4841,8 +4709,7 @@ public ResourceType backToWork(final CSimulation game, final ResourceType defaul abilityHarvest.getBehaviorReturnResources().reset(game); this.order(game, OrderIds.returnresources, abilityHarvest.getBehaviorReturnResources().findNearestDropoffPoint(game)); - } - else { + } else { this.order(game, OrderIds.harvest, CBehaviorReturnResources.findNearestTree(this, abilityHarvest, game, abilityHarvest.getLastHarvestTarget())); } @@ -4851,25 +4718,21 @@ public ResourceType backToWork(final CSimulation game, final ResourceType defaul throw new IllegalStateException( "Worker was carrying a resource of unsupported type: " + carriedResourceType); } - } - else if (carriedResourceType != null) { + } else if (carriedResourceType != null) { if (carriedResourceType == ResourceType.GOLD) { this.order(game, OrderIds.harvest, CBehaviorReturnResources.findNearestMine(this, game)); return ResourceType.GOLD; - } - else if (carriedResourceType == ResourceType.LUMBER) { + } else if (carriedResourceType == ResourceType.LUMBER) { this.order(game, OrderIds.harvest, CBehaviorReturnResources.findNearestTree(this, abilityHarvest, game, abilityHarvest.getLastHarvestTarget())); return ResourceType.LUMBER; } - } - else if (defaultResourceType != null) { + } else if (defaultResourceType != null) { if (((defaultResourceType == ResourceType.GOLD) || (abilityHarvest.getLumberCapacity() == 0)) && (abilityHarvest.getGoldCapacity() > 0)) { this.order(game, OrderIds.harvest, CBehaviorReturnResources.findNearestMine(this, game)); return ResourceType.GOLD; - } - else if (abilityHarvest.getLumberCapacity() > 0) { + } else if (abilityHarvest.getLumberCapacity() > 0) { this.order(game, OrderIds.harvest, CBehaviorReturnResources.findNearestTree(this, abilityHarvest, game, abilityHarvest.getLastHarvestTarget())); return ResourceType.LUMBER; @@ -5204,8 +5067,9 @@ public boolean isVisible(final CSimulation simulation, final int toPlayerIndex) && (simulation.isDay() ? this.unitType.getSightRadiusDay() : this.unitType.getSightRadiusNight()) > 0) { return true; } - if (this.invisLevels > 0 && ((this.detections & (1< 0 && ((this.detections & (1 << toPlayerIndex)) == 0)) { + return toPlayer.getFogOfWar().isDetecting(simulation.getPathingGrid(), this.getX(), this.getY(), + this.invisLevels); } return toPlayer.getFogOfWar().isVisible(simulation.getPathingGrid(), this.getX(), this.getY()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java index 619dd427c..cb31026ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java @@ -13,6 +13,7 @@ import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; @@ -70,11 +71,13 @@ public void setLife(final CSimulation simulation, final float life) { this.life = life; } - public abstract float damage(final CSimulation simulation, final CUnit source, final boolean isAttack, final boolean isRanged, final CAttackType attackType, - final CDamageType damageType, final String weaponSoundType, final float damage); + public abstract float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, + final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, + final float damage); - public abstract float damage(final CSimulation simulation, final CUnit source, final boolean isAttack, final boolean isRanged, final CAttackType attackType, - final CDamageType damageType, final String weaponSoundType, final float damage, final float bonusDamage); + public abstract float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, + final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, + final float damage, final float bonusDamage); public abstract float getFlyHeight(); @@ -87,7 +90,7 @@ public boolean isDead() { } public abstract boolean canBeTargetedBy(CSimulation simulation, CUnit source, - final EnumSet targetsAllowed, AbilityTargetCheckReceiver receiver); + final EnumSet targetsAllowed, AbilityTargetCheckReceiver receiver); public boolean canBeTargetedBy(CSimulation simulation, CUnit source, final EnumSet targetsAllowed) { return canBeTargetedBy(simulation, source, targetsAllowed, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilitySpellBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilitySpellBase.java index 25f12a5f3..8c83e1e19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilitySpellBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilitySpellBase.java @@ -18,11 +18,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; public abstract class CAbilitySpellBase extends AbstractGenericSingleIconNoSmartActiveAbility implements CAbilitySpell { + protected static CSpellDamageFlags DAMAGE_FLAGS = new CSpellDamageFlags(); private int manaCost; private float castRange; private float cooldown; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/archmage/CAbilityBlizzard.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/archmage/CAbilityBlizzard.java index bb0c47ed6..f9220aad1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/archmage/CAbilityBlizzard.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/archmage/CAbilityBlizzard.java @@ -16,6 +16,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbstractCAbilityTypeDefinition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -106,7 +107,7 @@ public boolean call(final CUnit possibleTarget) { else { thisTargetDamage = damagePerTarget; } - damageTarget.damage(simulation, caster, false, true, CAttackType.SPELLS, CDamageType.COLD, + damageTarget.damage(simulation, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.COLD, CWeaponSoundTypeJass.WHOKNOWS.name(), thisTargetDamage); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/mountainking/CAbilityThunderBolt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/mountainking/CAbilityThunderBolt.java index 10ed80cf9..7a7b276f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/mountainking/CAbilityThunderBolt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/mountainking/CAbilityThunderBolt.java @@ -58,7 +58,7 @@ public void onLaunch(final CSimulation game, CProjectile projectile, final Abili public void onHit(final CSimulation game, CProjectile projectile, final AbilityTarget target) { final CUnit unitTarget = target.visit(AbilityTargetUnitVisitor.INSTANCE); if (unitTarget != null) { - unitTarget.damage(game, caster, false, true, CAttackType.SPELLS, CDamageType.LIGHTNING, + unitTarget.damage(game, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.LIGHTNING, CWeaponSoundTypeJass.WHOKNOWS.name(), damage); if (!unitTarget.isDead()) { unitTarget.add(game, new CBuffStun(game.getHandleIdAllocator().createId(), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/mountainking/CAbilityThunderClap.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/mountainking/CAbilityThunderClap.java index f8bce7a54..fe55a7098 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/mountainking/CAbilityThunderClap.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/mountainking/CAbilityThunderClap.java @@ -50,7 +50,7 @@ public boolean doEffect(final CSimulation simulation, final CUnit caster, final new CBuffSlow(simulation.getHandleIdAllocator().createId(), CAbilityThunderClap.this.buffId, getDurationForTarget(enumUnit), attackSpeedReductionPercent, movementSpeedReductionPercent)); - enumUnit.damage(simulation, caster, false, true, CAttackType.SPELLS, CDamageType.UNIVERSAL, + enumUnit.damage(simulation, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.UNIVERSAL, CWeaponSoundTypeJass.WHOKNOWS.name(), CAbilityThunderClap.this.damage); } return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/paladin/CAbilityHolyLight.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/paladin/CAbilityHolyLight.java index ddde3e4e9..d264c4fc1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/paladin/CAbilityHolyLight.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/paladin/CAbilityHolyLight.java @@ -11,6 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -65,7 +66,7 @@ public boolean doEffect(final CSimulation simulation, final CUnit caster, final final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); if (targetUnit != null) { if (targetUnit.getClassifications().contains(CUnitClassification.UNDEAD)) { - targetUnit.damage(simulation, caster, false, true, CAttackType.SPELLS, CDamageType.DIVINE, null, healAmount * 0.5f); + targetUnit.damage(simulation, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.DIVINE, null, healAmount * 0.5f); } else { targetUnit.heal(simulation, healAmount); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java index 7680079ac..b3b469531 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java @@ -12,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CWeaponSoundTypeJass; @@ -101,7 +102,7 @@ private void explode(final CSimulation simulation, final CUnit caster) { if (enumUnit.isBuilding()) { damageAmount *= buildingDamageFactor; } - enumUnit.damage(simulation, caster, false, true, CAttackType.SPELLS, CDamageType.DEMOLITION, + enumUnit.damage(simulation, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.DEMOLITION, CWeaponSoundTypeJass.WHOKNOWS.name(), damageAmount); } return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/tinker/CAbilityClusterRockets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/tinker/CAbilityClusterRockets.java index 8ac29fa67..936a87ab2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/tinker/CAbilityClusterRockets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/tinker/CAbilityClusterRockets.java @@ -18,6 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbstractCAbilityTypeDefinition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -156,7 +157,7 @@ public boolean call(final CUnit possibleTarget) { else { thisTargetDamage = damagePerTarget; } - damageTarget.damage(simulation, unit, false, true, CAttackType.SPELLS, CDamageType.FIRE, + damageTarget.damage(simulation, unit, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.FIRE, CWeaponSoundTypeJass.WHOKNOWS.name(), thisTargetDamage); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityManaBurn.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityManaBurn.java index 899a176c1..97ac4a5d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityManaBurn.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityManaBurn.java @@ -12,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbstractCAbilityTypeDefinition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -106,7 +107,7 @@ public boolean update(final CSimulation game) { final float targetMana = targetUnit.getMana(); final float manaDamage = StrictMath.min(targetMana, this.maxManaDrained); targetUnit.setMana(targetMana - manaDamage); - targetUnit.damage(game, caster, false, true, CAttackType.SPELLS, CDamageType.FIRE, + targetUnit.damage(game, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.FIRE, CWeaponSoundTypeJass.WHOKNOWS.name(), manaDamage); game.spawnTextTag(targetUnit, caster.getPlayerIndex(), TextTagConfigType.MANA_BURN, (int) manaDamage); this.boltDelayEndTick = Integer.MAX_VALUE; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CBuffImmolationCaster.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CBuffImmolationCaster.java index b9248fbe7..3d0a31110 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CBuffImmolationCaster.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CBuffImmolationCaster.java @@ -11,6 +11,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CWeaponSoundTypeJass; @@ -19,6 +21,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class CBuffImmolationCaster extends AbstractCBuff { + private final static CDamageFlags DAMAGE_FLAGS = new CSpellDamageFlags(); private final CAbilityImmolation abilityImmolation; private SimulationRenderComponent fx; private int nextDamageTick; @@ -54,7 +57,7 @@ public void onTick(final CSimulation game, final CUnit caster) { public boolean call(final CUnit enumUnit) { if (caster.canReach(enumUnit, areaOfEffect) && enumUnit.canBeTargetedBy(game, caster, CBuffImmolationCaster.this.abilityImmolation.getTargetsAllowed())) { - enumUnit.damage(game, caster, false, true, CAttackType.SPELLS, CDamageType.FIRE, CWeaponSoundTypeJass.WHOKNOWS.name(), + enumUnit.damage(game, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.FIRE, CWeaponSoundTypeJass.WHOKNOWS.name(), CBuffImmolationCaster.this.abilityImmolation.getDamagePerInterval()); game.createPersistentSpellEffectOnUnit(enumUnit, CBuffImmolationCaster.this.abilityImmolation.getBuffId(), CEffectType.SPECIAL, 0).remove(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/farseer/CAbilityChainLightning.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/farseer/CAbilityChainLightning.java index 6dc32736a..118b54fc0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/farseer/CAbilityChainLightning.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/farseer/CAbilityChainLightning.java @@ -17,6 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbstractCAbilityTypeDefinition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; @@ -65,7 +66,7 @@ public boolean doEffect(final CSimulation simulation, final CUnit caster, final + (int) StrictMath.ceil(SECONDS_BETWEEN_JUMPS / WarsmashConstants.SIMULATION_STEP_TIME); final int boltLifetimeEndTick = simulation.getGameTurnTick() + (int) StrictMath.ceil(BOLT_LIFETIME_SECONDS / WarsmashConstants.SIMULATION_STEP_TIME); - targetUnit.damage(simulation, caster, false, true, CAttackType.SPELLS, CDamageType.LIGHTNING, + targetUnit.damage(simulation, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.LIGHTNING, CWeaponSoundTypeJass.WHOKNOWS.name(), damagePerTarget); final float remainingDamageJumpMultiplier = 1.0f - damageReductionPerTarget; final Set previousTargets = new HashSet<>(); @@ -139,7 +140,7 @@ public boolean update(final CSimulation game) { + (int) StrictMath.ceil(SECONDS_BETWEEN_JUMPS / WarsmashConstants.SIMULATION_STEP_TIME); final int boltLifetimeEndTick = gameTurnTick + (int) StrictMath.ceil(BOLT_LIFETIME_SECONDS / WarsmashConstants.SIMULATION_STEP_TIME); - nextJumpTarget.damage(game, caster, false, true, CAttackType.SPELLS, CDamageType.LIGHTNING, + nextJumpTarget.damage(game, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.LIGHTNING, CWeaponSoundTypeJass.WHOKNOWS.name(), remainingDamage); previousTargets.add(nextJumpTarget); game.registerEffect(new CEffectChainLightningBolt(boltLifetimeEndTick, jumpDelayEndTick, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/taurenchieftain/CAbilityWarStomp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/taurenchieftain/CAbilityWarStomp.java index a8a3042f7..d969a9248 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/taurenchieftain/CAbilityWarStomp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/taurenchieftain/CAbilityWarStomp.java @@ -44,7 +44,7 @@ public boolean doEffect(final CSimulation simulation, final CUnit caster, final && enumUnit.canBeTargetedBy(simulation, caster, getTargetsAllowed())) { enumUnit.add(simulation, new CBuffStun(simulation.getHandleIdAllocator().createId(), CAbilityWarStomp.this.buffId, getDurationForTarget(enumUnit))); - enumUnit.damage(simulation, caster, false, true, CAttackType.SPELLS, CDamageType.UNIVERSAL, + enumUnit.damage(simulation, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.UNIVERSAL, CWeaponSoundTypeJass.WHOKNOWS.name(), CAbilityWarStomp.this.damage); } return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/undead/deathknight/CAbilityDeathCoil.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/undead/deathknight/CAbilityDeathCoil.java index 51ca40581..258b82965 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/undead/deathknight/CAbilityDeathCoil.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/undead/deathknight/CAbilityDeathCoil.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; @@ -82,7 +83,7 @@ public void onHit(final CSimulation game, CProjectile projectile, final AbilityT final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); if (targetUnit != null) { if (!targetUnit.isUnitType(CUnitTypeJass.UNDEAD)) { - targetUnit.damage(simulation, caster, false, true, CAttackType.SPELLS, CDamageType.DEATH, null, + targetUnit.damage(simulation, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.DEATH, null, healAmount * .5f); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java index 81d19196b..065962f23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java @@ -12,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CWeaponSoundTypeJass; @@ -45,8 +46,8 @@ public void runAction(CSimulation game, CUnit caster, Map localS theDamageType = damageType.callback(game, caster, localStore, castId); } - target.callback(game, caster, localStore, castId).damage(game, source.callback(game, caster, localStore, castId), isItAttack, - isItRanged, theAttackType, theDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), + target.callback(game, caster, localStore, castId).damage(game, source.callback(game, caster, localStore, castId), new CGenericDamageFlags(isItAttack, + isItRanged), theAttackType, theDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damage.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java index cf1366734..f8c807fbd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java @@ -11,6 +11,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CWeaponSoundTypeJass; @@ -23,23 +25,26 @@ public class ABActionDamageTarget implements ABAction { private ABAttackTypeCallback attackType; private ABDamageTypeCallback damageType; private ABFloatCallback damage; - + private ABBooleanCallback ignoreLTEZero; + private ABBooleanCallback damageInvulnerable; @Override public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { - boolean isItAttack = false; - boolean isItRanged = true; CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; - + CDamageFlags flags = new CGenericDamageFlags(false, true); + float theDamage = damage.callback(game, caster, localStore, castId); if (isAttack != null) { - isItAttack = isAttack.callback(game, caster, localStore, castId); + flags.setAttack(isAttack.callback(game, caster, localStore, castId)); } if (isRanged != null) { - isItRanged = isRanged.callback(game, caster, localStore, castId); + flags.setRanged(isRanged.callback(game, caster, localStore, castId)); + } + if (damageInvulnerable != null) { + flags.setRanged(damageInvulnerable.callback(game, caster, localStore, castId)); } if (attackType != null) { theAttackType = attackType.callback(game, caster, localStore, castId); @@ -48,9 +53,9 @@ public void runAction(CSimulation game, CUnit caster, Map localS theDamageType = damageType.callback(game, caster, localStore, castId); } if (ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId) || theDamage > 0) { - target.callback(game, caster, localStore, castId).damage(game, source.callback(game, caster, localStore, castId), isItAttack, - isItRanged, theAttackType, theDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - damage.callback(game, caster, localStore, castId)); + target.callback(game, caster, localStore, castId).damage(game, + source.callback(game, caster, localStore, castId), flags, theAttackType, theDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damage.callback(game, caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java index acf0359c4..b05402454 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java @@ -7,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -28,12 +29,12 @@ public ABDamageTakenListener(Map localStore, List acti } @Override - public void onDamage(CSimulation simulation, CUnit attacker, CUnit target, boolean isAttack, boolean isRanged, + public void onDamage(CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CDamageType damageType, float damage, float bonusDamage, float trueDamage) { localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); localStore.put(ABLocalStoreKeys.ATTACKEDUNIT+triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, isAttack); - localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, isRanged); + localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, flags.isAttack()); + localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, flags.isRanged()); localStore.put(ABLocalStoreKeys.DAMAGETYPE+triggerId, damageType); localStore.put(ABLocalStoreKeys.BASEDAMAGEDEALT+triggerId, damage); localStore.put(ABLocalStoreKeys.BONUSDAMAGEDEALT+triggerId, bonusDamage); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java index 7cba193e8..37beb2b3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java @@ -8,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListenerDamageModResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -31,12 +32,12 @@ public ABDamageTakenModificationListener(Map localStore, List localStore, Li @Override public float onDamage(CSimulation simulation, CUnit attacker, - CUnit target, boolean isAttack, boolean isRanged, CAttackType attackType, CDamageType damageType, + CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, float previousDamage) { localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); localStore.put(ABLocalStoreKeys.ATTACKEDUNIT+triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, isAttack); - localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, isRanged); + localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, flags.isAttack()); + localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, flags.isRanged()); localStore.put(ABLocalStoreKeys.ATTACKTYPE+triggerId, attackType); localStore.put(ABLocalStoreKeys.DAMAGETYPE+triggerId, damageType); localStore.put(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId, previousDamage); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackDamageFlags.java new file mode 100644 index 000000000..e66aa0ae2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackDamageFlags.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat; + +public class CAttackDamageFlags extends CBaseDamageFlags { + + public CAttackDamageFlags(boolean ranged) { + super(); + this.setRanged(ranged); + } + + @Override + public boolean isAttack() { + return true; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java new file mode 100644 index 000000000..3200c24d0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java @@ -0,0 +1,53 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat; + +public abstract class CBaseDamageFlags implements CDamageFlags { + private static int ATTACK = 0b1; + private static int RANGED = 0b10; + private static int IGNOREINVUL = 0b100; + private static int EXPLODE = 0b1000; + + private int flags = 0; + + public CBaseDamageFlags() { + } + + @Override + public boolean isAttack() { + return (this.flags & ATTACK) != 0; + } + + @Override + public void setAttack(boolean attack) { + this.flags = attack ? this.flags | ATTACK : this.flags & ~ATTACK; + } + + @Override + public boolean isRanged() { + return (this.flags & RANGED) != 0; + } + + @Override + public void setRanged(boolean ranged) { + this.flags = ranged ? this.flags | RANGED : this.flags & ~RANGED; + } + + @Override + public boolean isIgnoreInvulnerable() { + return (this.flags & IGNOREINVUL) != 0; + } + + @Override + public void setIgnoreInvulnerable(boolean ignoreInvulnerable) { + this.flags = ignoreInvulnerable ? this.flags | IGNOREINVUL : this.flags & ~IGNOREINVUL; + } + + @Override + public boolean isExplode() { + return (this.flags & EXPLODE) != 0; + } + + @Override + public void setExplode(boolean explode) { + this.flags = explode ? this.flags | EXPLODE : this.flags & ~EXPLODE; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java new file mode 100644 index 000000000..2b5505a78 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat; + +public interface CDamageFlags { + + boolean isAttack(); + + boolean isRanged(); + + boolean isIgnoreInvulnerable(); + + void setAttack(boolean attack); + + void setRanged(boolean ranged); + + void setIgnoreInvulnerable(boolean ignoreInvulnerable); + + boolean isExplode(); + + void setExplode(boolean explode); + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CGenericDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CGenericDamageFlags.java new file mode 100644 index 000000000..11ae03bb6 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CGenericDamageFlags.java @@ -0,0 +1,11 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat; + +public class CGenericDamageFlags extends CBaseDamageFlags { + + public CGenericDamageFlags(final boolean attack, final boolean ranged) { + super(); + this.setAttack(attack); + this.setRanged(ranged); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CSpellDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CSpellDamageFlags.java new file mode 100644 index 000000000..3a0eacfbb --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CSpellDamageFlags.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat; + +public class CSpellDamageFlags extends CBaseDamageFlags { + + public CSpellDamageFlags() { + super(); + this.setRanged(true); + } + + @Override + public boolean isAttack() { + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java index 4811d4965..9d4bd8150 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java @@ -7,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; @@ -14,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectileInstant; public class CUnitAttackInstant extends CUnitAttack { + private static CAttackDamageFlags ATTACK_FLAGS = new CAttackDamageFlags(true); private String projectileArt; public CUnitAttackInstant(final float animationBackswingPoint, final float animationDamagePoint, @@ -66,7 +68,7 @@ public void doDamage(final CSimulation cSimulation, final CUnit source, final Ab final CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(cSimulation, source, target, damage); - float damageDealt = widget.damage(cSimulation, source, true, true, getAttackType(), getWeaponType().getDamageType(), getWeaponSound(), modDamage.computeFinalDamage(), modDamage.getBonusDamage()); + float damageDealt = widget.damage(cSimulation, source, ATTACK_FLAGS, getAttackType(), getWeaponType().getDamageType(), getWeaponSound(), modDamage.computeFinalDamage(), modDamage.getBonusDamage()); runPostDamageListeners(cSimulation, source, target, damageDealt); attackListener.onHit(target, damage); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java index 33ad04a16..db55eb533 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java @@ -7,16 +7,21 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; public class CUnitAttackMissile extends CUnitAttack { + private static CAttackDamageFlags ATTACK_FLAGS = new CAttackDamageFlags(true); private float projectileArc; private String projectileArt; private boolean projectileHomingEnabled; private int projectileSpeed; + + protected CDamageFlags damageFlags; public CUnitAttackMissile(final float animationBackswingPoint, final float animationDamagePoint, final CAttackType attackType, final float cooldownTime, final int damageBase, final int damageDice, @@ -31,6 +36,7 @@ public CUnitAttackMissile(final float animationBackswingPoint, final float anima this.projectileArt = projectileArt; this.projectileHomingEnabled = projectileHomingEnabled; this.projectileSpeed = projectileSpeed; + this.damageFlags = ATTACK_FLAGS; } @Override @@ -99,7 +105,7 @@ public void doDamage(final CSimulation cSimulation, final CUnit source, final Ab final CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(cSimulation, source, target, damage); - float damageDealt = widget.damage(cSimulation, source, true, true, getAttackType(), getWeaponType().getDamageType(), getWeaponSound(), modDamage.computeFinalDamage(), modDamage.getBonusDamage()); + float damageDealt = widget.damage(cSimulation, source, damageFlags, getAttackType(), getWeaponType().getDamageType(), getWeaponSound(), modDamage.computeFinalDamage(), modDamage.getBonusDamage()); runPostDamageListeners(cSimulation, source, target, damageDealt); attackListener.onHit(target, damage); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileLine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileLine.java index bd95e8ab7..9a3799824 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileLine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileLine.java @@ -2,6 +2,7 @@ import java.util.EnumSet; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; @@ -9,6 +10,7 @@ public class CUnitAttackMissileLine extends CUnitAttackMissile { private float damageSpillDistance; private float damageSpillRadius; + private boolean artillery; public CUnitAttackMissileLine(final float animationBackswingPoint, final float animationDamagePoint, final CAttackType attackType, final float cooldownTime, final int damageBase, final int damageDice, @@ -16,12 +18,17 @@ public CUnitAttackMissileLine(final float animationBackswingPoint, final float a final boolean showUI, final EnumSet targetsAllowed, final String weaponSound, final CWeaponType weaponType, final float projectileArc, final String projectileArt, final boolean projectileHomingEnabled, final int projectileSpeed, final float damageSpillDistance, - final float damageSpillRadius) { + final float damageSpillRadius, final boolean isArtillery) { super(animationBackswingPoint, animationDamagePoint, attackType, cooldownTime, damageBase, damageDice, damageSidesPerDie, damageUpgradeAmount, range, rangeMotionBuffer, showUI, targetsAllowed, weaponSound, weaponType, projectileArc, projectileArt, projectileHomingEnabled, projectileSpeed); this.damageSpillDistance = damageSpillDistance; this.damageSpillRadius = damageSpillRadius; + this.artillery = isArtillery; + if (isArtillery) { + this.damageFlags = new CAttackDamageFlags(true); + this.damageFlags.setExplode(true); + } } @Override @@ -30,7 +37,7 @@ public CUnitAttack copy() { getCooldownTime(), getDamageBase(), getDamageDice(), getDamageSidesPerDie(), getDamageUpgradeAmount(), getRange(), getRangeMotionBuffer(), isShowUI(), getTargetsAllowed(), getWeaponSound(), getWeaponType(), getProjectileArc(), getProjectileArt(), isProjectileHomingEnabled(), getProjectileSpeed(), - this.damageSpillDistance, this.damageSpillRadius); + this.damageSpillDistance, this.damageSpillRadius, this.artillery); } public float getDamageSpillDistance() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java index ba850069e..85725c5ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java @@ -11,6 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; @@ -23,6 +24,7 @@ public class CUnitAttackMissileSplash extends CUnitAttackMissile { private EnumSet areaOfEffectTargets; private float damageFactorMedium; private float damageFactorSmall; + private boolean artillery; public CUnitAttackMissileSplash(final float animationBackswingPoint, final float animationDamagePoint, final CAttackType attackType, final float cooldownTime, final int damageBase, final int damageDice, @@ -32,7 +34,7 @@ public CUnitAttackMissileSplash(final float animationBackswingPoint, final float final boolean projectileHomingEnabled, final int projectileSpeed, final int areaOfEffectFullDamage, final int areaOfEffectMediumDamage, final int areaOfEffectSmallDamage, final EnumSet areaOfEffectTargets, final float damageFactorMedium, - final float damageFactorSmall) { + final float damageFactorSmall, final boolean isArtillery) { super(animationBackswingPoint, animationDamagePoint, attackType, cooldownTime, damageBase, damageDice, damageSidesPerDie, damageUpgradeAmount, range, rangeMotionBuffer, showUI, targetsAllowed, weaponSound, weaponType, projectileArc, projectileArt, projectileHomingEnabled, projectileSpeed); @@ -42,6 +44,11 @@ public CUnitAttackMissileSplash(final float animationBackswingPoint, final float this.areaOfEffectTargets = areaOfEffectTargets; this.damageFactorMedium = damageFactorMedium; this.damageFactorSmall = damageFactorSmall; + this.artillery = isArtillery; + if (isArtillery) { + this.damageFlags = new CAttackDamageFlags(true); + this.damageFlags.setExplode(true); + } } @Override @@ -51,7 +58,7 @@ public CUnitAttack copy() { getRange(), getRangeMotionBuffer(), isShowUI(), getTargetsAllowed(), getWeaponSound(), getWeaponType(), getProjectileArc(), getProjectileArt(), isProjectileHomingEnabled(), getProjectileSpeed(), this.areaOfEffectFullDamage, this.areaOfEffectMediumDamage, this.areaOfEffectSmallDamage, - this.areaOfEffectTargets, this.damageFactorMedium, this.damageFactorSmall); + this.areaOfEffectTargets, this.damageFactorMedium, this.damageFactorSmall, this.artillery); } @Override @@ -184,16 +191,16 @@ public float damageTarget(final CWidget enumUnit) { float damageDealt = this.damage; final double distance = enumUnit.distance(this.x, this.y); if (distance <= (this.attack.areaOfEffectFullDamage)) { - damageDealt = enumUnit.damage(this.simulation, this.source, true, true, this.attack.getAttackType(), + damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, this.attack.getAttackType(), this.attack.getWeaponType().getDamageType(), this.attack.getWeaponSound(), this.damage, this.bonusDamage); this.attackListener.onHit(enumUnit, this.damage + this.bonusDamage); } else if (distance <= (this.attack.areaOfEffectMediumDamage)) { - damageDealt = enumUnit.damage(this.simulation, this.source, true, true, this.attack.getAttackType(), + damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, this.attack.getAttackType(), this.attack.getWeaponType().getDamageType(), this.attack.getWeaponSound(), this.damage * this.attack.damageFactorMedium, this.bonusDamage * this.attack.damageFactorMedium); this.attackListener.onHit(enumUnit, this.damage + this.bonusDamage); } else if (distance <= (this.attack.areaOfEffectSmallDamage)) { - damageDealt = enumUnit.damage(this.simulation, this.source, true, true, this.attack.getAttackType(), + damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, this.attack.getAttackType(), this.attack.getWeaponType().getDamageType(), this.attack.getWeaponSound(), this.damage * this.attack.damageFactorSmall, this.bonusDamage * this.attack.damageFactorSmall); this.attackListener.onHit(enumUnit, this.damage + this.bonusDamage); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java index 06c16fd7b..ad1bc1f0e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java @@ -7,12 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; public class CUnitAttackNormal extends CUnitAttack { + private static CAttackDamageFlags ATTACK_FLAGS = new CAttackDamageFlags(false); public CUnitAttackNormal(final float animationBackswingPoint, final float animationDamagePoint, final CAttackType attackType, final float cooldownTime, final int damageBase, final int damageDice, @@ -38,7 +40,7 @@ public void launch(final CSimulation simulation, final CUnit unit, final Ability final CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(simulation, unit, target, damage); - float damageDealt = widget.damage(simulation, unit, true, false, getAttackType(), getWeaponType().getDamageType(), + float damageDealt = widget.damage(simulation, unit, ATTACK_FLAGS, getAttackType(), getWeaponType().getDamageType(), modDamage.isMiss() ? null : getWeaponSound(), modDamage.computeFinalDamage(), modDamage.getBonusDamage()); runPostDamageListeners(simulation, unit, target, damageDealt); attackListener.onHit(target, damage); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenListener.java index c576a30ac..5d3599a12 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenListener.java @@ -4,11 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public interface CUnitAttackDamageTakenListener { public static final EnumSet ENEMY_TARGET = EnumSet.of(CTargetType.ENEMIES); - public void onDamage(final CSimulation simulation, CUnit attacker, CUnit target, boolean isAttack, boolean isRanged, CDamageType weaponType, float damage, float bonusDamage, float trueDamage); + public void onDamage(final CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CDamageType weaponType, float damage, float bonusDamage, float trueDamage); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListener.java index c85c06bba..278de3806 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListener.java @@ -3,8 +3,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public interface CUnitAttackDamageTakenModificationListener { - public CUnitAttackDamageTakenModificationListenerDamageModResult onDamage(final CSimulation simulation, CUnit attacker, CUnit target, boolean isAttack, boolean isRanged, CAttackType attackType, CDamageType damageType, CUnitAttackDamageTakenModificationListenerDamageModResult previousDamage); + public CUnitAttackDamageTakenModificationListenerDamageModResult onDamage(final CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, CUnitAttackDamageTakenModificationListenerDamageModResult previousDamage); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackFinalDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackFinalDamageTakenModificationListener.java index 31f3324ad..bfb4eed7f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackFinalDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackFinalDamageTakenModificationListener.java @@ -3,8 +3,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public interface CUnitAttackFinalDamageTakenModificationListener { - public float onDamage(final CSimulation simulation, CUnit attacker, CUnit target, boolean isAttack, boolean isRanged, CAttackType attackType, CDamageType damageType, float previousDamage); + public float onDamage(final CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, float previousDamage); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java index 79ec42ab9..21c4ac4a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java @@ -3,6 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -11,7 +12,7 @@ public class CUnitDefaultEtherealDamageModListener implements CUnitAttackDamageT @Override public CUnitAttackDamageTakenModificationListenerDamageModResult onDamage(CSimulation game, CUnit attacker, - CUnit target, boolean isAttack, boolean isRanged, CAttackType attackType, CDamageType damageType, + CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, CUnitAttackDamageTakenModificationListenerDamageModResult previousDamage) { boolean allied = game.getPlayer(attacker.getPlayerIndex()).hasAlliance(target.getPlayerIndex(), CAllianceType.PASSIVE); if (!allied || (allied && game.getGameplayConstants().isEtherealDamageBonusAlly())) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java index ac7765344..4d404f0f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java @@ -3,13 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class CUnitDefaultMagicImmuneDamageModListener implements CUnitAttackFinalDamageTakenModificationListener { public static CUnitDefaultMagicImmuneDamageModListener INSTANCE = new CUnitDefaultMagicImmuneDamageModListener(); @Override - public float onDamage(CSimulation game, CUnit attacker, CUnit target, boolean isAttack, boolean isRanged, + public float onDamage(CSimulation game, CUnit attacker, CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, float previousDamage) { if ((damageType != CDamageType.NORMAL && (damageType != CDamageType.UNIVERSAL && game.getGameplayConstants().isMagicImmuneResistsUltimates()) && attackType == CAttackType.SPELLS) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultSleepListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultSleepListener.java index d3a956b7c..ed204173e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultSleepListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultSleepListener.java @@ -2,19 +2,23 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuffType; public class CUnitDefaultSleepListener implements CUnitAttackDamageTakenListener { public static CUnitDefaultSleepListener INSTANCE = new CUnitDefaultSleepListener(); - - public CUnitDefaultSleepListener () { + + public CUnitDefaultSleepListener() { } - + @Override - public void onDamage(final CSimulation simulation, CUnit attacker, CUnit target, boolean isAttack, boolean isRanged, CDamageType damageType, float damage, float bonusDamage, float trueDamage) { - target.removeAllStateModBuffs(StateModBuffType.SLEEPING); - target.computeUnitState(simulation, StateModBuffType.SLEEPING); + public void onDamage(final CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, + CDamageType damageType, float damage, float bonusDamage, float trueDamage) { + if (damage > 0 || bonusDamage > 0 || trueDamage > 0) { + target.removeAllStateModBuffs(StateModBuffType.SLEEPING); + target.computeUnitState(simulation, StateModBuffType.SLEEPING); + } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultThornsListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultThornsListener.java index f5cdd8873..045d3834a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultThornsListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultThornsListener.java @@ -3,11 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CWeaponSoundTypeJass; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class CUnitDefaultThornsListener implements CUnitAttackDamageTakenListener { + private final static CDamageFlags DAMAGE_FLAGS = new CSpellDamageFlags(); private boolean percentage; private float amount; @@ -18,16 +21,16 @@ public CUnitDefaultThornsListener(boolean percentage, float amount) { } @Override - public void onDamage(final CSimulation simulation, CUnit attacker, CUnit target, boolean isAttack, boolean isRanged, + public void onDamage(final CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CDamageType damageType, float damage, float bonusDamage, float trueDamage) { - if (damageType == CDamageType.NORMAL && !isRanged && target.canBeTargetedBy(simulation, attacker, ENEMY_TARGET) + if (damageType == CDamageType.NORMAL && !flags.isRanged() && target.canBeTargetedBy(simulation, attacker, ENEMY_TARGET) && (!simulation.getGameplayConstants().isMagicImmuneResistsThorns() || !attacker.isUnitType(CUnitTypeJass.MAGIC_IMMUNE))) { float thornsAmount = amount; if (percentage) { thornsAmount *= damage; } - attacker.damage(simulation, target, false, true, CAttackType.SPELLS, CDamageType.DEFENSIVE, + attacker.damage(simulation, target, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.DEFENSIVE, CWeaponSoundTypeJass.WHOKNOWS.name(), thornsAmount); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java index 30ecbf5d6..3fa2e470b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java @@ -371,8 +371,7 @@ public void addDefaultAbilitiesToUnit(final CSimulation simulation, final Handle && (createAbility instanceof CAutocastAbility)) { ((CAutocastAbility) createAbility).setAutoCastOn(unit, true); } - } - else { + } else { if (ability.equals(unitTypeInstance.getDefaultAutocastAbility()) && (existingAbility instanceof CAutocastAbility)) { ((CAutocastAbility) existingAbility).setAutoCastOn(unit, true); @@ -462,8 +461,7 @@ public void addMissingDefaultAbilitiesToUnit(final CSimulation simulation, final CAbilityHero abil = unit.getFirstAbilityOfType(CAbilityHero.class); abil.setSkillsAvailable(heroAbilityList); abil.recalculateAllStats(simulation, unit); - } - else { + } else { unit.add(simulation, new CAbilityHero(handleIdAllocator.createId(), heroAbilityList)); // reset initial mana after the value is adjusted for hero data unit.setMana(manaInitial); @@ -481,8 +479,7 @@ public void addMissingDefaultAbilitiesToUnit(final CSimulation simulation, && (createAbility instanceof CAutocastAbility)) { ((CAutocastAbility) createAbility).setAutoCastOn(unit, true); } - } - else { + } else { if (ability.equals(unitTypeInstance.getDefaultAutocastAbility()) && (existingAbility instanceof CAutocastAbility)) { ((CAutocastAbility) existingAbility).setAutoCastOn(unit, true); @@ -611,8 +608,7 @@ private CUnitType getUnitTypeInstance(final War3ID typeId, final BufferedImage b damageSidesPerDie, damageSpillDistance, damageSpillRadius, damageUpgradeAmount, maximumNumberOfTargets, projectileArc, projectileArt, projectileHomingEnabled, projectileSpeed, range, rangeMotionBuffer, showUI, targetsAllowed, weaponSound, weaponType)); - } - catch (final Exception exc) { + } catch (final Exception exc) { System.err.println("Attack 1 failed to parse with: " + exc.getClass() + ":" + exc.getMessage()); } try { @@ -675,8 +671,7 @@ private CUnitType getUnitTypeInstance(final War3ID typeId, final BufferedImage b damageSidesPerDie, damageSpillDistance, damageSpillRadius, damageUpgradeAmount, maximumNumberOfTargets, projectileArc, projectileArt, projectileHomingEnabled, projectileSpeed, range, rangeMotionBuffer, showUI, targetsAllowed, weaponSound, weaponType)); - } - catch (final Exception exc) { + } catch (final Exception exc) { System.err.println("Attack 2 failed to parse with: " + exc.getClass() + ":" + exc.getMessage()); } final List enabledAttacks = getEnabledAttacks(attacks, attacksEnabled); @@ -744,8 +739,7 @@ private CUnitType getUnitTypeInstance(final War3ID typeId, final BufferedImage b if ((defaultAutocastAbility != null) && !defaultAutocastAbility.isEmpty() && !defaultAutocastAbility.equals("_")) { defaultAutocastAbilityId = War3ID.fromString(defaultAutocastAbility); - } - else { + } else { defaultAutocastAbilityId = null; } final List heroAbilityList = parseIDList(heroAbilityListString); @@ -784,13 +778,14 @@ private CUnitType getUnitTypeInstance(final War3ID typeId, final BufferedImage b decay, defenseType, impactZ, buildingPathingPixelMap, deathTime, targetedAs, acquisitionRange, minimumAttackRange, structuresBuilt, unitsTrained, researchesAvailable, upgradesUsed, upgradeClassToType, upgradesTo, itemsSold, itemsMade, unitRace, goldCost, lumberCost, foodUsed, - foodMade, buildTime, goldRepairCost, lumberRepairCost, repairTime, preventedPathingTypes, requiredPathingTypes, propWindow, turnRate, - requirements, requirementTiers, unitLevel, hero, strength, strPlus, agility, agiPlus, intelligence, - intPlus, primaryAttribute, heroAbilityList, heroProperNames, properNamesCount, canFlee, priority, - revivesHeroes, pointValue, castBackswingPoint, castPoint, canBeBuiltOnThem, canBuildOnMe, - defenseUpgradeBonus, sightRadiusDay, sightRadiusNight, extendedLineOfSight, goldBountyAwardedBase, - goldBountyAwardedDice, goldBountyAwardedSides, lumberBountyAwardedBase, lumberBountyAwardedDice, - lumberBountyAwardedSides, neutralBuildingShowMinimapIcon); + foodMade, buildTime, goldRepairCost, lumberRepairCost, repairTime, preventedPathingTypes, + requiredPathingTypes, propWindow, turnRate, requirements, requirementTiers, unitLevel, hero, + strength, strPlus, agility, agiPlus, intelligence, intPlus, primaryAttribute, heroAbilityList, + heroProperNames, properNamesCount, canFlee, priority, revivesHeroes, pointValue, castBackswingPoint, + castPoint, canBeBuiltOnThem, canBuildOnMe, defenseUpgradeBonus, sightRadiusDay, sightRadiusNight, + extendedLineOfSight, goldBountyAwardedBase, goldBountyAwardedDice, goldBountyAwardedSides, + lumberBountyAwardedBase, lumberBountyAwardedDice, lumberBountyAwardedSides, + neutralBuildingShowMinimapIcon); this.unitIdToUnitType.put(typeId, unitTypeInstance); this.jassLegacyNameToUnitId.put(legacyName, typeId); } @@ -842,31 +837,25 @@ public static List parseRequirements(final List re if (i < requirementsLevelsString.size()) { if (requirementsLevelsString.get(i).isEmpty()) { level = 1; - } - else { + } else { try { level = Integer.parseInt(requirementsLevelsString.get(i)); - } - catch (final NumberFormatException exc) { + } catch (final NumberFormatException exc) { level = 1; } } - } - else if (requirementsLevelsString.size() > 0) { + } else if (requirementsLevelsString.size() > 0) { final String requirementLevel = requirementsLevelsString.get(requirementsLevelsString.size() - 1); if (requirementLevel.isEmpty()) { level = 1; - } - else { + } else { try { level = Integer.parseInt(requirementLevel); - } - catch (final NumberFormatException exc) { + } catch (final NumberFormatException exc) { level = 1; } } - } - else { + } else { level = 1; } requirements.add(new CUnitTypeRequirement(War3ID.fromString(item), level)); @@ -886,8 +875,7 @@ private static int[] populateHeroStatTable(final int maxHeroLevel, final float s final float newSumBonusAtLevel = sumBonusAtLevel + statPerLevel; if (i == 0) { table[i] = (int) newSumBonusAtLevel; - } - else { + } else { table[i] = (int) newSumBonusAtLevel - table[i - 1]; } sumBonusAtLevel = newSumBonusAtLevel; @@ -926,14 +914,15 @@ private CUnitAttack createAttack(final float animationBackswingPoint, final floa cooldownTime, damageBase, damageDice, damageSidesPerDie, damageUpgradeAmount, range, rangeMotionBuffer, showUI, targetsAllowed, weaponSound, weaponType, projectileArc, projectileArt, projectileHomingEnabled, projectileSpeed, areaOfEffectFullDamage, areaOfEffectMediumDamage, - areaOfEffectSmallDamage, areaOfEffectTargets, damageFactorMedium, damageFactorSmall); + areaOfEffectSmallDamage, areaOfEffectTargets, damageFactorMedium, damageFactorSmall, + weaponType == CWeaponType.ARTILLERY); break; case MLINE: case ALINE: attack = new CUnitAttackMissileLine(animationBackswingPoint, animationDamagePoint, attackType, cooldownTime, damageBase, damageDice, damageSidesPerDie, damageUpgradeAmount, range, rangeMotionBuffer, showUI, targetsAllowed, weaponSound, weaponType, projectileArc, projectileArt, projectileHomingEnabled, - projectileSpeed, damageSpillDistance, damageSpillRadius); + projectileSpeed, damageSpillDistance, damageSpillRadius, weaponType == CWeaponType.ALINE); break; case INSTANT: attack = new CUnitAttackInstant(animationBackswingPoint, animationDamagePoint, attackType, cooldownTime, From fc91b085bea26b6d7d54119a83876daced055821 Mon Sep 17 00:00:00 2001 From: Glasir Date: Wed, 19 Feb 2025 05:50:32 -0500 Subject: [PATCH 05/44] Refactored Abilities to split isMagic/isPhysical and refactored attack/damage types to delineate magic/physical * Core: Refactored abilities to split the isMagic and isPhysical values. Non-spell abilities often are neither * Core: Refactored damage and attack types to define whether they are magic or physical to simplify Magic Immune and Ethereal checks * Core: Moved the Magic Immune and Ethereal checks earlier in the damage method, so the unit won't react to immune hits * AB: By default, Physical spells are non-magic. This can be specifically overridden if needed --- .../handlers/w3x/simulation/CUnit.java | 25 +++++- .../simulation/abilities/CAbilityAttack.java | 5 ++ .../abilities/CAbilityGenericDoNothing.java | 7 +- .../simulation/abilities/CAbilityMove.java | 5 ++ .../simulation/abilities/CAbilityView.java | 2 + .../build/CAbilityBuildInProgress.java | 5 ++ .../abilities/build/CAbilityHumanBuild.java | 5 ++ .../abilities/build/CAbilityHumanRepair.java | 5 ++ .../abilities/build/CAbilityNagaBuild.java | 5 ++ .../abilities/build/CAbilityNeutralBuild.java | 5 ++ .../build/CAbilityNightElfBuild.java | 5 ++ .../abilities/build/CAbilityOrcBuild.java | 5 ++ .../abilities/build/CAbilityRepair.java | 5 ++ .../abilities/build/CAbilityUndeadBuild.java | 5 ++ .../abilities/cargohold/CAbilityDrop.java | 5 ++ .../cargohold/CAbilityDropInstant.java | 5 ++ .../abilities/cargohold/CAbilityLoad.java | 5 ++ .../cargohold/CAbilityStandDown.java | 5 ++ .../abilities/combat/CAbilityColdArrows.java | 5 ++ ...bilityGenericSingleIconPassiveAbility.java | 7 +- .../generic/AbstractGenericNoIconAbility.java | 7 +- .../harvest/CAbilityAcolyteHarvest.java | 5 ++ .../abilities/harvest/CAbilityHarvest.java | 5 ++ .../harvest/CAbilityReturnResources.java | 5 ++ .../harvest/CAbilityWispHarvest.java | 5 ++ .../abilities/hero/CAbilityHero.java | 5 ++ .../abilities/item/CAbilityItemHeal.java | 5 ++ .../item/CAbilityItemManaRegain.java | 5 ++ .../item/shop/CAbilityNeutralBuilding.java | 5 ++ .../item/shop/CAbilitySellItems.java | 5 ++ .../abilities/jass/CAbilityJass.java | 5 ++ .../abilities/nightelf/root/CAbilityRoot.java | 5 ++ .../abilities/queue/CAbilityQueue.java | 5 ++ .../abilities/queue/CAbilityRally.java | 5 ++ .../abilities/queue/CAbilityReviveHero.java | 5 ++ .../abilities/skills/CAbilitySpellBase.java | 5 ++ .../demonhunter/CAbilityImmolation.java | 5 ++ .../abilities/skills/util/CBuffSlow.java | 5 ++ .../test/CAbilityCarrionSwarmDummy.java | 5 ++ .../abilities/test/CAbilityChannelTest.java | 5 ++ .../abilities/test/CAbilityCoupleInstant.java | 5 ++ .../abilities/upgrade/CAbilityUpgrade.java | 5 ++ .../CAbilityAbilityBuilderGenericActive.java | 11 +++ .../parser/AbilityBuilderOverrideFields.java | 8 ++ .../w3x/simulation/combat/CAttackType.java | 36 ++++++-- ...CUnitDefaultEtherealDamageModListener.java | 16 ++-- ...itDefaultMagicImmuneDamageModListener.java | 10 +-- .../trigger/enumtypes/CDamageType.java | 82 +++++++++++++------ 48 files changed, 343 insertions(+), 53 deletions(-) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index 1b0a72718..38b5dfcf2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -553,7 +553,7 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type for (final CAbility ability : this.abilities) { if (((isDisableAttack || isEthereal) && (ability.getAbilityCategory() == CAbilityCategory.ATTACK)) || (isDisableSpells && (ability.getAbilityCategory() == CAbilityCategory.SPELL) - && !ability.isPhysical()) + && ability.isMagic()) || (isEthereal && ability.isPhysical() && ((ability.getAbilityCategory() == CAbilityCategory.SPELL) || (ability.getAbilityCategory() == CAbilityCategory.CORE)))) { @@ -2676,6 +2676,26 @@ public boolean checkForAbilityEffectReaction(final CSimulation simulation, final return allow; } + public boolean isImmuneToDamage(final CSimulation simulation, final CDamageFlags flags, + final CAttackType attackType, final CDamageType damageType) { + if (simulation.getGameplayConstants().isMagicImmuneResistsDamage()) { + if (attackType.isMagic() || damageType.isMagic()) { + if (this.isMagicImmune()) { + return true; + } + } else if (attackType.isPhysical() || damageType.isPhysical()) { + if (this.isUnitType(CUnitTypeJass.ETHEREAL)) { + return true; + } + } + } else { + if (damageType.isOldMagic() && this.isMagicImmune()) { + return true; + } + } + return false; + } + @Override public float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, @@ -2691,6 +2711,9 @@ public float damage(final CSimulation simulation, final CUnit source, final CDam if (wasDead) { return 0; } + if (this.isImmuneToDamage(simulation, flags, attackType, damageType)) { + return 0; + } float trueDamage = 0; if (!this.invulnerable && !flags.isIgnoreInvulnerable()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityAttack.java index 6761d6215..7679ce459 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityAttack.java @@ -223,6 +223,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityGenericDoNothing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityGenericDoNothing.java index b04ac511e..ca0d48fb4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityGenericDoNothing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityGenericDoNothing.java @@ -93,7 +93,12 @@ public void onDeath(final CSimulation game, final CUnit cUnit) { @Override public boolean isPhysical() { - return true; + return false; + } + + @Override + public boolean isMagic() { + return false; } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityMove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityMove.java index c26d39c83..3cbf4e45d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityMove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityMove.java @@ -163,6 +163,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java index 21707f1fc..3f5a86e48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java @@ -38,6 +38,8 @@ void checkCanTarget(CSimulation game, CUnit unit, int orderId, AbilityPointTarge boolean isPermanent(); boolean isPhysical(); + + boolean isMagic(); boolean isUniversal(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java index 2c3a11324..ab4743803 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java @@ -125,6 +125,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanBuild.java index 868c5139e..ac2f871f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanBuild.java @@ -71,6 +71,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java index 3afe6ea0d..2c4485247 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java @@ -251,6 +251,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNagaBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNagaBuild.java index 28231721c..f105adafd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNagaBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNagaBuild.java @@ -71,6 +71,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNeutralBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNeutralBuild.java index 8c871158c..f92ebc032 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNeutralBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNeutralBuild.java @@ -64,6 +64,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNightElfBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNightElfBuild.java index b9b92eaa2..6d7078126 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNightElfBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNightElfBuild.java @@ -70,6 +70,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityOrcBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityOrcBuild.java index 388a1a45b..7eea35253 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityOrcBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityOrcBuild.java @@ -70,6 +70,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java index 886b8ffe3..c7e8e3993 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java @@ -238,6 +238,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityUndeadBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityUndeadBuild.java index b1994f2da..753598ad5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityUndeadBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityUndeadBuild.java @@ -70,6 +70,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDrop.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDrop.java index b22605bd0..88db70ec5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDrop.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDrop.java @@ -113,6 +113,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDropInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDropInstant.java index ea857a2d9..24acecf72 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDropInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDropInstant.java @@ -104,6 +104,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityLoad.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityLoad.java index bb046a87f..0b1ab542d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityLoad.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityLoad.java @@ -174,6 +174,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityStandDown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityStandDown.java index 3726a6d34..4d80664af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityStandDown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityStandDown.java @@ -114,6 +114,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityColdArrows.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityColdArrows.java index 85985a03c..cded53ab5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityColdArrows.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityColdArrows.java @@ -140,6 +140,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return true; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbilityGenericSingleIconPassiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbilityGenericSingleIconPassiveAbility.java index 8ccf5a08d..98bf4195f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbilityGenericSingleIconPassiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbilityGenericSingleIconPassiveAbility.java @@ -94,7 +94,12 @@ public void onDeath(final CSimulation game, final CUnit cUnit) { @Override public boolean isPhysical() { - return true; + return false; + } + + @Override + public boolean isMagic() { + return false; } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericNoIconAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericNoIconAbility.java index d87ea93ad..fa87cb522 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericNoIconAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericNoIconAbility.java @@ -18,7 +18,12 @@ public T visit(final CAbilityVisitor visitor) { @Override public boolean isPhysical() { - return true; + return false; + } + + @Override + public boolean isMagic() { + return false; } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityAcolyteHarvest.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityAcolyteHarvest.java index 484713d41..7340f16fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityAcolyteHarvest.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityAcolyteHarvest.java @@ -150,6 +150,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityHarvest.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityHarvest.java index 62cb766d4..ceaa96ee6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityHarvest.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityHarvest.java @@ -266,6 +266,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityReturnResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityReturnResources.java index 4e9840639..2d09ec166 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityReturnResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityReturnResources.java @@ -110,6 +110,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityWispHarvest.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityWispHarvest.java index b98ee73d9..afaf5d443 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityWispHarvest.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityWispHarvest.java @@ -172,6 +172,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java index 15eb45b38..2f08033da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java @@ -526,6 +526,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemHeal.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemHeal.java index 2f824baa0..4cb6ef89d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemHeal.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemHeal.java @@ -131,6 +131,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaRegain.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaRegain.java index 8a8cc734a..4341f25e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaRegain.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaRegain.java @@ -132,6 +132,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityNeutralBuilding.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityNeutralBuilding.java index 4116ade2e..43dd1685a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityNeutralBuilding.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityNeutralBuilding.java @@ -260,6 +260,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilitySellItems.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilitySellItems.java index 30edd5d3c..e3f6d344e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilitySellItems.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilitySellItems.java @@ -174,6 +174,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java index 2ff786de2..f02589e52 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java @@ -114,6 +114,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return true; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityRoot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityRoot.java index 22ce89155..a7a4e561d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityRoot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityRoot.java @@ -328,6 +328,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityQueue.java index 9ecbe67a0..7926da535 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityQueue.java @@ -278,6 +278,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityRally.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityRally.java index ecf703f34..84767c1d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityRally.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityRally.java @@ -130,6 +130,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityReviveHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityReviveHero.java index b981d2273..8dda6f6a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityReviveHero.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityReviveHero.java @@ -153,6 +153,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilitySpellBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilitySpellBase.java index 8c83e1e19..73a409e10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilitySpellBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilitySpellBase.java @@ -234,6 +234,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return true; + } + @Override public CAbilityCategory getAbilityCategory() { return CAbilityCategory.SPELL; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityImmolation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityImmolation.java index da8c00285..9eb41500b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityImmolation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityImmolation.java @@ -250,6 +250,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return true; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffSlow.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffSlow.java index 09eeb7b2e..d03d077f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffSlow.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffSlow.java @@ -48,5 +48,10 @@ protected void onBuffRemove(final CSimulation game, final CUnit unit) { public boolean isTimedLifeBar() { return false; } + + @Override + public boolean isMagic() { + return true; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCarrionSwarmDummy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCarrionSwarmDummy.java index 01d4cf048..34e033d8a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCarrionSwarmDummy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCarrionSwarmDummy.java @@ -134,6 +134,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return true; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityChannelTest.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityChannelTest.java index b1215fab6..1e74ac6e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityChannelTest.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityChannelTest.java @@ -102,6 +102,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCoupleInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCoupleInstant.java index 1ede760a0..826396a4a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCoupleInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCoupleInstant.java @@ -249,6 +249,11 @@ public boolean isPhysical() { return true; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/upgrade/CAbilityUpgrade.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/upgrade/CAbilityUpgrade.java index 26e389d0a..3392d9c1e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/upgrade/CAbilityUpgrade.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/upgrade/CAbilityUpgrade.java @@ -202,6 +202,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index 318977d78..3e01e031b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -81,6 +81,7 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri private War3ID offTooltipOverride = null; private EnumSet targetsAllowed; private boolean physical = false; + private boolean magic = true; private boolean universal = false; public CAbilityAbilityBuilderGenericActive(int handleId, War3ID code, War3ID alias, @@ -275,6 +276,11 @@ protected void setSpellFields(CSimulation game, CUnit unit) { if (this.config.getOverrideFields().getPhysicalSpell() != null) { this.physical = this.config.getOverrideFields().getPhysicalSpell().callback(game, unit, localStore, castId); + this.magic = this.physical ? false : this.magic; // Spells that just declare physical:true default to magic:false + } + if (this.config.getOverrideFields().getMagicSpell() != null) { + this.magic = this.config.getOverrideFields().getMagicSpell().callback(game, + unit, localStore, castId); } if (this.config.getOverrideFields().getUniversalSpell() != null) { this.universal = this.config.getOverrideFields().getUniversalSpell().callback(game, @@ -1074,6 +1080,11 @@ public boolean isPhysical() { return physical; } + @Override + public boolean isMagic() { + return magic; + } + @Override public boolean isUniversal() { return universal; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java index a17e0ec44..191b6bcc4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java @@ -5,6 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; public class AbilityBuilderOverrideFields { @@ -20,6 +21,7 @@ public class AbilityBuilderOverrideFields { private ABIDCallback offTooltipOverride; private ABBooleanCallback physicalSpell; + private ABBooleanCallback magicSpell; private ABBooleanCallback universalSpell; public ABFloatCallback getAreaOverride() { @@ -76,6 +78,12 @@ public ABBooleanCallback getPhysicalSpell() { public void setPhysicalSpell(ABBooleanCallback physicalSpell) { this.physicalSpell = physicalSpell; } + public ABBooleanCallback getMagicSpell() { + return magicSpell; + } + public void setMagicSpell(ABBooleanCallback magicSpell) { + this.magicSpell = magicSpell; + } public ABBooleanCallback getUniversalSpell() { return universalSpell; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java index f8508af11..c1f84ffb7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java @@ -3,24 +3,30 @@ import com.etheller.interpreter.ast.util.CHandle; public enum CAttackType implements CodeKeyType, CHandle { - UNKNOWN, - NORMAL, - PIERCE, - SIEGE, - SPELLS, - CHAOS, - MAGIC, - HERO; + UNKNOWN(false, false, false), + NORMAL(false, false, true), + PIERCE(false, false, true), + SIEGE(false, false, true), + SPELLS(true, false, false), + CHAOS(false, false, true), + MAGIC(false, true, false), + HERO(false, false, true); public static CAttackType[] VALUES = values(); private String codeKey; private String damageKey; + private boolean universal; + private boolean magic; + private boolean physical; - private CAttackType() { + private CAttackType(boolean universal, boolean magic, boolean physical) { final String name = name(); this.codeKey = name.charAt(0) + name.substring(1).toLowerCase(); this.damageKey = this.codeKey; + this.universal = universal; + this.magic = magic; + this.physical = physical; } @Override @@ -44,4 +50,16 @@ public static CAttackType parseAttackType(final String attackTypeString) { public int getHandleId() { return ordinal(); } + + public boolean isUniversal() { + return this.universal; + } + + public boolean isMagic() { + return this.magic; + } + + public boolean isPhysical() { + return this.physical; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java index 21c4ac4a4..1765c0967 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java @@ -14,8 +14,8 @@ public class CUnitDefaultEtherealDamageModListener implements CUnitAttackDamageT public CUnitAttackDamageTakenModificationListenerDamageModResult onDamage(CSimulation game, CUnit attacker, CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, CUnitAttackDamageTakenModificationListenerDamageModResult previousDamage) { - boolean allied = game.getPlayer(attacker.getPlayerIndex()).hasAlliance(target.getPlayerIndex(), CAllianceType.PASSIVE); - if (!allied || (allied && game.getGameplayConstants().isEtherealDamageBonusAlly())) { + if (attacker == null || game.getGameplayConstants().isEtherealDamageBonusAlly() || !game + .getPlayer(attacker.getPlayerIndex()).hasAlliance(target.getPlayerIndex(), CAllianceType.PASSIVE)) { if (attackType == CAttackType.MAGIC) { previousDamage.addDamageMultiplier(game.getGameplayConstants().getEtherealDamageBonusMagic()); } @@ -23,12 +23,12 @@ public CUnitAttackDamageTakenModificationListenerDamageModResult onDamage(CSimul previousDamage.addDamageMultiplier(game.getGameplayConstants().getEtherealDamageBonusSpells()); } } - if (damageType == CDamageType.NORMAL && attackType != CAttackType.MAGIC) { - previousDamage.setBaseDamage(0); - previousDamage.setBonusDamage(0); - previousDamage.setDamageMultiplier(0); - } - +// if (damageType == CDamageType.NORMAL && attackType != CAttackType.MAGIC) { +// previousDamage.setBaseDamage(0); +// previousDamage.setBonusDamage(0); +// previousDamage.setDamageMultiplier(0); +// } + return previousDamage; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java index 4d404f0f0..5db401ed5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java @@ -12,11 +12,11 @@ public class CUnitDefaultMagicImmuneDamageModListener implements CUnitAttackFina @Override public float onDamage(CSimulation game, CUnit attacker, CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, float previousDamage) { - if ((damageType != CDamageType.NORMAL && (damageType != CDamageType.UNIVERSAL && game.getGameplayConstants().isMagicImmuneResistsUltimates()) - && attackType == CAttackType.SPELLS) - || (attackType == CAttackType.MAGIC && game.getGameplayConstants().isMagicImmuneResistsDamage())) { - return 0; - } +// if ((damageType != CDamageType.NORMAL && (damageType != CDamageType.UNIVERSAL && game.getGameplayConstants().isMagicImmuneResistsUltimates()) +// && attackType == CAttackType.SPELLS) +// || (attackType == CAttackType.MAGIC && game.getGameplayConstants().isMagicImmuneResistsDamage())) { +// return 0; +// } return previousDamage; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CDamageType.java index a770b69ff..83fe7964a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CDamageType.java @@ -3,33 +3,45 @@ import com.etheller.interpreter.ast.util.CHandle; public enum CDamageType implements CHandle { - UNKNOWN, - UNKNOWN_CODE_1, - UNKNOWN_CODE_2, - UNKNOWN_CODE_3, - NORMAL, - ENHANCED, - UNKNOWN_CODE_6, - UNKNOWN_CODE_7, - FIRE, - COLD, - LIGHTNING, - POISON, - DISEASE, - DIVINE, - MAGIC, - SONIC, - ACID, - FORCE, - DEATH, - MIND, - PLANT, - DEFENSIVE, - DEMOLITION, - SLOW_POISON, - SPIRIT_LINK, - SHADOW_STRIKE, - UNIVERSAL; + UNKNOWN(false, false, false, true), + UNKNOWN_CODE_1(false, false, false, true), + UNKNOWN_CODE_2(false, false, false, true), + UNKNOWN_CODE_3(false, false, false, true), + NORMAL(false, false, true, false), + ENHANCED(false, false, true, false), + UNKNOWN_CODE_6(false, false, false, true), + UNKNOWN_CODE_7(false, false, false, true), + FIRE(false, true, false, true), + COLD(false, true, false, true), + LIGHTNING(false, true, false, true), + POISON(false, false, true, true), + DISEASE(false, false, true, true), + DIVINE(false, true, false, true), + MAGIC(false, true, false, true), + SONIC(false, true, false, true), + ACID(false, false, true, true), + FORCE(false, true, false, true), + DEATH(false, true, false, true), + MIND(false, true, false, true), + PLANT(false, true, false, true), + DEFENSIVE(false, true, false, true), + DEMOLITION(false, false, true, false), + SLOW_POISON(false, false, true, true), + SPIRIT_LINK(false, true, false, true), + SHADOW_STRIKE(false, true, false, true), + UNIVERSAL(true, false, false, false); + + private boolean universal; + private boolean magic; + private boolean physical; + private boolean oldMagic; + + private CDamageType(boolean universal, boolean magic, boolean physical, boolean oldMagic) { + this.universal = universal; + this.magic = magic; + this.physical = physical; + this.oldMagic = oldMagic; + } public static CDamageType[] VALUES = values(); @@ -37,4 +49,20 @@ public enum CDamageType implements CHandle { public int getHandleId() { return ordinal(); } + + public boolean isUniversal() { + return this.universal; + } + + public boolean isMagic() { + return this.magic; + } + + public boolean isPhysical() { + return this.physical; + } + + public boolean isOldMagic() { + return this.oldMagic; + } } From fb49b6c378dd2dcb0541dfe0a433cb61680ffecd Mon Sep 17 00:00:00 2001 From: Glasir Date: Wed, 19 Feb 2025 06:01:53 -0500 Subject: [PATCH 06/44] Add flags to buffs for Hero and Aura buffs. Prepare for implementing Dispel * Core: Added Hero, Aura, Physical, and Magic as flags for buffs * AB: Started setting up functions for dispelling buffs and damaging summoned units * AB: Updated flag storage to consolidate in a single int flags field --- .../handlers/w3x/simulation/CUnit.java | 3 + .../abilities/generic/AbstractCBuff.java | 15 ++++ .../simulation/abilities/generic/CBuff.java | 9 ++ .../abilities/generic/CDestructableBuff.java | 10 +++ .../action/unit/ABActionDamageTarget.java | 10 ++- .../action/unit/ABActionDispelBuffs.java | 52 ++++++++++++ .../abilitybuilder/buff/ABBuff.java | 82 +++++++++++++++++++ .../buff/ABDestructableBuff.java | 64 ++++++++++++++- .../abilitybuilder/buff/ABGenericArtBuff.java | 5 -- .../buff/ABGenericAuraBuff.java | 24 +----- .../buff/ABGenericPermanentBuff.java | 26 +----- .../buff/ABGenericTimedBuff.java | 32 +------- .../abilitybuilder/buff/ABTargetingBuff.java | 5 -- .../abilitybuilder/core/ABLocalStoreKeys.java | 2 + .../simulation/combat/CBaseDamageFlags.java | 11 +++ .../w3x/simulation/combat/CDamageFlags.java | 12 ++- 16 files changed, 273 insertions(+), 89 deletions(-) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index 38b5dfcf2..452e92a9e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -2678,6 +2678,9 @@ public boolean checkForAbilityEffectReaction(final CSimulation simulation, final public boolean isImmuneToDamage(final CSimulation simulation, final CDamageFlags flags, final CAttackType attackType, final CDamageType damageType) { + if (flags.isOnlyDamageSummons() && !this.isUnitType(CUnitTypeJass.SUMMONED)) { + return true; + } if (simulation.getGameplayConstants().isMagicImmuneResistsDamage()) { if (attackType.isMagic() || damageType.isMagic()) { if (this.isMagicImmune()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java index 9310eea77..5fedef3f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java @@ -15,6 +15,11 @@ public T visit(final CAbilityVisitor visitor) { return visitor.accept(this); } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isPhysical() { return false; @@ -44,5 +49,15 @@ public boolean isLeveled() { public boolean isDispellable() { return false; } + + @Override + public boolean isAura() { + return false; + } + + @Override + public boolean isHero() { + return false; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java index 7a5a8a865..8c2785af1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java @@ -15,4 +15,13 @@ public interface CBuff extends CAliasedLevelingAbility { boolean isPositive(); boolean isDispellable(); + + boolean isHero(); + + boolean isPhysical(); + + boolean isMagic(); + + boolean isAura(); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java index b9c204a21..d2170ef1b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java @@ -19,4 +19,14 @@ public interface CDestructableBuff extends CHandle, Aliased { void setLevel(int level); boolean isDispellable(); + + boolean isTimedLife(); + + boolean isPositive(); + + boolean isHero(); + + boolean isPhysical(); + + boolean isAura(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java index f8c807fbd..edbc35760 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java @@ -28,6 +28,8 @@ public class ABActionDamageTarget implements ABAction { private ABBooleanCallback ignoreLTEZero; private ABBooleanCallback damageInvulnerable; + private ABBooleanCallback explodeOnDeath; + private ABBooleanCallback onlyDamageSummons; @Override public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { @@ -44,7 +46,13 @@ public void runAction(CSimulation game, CUnit caster, Map localS flags.setRanged(isRanged.callback(game, caster, localStore, castId)); } if (damageInvulnerable != null) { - flags.setRanged(damageInvulnerable.callback(game, caster, localStore, castId)); + flags.setIgnoreInvulnerable(damageInvulnerable.callback(game, caster, localStore, castId)); + } + if (explodeOnDeath != null) { + flags.setExplode(explodeOnDeath.callback(game, caster, localStore, castId)); + } + if (onlyDamageSummons != null) { + flags.setOnlyDamageSummons(onlyDamageSummons.callback(game, caster, localStore, castId)); } if (attackType != null) { theAttackType = attackType.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java new file mode 100644 index 000000000..67d8df566 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java @@ -0,0 +1,52 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABActionDispelBuffs implements ABAction { + + private ABUnitCallback source; + private ABUnitCallback target; + private ABCondition filter; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theCaster = caster; + if (source != null) { + theCaster = source.callback(game, theCaster, localStore, castId); + } + CUnit theTarget = null; + if (target != null) { + theTarget = target.callback(game, theCaster, localStore, castId); + } + + if (theTarget != null) { + List toRemove = new ArrayList<>(); + for (CAbility ability : theTarget.getAbilities()) { + if (ability.getAbilityCategory() == CAbilityCategory.BUFF) { + CBuff buff = (CBuff) ability; + localStore.put(ABLocalStoreKeys.ENUMBUFF, buff); + if (filter != null && filter.callback(game, theCaster, localStore, castId)) { + toRemove.add(buff); + } + } + } + + for (CBuff buff : toRemove) { + theTarget.remove(game, buff); + } + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java index bce07cd43..0b836c545 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java @@ -12,6 +12,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; public abstract class ABBuff extends AbstractCBuff { + protected static int TIMEDLIFE = 0b1; + protected static int NEGATIVE = 0b10; + protected static int DISPELLABLE = 0b100; + protected static int LEVELED = 0b1000; + protected static int HERO = 0b10000; + protected static int PHYSICAL = 0b100000; + protected static int MAGIC = 0b1000000; + protected static int AURA = 0b10000000; + + protected int flags = DISPELLABLE; public ABBuff(int handleId, War3ID code, War3ID alias) { super(handleId, code, alias); @@ -65,4 +75,76 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final public T visit(final CAbilityVisitor visitor) { return visitor.accept(this); } + + public void setTimedLifeBar(boolean timedLife) { + this.flags = timedLife ? this.flags | TIMEDLIFE : this.flags & ~TIMEDLIFE; + } + + @Override + public boolean isTimedLifeBar() { + return ((this.flags & TIMEDLIFE) != 0); + } + + public void setPositive(boolean positive) { + this.flags = positive ? this.flags & ~NEGATIVE : this.flags | NEGATIVE; + } + + @Override + public boolean isPositive() { + return ((this.flags & NEGATIVE) == 0); + } + + public void setLeveled(boolean leveled) { + this.flags = leveled ? this.flags | LEVELED : this.flags & ~LEVELED; + } + + @Override + public boolean isLeveled() { + return ((this.flags & LEVELED) != 0); + } + + public void setDispellable(boolean dispellable) { + this.flags = dispellable ? this.flags | DISPELLABLE : this.flags & ~DISPELLABLE; + } + + @Override + public boolean isDispellable() { + return ((this.flags & DISPELLABLE) != 0); + } + + public void setHero(boolean hero) { + this.flags = hero ? this.flags | HERO : this.flags & ~HERO; + } + + @Override + public boolean isHero() { + return ((this.flags & HERO) != 0); + } + + public void setPhysical(boolean physical) { + this.flags = physical ? this.flags | PHYSICAL : this.flags & ~PHYSICAL; + } + + @Override + public boolean isPhysical() { + return ((this.flags & PHYSICAL) != 0); + } + + public void setMagic(boolean magic) { + this.flags = magic ? this.flags | MAGIC : this.flags & ~MAGIC; + } + + @Override + public boolean isMagic() { + return ((this.flags & MAGIC) != 0); + } + + public void setAura(boolean aura) { + this.flags = aura ? this.flags | AURA : this.flags & ~AURA; + } + + @Override + public boolean isAura() { + return ((this.flags & AURA) != 0); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java index be7be1583..fbd817743 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java @@ -12,6 +12,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; public class ABDestructableBuff implements CDestructableBuff { + + protected static int TIMEDLIFE = 0b1; + protected static int NEGATIVE = 0b10; + protected static int DISPELLABLE = 0b100; + protected static int HERO = 0b1000; + protected static int PHYSICAL = 0b10000; + protected static int AURA = 0b100000; + protected int flags = 0b0; private int handleId; private War3ID alias; @@ -24,8 +32,6 @@ public class ABDestructableBuff implements CDestructableBuff { private List onAddActions; private List onRemoveActions; private List onDeathActions; - - private boolean dispellable; public ABDestructableBuff(int handleId, War3ID alias, int level, Map localStore, List onAddActions, List onRemoveActions, List onDeathActions, final int castId, CUnit caster, boolean dispellable) { @@ -38,7 +44,8 @@ public ABDestructableBuff(int handleId, War3ID alias, int level, Map(); - this.positive = positive; - this.leveled = leveled; + this.setHero(caster.isHero()); + this.setLeveled(leveled); + this.setPositive(positive); + this.setAura(true); this.setLevel(null, null, 1); } @@ -53,11 +52,6 @@ public float getDurationMax() { return 0; } - @Override - public boolean isTimedLifeBar() { - return false; - } - @Override public void onTick(CSimulation game, CUnit unit) { } @@ -66,14 +60,4 @@ public void onTick(CSimulation game, CUnit unit) { public void onDeath(CSimulation game, CUnit cUnit) { } - @Override - public boolean isPositive() { - return this.positive; - } - - @Override - public boolean isLeveled() { - return this.leveled; - } - } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java index db9ee53ad..5daa13031 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java @@ -6,20 +6,17 @@ public abstract class ABGenericPermanentBuff extends ABBuff { - private boolean leveled; - private boolean positive; - public ABGenericPermanentBuff(int handleId, War3ID alias, boolean showIcon, boolean leveled, boolean positive) { super(handleId, alias, alias); this.setIconShowing(showIcon); - this.leveled = leveled; - this.positive = positive; + this.setLeveled(leveled); + this.setPositive(positive); } public ABGenericPermanentBuff(int handleId, War3ID alias, boolean leveled, boolean positive) { super(handleId, alias, alias); - this.leveled = leveled; - this.positive = positive; + this.setLeveled(leveled); + this.setPositive(positive); } protected abstract void onBuffAdd(CSimulation game, CUnit unit); @@ -46,11 +43,6 @@ public float getDurationMax() { return 0; } - @Override - public boolean isTimedLifeBar() { - return false; - } - @Override public void onTick(CSimulation game, CUnit unit) { } @@ -59,14 +51,4 @@ public void onTick(CSimulation game, CUnit unit) { public void onDeath(CSimulation game, CUnit cUnit) { } - @Override - public boolean isPositive() { - return this.positive; - } - - @Override - public boolean isLeveled() { - return this.leveled; - } - } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java index d325579b7..49b702233 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java @@ -6,27 +6,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; public abstract class ABGenericTimedBuff extends ABBuff { - private boolean showTimedLifeBar; private final float duration; private int currentTick = 0; private int expireTick; - private boolean leveled; - private boolean positive; - private boolean dispellable; public ABGenericTimedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, boolean leveled, boolean positive, boolean dispellable) { super(handleId, alias, alias); - this.showTimedLifeBar = showTimedLifeBar; + this.setTimedLifeBar(showTimedLifeBar); this.duration = duration; - this.leveled = leveled; - this.positive = positive; - this.dispellable = dispellable; - } - - @Override - public boolean isTimedLifeBar() { - return showTimedLifeBar; + this.setLeveled(leveled); + this.setPositive(positive); + this.setDispellable(dispellable); } @Override @@ -80,19 +71,4 @@ public void updateExpiration(final CSimulation game, final CUnit unit) { final int durationTicks = (int) (this.duration / WarsmashConstants.SIMULATION_STEP_TIME); expireTick = game.getGameTurnTick() + durationTicks; } - - @Override - public boolean isPositive() { - return this.positive; - } - - @Override - public boolean isLeveled() { - return this.leveled; - } - - @Override - public boolean isDispellable() { - return this.dispellable; - } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java index 8bd3d103f..1151bef60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java @@ -20,11 +20,6 @@ public float getDurationMax() { return 0; } - @Override - public boolean isTimedLifeBar() { - return false; - } - @Override public void onAdd(CSimulation game, CUnit unit) { } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index 5b3a726e2..3d3704245 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -55,6 +55,8 @@ public class ABLocalStoreKeys { public static final String LASTADDEDABILITY = "_lastAddedAbility"; public static final String LASTADDEDBUFF = "_lastAddedBuff"; public static final String CURRENTLEVEL = "_currentLevel"; + + public static final String ENUMBUFF = "_enumBuff"; public static final String LASTCREATEDUNITGROUP = "_lastCreatedUnitGroup"; public static final String LASTCREATEDUNITQUEUE = "_lastCreatedUnitQueue"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java index 3200c24d0..244038f9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java @@ -5,6 +5,7 @@ public abstract class CBaseDamageFlags implements CDamageFlags { private static int RANGED = 0b10; private static int IGNOREINVUL = 0b100; private static int EXPLODE = 0b1000; + private static int SUMMON = 0b10000; private int flags = 0; @@ -50,4 +51,14 @@ public boolean isExplode() { public void setExplode(boolean explode) { this.flags = explode ? this.flags | EXPLODE : this.flags & ~EXPLODE; } + + @Override + public boolean isOnlyDamageSummons() { + return (this.flags & SUMMON) != 0; + } + + @Override + public void setOnlyDamageSummons(boolean summon) { + this.flags = summon ? this.flags | SUMMON : this.flags & ~SUMMON; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java index 2b5505a78..516dfb1da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java @@ -4,18 +4,22 @@ public interface CDamageFlags { boolean isAttack(); - boolean isRanged(); - - boolean isIgnoreInvulnerable(); - void setAttack(boolean attack); + boolean isRanged(); + void setRanged(boolean ranged); + boolean isIgnoreInvulnerable(); + void setIgnoreInvulnerable(boolean ignoreInvulnerable); boolean isExplode(); void setExplode(boolean explode); + boolean isOnlyDamageSummons(); + + void setOnlyDamageSummons(boolean callback); + } From d950d6f1c859fe38840dba5b3215a7c41dfabfed Mon Sep 17 00:00:00 2001 From: Glasir Date: Fri, 21 Feb 2025 09:40:41 -0500 Subject: [PATCH 07/44] Followup Merge Fixes --- .../w3x/simulation/abilities/neutral/CAbilityWayGate.java | 5 +++++ .../skills/orc/blademaster/CBuffWhirlWindCaster.java | 5 ++++- .../w3x/simulation/abilitybuilder/jass/ABConditionJass.java | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/neutral/CAbilityWayGate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/neutral/CAbilityWayGate.java index 68d4b51de..3b7f083e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/neutral/CAbilityWayGate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/neutral/CAbilityWayGate.java @@ -153,6 +153,11 @@ public boolean isPhysical() { return false; } + @Override + public boolean isMagic() { + return false; + } + @Override public boolean isUniversal() { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/blademaster/CBuffWhirlWindCaster.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/blademaster/CBuffWhirlWindCaster.java index bd88409d1..c52eb4a77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/blademaster/CBuffWhirlWindCaster.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/blademaster/CBuffWhirlWindCaster.java @@ -12,6 +12,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CWeaponSoundTypeJass; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; @@ -21,6 +23,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; public class CBuffWhirlWindCaster extends CBuffTimed { + private final static CDamageFlags DAMAGE_FLAGS = new CSpellDamageFlags(); private final CAbilityWhirlWind abilityImmolation; private int nextDamageTick; private final Rectangle recycleRect = new Rectangle(); @@ -65,7 +68,7 @@ public void onTick(final CSimulation game, final CUnit caster) { public boolean call(final CUnit enumUnit) { if (caster.canReach(enumUnit, areaOfEffect) && enumUnit.canBeTargetedBy(game, caster, CBuffWhirlWindCaster.this.abilityImmolation.getTargetsAllowed())) { - enumUnit.damage(game, caster, false, true, CAttackType.SPELLS, CDamageType.NORMAL, + enumUnit.damage(game, caster, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.NORMAL, CWeaponSoundTypeJass.WHOKNOWS.name(), CBuffWhirlWindCaster.this.abilityImmolation.getDamagePerSecond()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java index 649fe5fca..5d646b27a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java @@ -11,7 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABConditionJass implements ABCondition { +public class ABConditionJass extends ABCondition { private final TriggerBooleanExpression boolExpr; public ABConditionJass(final TriggerBooleanExpression boolExpr) { @@ -19,7 +19,7 @@ public ABConditionJass(final TriggerBooleanExpression boolExpr) { } @Override - public boolean evaluate(final CSimulation game, final CUnit caster, final Map localStore, + public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { return this.boolExpr.evaluate(game.getGlobalScope(), CommonTriggerExecutionScope.abilityBuilder(caster, localStore, castId)); From c4feb8f5f110d44992adfc768b12b7b5bbd1d49e Mon Sep 17 00:00:00 2001 From: Glasir Date: Fri, 21 Feb 2025 09:44:15 -0500 Subject: [PATCH 08/44] Update Invisibility to allow non-transparent invis * Core: Invis flag 1 is used for transparency, higher flags like 2 will be invisible but not transparent * AB: Updated Burrow to use invis flag 2 * AB: Updated Essence of Blight and Spirit Touch to override the cast time --- core/assets/abilityBehaviors/Transformations.json | 6 +++++- core/assets/abilityBehaviors/undeadUnitActives.json | 12 ++++++++++++ .../viewer5/handlers/w3x/rendersim/RenderUnit.java | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/core/assets/abilityBehaviors/Transformations.json b/core/assets/abilityBehaviors/Transformations.json index 10222ebca..3d9ceee7a 100644 --- a/core/assets/abilityBehaviors/Transformations.json +++ b/core/assets/abilityBehaviors/Transformations.json @@ -677,7 +677,11 @@ }, "onAddDisabledAbility": [{ "type": "createStateModBuff", - "buffType": "INVISIBLE" + "buffType": "INVISIBLE", + "value": { + "type": "rawLong", + "value": 2 + } },{ "type": "if", "condition": { diff --git a/core/assets/abilityBehaviors/undeadUnitActives.json b/core/assets/abilityBehaviors/undeadUnitActives.json index fe943cbd2..0d697e830 100644 --- a/core/assets/abilityBehaviors/undeadUnitActives.json +++ b/core/assets/abilityBehaviors/undeadUnitActives.json @@ -297,6 +297,12 @@ },{ "ids": [{"id":"Arpl", "castId": "replenishlife", "autoCastOnId": "replenishlifeon", "autoCastOffId": "replenishlifeoff", "autoCastType": "NOTARGET"}], "type": "NORMAL_NOTARGET", + "overrideFields": { + "castTimeOverride": { + "type": "rawFloat", + "value": 0.0 + } + }, "specialFields": { "bufferManaRequired": { "type": "i*", @@ -516,6 +522,12 @@ },{ "ids": [{"id":"Arpm", "castId": "replenishmana", "autoCastOnId": "replenishmanaon", "autoCastOffId": "replenishmanaoff", "autoCastType": "NOTARGET"}], "type": "NORMAL_NOTARGET", + "overrideFields": { + "castTimeOverride": { + "type": "rawFloat", + "value": 0.0 + } + }, "specialFields": { "bufferManaRequired": { "type": "i*", diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java index 07b14903a..a580e3963 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java @@ -228,7 +228,7 @@ public void updateAnimations(final War3MapViewer map) { boolean swimming = (movementType == MovementType.AMPHIBIOUS) && PathingGrid.isPathingFlag(terrainPathing, PathingGrid.PathingType.SWIMMABLE) && !PathingGrid.isPathingFlag(terrainPathing, PathingGrid.PathingType.WALKABLE); - final boolean invisible = this.simulationUnit.getInvisLevels() > 0; + final boolean invisible = (this.simulationUnit.getInvisLevels() & 1) > 0; final boolean working = this.simulationUnit.getBuildQueueTypes()[0] != null; final float groundHeightTerrain = map.terrain.getGroundHeight(this.location[0], this.location[1]); float groundHeightTerrainAndWater; From 1195c8b529ad1690502be5e5af6805f5ffa02173 Mon Sep 17 00:00:00 2001 From: Glasir Date: Fri, 21 Feb 2025 09:58:17 -0500 Subject: [PATCH 09/44] Remove armor calculation for buildings under construction --- .../warsmash/viewer5/handlers/w3x/simulation/CUnit.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index e8153ebb7..6248a85de 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -2829,10 +2829,10 @@ public float damage(final CSimulation simulation, final CUnit source, final CDam } final float damageRatioFromArmorClass = simulation.getGameplayConstants().getDamageRatioAgainst(attackType, - getDefenseType()); + (this.isBuilding() && this.isConstructing()) ? CDefenseType.NORMAL : getDefenseType()); final float damageRatioFromDefense; final float defense = this.currentDefense; - if (damageType != CDamageType.NORMAL) { + if (damageType != CDamageType.NORMAL || (this.isBuilding() && this.isConstructing())) { damageRatioFromDefense = 1.0f; } else if (defense >= 0) { damageRatioFromDefense = 1f - ((defense * simulation.getGameplayConstants().getDefenseArmor()) From 5742933fccc43fd35341abf18611d41f4215ee7b Mon Sep 17 00:00:00 2001 From: Glasir Date: Mon, 24 Feb 2025 05:47:04 -0500 Subject: [PATCH 10/44] Refactor Ethereal Damage Table to load all values * Core: Originally only loaded magic/spell ethereal damage ratios, now loads all --- .../w3x/simulation/CGameplayConstants.java | 78 +++++++++---------- .../w3x/simulation/combat/CAttackType.java | 8 +- ...CUnitDefaultEtherealDamageModListener.java | 7 +- 3 files changed, 43 insertions(+), 50 deletions(-) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java index efb0fba86..ab94625fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java @@ -27,22 +27,21 @@ public class CGameplayConstants { private final float structureDecayTime; private final float buildingAngle; private final float rootAngle; - + private final float fogFlashTime; private final float dyingRevealRadius; private final float foggedAttackRevealRadius; private final float defenseArmor; - private final float etherealDamageBonusSpells; - private final float etherealDamageBonusMagic; + private final float[] etherealDamageBonus; private final boolean etherealDamageBonusAlly; - + private final boolean magicImmuneResistsDamage; private final boolean magicImmuneResistsLeech; private final boolean magicImmuneResistsThorns; private final boolean magicImmuneResistsUltimates; - + private final boolean defendDeflection; private final int heroMaxReviveCostGold; @@ -125,7 +124,7 @@ public class CGameplayConstants { private final float maxUnitSpeed; private final float minBldgSpeed; private final float maxBldgSpeed; - + private final float chanceToMiss; private final float missDamageReduction; @@ -171,8 +170,7 @@ public CGameplayConstants(final DataTable parsedDataTable) { try { this.damageBonusTable[i][defenseType.ordinal()] = Float.parseFloat(damageComponents[j]); // System.out.println(attackType + ":" + defenseType + ": " + damageComponents[j]); - } - catch (final NumberFormatException e) { + } catch (final NumberFormatException e) { throw new RuntimeException(fieldName, e); } } @@ -183,38 +181,43 @@ public CGameplayConstants(final DataTable parsedDataTable) { final String damageBonus = miscData.getField("EtherealDamageBonus"); final String[] damageComponents = damageBonus.split(","); - float magBonus = 1; - float spellBonus = 1; + this.etherealDamageBonus = new float[damageComponents.length + 1]; + this.etherealDamageBonus[this.etherealDamageBonus.length - 1] = 1; for (int j = 0; j < damageComponents.length; j++) { - if (j == 3) { - if (damageComponents[j].length() > 0) { - try { - magBonus = Float.parseFloat(damageComponents[j]); - } - catch (final NumberFormatException e) { - throw new RuntimeException("EtherealDamageBonus", e); - } - } - } else if (j == 5) { - if (damageComponents[j].length() > 0) { - try { - spellBonus = Float.parseFloat(damageComponents[j]); - } - catch (final NumberFormatException e) { - throw new RuntimeException("EtherealDamageBonus", e); - } + int iter = 0; + if (j < 5) { + iter = j + 1; + } else if (j > 5) { + iter = j; + } + /* + * The above reordering is to match the War3 attack type order. The ethereal + * table is organized: + * + * Normal,Pierce,Siege,Magic,Chaos,Spells,Hero + * + * + * But the actual internal attack types are ordered: + * + * Spells,Normal,Pierce,Siege,Magic,Chaos,Hero + */ + if (damageComponents[j].length() > 0) { + try { + this.etherealDamageBonus[iter] = Float.parseFloat(damageComponents[j]); + } catch (final NumberFormatException e) { + throw new RuntimeException("EtherealDamageBonus", e); } + } else { + this.etherealDamageBonus[iter] = 0; } } - this.etherealDamageBonusMagic = magBonus; - this.etherealDamageBonusSpells = spellBonus; this.etherealDamageBonusAlly = miscData.getFieldValue("EtherealDamageBonusAlly") != 0; this.magicImmuneResistsDamage = miscData.getFieldValue("MagicImmunesResistDamage") != 0; this.magicImmuneResistsLeech = miscData.getFieldValue("MagicImmunesResistLeech") != 0; this.magicImmuneResistsThorns = miscData.getFieldValue("MagicImmunesResistThorns") != 0; this.magicImmuneResistsUltimates = miscData.getFieldValue("MagicImmunesResistUltimates") != 0; - + this.defendDeflection = miscData.getFieldValue("DefendDeflection") != 0; this.globalExperience = miscData.getFieldValue("GlobalExperience") != 0; @@ -270,8 +273,7 @@ public CGameplayConstants(final DataTable parsedDataTable) { for (int i = 0; i < this.needHeroXpSum.length; i++) { if (i == 0) { this.needHeroXpSum[i] = this.needHeroXp[i]; - } - else { + } else { this.needHeroXpSum[i] = this.needHeroXp[i] + this.needHeroXpSum[i - 1]; } } @@ -392,12 +394,8 @@ public float getDefenseArmor() { return this.defenseArmor; } - public float getEtherealDamageBonusSpells() { - return etherealDamageBonusSpells; - } - - public float getEtherealDamageBonusMagic() { - return etherealDamageBonusMagic; + public float[] getEtherealDamageBonus() { + return etherealDamageBonus; } public boolean isEtherealDamageBonusAlly() { @@ -419,6 +417,7 @@ public boolean isMagicImmuneResistsThorns() { public boolean isMagicImmuneResistsUltimates() { return magicImmuneResistsUltimates; } + public boolean isDefendDeflection() { return defendDeflection; } @@ -625,8 +624,7 @@ private static int[] parseTable(final String txt, final int formulaA, final int for (int i = 0; i < tableSize; i++) { if (i < splitTxt.length) { result[i] = Integer.parseInt(splitTxt[i]); - } - else { + } else { result[i] = (formulaA * result[i - 1]) + (formulaB * i) + formulaC; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java index f471449c5..4a41fb924 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java @@ -3,14 +3,14 @@ import com.etheller.interpreter.ast.util.CHandle; public enum CAttackType implements CodeKeyType, CHandle { - UNKNOWN(false, false, false), + SPELLS(true, false, false), NORMAL(false, false, true), PIERCE(false, false, true), SIEGE(false, false, true), - SPELLS(true, false, false), - CHAOS(false, false, true), MAGIC(false, true, false), - HERO(false, false, true); + CHAOS(false, false, true), + HERO(false, false, true), + UNKNOWN(false, false, false); public static CAttackType[] VALUES = values(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java index 1765c0967..0b1add69f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java @@ -16,12 +16,7 @@ public CUnitAttackDamageTakenModificationListenerDamageModResult onDamage(CSimul CUnitAttackDamageTakenModificationListenerDamageModResult previousDamage) { if (attacker == null || game.getGameplayConstants().isEtherealDamageBonusAlly() || !game .getPlayer(attacker.getPlayerIndex()).hasAlliance(target.getPlayerIndex(), CAllianceType.PASSIVE)) { - if (attackType == CAttackType.MAGIC) { - previousDamage.addDamageMultiplier(game.getGameplayConstants().getEtherealDamageBonusMagic()); - } - if (attackType == CAttackType.SPELLS) { - previousDamage.addDamageMultiplier(game.getGameplayConstants().getEtherealDamageBonusSpells()); - } + previousDamage.addDamageMultiplier(game.getGameplayConstants().getEtherealDamageBonus()[attackType.ordinal()]); } // if (damageType == CDamageType.NORMAL && attackType != CAttackType.MAGIC) { // previousDamage.setBaseDamage(0); From e8d6f7c32a554ac0712166626eae894f712d590d Mon Sep 17 00:00:00 2001 From: Glasir Date: Tue, 25 Feb 2025 07:44:32 -0500 Subject: [PATCH 11/44] Ability Builder Inheritance! Added function for abilities to inherit from each other, overriding parts of the parent ability. Also set up system of internal method definitions that can be reused in the spell (that can also be individually overridden by child spells) * AB: Addition of INHERIT type that inherits function for the parent spell * AB: Added ReuseActions and ReuseCallbacks. These can be invoked (with arguments if needed) repeatedly in a spell to simplify large spells. They are similar to subroutines, but subroutines are defined during execution, while reuse methods are defined at startup * AB: Reworked several spell definitions to use Reusable actions and callbacks ** Transformations all inherit base functionality now, only making minor adjustments ** Rejuvination (and ItemRejuv) massively simplified with reuse actions and inheritance ** Magic Defense now inherits nearly everything from Defend ** Spirit Touch now inheritcs from Essence of Blight, overriding the heal with mana restore * AB: Minor: treat all ABBooleanCallbacks as ABConditions for clarity --- .../abilityBehaviors/Transformations.json | 3192 +++-------------- .../abilityBehaviors/generalPassives.json | 6 +- core/assets/abilityBehaviors/itemSimple.json | 1085 ++---- .../abilityBehaviors/nightElfUnitActives.json | 765 +--- core/assets/abilityBehaviors/reactions.json | 674 +--- .../abilityBehaviors/undeadUnitActives.json | 288 +- .../structural/ABActionCreateSubroutine.java | 8 +- .../structural/ABActionRunReuseAction.java | 45 + .../ABActionRunReuseActionWithArguments.java | 52 + .../structural/ABActionRunSubroutine.java | 9 +- .../ABCallbackArgumentAbility.java | 35 + .../ABCallbackReuseAbility.java | 43 + .../ABCallbackReuseAbilityWithArguments.java | 50 + .../ABCallbackGetAbilityDataAsBoolean.java | 3 +- ...CallbackGetParentAbilityDataAsBoolean.java | 3 +- .../ABCallbackGetStoredBooleanByKey.java | 3 +- .../ABCallbackIntegerToBoolean.java | 3 +- .../ABCallbackIsProjectileReflected.java | 3 +- .../ABCallbackRawBoolean.java | 3 +- .../ABCallbackWasCastingInterrupted.java | 3 +- .../buffcallbacks/ABCallbackArgumentBuff.java | 35 + .../buffcallbacks/ABCallbackReuseBuff.java | 43 + .../ABCallbackReuseBuffWithArguments.java | 50 + .../ABCallbackArgumentDestructable.java | 35 + .../ABCallbackReuseDestructable.java | 43 + ...allbackReuseDestructableWithArguments.java | 50 + .../ABCallbackArgumentDestructableBuff.java | 35 + .../ABCallbackReuseDestructableBuff.java | 43 + ...ackReuseDestructableBuffWithArguments.java | 50 + .../ABCallbackArgumentTimeOfDayEvent.java | 35 + .../ABCallbackReuseTimeOfDayEvent.java | 43 + ...lbackReuseTimeOfDayEventWithArguments.java | 50 + .../ABCallbackArgumentFloat.java | 34 + .../floatcallbacks/ABCallbackReuseFloat.java | 42 + .../ABCallbackReuseFloatWithArguments.java | 49 + .../fxcallbacks/ABCallbackArgumentFX.java | 35 + .../fxcallbacks/ABCallbackReuseFX.java | 43 + .../ABCallbackReuseFXWithArguments.java | 50 + .../idcallbacks/ABCallbackArgumentID.java | 35 + .../idcallbacks/ABCallbackReuseID.java | 43 + .../ABCallbackReuseIDWithArguments.java | 50 + .../ABCallbackArgumentInteger.java | 34 + .../ABCallbackReuseInteger.java | 42 + .../ABCallbackReuseIntegerWithArguments.java | 49 + .../callback/item/ABCallbackArgumentItem.java | 35 + .../callback/item/ABCallbackReuseItem.java | 43 + .../ABCallbackReuseItemWithArguments.java | 50 + .../ABCallbackArgumentLocation.java | 35 + .../ABCallbackReuseLocation.java | 43 + .../ABCallbackReuseLocationWithArguments.java | 50 + .../longcallbacks/ABCallbackArgumentLong.java | 34 + .../longcallbacks/ABCallbackReuseLong.java | 42 + .../ABCallbackReuseLongWithArguments.java | 49 + .../orderid/ABCallbackArgumentOrderId.java | 34 + .../orderid/ABCallbackReuseOrderId.java | 42 + .../ABCallbackReuseOrderIdWithArguments.java | 49 + .../player/ABCallbackArgumentPlayer.java | 35 + .../player/ABCallbackReusePlayer.java | 43 + .../ABCallbackReusePlayerWithArguments.java | 50 + .../ABCallbackArgumentProjectile.java | 35 + .../projectile/ABCallbackReuseProjectile.java | 43 + ...BCallbackReuseProjectileWithArguments.java | 50 + ...ABCallbackArgumentNonStackingStatBuff.java | 35 + .../ABCallbackReuseNonStackingStatBuff.java | 43 + ...ReuseNonStackingStatBuffWithArguments.java | 50 + .../ABCallbackArgumentStateModBuff.java | 35 + .../ABCallbackReuseStateModBuff.java | 43 + ...allbackReuseStateModBuffWithArguments.java | 50 + .../ABCallbackArgumentString.java | 33 + .../ABCallbackReuseString.java | 41 + .../ABCallbackReuseStringWithArguments.java | 48 + .../ABCallbackArgumentTarget.java | 35 + .../ABCallbackReuseTarget.java | 43 + .../ABCallbackReuseTargetWithArguments.java | 50 + .../ABCallbackArgumentTimer.java | 35 + .../timercallbacks/ABCallbackReuseTimer.java | 43 + .../ABCallbackReuseTimerWithArguments.java | 50 + .../unitcallbacks/ABCallbackArgumentUnit.java | 34 + .../unitcallbacks/ABCallbackReuseUnit.java | 42 + .../ABCallbackReuseUnitWithArguments.java | 49 + .../ABCallbackArgumentUnitGroup.java | 35 + .../ABCallbackReuseUnitGroup.java | 43 + ...ABCallbackReuseUnitGroupWithArguments.java | 50 + .../ABCallbackArgumentUnitQueue.java | 35 + .../unitqueue/ABCallbackReuseUnitQueue.java | 43 + ...ABCallbackReuseUnitQueueWithArguments.java | 50 + .../ABCallbackArgumentVisionModifier.java | 35 + .../ABCallbackReuseVisionModifier.java | 43 + ...lbackReuseVisionModifierWithArguments.java | 50 + .../widget/ABCallbackArgumentWidget.java | 35 + .../widget/ABCallbackReuseWidget.java | 43 + .../ABCallbackReuseWidgetWithArguments.java | 50 + .../condition/ABCallbackArgumentBoolean.java | 36 + .../condition/ABCallbackReuseBoolean.java | 44 + .../ABCallbackReuseBooleanWithArguments.java | 51 + .../abilitybuilder/core/ABLocalStoreKeys.java | 4 + .../core/AbilityBuilderGsonBuilder.java | 147 +- .../parser/AbilityBuilderConfiguration.java | 24 + .../parser/AbilityBuilderOverrideFields.java | 31 +- .../parser/AbilityBuilderParser.java | 118 + .../AbilityBuilderParserTemplateFields.java | 22 + .../AbilityBuilderSpecialConfigFields.java | 47 + .../AbilityBuilderSpecialDisplayFields.java | 28 + .../parser/AbilityBuilderType.java | 1 + .../w3x/simulation/data/CAbilityData.java | 45 +- 105 files changed, 4783 insertions(+), 5139 deletions(-) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbilityWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseIDWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLongWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseStringWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java diff --git a/core/assets/abilityBehaviors/Transformations.json b/core/assets/abilityBehaviors/Transformations.json index 3d9ceee7a..9d8588f54 100644 --- a/core/assets/abilityBehaviors/Transformations.json +++ b/core/assets/abilityBehaviors/Transformations.json @@ -220,2458 +220,57 @@ } }, "onAddDisabledAbility": [{ - "type": "if", - "condition": { - "type": "isToggleAbilityActive" - }, - "thenActions": [{ - "type": "transformedUnitAbilityAdd", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - } - }], - "elseActions": [] - }], - "onRemoveDisabledAbility": [{ - "type": "transformedUnitAbilityRemove", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - } - }], - "onBeginCasting": [{ - "type": "createTemporarySpellEffectOnUnit", - "target": { - "type": "getCastingUnit" - }, - "id": { - "type": "getAlias" - }, - "effectType": "CASTER" - },{ - "type": "transformUnit", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - } - },{ - "type": "if", - "condition": { - "type": "isTransformingToAlternate" - }, - "thenActions": [{ - "type": "activateToggledAbility" - }], - "elseActions": [{ - "type": "deactivateToggledAbility" - }] - }] - },{ - "ids": [{"id":"Abur", "castId": "burrow", "uncastId": "unburrow"}], - "type": "NORMAL_NOTARGET", - "displayFields": { - "toggleable": { - "type": "rawBoolean", - "value": "true" - }, - "castToggleOff": { - "type": "rawBoolean", - "value": "true" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "goldCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" - }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getUnitType" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - } - } - }, - "lumberCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" - }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getUnitType" - } - } - }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - } - } - }, - "foodCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "i-", - "value1": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getUnitType" - } - } - } - } - }, - "overrideFields": { - "physicalSpell": { - "type": "rawBoolean", - "value": "true" - }, - "onTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - } - }, - "value": { - "type": "getAbilityDataAsID", - "dataField": "A" - } - }, - "offTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - } - }, - "value": { - "type": "getAbilityUnitId" - } - } - }, - "onAddDisabledAbility": [{ - "type": "createStateModBuff", - "buffType": "INVISIBLE", - "value": { - "type": "rawLong", - "value": 2 - } - },{ - "type": "if", - "condition": { - "type": "isToggleAbilityActive" - }, - "thenActions": [{ - "type": "transformedUnitAbilityAdd", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - }, - "onTransformActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }], - "onUntransformActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] - }], - "elseActions": [] - }], - "onRemoveDisabledAbility": [{ - "type": "transformedUnitAbilityRemove", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "onUntransformActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] - }], - "onBeginCasting": [{ - "type": "createTemporarySpellEffectOnUnit", - "target": { - "type": "getCastingUnit" - }, - "id": { - "type": "getAlias" - }, - "effectType": "CASTER" - },{ - "type": "transformUnit", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - }, - "onTransformActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }], - "onUntransformActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] - },{ - "type": "if", - "condition": { - "type": "isTransformingToAlternate" - }, - "thenActions": [{ - "type": "activateToggledAbility" - }], - "elseActions": [{ - "type": "deactivateToggledAbility" - }] - }] - },{ - "ids": [{"id":"Astn", "castId": "stoneform", "uncastId": "unstoneform"}], - "type": "NORMAL_NOTARGET", - "displayFields": { - "toggleable": { - "type": "rawBoolean", - "value": "true" - }, - "castToggleOff": { - "type": "rawBoolean", - "value": "true" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "goldCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" - }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getUnitType" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - } - } - }, - "lumberCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" - }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getUnitType" - } - } - }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - } - } - }, - "foodCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "i-", - "value1": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getUnitType" - } - } - } - } - }, - "overrideFields": { - "physicalSpell": { - "type": "rawBoolean", - "value": "true" - }, - "onTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - } - }, - "value": { - "type": "getAbilityDataAsID", - "dataField": "A" - } - }, - "offTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - } - }, - "value": { - "type": "getAbilityUnitId" - } - } - }, - "onAddDisabledAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "HPGEN" - } - }, - "stackingKey": { - "type": "getAllowStackingKey" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "E" - } - },{ - "type": "if", - "condition": { - "type": "isToggleAbilityActive" - }, - "thenActions": [{ - "type": "transformedUnitAbilityAdd", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - }, - "onTransformActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - }], - "onUntransformActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - }] - }], - "elseActions": [] - }], - "onRemoveDisabledAbility": [{ - "type": "transformedUnitAbilityRemove", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "onUntransformActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - }] - }], - "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "E" - } - }], - "onBeginCasting": [{ - "type": "createTemporarySpellEffectOnUnit", - "target": { - "type": "getCastingUnit" - }, - "id": { - "type": "getAlias" - }, - "effectType": "CASTER" - },{ - "type": "transformUnit", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - }, - "onTransformActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - }], - "onUntransformActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - }] - },{ - "type": "if", - "condition": { - "type": "isTransformingToAlternate" - }, - "thenActions": [{ - "type": "activateToggledAbility" - },{ - "type": "resetCooldown" - }], - "elseActions": [{ - "type": "deactivateToggledAbility" - }] - }] - },{ - "ids": [{"id":"Acpf", "castId": "corporealform", "uncastId": "uncorporealform"}], - "type": "NORMAL_NOTARGET", - "displayFields": { - "toggleable": { - "type": "rawBoolean", - "value": "true" - }, - "castToggleOff": { - "type": "rawBoolean", - "value": "true" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "goldCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" - }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getUnitType" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - } - } - }, - "lumberCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" - }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getUnitType" - } - } - }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - } - } - }, - "foodCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "i-", - "value1": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getUnitType" - } - } - } - } - }, - "overrideFields": { - "onTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - } - }, - "value": { - "type": "getAbilityDataAsID", - "dataField": "A" - } - }, - "offTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - } - }, - "value": { - "type": "getAbilityUnitId" - } - } - }, - "onAddDisabledAbility": [{ - "type": "createStateModBuff", - "buffType": "ETHEREAL" - },{ - "type": "if", - "condition": { - "type": "isToggleAbilityActive" - }, - "thenActions": [{ - "type": "transformedUnitAbilityAdd", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - }, - "onTransformActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }], - "onUntransformActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] - }], - "elseActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] - }], - "onRemoveDisabledAbility": [{ - "type": "transformedUnitAbilityRemove", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - } - }], - "onBeginCasting": [{ - "type": "createTemporarySpellEffectOnUnit", - "target": { - "type": "getCastingUnit" - }, - "id": { - "type": "getAlias" - }, - "effectType": "CASTER" - },{ - "type": "transformUnit", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - }, - "onTransformActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }], - "onUntransformActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] - },{ - "type": "if", - "condition": { - "type": "isTransformingToAlternate" - }, - "thenActions": [{ - "type": "activateToggledAbility" - },{ - "type": "resetCooldown" - }], - "elseActions": [{ - "type": "deactivateToggledAbility" - }] - }] - },{ - "ids": [{"id":"Aetf", "castId": "etherealform", "uncastId": "unetherealform"}], - "type": "NORMAL_NOTARGET", - "displayFields": { - "toggleable": { - "type": "rawBoolean", - "value": "true" - }, - "castToggleOff": { - "type": "rawBoolean", - "value": "true" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "goldCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" - }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getUnitType" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - } - } - }, - "lumberCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" - }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getUnitType" - } - } - }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - } - } - }, - "foodCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "i-", - "value1": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getUnitType" - } - } - } - } - }, - "overrideFields": { - "onTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - } - }, - "value": { - "type": "getAbilityDataAsID", - "dataField": "A" - } - }, - "offTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - } - }, - "value": { - "type": "getAbilityUnitId" - } - } - }, - "onAddDisabledAbility": [{ - "type": "createStateModBuff", - "buffType": "ETHEREAL" - },{ - "type": "if", - "condition": { - "type": "isToggleAbilityActive" - }, - "thenActions": [{ - "type": "transformedUnitAbilityAdd", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - }, - "onTransformActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }], - "onUntransformActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] - }], - "elseActions": [] - }], - "onRemoveDisabledAbility": [{ - "type": "transformedUnitAbilityRemove", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "onUntransformActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] - }], - "onBeginCasting": [{ - "type": "createTemporarySpellEffectOnUnit", - "target": { - "type": "getCastingUnit" - }, - "id": { - "type": "getAlias" - }, - "effectType": "CASTER" - },{ - "type": "transformUnit", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - }, - "onTransformActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }], - "onUntransformActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] - },{ - "type": "if", - "condition": { - "type": "isTransformingToAlternate" - }, - "thenActions": [{ - "type": "activateToggledAbility" - },{ - "type": "resetCooldown" - }], - "elseActions": [{ - "type": "deactivateToggledAbility" - }] - }] - },{ - "ids": [{"id":"Aave", "castId": "avengerform", "uncastId": "unavengerform"}], - "type": "NORMAL_NOTARGET", - "displayFields": { - "toggleable": { - "type": "rawBoolean", - "value": "true" - }, - "castToggleOff": { - "type": "rawBoolean", - "value": "true" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "goldCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" - }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getUnitType" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" } - }, - "lumberCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } + },{ + "type": "if", + "condition": { + "type": "isToggleAbilityActive" }, - "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" + "thenActions": [{ + "type": "transformedUnitAbilityAdd", + "unit": { + "type": "getCastingUnit" }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getUnitType" - } - } + "baseUnitId": { + "type": "getAbilityDataAsID", + "dataField": "A" }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" + "alternateUnitId": { + "type": "getAbilityUnitId" + }, + "immediateLanding": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" }, - "alternateUnitId": { - "type": "getAbilityUnitId" + "value2": { + "type": "rawInteger", + "value": 2 } } - } - } - }, - "foodCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "i-", - "value1": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" + }, + "immediateTakeOff": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" }, - "alternateUnitId": { - "type": "getAbilityUnitId" + "value2": { + "type": "rawInteger", + "value": 4 } } }, - "value2": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getUnitType" - } - } - } - } - }, - "overrideFields": { - "physicalSpell": { - "type": "rawBoolean", - "value": "true" - }, - "onTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { + "permanent": { "type": "i2b", "value": { "type": "i&", @@ -2681,21 +280,11 @@ }, "value2": { "type": "rawInteger", - "value": 16 + "value": 8 } } - } - }, - "value": { - "type": "getAbilityDataAsID", - "dataField": "A" - } - }, - "offTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { + }, + "requiresPayment": { "type": "i2b", "value": { "type": "i&", @@ -2705,111 +294,46 @@ }, "value2": { "type": "rawInteger", - "value": 16 - } - } - } - }, - "value": { - "type": "getAbilityUnitId" - } - } - }, - "onAddDisabledAbility": [{ - "type": "if", - "condition": { - "type": "isToggleAbilityActive" - }, - "thenActions": [{ - "type": "transformedUnitAbilityAdd", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 + "value": 16 + } } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 + }, + "altitudeAdjustmentDelay": { + "type": "getAbilityCastTime" + }, + "altitudeAdjustmentTime": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "landingDelayTime": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "transformTime": { + "type": "getAbilityDuration" + }, + "duration": { + "type": "getAbilityHeroDuration" + }, + "buffId": { + "type": "getFirstBuffId" + }, + "onTransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - } - }], - "elseActions": [] + }], + "onUntransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" + } + }] + }], + "elseActions": [] }], "onRemoveDisabledAbility": [{ "type": "transformedUnitAbilityRemove", @@ -2836,7 +360,14 @@ "value": 8 } } - } + }, + "onUntransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" + } + }] }], "onBeginCasting": [{ "type": "createTemporarySpellEffectOnUnit", @@ -2936,15 +467,17 @@ "type": "getFirstBuffId" }, "onTransformActions": [{ - "type": "setMp", - "target": { - "type": "getCastingUnit" - }, - "amount": { - "type": "getUnitInitialMana", - "unit": { - "type": "getCastingUnit" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" + } + }], + "onUntransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" } }] },{ @@ -2953,181 +486,205 @@ "type": "isTransformingToAlternate" }, "thenActions": [{ - "type": "activateToggledAbility" + "type": "activateToggledAbility" + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransformExtra" + } }], "elseActions": [{ - "type": "deactivateToggledAbility" + "type": "deactivateToggledAbility" + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransformExtra" + } }] }] },{ - "ids": [{"id":"AEme", "castId": "metamorphosis"}], - "type": "NORMAL_NOTARGET", - "displayFields": { - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "goldCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } + "ids": [{"id":"Abur", "castId": "burrow", "uncastId": "unburrow"}], + "type": "INHERIT", + "parentId": "Arav", + "overrideFields": { + "physicalSpell": { + "type": "rawBoolean", + "value": "true" + } + }, + "reuseActions": { + "setup": [{ + "type": "createStateModBuff", + "buffType": "INVISIBLE", + "value": { + "type": "rawLong", + "value": 2 + } + }], + "onTransform": [{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }], + "onUnTransform": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }] + } + },{ + "ids": [{"id":"Astn", "castId": "stoneform", "uncastId": "unstoneform"}], + "type": "INHERIT", + "parentId": "Arav", + "overrideFields": { + "physicalSpell": { + "type": "rawBoolean", + "value": "true" + } + }, + "reuseActions": { + "setup": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "HPGEN" } }, + "stackingKey": { + "type": "getAllowStackingKey" + }, "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" - }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getUnitType" - } - } - }, - "value2": { - "type": "getUnitTypeGoldCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - } + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + }], + "onTransform": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onTransformExtra": [{ + "type": "resetCooldown" + }], + "onUnTransform": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" } + }] + }, + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getLastCreatedNonStackingStatBuff" }, - "lumberCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + }] + },{ + "ids": [{"id":"Acpf", "castId": "corporealform", "uncastId": "uncorporealform"}], + "type": "INHERIT", + "parentId": "Arav", + "reuseActions": { + "setup": [{ + "type": "createStateModBuff", + "buffType": "ETHEREAL" + }], + "onTransform": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }], + "onTransformExtra": [{ + "type": "resetCooldown" + }], + "onUnTransform": [{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + },{ + "type": "if", + "condition": { + "type": "isToggleAbilityActive" }, - "value": { - "type": "iIf", - "condition": { - "type": "gameplayConstantIsRelativeUpgradeCosts" + "thenActions": [{ + "type": "transformedUnitAbilityAdd", + "unit": { + "type": "getCastingUnit" }, - "value1": { - "type": "i-", - "value1": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - } - } - }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getUnitType" - } - } + "baseUnitId": { + "type": "getAbilityDataAsID", + "dataField": "A" }, - "value2": { - "type": "getUnitTypeLumberCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" + "alternateUnitId": { + "type": "getAbilityUnitId" + }, + "immediateLanding": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" }, - "alternateUnitId": { - "type": "getAbilityUnitId" + "value2": { + "type": "rawInteger", + "value": 2 } } - } - } - }, - "foodCost": { - "type": "i0IfFalse", - "bool": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "value": { - "type": "i-", - "value1": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getNonCurrentTransformType", - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" + }, + "immediateTakeOff": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" }, - "alternateUnitId": { - "type": "getAbilityUnitId" + "value2": { + "type": "rawInteger", + "value": 4 } } }, - "value2": { - "type": "getUnitTypeFoodCost", - "id": { - "type": "getUnitType" - } - } - } - } - }, - "overrideFields": { - "onTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { + "permanent": { "type": "i2b", "value": { "type": "i&", @@ -3137,21 +694,11 @@ }, "value2": { "type": "rawInteger", - "value": 16 + "value": 8 } } - } - }, - "value": { - "type": "getAbilityDataAsID", - "dataField": "A" - } - }, - "offTooltipOverride": { - "type": "nullIfFalse", - "condition": { - "type": "bool", - "bool": { + }, + "requiresPayment": { "type": "i2b", "value": { "type": "i&", @@ -3164,29 +711,49 @@ "value": 16 } } - } - }, - "value": { - "type": "getAbilityUnitId" - } - } - }, - "onAddDisabledAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + }, + "altitudeAdjustmentDelay": { + "type": "getAbilityCastTime" + }, + "altitudeAdjustmentTime": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "landingDelayTime": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "transformTime": { + "type": "getAbilityDuration" + }, + "duration": { + "type": "getAbilityHeroDuration" + }, + "buffId": { + "type": "getFirstBuffId" + }, + "onTransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" + } + }], + "onUntransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" + } + }] + }], + "elseActions": [{ + "type": "runReuseAction", + "name": { "type": "rawString", - "value": "MAXHP" + "value": "onUnTransform" } - }, - "stackingKey": { - "type": "getAllowStackingKey" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "E" - } + }] }], "onRemoveDisabledAbility": [{ "type": "transformedUnitAbilityRemove", @@ -3213,8 +780,82 @@ "value": 8 } } + } + }] + },{ + "ids": [{"id":"Aetf", "castId": "etherealform", "uncastId": "unetherealform"}], + "type": "INHERIT", + "parentId": "Arav", + "reuseActions": { + "setup": [{ + "type": "createStateModBuff", + "buffType": "ETHEREAL" + }], + "onTransform": [{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }], + "onTransformExtra": [{ + "type": "resetCooldown" + }], + "onUnTransform": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }] + } + },{ + "ids": [{"id":"Aave", "castId": "avengerform", "uncastId": "unavengerform"}], + "type": "INHERIT", + "parentId": "Arav", + "reuseActions": { + "onTransform": [{ + "type": "setMp", + "target": { + "type": "getCastingUnit" + }, + "amount": { + "type": "getUnitInitialMana", + "unit": { + "type": "getCastingUnit" + } + } + }] + } + },{ + "ids": [{"id":"AEme", "castId": "metamorphosis"}], + "type": "INHERIT", + "parentId": "Arav", + "displayFields": { + "toggleable": { + "type": "rawBoolean", + "value": "false" }, - "onUntransformActions": [{ + "castToggleOff": { + "type": "rawBoolean", + "value": "false" + } + }, + "reuseActions": { + "onTransform": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onUnTransform": [{ "type": "removeNonStackingStatBuff", "targetUnit": { "type": "getCastingUnit" @@ -3223,6 +864,23 @@ "type": "getLastCreatedNonStackingStatBuff" } }] + }, + "onAddDisabledAbility": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MAXHP" + } + }, + "stackingKey": { + "type": "getAllowStackingKey" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } }], "onLevelChange": [{ "type": "updateNonStackingStatBuff", @@ -3336,21 +994,17 @@ "value": "true" }, "onTransformActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" } }], "onUntransformActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" } }] }] diff --git a/core/assets/abilityBehaviors/generalPassives.json b/core/assets/abilityBehaviors/generalPassives.json index ba631fa5a..9338c0bd4 100644 --- a/core/assets/abilityBehaviors/generalPassives.json +++ b/core/assets/abilityBehaviors/generalPassives.json @@ -1836,7 +1836,7 @@ }] },{ "type": "createSubroutine", - "key": { + "name": { "type": "rawString", "value": "removeOrb" }, @@ -2112,7 +2112,7 @@ }, "thenActions": [{ "type": "runSubroutine", - "key": { + "name": { "type": "rawString", "value": "removeOrb" }, @@ -2130,7 +2130,7 @@ }, "thenActions": [{ "type": "runSubroutine", - "key": { + "name": { "type": "rawString", "value": "removeOrb" }, diff --git a/core/assets/abilityBehaviors/itemSimple.json b/core/assets/abilityBehaviors/itemSimple.json index e5c15fa4f..08ce5c81b 100644 --- a/core/assets/abilityBehaviors/itemSimple.json +++ b/core/assets/abilityBehaviors/itemSimple.json @@ -149,159 +149,337 @@ } }] }, - "extraCastConditions": [{ - "type": "or", - "conditions": [{ - "type": "isFlexAbilityTargeted" - },{ - "type": "or", - "conditions": [{ - "type": "f!=0", - "value": { - "type": "getAbilityArea" - } - },{ - "type": "not", - "condition": { - "type": "and", - "conditions": [{ - "type": "not", - "condition": { - "type": "or", - "conditions": [{ - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getCastingUnit" - } + "reuseActions": { + "doUnitEffect": [{ + "type": "createTimedTickingPausedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "effectUnit" + } + } + }, + "dispellable": { + "type": "reuseBoolean", + "name": { + "type": "rawString", + "value": "isMagic" + } + }, + "onAddActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "hpPerSec" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getBuffedUnit" } - },{ - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "i>", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - }, - "value2": { - "type": "rawInteger", - "value": 1 - } - }, - "reason": "ALREADY_AT_FULL_MANA" - }] + } } },{ - "type": "not", - "condition": { - "type": "or", - "conditions": [{ - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mpPerSec" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getBuffedUnit" } - },{ - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getCastingUnit" + } + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "heal", + "target": { + "type": "getBuffedUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "hpPerSec" } } },{ - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "iOdd", - "value": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - } + "type": "addMp", + "target": { + "type": "getBuffedUnit" }, - "reason": "ALREADY_AT_FULL_HEALTH" - }] + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "mpPerSec" + } + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } } - }] + }], + "onRemoveActions": [{ + "type": "runSubroutine", + "name": { + "type": "rawString", + "value": "onRemoveActions" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "true" + } + + }] + },{ + "type": "addNonStackingDisplayBuff", + "target": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "effectUnit" + } + }, + "buff": { + "type": "getLastCreatedBuff" + }, + "key": { + "type": "getCodeAsString" } - }] - }] - }], - "extraTargetConditions": [{ - "type": "not", - "condition": { - "type": "and", - "conditions": [{ - "type": "not", + },{ + "type": "storeValueLocally", + "key": { + "type": "argumentString", + "name": { + "type": "rawString", + "value": "regenBuffKey" + } + }, + "valueToStore": { + "type": "getLastCreatedBuff" + } + },{ + "type": "if", "condition": { - "type": "or", - "conditions": [{ - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } + "type": "bool", + "bool": { + "type": "getAbilityDataAsBoolean", + "dataField": "E" + } + }, + "thenActions": [{ + "type": "createDamageTakenListener", + "actions": [{ + "type": "removeDamageTakenListener", + "targetUnit": { + "type": "getListenerUnit" + }, + "listener": { + "type": "getStoredDamageTakenListenerByKey", + "key": { + "type": "argumentString", + "name": { + "type": "rawString", + "value": "breakHealKey" + } + } + } + + },{ + "type": "removeBuff", + "target": { + "type": "getListenerUnit" + }, + "buff": { + "type": "getStoredBuffByKey", + "key": { + "type": "argumentString", + "name": { + "type": "rawString", + "value": "regenBuffKey" + } + } + } + }] },{ - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getAbilityTargetedUnit" + "type": "addDamageTakenListener", + "targetUnit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "effectUnit" } + }, + "listener": { + "type": "getLastCreatedDamageTakenListener" } },{ - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "i>", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - }, - "value2": { - "type": "rawInteger", - "value": 1 + "type": "storeValueLocally", + "key": { + "type": "argumentString", + "name": { + "type": "rawString", + "value": "breakHealKey" } }, - "reason": "ALREADY_AT_FULL_MANA" - }] - } - },{ - "type": "not", - "condition": { - "type": "or", - "conditions": [{ - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" + "valueToStore": { + "type": "getLastCreatedDamageTakenListener" } - },{ - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getAbilityTargetedUnit" + }], + "elseActions": [] + } + ] + }, + "reuseCallbacks": { + "isMagic": { + "type": "rawBoolean", + "value": "false" + }, + "isMax": { + "type": "not", + "condition": { + "type": "and", + "conditions": [{ + "type": "not", + "condition": { + "type": "or", + "conditions": [{ + "type": "f=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" } - } - },{ - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "iOdd", + },{ + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "checkUnit" + } + } + } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "reason": "ALREADY_AT_FULL_MANA" + }] + } + },{ + "type": "not", + "condition": { + "type": "or", + "conditions": [{ + "type": "f=0", "value": { - "type": "getAbilityDataAsInteger", - "dataField": "C" + "type": "getAbilityDataAsFloat", + "dataField": "A" } - }, - "reason": "ALREADY_AT_FULL_HEALTH" - }] + },{ + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "checkUnit" + } + } + } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "iOdd", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + }] + } + }] + } + } + }, + "extraCastConditions": [{ + "type": "or", + "conditions": [{ + "type": "isFlexAbilityTargeted" + },{ + "type": "or", + "conditions": [{ + "type": "f!=0", + "value": { + "type": "getAbilityArea" + } + },{ + "type": "reuseBooleanWithArguments", + "name": { + "type": "rawString", + "value": "isMax" + }, + "arguments": { + "checkUnit": { + "type": "getCastingUnit" + } } }] + }] + }], + "extraTargetConditions": [{ + "type": "reuseBooleanWithArguments", + "name": { + "type": "rawString", + "value": "isMax" + }, + "arguments": { + "checkUnit": { + "type": "getAbilityTargetedUnit" + } } }], "onEndCasting": [{ @@ -315,176 +493,38 @@ "type": "getAbilityTargetedUnit" }, "onHitActions": [{ - "type": "createTimedTickingPausedBuff", - "buffId": { - "type": "getFirstBuffId" - }, - "duration": { - "type": "getAbilityDuration", - "target": { - "type": "getAbilityTargetedUnit" - } + "type": "createSubroutine", + "name": { + "type": "rawString", + "value": "onRemoveActions" }, - "dispellable": { + "instanceValue": { "type": "rawBoolean", - "value": "false" + "value": "true" }, - "onAddActions": [{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "hpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - }], - "onTickActions": [{ - "type": "periodicExecute", - "periodicActions": [{ - "type": "heal", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "hpPerSec" - } - } - },{ - "type": "addMp", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "mpPerSec" - } - } - }], - "delaySeconds": { - "type": "rawFloat", - "value": 1 - }, - "unique": { - "type": "getUnitHandleAsString", - "unit": { - "type": "getBuffedUnit" - } - } - }], - "onRemoveActions": [{ + "actions": [{ "type": "cleanUpCastInstance" }] },{ - "type": "addNonStackingDisplayBuff", - "target": { - "type": "getAbilityTargetedUnit" - }, - "buff": { - "type": "getLastCreatedBuff" - }, - "key": { - "type": "getCodeAsString" - } - },{ - "type": "storeValueLocally", - "key": { + "type": "runReuseActionWithArguments", + "name": { "type": "rawString", - "value": "regenBuff" + "value": "doUnitEffect" }, - "valueToStore": { - "type": "getLastCreatedBuff" - } - },{ - "type": "if", - "condition": { - "type": "bool", - "bool": { - "type": "getAbilityDataAsBoolean", - "dataField": "E" + "arguments": { + "effectUnit": { + "type": "getAbilityTargetedUnit" + }, + "regenBuffKey": { + "type": "rawString", + "value": "regenBuff" + }, + "breakHealKey": { + "type": "rawString", + "value": "breakHeal" } - }, - "thenActions": [{ - "type": "createDamageTakenListener", - "actions": [{ - "type": "removeDamageTakenListener", - "targetUnit": { - "type": "getListenerUnit" - }, - "listener": { - "type": "getStoredDamageTakenListenerByKey", - "key": { - "type": "rawString", - "value": "breakHeal" - } - } - - },{ - "type": "removeBuff", - "target": { - "type": "getListenerUnit" - }, - "buff": { - "type": "getStoredBuffByKey", - "key": { - "type": "rawString", - "value": "regenBuff" - } - } - }] - },{ - "type": "addDamageTakenListener", - "targetUnit": { - "type": "getAbilityTargetedUnit" - }, - "listener": { - "type": "getLastCreatedDamageTakenListener" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "breakHeal" - }, - "valueToStore": { - "type": "getLastCreatedDamageTakenListener" - } - }] - }], + } + }], "elseActions": [] }], "elseActions": [{ @@ -510,182 +550,28 @@ "iterationActions": [{ "type": "if", "condition": { - "type": "not", - "condition": { - "type": "and", - "conditions": [{ - "type": "not", - "condition": { - "type": "or", - "conditions": [{ - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getEnumUnit" - } - } - },{ - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "i>", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - }, - "value2": { - "type": "rawInteger", - "value": 1 - } - }, - "reason": "ALREADY_AT_FULL_MANA" - }] - } - },{ - "type": "not", - "condition": { - "type": "or", - "conditions": [{ - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getEnumUnit" - } - } - },{ - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "iOdd", - "value": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - } - }, - "reason": "ALREADY_AT_FULL_HEALTH" - }] - } - }] + "type": "reuseBooleanWithArguments", + "name": { + "type": "rawString", + "value": "isMax" + }, + "arguments": { + "checkUnit": { + "type": "getEnumUnit" + } } }, "thenActions": [{ - "type": "createTimedTickingPausedBuff", - "buffId": { - "type": "getFirstBuffId" - }, - "duration": { - "type": "getAbilityDuration", - "target": { - "type": "getEnumUnit" - } - }, - "dispellable": { - "type": "rawBoolean", - "value": "false" - }, - "onAddActions": [{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "hpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - }], - "onTickActions": [{ - "type": "periodicExecute", - "periodicActions": [{ - "type": "heal", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "hpPerSec" - } - } - },{ - "type": "addMp", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "mpPerSec" - } - } - }], - "delaySeconds": { - "type": "rawFloat", - "value": 1 - }, - "unique": { - "type": "getUnitHandleAsString", - "unit": { - "type": "getBuffedUnit" - } - } - }] - },{ - "type": "addNonStackingDisplayBuff", - "target": { + "type": "runReuseActionWithArguments", + "name": { + "type": "rawString", + "value": "doUnitEffect" + }, + "arguments": { + "effectUnit": { "type": "getEnumUnit" }, - "buff": { - "type": "getLastCreatedBuff" - }, - "key": { - "type": "getCodeAsString" - } - },{ - "type": "storeValueLocally", - "key": { + "regenBuffKey": { "type": "catStrings", "stringList": [{ "type": "rawString", @@ -697,89 +583,19 @@ } }] }, - "valueToStore": { - "type": "getLastCreatedBuff" - } - },{ - "type": "if", - "condition": { - "type": "bool", - "bool": { - "type": "getAbilityDataAsBoolean", - "dataField": "E" - } - }, - "thenActions": [{ - "type": "createDamageTakenListener", - "actions": [{ - "type": "removeDamageTakenListener", - "targetUnit": { - "type": "getListenerUnit" - }, - "listener": { - "type": "getStoredDamageTakenListenerByKey", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "breakHeal" - },{ - "type": "getUnitHandleAsString", - "unit": { - "type": "getListenerUnit" - } - }] - } - } - - },{ - "type": "removeBuff", - "target": { - "type": "getListenerUnit" - }, - "buff": { - "type": "getStoredBuffByKey", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "regenBuff" - },{ - "type": "getUnitHandleAsString", - "unit": { - "type": "getListenerUnit" - } - }] - } - } - }] - },{ - "type": "addDamageTakenListener", - "targetUnit": { - "type": "getEnumUnit" - }, - "listener": { - "type": "getLastCreatedDamageTakenListener" - } + "breakHealKey": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "breakHeal" },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "breakHeal" - },{ - "type": "getUnitHandleAsString", - "unit": { - "type": "getEnumUnit" - } - }] - }, - "valueToStore": { - "type": "getLastCreatedDamageTakenListener" + "type": "getUnitHandleAsString", + "unit": { + "type": "getListenerUnit" } - }], - "elseActions": [] + }] + } + } }], "elseActions": [] }], @@ -812,176 +628,37 @@ }] }], "elseActions": [{ - "type": "createTimedTickingPausedBuff", - "buffId": { - "type": "getFirstBuffId" - }, - "duration": { - "type": "getAbilityDuration", - "target": { - "type": "getCastingUnit" - } + "type": "createSubroutine", + "name": { + "type": "rawString", + "value": "onRemoveActions" }, - "dispellable": { + "instanceValue": { "type": "rawBoolean", - "value": "false" + "value": "true" }, - "onAddActions": [{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "hpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - }], - "onTickActions": [{ - "type": "periodicExecute", - "periodicActions": [{ - "type": "heal", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "hpPerSec" - } - } - },{ - "type": "addMp", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "mpPerSec" - } - } - }], - "delaySeconds": { - "type": "rawFloat", - "value": 1 - }, - "unique": { - "type": "getUnitHandleAsString", - "unit": { - "type": "getBuffedUnit" - } - } - }], - "onRemoveActions": [{ + "actions": [{ "type": "cleanUpCastInstance" }] },{ - "type": "addNonStackingDisplayBuff", - "target": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedBuff" - }, - "key": { - "type": "getCodeAsString" - } - },{ - "type": "storeValueLocally", - "key": { + "type": "runReuseActionWithArguments", + "name": { "type": "rawString", - "value": "regenBuff" + "value": "doUnitEffect" }, - "valueToStore": { - "type": "getLastCreatedBuff" - } - },{ - "type": "if", - "condition": { - "type": "bool", - "bool": { - "type": "getAbilityDataAsBoolean", - "dataField": "E" + "arguments": { + "effectUnit": { + "type": "getCastingUnit" + }, + "regenBuffKey": { + "type": "rawString", + "value": "regenBuff" + }, + "breakHealKey": { + "type": "rawString", + "value": "breakHeal" } - }, - "thenActions": [{ - "type": "createDamageTakenListener", - "actions": [{ - "type": "removeDamageTakenListener", - "targetUnit": { - "type": "getListenerUnit" - }, - "listener": { - "type": "getStoredDamageTakenListenerByKey", - "key": { - "type": "rawString", - "value": "breakHeal" - } - } - - },{ - "type": "removeBuff", - "target": { - "type": "getListenerUnit" - }, - "buff": { - "type": "getStoredBuffByKey", - "key": { - "type": "rawString", - "value": "regenBuff" - } - } - }] - },{ - "type": "addDamageTakenListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "listener": { - "type": "getLastCreatedDamageTakenListener" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "breakHeal" - }, - "valueToStore": { - "type": "getLastCreatedDamageTakenListener" - } - }], - "elseActions": [] + } }] }] }] diff --git a/core/assets/abilityBehaviors/nightElfUnitActives.json b/core/assets/abilityBehaviors/nightElfUnitActives.json index de4e05039..6f4d094bf 100644 --- a/core/assets/abilityBehaviors/nightElfUnitActives.json +++ b/core/assets/abilityBehaviors/nightElfUnitActives.json @@ -380,25 +380,8 @@ }] },{ "ids": [{"id":"Arej", "castId": "rejuvination"}], - "type": "NORMAL_FLEXTARGET", - "overrideFields": { - "universalSpell": { - "type": "rawBoolean", - "value": "true" - } - }, - "specialFields": { - "targetedSpell": [{ - "type": "not", - "condition": { - "type": "bool", - "bool": { - "type": "getAbilityDataAsBoolean", - "dataField": "D" - } - } - }] - }, + "type": "INHERIT", + "parentId": "AIrg", "extraCastConditions": [{ "type": "or", "conditions": [{ @@ -480,746 +463,12 @@ } }] }], - "extraTargetConditions": [{ - "type": "not", - "condition": { - "type": "and", - "conditions": [{ - "type": "not", - "condition": { - "type": "or", - "conditions": [{ - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getAbilityTargetedUnit" - } - } - },{ - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "i>", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - }, - "value2": { - "type": "rawInteger", - "value": 1 - } - }, - "reason": "ALREADY_AT_FULL_MANA" - }] - } - },{ - "type": "not", - "condition": { - "type": "or", - "conditions": [{ - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getAbilityTargetedUnit" - } - } - },{ - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "iOdd", - "value": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - } - }, - "reason": "ALREADY_AT_FULL_HEALTH" - }] - } - }] + "reuseCallbacks": { + "isMagic": { + "type": "rawBoolean", + "value": "true" } - }], - "onEndCasting": [{ - "type": "if", - "condition": { - "type": "isFlexAbilityTargeted" - }, - "thenActions": [{ - "type": "checkAbilityEffectReaction", - "target": { - "type": "getAbilityTargetedUnit" - }, - "onHitActions": [{ - "type": "createTimedTickingPausedBuff", - "buffId": { - "type": "getFirstBuffId" - }, - "duration": { - "type": "getAbilityDuration", - "target": { - "type": "getAbilityTargetedUnit" - } - }, - "onAddActions": [{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "hpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - }], - "onTickActions": [{ - "type": "periodicExecute", - "periodicActions": [{ - "type": "heal", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "hpPerSec" - } - } - },{ - "type": "addMp", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "mpPerSec" - } - } - }], - "delaySeconds": { - "type": "rawFloat", - "value": 1 - }, - "unique": { - "type": "getUnitHandleAsString", - "unit": { - "type": "getBuffedUnit" - } - } - }], - "onRemoveActions": [{ - "type": "cleanUpCastInstance" - }] - },{ - "type": "addNonStackingDisplayBuff", - "target": { - "type": "getAbilityTargetedUnit" - }, - "buff": { - "type": "getLastCreatedBuff" - }, - "key": { - "type": "getCodeAsString" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "regenBuff" - }, - "valueToStore": { - "type": "getLastCreatedBuff" - } - },{ - "type": "if", - "condition": { - "type": "bool", - "bool": { - "type": "getAbilityDataAsBoolean", - "dataField": "E" - } - }, - "thenActions": [{ - "type": "createDamageTakenListener", - "actions": [{ - "type": "removeDamageTakenListener", - "targetUnit": { - "type": "getListenerUnit" - }, - "listener": { - "type": "getStoredDamageTakenListenerByKey", - "key": { - "type": "rawString", - "value": "breakHeal" - } - } - - },{ - "type": "removeBuff", - "target": { - "type": "getListenerUnit" - }, - "buff": { - "type": "getStoredBuffByKey", - "key": { - "type": "rawString", - "value": "regenBuff" - } - } - }] - },{ - "type": "addDamageTakenListener", - "targetUnit": { - "type": "getAbilityTargetedUnit" - }, - "listener": { - "type": "getLastCreatedDamageTakenListener" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "breakHeal" - }, - "valueToStore": { - "type": "getLastCreatedDamageTakenListener" - } - }] - }], - "elseActions": [] - }], - "elseActions": [{ - "type": "if", - "condition": { - "type": "f>", - "value1": { - "type": "getAbilityArea" - }, - "value2": { - "type": "rawFloat", - "value": 0 - } - }, - "thenActions": [{ - "type": "iterateUnitsInRangeOfUnitMatchingCondition", - "condition": { - "type": "isUnitValidTarget", - "target": { - "type": "getMatchingUnit" - } - }, - "iterationActions": [{ - "type": "if", - "condition": { - "type": "not", - "condition": { - "type": "and", - "conditions": [{ - "type": "not", - "condition": { - "type": "or", - "conditions": [{ - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getEnumUnit" - } - } - },{ - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "i>", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - }, - "value2": { - "type": "rawInteger", - "value": 1 - } - }, - "reason": "ALREADY_AT_FULL_MANA" - }] - } - },{ - "type": "not", - "condition": { - "type": "or", - "conditions": [{ - "type": "f=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getEnumUnit" - } - } - },{ - "type": "setCantUseReasonOnFailure", - "condition": { - "type": "iOdd", - "value": { - "type": "getAbilityDataAsInteger", - "dataField": "C" - } - }, - "reason": "ALREADY_AT_FULL_HEALTH" - }] - } - }] - } - }, - "thenActions": [{ - "type": "createTimedTickingPausedBuff", - "buffId": { - "type": "getFirstBuffId" - }, - "duration": { - "type": "getAbilityDuration", - "target": { - "type": "getEnumUnit" - } - }, - "onAddActions": [{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "hpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - }], - "onTickActions": [{ - "type": "periodicExecute", - "periodicActions": [{ - "type": "heal", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "hpPerSec" - } - } - },{ - "type": "addMp", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "mpPerSec" - } - } - }], - "delaySeconds": { - "type": "rawFloat", - "value": 1 - }, - "unique": { - "type": "getUnitHandleAsString", - "unit": { - "type": "getBuffedUnit" - } - } - }] - },{ - "type": "addNonStackingDisplayBuff", - "target": { - "type": "getEnumUnit" - }, - "buff": { - "type": "getLastCreatedBuff" - }, - "key": { - "type": "getCodeAsString" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "regenBuff" - },{ - "type": "getUnitHandleAsString", - "unit": { - "type": "getEnumUnit" - } - }] - }, - "valueToStore": { - "type": "getLastCreatedBuff" - } - },{ - "type": "if", - "condition": { - "type": "bool", - "bool": { - "type": "getAbilityDataAsBoolean", - "dataField": "E" - } - }, - "thenActions": [{ - "type": "createDamageTakenListener", - "actions": [{ - "type": "removeDamageTakenListener", - "targetUnit": { - "type": "getListenerUnit" - }, - "listener": { - "type": "getStoredDamageTakenListenerByKey", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "breakHeal" - },{ - "type": "getUnitHandleAsString", - "unit": { - "type": "getListenerUnit" - } - }] - } - } - - },{ - "type": "removeBuff", - "target": { - "type": "getListenerUnit" - }, - "buff": { - "type": "getStoredBuffByKey", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "regenBuff" - },{ - "type": "getUnitHandleAsString", - "unit": { - "type": "getListenerUnit" - } - }] - } - } - }] - },{ - "type": "addDamageTakenListener", - "targetUnit": { - "type": "getEnumUnit" - }, - "listener": { - "type": "getLastCreatedDamageTakenListener" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "breakHeal" - },{ - "type": "getUnitHandleAsString", - "unit": { - "type": "getEnumUnit" - } - }] - }, - "valueToStore": { - "type": "getLastCreatedDamageTakenListener" - } - }], - "elseActions": [] - }], - "elseActions": [] - }], - "originUnit": { - "type": "getCastingUnit" - }, - "range": { - "type": "getAbilityArea" - } - },{ - "type": "createTimer", - "timeout": { - "type": "f+", - "value1": { - "type": "fMax", - "value1": { - "type": "getAbilityDuration" - }, - "value2": { - "type": "getAbilityHeroDuration" - } - }, - "value2": { - "type": "rawFloat", - "value": 1 - } - }, - "actions": [{ - "type": "cleanUpCastInstance" - }] - }], - "elseActions": [{ - "type": "createTimedTickingPausedBuff", - "buffId": { - "type": "getFirstBuffId" - }, - "duration": { - "type": "getAbilityDuration", - "target": { - "type": "getCastingUnit" - } - }, - "onAddActions": [{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "hpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mpPerSec" - }, - "valueToStore": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - }, - "value2": { - "type": "getAbilityDuration", - "target": { - "type": "getBuffedUnit" - } - } - } - }], - "onTickActions": [{ - "type": "periodicExecute", - "periodicActions": [{ - "type": "heal", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "hpPerSec" - } - } - },{ - "type": "addMp", - "target": { - "type": "getBuffedUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "mpPerSec" - } - } - }], - "delaySeconds": { - "type": "rawFloat", - "value": 1 - }, - "unique": { - "type": "getUnitHandleAsString", - "unit": { - "type": "getBuffedUnit" - } - } - }], - "onRemoveActions": [{ - "type": "cleanUpCastInstance" - }] - },{ - "type": "addNonStackingDisplayBuff", - "target": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedBuff" - }, - "key": { - "type": "getCodeAsString" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "regenBuff" - }, - "valueToStore": { - "type": "getLastCreatedBuff" - } - },{ - "type": "if", - "condition": { - "type": "bool", - "bool": { - "type": "getAbilityDataAsBoolean", - "dataField": "E" - } - }, - "thenActions": [{ - "type": "createDamageTakenListener", - "actions": [{ - "type": "removeDamageTakenListener", - "targetUnit": { - "type": "getListenerUnit" - }, - "listener": { - "type": "getStoredDamageTakenListenerByKey", - "key": { - "type": "rawString", - "value": "breakHeal" - } - } - - },{ - "type": "removeBuff", - "target": { - "type": "getListenerUnit" - }, - "buff": { - "type": "getStoredBuffByKey", - "key": { - "type": "rawString", - "value": "regenBuff" - } - } - }] - },{ - "type": "addDamageTakenListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "listener": { - "type": "getLastCreatedDamageTakenListener" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "breakHeal" - }, - "valueToStore": { - "type": "getLastCreatedDamageTakenListener" - } - }], - "elseActions": [] - }] - }] - }] + } },{ "ids": [{"id":"Acoa", "castId": "mounthippogryph"}], "type": "NORMAL_PAIRING", diff --git a/core/assets/abilityBehaviors/reactions.json b/core/assets/abilityBehaviors/reactions.json index c1efba41e..38b569c25 100644 --- a/core/assets/abilityBehaviors/reactions.json +++ b/core/assets/abilityBehaviors/reactions.json @@ -758,626 +758,11 @@ } }, "onAddAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "ATKSPD" - } - }, - "stackingKey": { - "type": "rawString", - "value": "defend" - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "asbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "MVSPDPCT" - } - }, - "stackingKey": { - "type": "rawString", - "value": "defend" - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mvbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createAttackPreDamageListener", - "actions": [{ - "type": "addDamageDealtMultiplier", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - }] - },{ - "type": "createDamageTakenModificationListener", - "actions": [{ - "type": "if", - "condition": { - "type": "or", - "conditions": [{ - "type": "isAttackTypeEqual", - "attackType1": { - "type": "getTriggeringAttackType" - }, - "attackType2": { - "type": "getAttackTypeFromString", - "id": { - "type": "rawString", - "value": "MAGIC" - } - } - },{ - "type": "isAttackTypeEqual", - "attackType1": { - "type": "getTriggeringAttackType" - }, - "attackType2": { - "type": "getAttackTypeFromString", - "id": { - "type": "rawString", - "value": "SPELLS" - } - } - }] - }, - "thenActions": [{ - "type": "multiplyDamageTakenMultiplier", - "multiplier": { - "type": "getAbilityDataAsFloat", - "dataField": "E" - } - }], - "elseActions": [] - }] - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "sMod" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedDamageTakenModificationListener" - } - },{ - "type": "createDamageTakenModificationListener", - "actions": [{ - "type": "if", - "condition": { - "type": "isAttackTypeEqual", - "attackType1": { - "type": "getTriggeringAttackType" - }, - "attackType2": { - "type": "getAttackTypeFromString", - "id": { - "type": "rawString", - "value": "PIERCE" - } - } - }, - "thenActions": [{ - "type": "multiplyDamageTakenMultiplier", - "multiplier": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - }], - "elseActions": [] - }] - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "pMod" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedDamageTakenModificationListener" - } - },{ - "type": "createAttackProjReactionListener", - "actions": [{ - "type": "if", - "condition": { - "type": "isAttackTypeEqual", - "attackType1": { - "type": "getReactionAttackProjectileAttackType" - }, - "attackType2": { - "type": "getAttackTypeFromString", - "id": { - "type": "rawString", - "value": "PIERCE" - } - } - }, - "thenActions": [{ - "type": "if", - "condition": { - "type": "and", - "conditions": [{ - "type": "gameplayConstantIsDefendCanDeflect" - },{ - "type": "not", - "condition": { - "type": "bool", - "bool": { - "type": "isProjectileReflected", - "projectile": { - "type": "getReactionAttackProjectile" - } - } - } - },{ - "type": "f<", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "G" - }, - "value2": { - "type": "rawFloat", - "value": 1 - } - },{ - "type": "f<", - "value1": { - "type": "randomBoundedFloat", - "bound": { - "type": "rawFloat", - "value": 100 - } - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "F" - } - }] - }, - "thenActions": [{ - "type": "reactionPreventHit" - },{ - "type": "setProjectileDone", - "projectile": { - "type": "getReactionAttackProjectile" - }, - "done": { - "type": "rawBoolean", - "value": "false" - } - },{ - "type": "setProjectileReflected", - "projectile": { - "type": "getReactionAttackProjectile" - } - },{ - "type": "setProjectileTarget", - "projectile": { - "type": "getReactionAttackProjectile" - }, - "target": { - "type": "getAttackingUnit" - } - },{ - "type": "damageTarget", - "source": { - "type": "getAttackingUnit" - }, - "target": { - "type": "getListenerUnit" - }, - "damageType": { - "type": "getDamageTypeFromString", - "id": { - "type": "rawString", - "value": "NORMAL" - } - }, - "attackType": { - "type": "getAttackTypeFromString", - "id": { - "type": "rawString", - "value": "PIERCE" - } - }, - "damage": { - "type": "f*", - "value1": { - "type": "getReactionAttackProjectileDamage" - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "G" - } - } - }], - "elseActions": [] - }], - "elseActions": [] - },{ - "type": "if", - "condition": { - "type": "or", - "conditions": [{ - "type": "isAttackTypeEqual", - "attackType1": { - "type": "getReactionAttackProjectileAttackType" - }, - "attackType2": { - "type": "getAttackTypeFromString", - "id": { - "type": "rawString", - "value": "MAGIC" - } - } - },{ - "type": "isAttackTypeEqual", - "attackType1": { - "type": "getReactionAttackProjectileAttackType" - }, - "attackType2": { - "type": "getAttackTypeFromString", - "id": { - "type": "rawString", - "value": "SPELLS" - } - } - }] - }, - "thenActions": [{ - "type": "if", - "condition": { - "type": "and", - "conditions": [{ - "type": "gameplayConstantIsDefendCanDeflect" - },{ - "type": "not", - "condition": { - "type": "bool", - "bool": { - "type": "isProjectileReflected", - "projectile": { - "type": "getReactionAttackProjectile" - } - } - } - },{ - "type": "f<", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "H" - }, - "value2": { - "type": "rawFloat", - "value": 1 - } - },{ - "type": "f<", - "value1": { - "type": "randomBoundedFloat", - "bound": { - "type": "rawFloat", - "value": 100 - } - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "F" - } - }] - }, - "thenActions": [{ - "type": "reactionPreventHit" - },{ - "type": "setProjectileDone", - "projectile": { - "type": "getReactionAttackProjectile" - }, - "done": { - "type": "rawBoolean", - "value": "false" - } - },{ - "type": "setProjectileReflected", - "projectile": { - "type": "getReactionAttackProjectile" - } - },{ - "type": "setProjectileTarget", - "projectile": { - "type": "getReactionAttackProjectile" - }, - "target": { - "type": "getAttackingUnit" - } - },{ - "type": "damageTarget", - "source": { - "type": "getAttackingUnit" - }, - "target": { - "type": "getListenerUnit" - }, - "damageType": { - "type": "getDamageTypeFromString", - "id": { - "type": "rawString", - "value": "NORMAL" - } - }, - "attackType": { - "type": "getReactionAttackProjectileAttackType" - }, - "damage": { - "type": "f*", - "value1": { - "type": "getReactionAttackProjectileDamage" - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "H" - } - } - }], - "elseActions": [] - }], - "elseActions": [] - }] - }], - "onActivate": [{ - "type": "addSecondaryAnimationTag", - "unit": { - "type": "getCastingUnit" - }, - "tag": { - "type": "rawString", - "value": "DEFEND" - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - },{ - "type": "addAttackPreDamageListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "priority": { - "type": "rawPriority", - "priority": "STACKING" - }, - "listener": { - "type": "getLastCreatedAttackPreDamageListener" - } - },{ - "type": "addDamageTakenModificationListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "listener": { - "type": "getStoredDamageTakenModificationListenerByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "pMod" - } - } - },{ - "type": "addDamageTakenModificationListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "listener": { - "type": "getStoredDamageTakenModificationListenerByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "sMod" - } - } - },{ - "type": "addAttackProjReactionListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "listener": { - "type": "getLastCreatedAttackProjReactionListener" - } - }], - "onDeactivate": [{ - "type": "removeSecondaryAnimationTag", - "unit": { - "type": "getCastingUnit" - }, - "tag": { + "type": "runReuseAction", + "name": { "type": "rawString", - "value": "DEFEND" - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - },{ - "type": "removeAttackPreDamageListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "priority": { - "type": "rawPriority", - "priority": "STACKING" - }, - "listener": { - "type": "getLastCreatedAttackPreDamageListener" - } - },{ - "type": "removeDamageTakenModificationListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "listener": { - "type": "getStoredDamageTakenModificationListenerByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "pMod" - } - } - },{ - "type": "removeDamageTakenModificationListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "listener": { - "type": "getStoredDamageTakenModificationListenerByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "sMod" - } - } - },{ - "type": "removeAttackProjReactionListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "listener": { - "type": "getLastCreatedAttackProjReactionListener" + "value": "setup" } - }] - },{ - "ids": [{"id":"Amdf", "castId": "magicdefense", "uncastId": "magicundefense"}], - "type": "NORMAL_NOTARGET", - "displayFields": { - "toggleable": { - "type": "rawBoolean", - "value": "true" - }, - "castlessNoTarget": { - "type": "rawBoolean", - "value": "true" - } - }, - "onAddAbility": [{ - "type": "createStateModBuff", - "buffType": "MAGIC_IMMUNE" },{ "type": "createNonStackingStatBuff", "buffType": { @@ -1805,12 +1190,19 @@ "value": "DEFEND" } },{ - "type": "addStateModBuff", - "targetUnit": { + "type": "createTemporarySpellEffectOnUnit", + "target": { "type": "getCastingUnit" }, - "buff": { - "type": "getLastCreatedStateModBuff" + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onDefend" } },{ "type": "addNonStackingStatBuff", @@ -1907,12 +1299,10 @@ "value": "DEFEND" } },{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnDefend" } },{ "type": "removeNonStackingStatBuff", @@ -1999,5 +1389,33 @@ "type": "getLastCreatedAttackProjReactionListener" } }] + },{ + "ids": [{"id":"Amdf", "castId": "magicdefense", "uncastId": "magicundefense"}], + "type": "INHERIT", + "parentId": "Adef", + "reuseActions": { + "setup": [{ + "type": "createStateModBuff", + "buffType": "MAGIC_IMMUNE" + }], + "onDefend": [{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }], + "onUnDefend": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }] + } }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/undeadUnitActives.json b/core/assets/abilityBehaviors/undeadUnitActives.json index 0d697e830..5c25376f0 100644 --- a/core/assets/abilityBehaviors/undeadUnitActives.json +++ b/core/assets/abilityBehaviors/undeadUnitActives.json @@ -322,227 +322,25 @@ } } }, - "extraAutoNoTargetConditions": [{ - "type": "matchingUnitExistsInRangeOfUnit", - "originUnit": { - "type": "getCastingUnit" - }, - "range": { - "type": "getAbilityArea" - }, - "conditions": [{ - "type": "and", - "conditions": [{ - "type": "isUnitValidTarget", - "target": { - "type": "getMatchingUnit" - } - },{ - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getMatchingUnit" - } - } - }] - }] - }], - "onEndCasting": [{ - "type": "createTemporarySpellEffectOnUnit", - "target": { - "type": "getCastingUnit" - }, - "id": { - "type": "getAlias" - }, - "effectType": "CASTER" - },{ - "type": "createTemporarySpellEffectOnUnit", + "reuseActions": { + "effect": [{ + "type": "heal", "target": { - "type": "getCastingUnit" - }, - "id": { - "type": "getAlias" - }, - "effectType": "SPECIAL" - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "cnt" + "type": "getEnumUnit" }, - "valueToStore": { - "type": "rawInteger", - "value": 0 + "amount": { + "type": "getAbilityDataAsFloat", + "dataField": "A" } - },{ - "type": "iterateUnitsInRangeOfUnitMatchingCondition", - "originUnit": { - "type": "getCastingUnit" - }, - "range": { - "type": "getAbilityArea" - }, - "condition": { - "type": "and", - "conditions": [{ - "type": "isUnitValidTarget", - "target": { - "type": "getMatchingUnit" - } - },{ - "type": "not", - "condition": { - "type": "isUnitMaxHp", - "unit": { - "type": "getMatchingUnit" - } - } - }] - }, - "iterationActions": [{ - "type": "if", - "condition": { - "type": "i<", - "value1": { - "type": "getStoredIntegerByKey", - "key": { - "type": "rawString", - "value": "cnt" - } - }, - "value2": { - "type": "getAbilityCastTimeAsInteger" - } - }, - "thenActions": [{ - "type": "if", - "condition": { - "type": "and", - "conditions": [{ - "type": "i!=0", - "value": { - "type": "getStoredIntegerByKey", - "key": { - "type": "rawString", - "value": "cnt" - } - } - },{ - "type": "i<", - "value1": { - "type": "getStoredIntegerByKey", - "key": { - "type": "rawString", - "value": "cnt" - } - }, - "value2": { - "type": "getAbilityDataAsInteger", - "dataField": "E" - } - }] - }, - "thenActions": [{ - "type": "subtractMp", - "target": { - "type": "getCastingUnit" - }, - "amount": { - "type": "i2f", - "value": { - "type": "getAbilityManaCost" - } - } - }], - "elseActions": [] - },{ - "type": "heal", - "target": { - "type": "getEnumUnit" - }, - "amount": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "createTemporarySpellEffectOnUnit", - "target": { - "type": "getEnumUnit" - }, - "id": { - "type": "getAlias" - }, - "effectType": "TARGET" - },{ - "type": "createTimedBuff", - "buffId": { - "type": "getFirstBuffId" - }, - "dispellable": { - "type": "rawBoolean", - "value": "false" - }, - "duration": { - "type": "getAbilityDuration" - } - },{ - "type": "addBuff", - "target": { - "type": "getEnumUnit" - }, - "buff": { - "type": "getLastCreatedBuff" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "cnt" - }, - "valueToStore": { - "type": "i+", - "value1": { - "type": "getStoredIntegerByKey", - "key": { - "type": "rawString", - "value": "cnt" - } - }, - "value2": { - "type": "rawInteger", - "value": 1 - } - } - }], - "elseActions": [] - }] }] - },{ - "ids": [{"id":"Arpm", "castId": "replenishmana", "autoCastOnId": "replenishmanaon", "autoCastOffId": "replenishmanaoff", "autoCastType": "NOTARGET"}], - "type": "NORMAL_NOTARGET", - "overrideFields": { - "castTimeOverride": { - "type": "rawFloat", - "value": 0.0 - } }, - "specialFields": { - "bufferManaRequired": { - "type": "i*", - "value1": { - "type": "getAbilityManaCost" - }, - "value2": { - "type": "i-", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "E" - }, - "value2": { - "type": "rawInteger", - "value": 1 + "reuseCallbacks": { + "checkValidTarget": { + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "getMatchingUnit" } } } @@ -563,12 +361,10 @@ "type": "getMatchingUnit" } },{ - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getMatchingUnit" - } + "type": "reuseBoolean", + "name": { + "type": "rawString", + "value": "checkValidTarget" } }] }] @@ -617,12 +413,10 @@ "type": "getMatchingUnit" } },{ - "type": "not", - "condition": { - "type": "isUnitMaxMp", - "unit": { - "type": "getMatchingUnit" - } + "type": "reuseBoolean", + "name": { + "type": "rawString", + "value": "checkValidTarget" } }] }, @@ -683,13 +477,10 @@ }], "elseActions": [] },{ - "type": "addMp", - "target": { - "type": "getEnumUnit" - }, - "amount": { - "type": "getAbilityDataAsFloat", - "dataField": "B" + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "effect" } },{ "type": "createTemporarySpellEffectOnUnit", @@ -744,6 +535,33 @@ "elseActions": [] }] }] + },{ + "ids": [{"id":"Arpm", "castId": "replenishmana", "autoCastOnId": "replenishmanaon", "autoCastOffId": "replenishmanaoff", "autoCastType": "NOTARGET"}], + "type": "INHERIT", + "parentId": "Arpl", + "reuseActions": { + "effect": [{ + "type": "addMp", + "target": { + "type": "getEnumUnit" + }, + "amount": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }] + }, + "reuseCallbacks": { + "checkValidTarget": { + "type": "not", + "condition": { + "type": "isUnitMaxMp", + "unit": { + "type": "getMatchingUnit" + } + } + } + } },{ "ids": [{"id":"Acrs", "castId": "curse", "autoCastOnId": "curseon", "autoCastOffId": "curseoff", "autoCastType": "ATTACKINGALLY"}], "type": "NORMAL_UNITTARGET", diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java index f9ce58ede..80a59e109 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java @@ -14,7 +14,7 @@ public class ABActionCreateSubroutine implements ABSingleAction { - private ABStringCallback key; + private ABStringCallback name; private ABBooleanCallback instanceValue; private List actions; @@ -23,11 +23,11 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseActions() != null) { + List actions = config.getReuseActions().get(keyS); + if (actions != null && !actions.isEmpty()) { + for (final ABAction action : actions) { + action.runAction(game, caster, localStore, castId); + } + } else { + System.err.println("Trying to run ReuseAction, but key is missing or empty: " + keyS); + } + } else { + System.err.println("Trying to run ReuseAction, but none defined"); + } + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java new file mode 100644 index 000000000..ff02eb9ea --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java @@ -0,0 +1,52 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABActionRunReuseActionWithArguments implements ABSingleAction { + + private ABStringCallback name; + private Map arguments; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseActions() != null) { + List actions = config.getReuseActions().get(keyS); + if (actions != null && !actions.isEmpty()) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + for (final ABAction action : actions) { + action.runAction(game, caster, localStore, castId); + } + } else { + System.err.println("Trying to run ReuseAction, but key is missing or empty: " + keyS); + } + } else { + System.err.println("Trying to run ReuseAction, but none defined"); + } + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java index cf8448f8d..2c17ad6c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java @@ -14,7 +14,7 @@ public class ABActionRunSubroutine implements ABSingleAction { - private ABStringCallback key; + private ABStringCallback name; private ABBooleanCallback instanceValue; @Override @@ -24,13 +24,12 @@ public void runAction(final CSimulation game, final CUnit caster, final Map actions; if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { actions = (List) localStore.get(ABLocalStoreKeys - .combineSubroutineInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineSubroutineInstanceKey(this.name.callback(game, caster, localStore, castId), castId)); } else { actions = (List) localStore.get( - ABLocalStoreKeys.combineSubroutineKey(this.key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineSubroutineKey(this.name.callback(game, caster, localStore, castId), castId)); } - System.err.println("RUNNING SUBROUTINE: " + this.key.callback(game, caster, localStore, castId)); if (actions != null) { for (final ABAction action : actions) { action.runAction(game, caster, localStore, castId); @@ -46,7 +45,7 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { } return "RunSubroutineAU(" + jassTextGenerator.getCaster() + ", " + jassTextGenerator.getTriggerLocalStore() - + ", " + jassTextGenerator.getCastId() + ", " + this.key.generateJassEquivalent(jassTextGenerator) + + ", " + jassTextGenerator.getCastId() + ", " + this.name.generateJassEquivalent(jassTextGenerator) + ", " + instanceValueExpression + ")"; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java new file mode 100644 index 000000000..444b05f31 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentAbility extends ABAbilityCallback { + + private ABStringCallback name; + + @Override + public CAbility callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABAbilityCallback) { + return ((ABAbilityCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseAbilityCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java new file mode 100644 index 000000000..e24bcc676 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseAbility extends ABAbilityCallback { + + private ABStringCallback name; + + @Override + public CAbility callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABAbilityCallback) { + return ((ABAbilityCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseAbilityCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseAbilityCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbilityWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbilityWithArguments.java new file mode 100644 index 000000000..6e074bb4d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbilityWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseAbilityWithArguments extends ABAbilityCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public CAbility callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABAbilityCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABAbilityCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseAbilityCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseAbilityCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java index d548fc3f4..35ff82ff1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java @@ -6,11 +6,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; -public class ABCallbackGetAbilityDataAsBoolean extends ABBooleanCallback { +public class ABCallbackGetAbilityDataAsBoolean extends ABCondition { private DataFieldLetter dataField; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java index 8b731440e..a580c6326 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java @@ -7,10 +7,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; -public class ABCallbackGetParentAbilityDataAsBoolean extends ABBooleanCallback { +public class ABCallbackGetParentAbilityDataAsBoolean extends ABCondition { private ABIntegerCallback dataField; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java index 56ffbd12f..795122eb8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java @@ -6,9 +6,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABCallbackGetStoredBooleanByKey extends ABBooleanCallback { +public class ABCallbackGetStoredBooleanByKey extends ABCondition { private ABStringCallback key; private ABBooleanCallback instanceValue; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java index c12d5bd41..f06be83b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java @@ -6,8 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABCallbackIntegerToBoolean extends ABBooleanCallback { +public class ABCallbackIntegerToBoolean extends ABCondition { private ABIntegerCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIsProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIsProjectileReflected.java index 4bcd190ac..0b0f691cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIsProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIsProjectileReflected.java @@ -6,9 +6,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; -public class ABCallbackIsProjectileReflected extends ABBooleanCallback { +public class ABCallbackIsProjectileReflected extends ABCondition { private ABProjectileCallback projectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java index e1423a735..5732db44f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java @@ -5,8 +5,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -public class ABCallbackRawBoolean extends ABBooleanCallback { +public class ABCallbackRawBoolean extends ABCondition { private Boolean value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackWasCastingInterrupted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackWasCastingInterrupted.java index be620b98f..12ed39d39 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackWasCastingInterrupted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackWasCastingInterrupted.java @@ -6,9 +6,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABCallbackWasCastingInterrupted extends ABBooleanCallback { +public class ABCallbackWasCastingInterrupted extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java new file mode 100644 index 000000000..5f6789b01 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentBuff extends ABBuffCallback { + + private ABStringCallback name; + + @Override + public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABBuffCallback) { + return ((ABBuffCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java new file mode 100644 index 000000000..215a09c3f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseBuff extends ABBuffCallback { + + private ABStringCallback name; + + @Override + public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABBuffCallback) { + return ((ABBuffCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseBuffCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java new file mode 100644 index 000000000..fd472f883 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseBuffWithArguments extends ABBuffCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABBuffCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABBuffCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseBuffCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java new file mode 100644 index 000000000..bc71f855d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentDestructable extends ABDestructableCallback { + + private ABStringCallback name; + + @Override + public CDestructable callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABDestructableCallback) { + return ((ABDestructableCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseDestructableCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java new file mode 100644 index 000000000..8aff3373b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseDestructable extends ABDestructableCallback { + + private ABStringCallback name; + + @Override + public CDestructable callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABDestructableCallback) { + return ((ABDestructableCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseDestructableCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseDestructableCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java new file mode 100644 index 000000000..eed651f8c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseDestructableWithArguments extends ABDestructableCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public CDestructable callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABDestructableCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABDestructableCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseDestructableCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseDestructableCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java new file mode 100644 index 000000000..f43eae9a5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentDestructableBuff extends ABDestructableBuffCallback { + + private ABStringCallback name; + + @Override + public CDestructableBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABDestructableBuffCallback) { + return ((ABDestructableBuffCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java new file mode 100644 index 000000000..8244008b4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseDestructableBuff extends ABDestructableBuffCallback { + + private ABStringCallback name; + + @Override + public CDestructableBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABDestructableBuffCallback) { + return ((ABDestructableBuffCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseDestructableBuffCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java new file mode 100644 index 000000000..232829c6b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseDestructableBuffWithArguments extends ABDestructableBuffCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public CDestructableBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABDestructableBuffCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABDestructableBuffCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseDestructableBuffCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java new file mode 100644 index 000000000..ad2f3d67d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; + +public class ABCallbackArgumentTimeOfDayEvent extends ABTimeOfDayEventCallback { + + private ABStringCallback name; + + @Override + public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABTimeOfDayEventCallback) { + return ((ABTimeOfDayEventCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseTimeOfDayEventCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java new file mode 100644 index 000000000..faa8a14f0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseTimeOfDayEvent extends ABTimeOfDayEventCallback { + + private ABStringCallback name; + + @Override + public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABTimeOfDayEventCallback) { + return ((ABTimeOfDayEventCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseTimeOfDayEventCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseTimeOfDayEventCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java new file mode 100644 index 000000000..47fca8c5e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseTimeOfDayEventWithArguments extends ABTimeOfDayEventCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABTimeOfDayEventCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABTimeOfDayEventCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseTimeOfDayEventCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseTimeOfDayEventCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java new file mode 100644 index 000000000..0c2b2a922 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java @@ -0,0 +1,34 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentFloat extends ABFloatCallback { + + private ABStringCallback name; + + @Override + public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABFloatCallback) { + return ((ABFloatCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseFloatCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java new file mode 100644 index 000000000..1f62c7f8a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java @@ -0,0 +1,42 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseFloat extends ABFloatCallback { + + private ABStringCallback name; + + @Override + public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABFloatCallback) { + return ((ABFloatCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseFloatCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseFloatCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java new file mode 100644 index 000000000..daab9dd01 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java @@ -0,0 +1,49 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseFloatWithArguments extends ABFloatCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABFloatCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABFloatCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseFloatCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseFloatCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java new file mode 100644 index 000000000..c1b15c2f6 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABCallbackArgumentFX extends ABFXCallback { + + private ABStringCallback name; + + @Override + public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABFXCallback) { + return ((ABFXCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseFXCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java new file mode 100644 index 000000000..efb7dd53c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABCallbackReuseFX extends ABFXCallback { + + private ABStringCallback name; + + @Override + public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABFXCallback) { + return ((ABFXCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseFXCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseFXCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java new file mode 100644 index 000000000..4ab622fbd --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABCallbackReuseFXWithArguments extends ABFXCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABFXCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABFXCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseFXCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseFXCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java new file mode 100644 index 000000000..0afbb5e8d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentID extends ABIDCallback { + + private ABStringCallback name; + + @Override + public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABIDCallback) { + return ((ABIDCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseIDCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java new file mode 100644 index 000000000..75673083c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseID extends ABIDCallback { + + private ABStringCallback name; + + @Override + public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABIDCallback) { + return ((ABIDCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseIDCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseIDCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseIDWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseIDWithArguments.java new file mode 100644 index 000000000..d3ece707c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseIDWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseIDWithArguments extends ABIDCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABIDCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABIDCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseIDCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseIDCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java new file mode 100644 index 000000000..0900f507f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java @@ -0,0 +1,34 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentInteger extends ABIntegerCallback { + + private ABStringCallback name; + + @Override + public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABIntegerCallback) { + return ((ABIntegerCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseIntegerCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java new file mode 100644 index 000000000..d24d3fd86 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java @@ -0,0 +1,42 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseInteger extends ABIntegerCallback { + + private ABStringCallback name; + + @Override + public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABIntegerCallback) { + return ((ABIntegerCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseIntegerCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseIntegerCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java new file mode 100644 index 000000000..8f6c88c45 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java @@ -0,0 +1,49 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseIntegerWithArguments extends ABIntegerCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABIntegerCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABIntegerCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseIntegerCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseIntegerCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java new file mode 100644 index 000000000..690fd2e5a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentItem extends ABItemCallback { + + private ABStringCallback name; + + @Override + public CItem callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABItemCallback) { + return ((ABItemCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseItemCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java new file mode 100644 index 000000000..7160ea047 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseItem extends ABItemCallback { + + private ABStringCallback name; + + @Override + public CItem callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABItemCallback) { + return ((ABItemCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseItemCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseItemCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java new file mode 100644 index 000000000..8a3cfe574 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseItemWithArguments extends ABItemCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public CItem callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABItemCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABItemCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseItemCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseItemCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java new file mode 100644 index 000000000..ce6a85643 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentLocation extends ABLocationCallback { + + private ABStringCallback name; + + @Override + public AbilityPointTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABLocationCallback) { + return ((ABLocationCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java new file mode 100644 index 000000000..16321409d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseLocation extends ABLocationCallback { + + private ABStringCallback name; + + @Override + public AbilityPointTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABLocationCallback) { + return ((ABLocationCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseLocationCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java new file mode 100644 index 000000000..6d288549c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseLocationWithArguments extends ABLocationCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public AbilityPointTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABLocationCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABLocationCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseLocationCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java new file mode 100644 index 000000000..e9542fbd1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java @@ -0,0 +1,34 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentLong extends ABLongCallback { + + private ABStringCallback name; + + @Override + public Long callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABLongCallback) { + return ((ABLongCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseLongCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java new file mode 100644 index 000000000..daaf4f89f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java @@ -0,0 +1,42 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseLong extends ABLongCallback { + + private ABStringCallback name; + + @Override + public Long callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABLongCallback) { + return ((ABLongCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseLongCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseLongCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLongWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLongWithArguments.java new file mode 100644 index 000000000..c65b4fce2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLongWithArguments.java @@ -0,0 +1,49 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseLongWithArguments extends ABLongCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public Long callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABLongCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABLongCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseLongCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseLongCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java new file mode 100644 index 000000000..cdc500ad4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java @@ -0,0 +1,34 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentOrderId extends ABOrderIdCallback { + + private ABStringCallback name; + + @Override + public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABOrderIdCallback) { + return ((ABOrderIdCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseOrderIdCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java new file mode 100644 index 000000000..e056ba798 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java @@ -0,0 +1,42 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseOrderId extends ABOrderIdCallback { + + private ABStringCallback name; + + @Override + public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABOrderIdCallback) { + return ((ABOrderIdCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseOrderIdCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseOrderIdCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java new file mode 100644 index 000000000..0b0871c71 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java @@ -0,0 +1,49 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseOrderIdWithArguments extends ABOrderIdCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABOrderIdCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABOrderIdCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseOrderIdCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseOrderIdCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java new file mode 100644 index 000000000..5d29d6409 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; + +public class ABCallbackArgumentPlayer extends ABPlayerCallback { + + private ABStringCallback name; + + @Override + public CPlayer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABPlayerCallback) { + return ((ABPlayerCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReusePlayerCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java new file mode 100644 index 000000000..52b1f2a6b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; + +public class ABCallbackReusePlayer extends ABPlayerCallback { + + private ABStringCallback name; + + @Override + public CPlayer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABPlayerCallback) { + return ((ABPlayerCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReusePlayerCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReusePlayerCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java new file mode 100644 index 000000000..c6af3ab53 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; + +public class ABCallbackReusePlayerWithArguments extends ABPlayerCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public CPlayer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABPlayerCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABPlayerCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReusePlayerCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReusePlayerCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java new file mode 100644 index 000000000..3740577d1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; + +public class ABCallbackArgumentProjectile extends ABProjectileCallback { + + private ABStringCallback name; + + @Override + public CProjectile callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABProjectileCallback) { + return ((ABProjectileCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java new file mode 100644 index 000000000..9597559e3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; + +public class ABCallbackReuseProjectile extends ABProjectileCallback { + + private ABStringCallback name; + + @Override + public CProjectile callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABProjectileCallback) { + return ((ABProjectileCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseProjectileCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java new file mode 100644 index 000000000..0e5645e77 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; + +public class ABCallbackReuseProjectileWithArguments extends ABProjectileCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public CProjectile callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABProjectileCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABProjectileCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseProjectileCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java new file mode 100644 index 000000000..2fe7e8d80 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; + +public class ABCallbackArgumentNonStackingStatBuff extends ABNonStackingStatBuffCallback { + + private ABStringCallback name; + + @Override + public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABNonStackingStatBuffCallback) { + return ((ABNonStackingStatBuffCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseNonStackingStatBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java new file mode 100644 index 000000000..80ba31d19 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; + +public class ABCallbackReuseNonStackingStatBuff extends ABNonStackingStatBuffCallback { + + private ABStringCallback name; + + @Override + public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABNonStackingStatBuffCallback) { + return ((ABNonStackingStatBuffCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseNonStackingStatBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseNonStackingStatBuffCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java new file mode 100644 index 000000000..6acc74754 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; + +public class ABCallbackReuseNonStackingStatBuffWithArguments extends ABNonStackingStatBuffCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABNonStackingStatBuffCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABNonStackingStatBuffCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseNonStackingStatBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseNonStackingStatBuffCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java new file mode 100644 index 000000000..d7b870afb --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; + +public class ABCallbackArgumentStateModBuff extends ABStateModBuffCallback { + + private ABStringCallback name; + + @Override + public StateModBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABStateModBuffCallback) { + return ((ABStateModBuffCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseStateModBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java new file mode 100644 index 000000000..bfe368811 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; + +public class ABCallbackReuseStateModBuff extends ABStateModBuffCallback { + + private ABStringCallback name; + + @Override + public StateModBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABStateModBuffCallback) { + return ((ABStateModBuffCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseStateModBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseStateModBuffCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java new file mode 100644 index 000000000..92b28d749 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; + +public class ABCallbackReuseStateModBuffWithArguments extends ABStateModBuffCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public StateModBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABStateModBuffCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABStateModBuffCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseStateModBuffCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseStateModBuffCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java new file mode 100644 index 000000000..b1bf10bc7 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java @@ -0,0 +1,33 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentString extends ABStringCallback { + + private ABStringCallback name; + + @Override + public String callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABStringCallback) { + return ((ABStringCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseStringCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java new file mode 100644 index 000000000..8e7566e6d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java @@ -0,0 +1,41 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseString extends ABStringCallback { + + private ABStringCallback name; + + @Override + public String callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABStringCallback) { + return ((ABStringCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseStringCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseStringCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseStringWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseStringWithArguments.java new file mode 100644 index 000000000..b849a1172 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseStringWithArguments.java @@ -0,0 +1,48 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseStringWithArguments extends ABStringCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public String callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABStringCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABStringCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseStringCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseStringCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java new file mode 100644 index 000000000..d3cfab720 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentTarget extends ABTargetCallback { + + private ABStringCallback name; + + @Override + public AbilityTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABTargetCallback) { + return ((ABTargetCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseTargetCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java new file mode 100644 index 000000000..943c03003 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseTarget extends ABTargetCallback { + + private ABStringCallback name; + + @Override + public AbilityTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABTargetCallback) { + return ((ABTargetCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseTargetCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseTargetCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java new file mode 100644 index 000000000..4b74da5f4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseTargetWithArguments extends ABTargetCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public AbilityTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABTargetCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABTargetCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseTargetCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseTargetCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java new file mode 100644 index 000000000..244fdb719 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; + +public class ABCallbackArgumentTimer extends ABTimerCallback { + + private ABStringCallback name; + + @Override + public CTimer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABTimerCallback) { + return ((ABTimerCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseTimerCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java new file mode 100644 index 000000000..80eaff965 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; + +public class ABCallbackReuseTimer extends ABTimerCallback { + + private ABStringCallback name; + + @Override + public CTimer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABTimerCallback) { + return ((ABTimerCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseTimerCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseTimerCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java new file mode 100644 index 000000000..24539716c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; + +public class ABCallbackReuseTimerWithArguments extends ABTimerCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public CTimer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABTimerCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABTimerCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseTimerCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseTimerCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java new file mode 100644 index 000000000..556188a69 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java @@ -0,0 +1,34 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentUnit extends ABUnitCallback { + + private ABStringCallback name; + + @Override + public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABUnitCallback) { + return ((ABUnitCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseUnitCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java new file mode 100644 index 000000000..ab371f40c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java @@ -0,0 +1,42 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseUnit extends ABUnitCallback { + + private ABStringCallback name; + + @Override + public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABUnitCallback) { + return ((ABUnitCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseUnitCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseUnitCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java new file mode 100644 index 000000000..9e6029109 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java @@ -0,0 +1,49 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseUnitWithArguments extends ABUnitCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABUnitCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABUnitCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseUnitCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseUnitCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java new file mode 100644 index 000000000..fbefe2f05 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; + +import java.util.Map; +import java.util.Set; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentUnitGroup extends ABUnitGroupCallback { + + private ABStringCallback name; + + @Override + public Set callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABUnitGroupCallback) { + return ((ABUnitGroupCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseUnitGroupCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java new file mode 100644 index 000000000..1bbf216b6 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; + +import java.util.Map; +import java.util.Set; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseUnitGroup extends ABUnitGroupCallback { + + private ABStringCallback name; + + @Override + public Set callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABUnitGroupCallback) { + return ((ABUnitGroupCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseUnitGroupCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseUnitGroupCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java new file mode 100644 index 000000000..615a40788 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; + +import java.util.Map; +import java.util.Set; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseUnitGroupWithArguments extends ABUnitGroupCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public Set callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABUnitGroupCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABUnitGroupCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseUnitGroupCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseUnitGroupCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java new file mode 100644 index 000000000..bfbab409b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; + +import java.util.Map; +import java.util.Queue; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentUnitQueue extends ABUnitQueueCallback { + + private ABStringCallback name; + + @Override + public Queue callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABUnitQueueCallback) { + return ((ABUnitQueueCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseUnitQueueCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java new file mode 100644 index 000000000..229aea92a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; + +import java.util.Map; +import java.util.Queue; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseUnitQueue extends ABUnitQueueCallback { + + private ABStringCallback name; + + @Override + public Queue callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABUnitQueueCallback) { + return ((ABUnitQueueCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseUnitQueueCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseUnitQueueCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java new file mode 100644 index 000000000..99e0720ef --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; + +import java.util.Map; +import java.util.Queue; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseUnitQueueWithArguments extends ABUnitQueueCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public Queue callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABUnitQueueCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABUnitQueueCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseUnitQueueCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseUnitQueueCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java new file mode 100644 index 000000000..43930818a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; + +public class ABCallbackArgumentVisionModifier extends ABVisionModifierCallback { + + private ABStringCallback name; + + @Override + public CFogModifier callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABVisionModifierCallback) { + return ((ABVisionModifierCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseVisionModifierCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java new file mode 100644 index 000000000..c65bef39d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; + +public class ABCallbackReuseVisionModifier extends ABVisionModifierCallback { + + private ABStringCallback name; + + @Override + public CFogModifier callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABVisionModifierCallback) { + return ((ABVisionModifierCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseVisionModifierCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseVisionModifierCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java new file mode 100644 index 000000000..5a12663ee --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; + +public class ABCallbackReuseVisionModifierWithArguments extends ABVisionModifierCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public CFogModifier callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABVisionModifierCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABVisionModifierCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseVisionModifierCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseVisionModifierCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java new file mode 100644 index 000000000..d8c54f355 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentWidget extends ABWidgetCallback { + + private ABStringCallback name; + + @Override + public CWidget callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABWidgetCallback) { + return ((ABWidgetCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseWidgetCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java new file mode 100644 index 000000000..4cdc26f85 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseWidget extends ABWidgetCallback { + + private ABStringCallback name; + + @Override + public CWidget callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABWidgetCallback) { + return ((ABWidgetCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseWidgetCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseWidgetCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java new file mode 100644 index 000000000..c6ebdbc4a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseWidgetWithArguments extends ABWidgetCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public CWidget callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABWidgetCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABWidgetCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseWidgetCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseWidgetCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java new file mode 100644 index 000000000..99c6ae7f7 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java @@ -0,0 +1,36 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentBoolean extends ABCondition { + + private ABStringCallback name; + + @Override + public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABBooleanCallback) { + return ((ABBooleanCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseBooleanCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java new file mode 100644 index 000000000..a4faeb0cf --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java @@ -0,0 +1,44 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseBoolean extends ABCondition { + + private ABStringCallback name; + + @Override + public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABBooleanCallback) { + return ((ABBooleanCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseBooleanCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseBooleanCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java new file mode 100644 index 000000000..9e4d92727 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java @@ -0,0 +1,51 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseBooleanWithArguments extends ABCondition { + + private ABStringCallback name; + private Map arguments; + + @Override + public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABBooleanCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABBooleanCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseBooleanCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseBooleanCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index 3d3704245..e94271ca4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -196,4 +196,8 @@ public static String combineSubroutineKey(String key, int castId) { public static String combineSubroutineInstanceKey(String key, int castId) { return "_!" + key + "#" + castId; } + + public static String combineArgumentKey(String key) { + return "_$" + key; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index 615d2862a..7646bc264 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -73,7 +73,12 @@ private static void registerAbilityCallbacks(RuntimeTypeAdapterFactory callbackT callbackTypeFactory.registerSubtype(ABCallbackGetStoredAbilityByKey.class, "getStoredAbilityByKey") .registerSubtype(ABCallbackGetPartnerAbility.class, "getPartnerAbility") .registerSubtype(ABCallbackGetReactionAbility.class, "getReactionAbility") - .registerSubtype(ABCallbackGetLastCreatedAbility.class, "getLastCreatedAbility"); + .registerSubtype(ABCallbackGetLastCreatedAbility.class, "getLastCreatedAbility") + + .registerSubtype(ABCallbackArgumentAbility.class, "argumentAbility") + .registerSubtype(ABCallbackReuseAbility.class, "reuseAbility") + .registerSubtype(ABCallbackReuseAbilityWithArguments.class, "reuseAbilityWithArguments"); + } private static void registerAbilityEffectReactionListenerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { @@ -136,12 +141,20 @@ private static void registerBooleanCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackIsProjectileReflected.class, "isProjectileReflected") .registerSubtype(ABCallbackIntegerToBoolean.class, "i2b") + + .registerSubtype(ABCallbackArgumentBoolean.class, "argumentBoolean") + .registerSubtype(ABCallbackReuseBoolean.class, "reuseBoolean") + .registerSubtype(ABCallbackReuseBooleanWithArguments.class, "reuseBooleanWithArguments") ; } private static void registerBuffCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetStoredBuffByKey.class, "getStoredBuffByKey") - .registerSubtype(ABCallbackGetLastCreatedBuff.class, "getLastCreatedBuff"); + .registerSubtype(ABCallbackGetLastCreatedBuff.class, "getLastCreatedBuff") + + .registerSubtype(ABCallbackArgumentBuff.class, "argumentBuff") + .registerSubtype(ABCallbackReuseBuff.class, "reuseBuff") + .registerSubtype(ABCallbackReuseBuffWithArguments.class, "reuseBuffWithArguments"); } private static void registerDamageTakenListenerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { @@ -169,13 +182,21 @@ private static void registerDeathReplacementEffectCallbacks(RuntimeTypeAdapterFa private static void registerDestructableCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory .registerSubtype(ABCallbackGetEnumDestructable.class, "getEnumDestructable") - .registerSubtype(ABCallbackGetProjectileHitDestructable.class, "getProjectileHitDestructable"); + .registerSubtype(ABCallbackGetProjectileHitDestructable.class, "getProjectileHitDestructable") + + .registerSubtype(ABCallbackArgumentDestructable.class, "argumentDestructable") + .registerSubtype(ABCallbackReuseDestructable.class, "reuseDestructable") + .registerSubtype(ABCallbackReuseDestructableWithArguments.class, "reuseDestructableWithArguments"); } private static void registerDestructableBuffCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory .registerSubtype(ABCallbackGetLastCreatedDestructableBuff.class, "getLastCreatedDestructableBuff") - .registerSubtype(ABCallbackGetStoredDestructableBuffByKey.class, "getStoredDestructableBuffByKey"); + .registerSubtype(ABCallbackGetStoredDestructableBuffByKey.class, "getStoredDestructableBuffByKey") + + .registerSubtype(ABCallbackArgumentDestructableBuff.class, "argumentDestructableBuff") + .registerSubtype(ABCallbackReuseDestructableBuff.class, "reuseDestructableBuff") + .registerSubtype(ABCallbackReuseDestructableBuffWithArguments.class, "reuseDestructableBuffWithArguments"); } private static void registerEvasionListenerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { @@ -231,6 +252,10 @@ private static void registerFloatCallbacks(RuntimeTypeAdapterFactory callbackTyp .registerSubtype(ABCallbackGetTotalDamageDealt.class, "getTotalDamageDealt") .registerSubtype(ABCallbackGetReactionAttackProjectileDamage.class, "getReactionAttackProjectileDamage") + + .registerSubtype(ABCallbackArgumentFloat.class, "argumentFloat") + .registerSubtype(ABCallbackReuseFloat.class, "reuseFloat") + .registerSubtype(ABCallbackReuseFloatWithArguments.class, "reuseFloatWithArguments") ; } @@ -257,7 +282,11 @@ private static void registerSpecialFloatCallbacks(RuntimeTypeAdapterFactory call private static void registerFxCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetLastCreatedSpellEffect.class, "getLastCreatedSpellEffect") - .registerSubtype(ABCallbackGetStoredFXByKey.class, "getStoredFXByKey"); + .registerSubtype(ABCallbackGetStoredFXByKey.class, "getStoredFXByKey") + + .registerSubtype(ABCallbackArgumentFX.class, "argumentFX") + .registerSubtype(ABCallbackReuseFX.class, "reuseFX") + .registerSubtype(ABCallbackReuseFXWithArguments.class, "reuseFXWithArguments"); } private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { @@ -274,7 +303,11 @@ private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFa .registerSubtype(ABCallbackGetUnitType.class, "getUnitType") .registerSubtype(ABCallbackGetNonCurrentTransformType.class, "getNonCurrentTransformType") - .registerSubtype(ABCallbackNullIfFalse.class, "nullIfFalse"); + .registerSubtype(ABCallbackNullIfFalse.class, "nullIfFalse") + + .registerSubtype(ABCallbackArgumentID.class, "argumentID") + .registerSubtype(ABCallbackReuseID.class, "reuseID") + .registerSubtype(ABCallbackReuseIDWithArguments.class, "reuseIDWithArguments"); } private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { @@ -315,7 +348,11 @@ private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetPlayerId.class, "getPlayerId") .registerSubtype(ABCallbackPlayerToStateModValue.class, "playerToStateModValue") - .registerSubtype(ABCallbackDetectionDropdownConversion.class, "detectionDropdownConversion"); + .registerSubtype(ABCallbackDetectionDropdownConversion.class, "detectionDropdownConversion") + + .registerSubtype(ABCallbackArgumentInteger.class, "argumentInteger") + .registerSubtype(ABCallbackReuseInteger.class, "reuseInteger") + .registerSubtype(ABCallbackReuseIntegerWithArguments.class, "reuseIntegerWithArguments"); } private static void registerLightningCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { @@ -330,7 +367,11 @@ private static void registerLocationCallbacks(RuntimeTypeAdapterFactory callback .registerSubtype(ABCallbackGetTargetedLocation.class, "getTargetedLocation") .registerSubtype(ABCallbackCreateLocationFromTarget.class, "createLocationFromTarget") .registerSubtype(ABCallbackGetProjectileCurrentLocation.class, "getProjectileCurrentLocation") - .registerSubtype(ABCallbackGetUnitLocation.class, "getUnitLocation"); + .registerSubtype(ABCallbackGetUnitLocation.class, "getUnitLocation") + + .registerSubtype(ABCallbackArgumentLocation.class, "argumentLocation") + .registerSubtype(ABCallbackReuseLocation.class, "reuseLocation") + .registerSubtype(ABCallbackReuseLocationWithArguments.class, "reuseLocationWithArguments"); } private static void registerLongCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { @@ -347,18 +388,30 @@ private static void registerLongCallbacks(RuntimeTypeAdapterFactory callbackType .registerSubtype(ABCallbackMaxLong.class, "lMax") .registerSubtype(ABCallbackCreateDetectorData.class, "createDetectorData") - .registerSubtype(ABCallbackCreateDetectedData.class, "createDetectedData"); + .registerSubtype(ABCallbackCreateDetectedData.class, "createDetectedData") + + .registerSubtype(ABCallbackArgumentLong.class, "argumentLong") + .registerSubtype(ABCallbackReuseLong.class, "reuseLong") + .registerSubtype(ABCallbackReuseLongWithArguments.class, "reuseLongWithArguments"); } private static void registerOrderIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackRawID.class, "rawId") - .registerSubtype(ABCallbackIdString.class, "idString"); + .registerSubtype(ABCallbackIdString.class, "idString") + + .registerSubtype(ABCallbackArgumentOrderId.class, "argumentOrderId") + .registerSubtype(ABCallbackReuseOrderId.class, "reuseOrderId") + .registerSubtype(ABCallbackReuseOrderIdWithArguments.class, "reuseOrderIdWithArguments"); } private static void registerPlayerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetPlayerById.class, "getPlayerById") .registerSubtype(ABCallbackGetStoredPlayerByKey.class, "getStoredPlayerByKey") - .registerSubtype(ABCallbackGetOwnerOfUnit.class, "getOwnerOfUnit"); + .registerSubtype(ABCallbackGetOwnerOfUnit.class, "getOwnerOfUnit") + + .registerSubtype(ABCallbackArgumentPlayer.class, "argumentPlayer") + .registerSubtype(ABCallbackReusePlayer.class, "reusePlayer") + .registerSubtype(ABCallbackReusePlayerWithArguments.class, "reusePlayerWithArguments"); } private static void registerProjectileCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { @@ -369,7 +422,10 @@ private static void registerProjectileCallbacks(RuntimeTypeAdapterFactory callba .registerSubtype(ABCallbackGetReactionAttackProjectile.class, "getReactionAttackProjectile") .registerSubtype(ABCallbackGetReactionAbilityProjectile.class, "getReactionAbilityProjectile") - + + .registerSubtype(ABCallbackArgumentProjectile.class, "argumentProjectile") + .registerSubtype(ABCallbackReuseProjectile.class, "reuseProjectile") + .registerSubtype(ABCallbackReuseProjectileWithArguments.class, "reuseProjectileWithArguments") ; } @@ -377,14 +433,22 @@ private static void registerStatBuffCallbacks(RuntimeTypeAdapterFactory callback callbackTypeFactory .registerSubtype(ABCallbackGetLastCreatedNonStackingStatBuff.class, "getLastCreatedNonStackingStatBuff") .registerSubtype(ABCallbackGetStoredNonStackingStatBuffByKey.class, - "getStoredNonStackingStatBuffByKey"); + "getStoredNonStackingStatBuffByKey") + + .registerSubtype(ABCallbackArgumentNonStackingStatBuff.class, "argumentNonStackingStatBuff") + .registerSubtype(ABCallbackReuseNonStackingStatBuff.class, "reuseNonStackingStatBuff") + .registerSubtype(ABCallbackReuseNonStackingStatBuffWithArguments.class, "reuseNonStackingStatBuffWithArguments"); } private static void registerStateModBuffCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory .registerSubtype(ABCallbackGetLastCreatedStateModBuff.class, "getLastCreatedStateModBuff") .registerSubtype(ABCallbackGetStoredStateModBuffByKey.class, - "getStoredStateModBuffByKey"); + "getStoredStateModBuffByKey") + + .registerSubtype(ABCallbackArgumentStateModBuff.class, "argumentStateModBuff") + .registerSubtype(ABCallbackReuseStateModBuff.class, "reuseStateModBuff") + .registerSubtype(ABCallbackReuseStateModBuffWithArguments.class, "reuseStateModBuffWithArguments"); } private static void registerStringCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { @@ -402,6 +466,10 @@ private static void registerStringCallbacks(RuntimeTypeAdapterFactory callbackTy .registerSubtype(ABCallbackFloatToString.class, "f2s") .registerSubtype(ABCallbackIntegerToString.class, "i2s") .registerSubtype(ABCallbackLongToString.class, "l2s") + + .registerSubtype(ABCallbackArgumentString.class, "argumentString") + .registerSubtype(ABCallbackReuseString.class, "reuseString") + .registerSubtype(ABCallbackReuseStringWithArguments.class, "reuseStringWithArguments") ; } @@ -409,19 +477,31 @@ private static void registerTargetCallbacks(RuntimeTypeAdapterFactory callbackTy callbackTypeFactory .registerSubtype(ABCallbackGetAbilityTarget.class, "getAbilityTarget") .registerSubtype(ABCallbackGetNewBehaviorTarget.class, "getNewBehaviorTarget") - .registerSubtype(ABCallbackGetStoredTargetByKey.class, "getStoredTargetByKey"); + .registerSubtype(ABCallbackGetStoredTargetByKey.class, "getStoredTargetByKey") + + .registerSubtype(ABCallbackArgumentTarget.class, "argumentTarget") + .registerSubtype(ABCallbackReuseTarget.class, "reuseTarget") + .registerSubtype(ABCallbackReuseTargetWithArguments.class, "reuseTargetWithArguments"); } private static void registerTimeOfDayEventCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetLastCreatedTimeOfDayEvent.class, "getLastCreatedTimeOfDayEvent") - .registerSubtype(ABCallbackGetStoredTimeOfDayEventByKey.class, "getStoredTimeOfDayEventByKey"); + .registerSubtype(ABCallbackGetStoredTimeOfDayEventByKey.class, "getStoredTimeOfDayEventByKey") + + .registerSubtype(ABCallbackArgumentTimeOfDayEvent.class, "argumentTimeOfDayEvent") + .registerSubtype(ABCallbackReuseTimeOfDayEvent.class, "reuseTimeOfDayEvent") + .registerSubtype(ABCallbackReuseTimeOfDayEventWithArguments.class, "reuseTimeOfDayEventWithArguments"); } private static void registerTimerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetLastCreatedTimer.class, "getLastCreatedTimer") .registerSubtype(ABCallbackGetLastStartedTimer.class, "getLastStartedTimer") .registerSubtype(ABCallbackGetFiringTimer.class, "getFiringTimer") - .registerSubtype(ABCallbackGetStoredTimerByKey.class, "getStoredTimerByKey"); + .registerSubtype(ABCallbackGetStoredTimerByKey.class, "getStoredTimerByKey") + + .registerSubtype(ABCallbackArgumentTimer.class, "argumentTimer") + .registerSubtype(ABCallbackReuseTimer.class, "reuseTimer") + .registerSubtype(ABCallbackReuseTimerWithArguments.class, "reuseTimerWithArguments"); } private static void registerUnitCallbacks(RuntimeTypeAdapterFactory unitCallbackTypeFactory) { @@ -448,23 +528,39 @@ private static void registerUnitCallbacks(RuntimeTypeAdapterFactory unitCallback .registerSubtype(ABCallbackPollUnitQueue.class, "pollUnitQueue") .registerSubtype(ABCallbackGetNearestUnitInRangeOfUnit.class, "getNearestUnitInRangeOfUnit") - .registerSubtype(ABCallbackGetNearestCorpseInRangeOfUnit.class, "getNearestCorpseInRangeOfUnit"); + .registerSubtype(ABCallbackGetNearestCorpseInRangeOfUnit.class, "getNearestCorpseInRangeOfUnit") + + .registerSubtype(ABCallbackArgumentUnit.class, "argumentUnit") + .registerSubtype(ABCallbackReuseUnit.class, "reuseUnit") + .registerSubtype(ABCallbackReuseUnitWithArguments.class, "reuseUnitWithArguments"); } private static void registerUnitGroupCallbacks(RuntimeTypeAdapterFactory unitGroupCallbackTypeFactory) { unitGroupCallbackTypeFactory.registerSubtype(ABCallbackGetUnitGroupByName.class, "getUnitGroupByName") - .registerSubtype(ABCallbackGetLastCreatedUnitGroup.class, "getLastCreatedUnitGroup"); + .registerSubtype(ABCallbackGetLastCreatedUnitGroup.class, "getLastCreatedUnitGroup") + + .registerSubtype(ABCallbackArgumentUnitGroup.class, "argumentUnitGroup") + .registerSubtype(ABCallbackReuseUnitGroup.class, "reuseUnitGroup") + .registerSubtype(ABCallbackReuseUnitGroupWithArguments.class, "reuseUnitGroupWithArguments"); } private static void registerUnitQueueCallbacks(RuntimeTypeAdapterFactory unitGroupCallbackTypeFactory) { unitGroupCallbackTypeFactory.registerSubtype(ABCallbackGetUnitQueueByName.class, "getUnitQueueByName") - .registerSubtype(ABCallbackGetLastCreatedUnitQueue.class, "getLastCreatedUnitQueue"); + .registerSubtype(ABCallbackGetLastCreatedUnitQueue.class, "getLastCreatedUnitQueue") + + .registerSubtype(ABCallbackArgumentUnitQueue.class, "argumentUnitQueue") + .registerSubtype(ABCallbackReuseUnitQueue.class, "reuseUnitQueue") + .registerSubtype(ABCallbackReuseUnitQueueWithArguments.class, "reuseUnitQueueWithArguments"); } private static void registerVisionModifierCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory .registerSubtype(ABCallbackGetStoredVisionModifierByKey.class, "getStoredVisionModifierByKey") .registerSubtype(ABCallbackGetLastCreatedVisionModifier.class, "getLastCreatedVisionModifier") + + .registerSubtype(ABCallbackArgumentVisionModifier.class, "argumentVisionModifier") + .registerSubtype(ABCallbackReuseVisionModifier.class, "reuseVisionModifier") + .registerSubtype(ABCallbackReuseVisionModifierWithArguments.class, "reuseVisionModifierWithArguments") ; } @@ -472,6 +568,10 @@ private static void registerWidgetCallbacks(RuntimeTypeAdapterFactory callbackTy callbackTypeFactory .registerSubtype(ABCallbackGetProjectileHitWidget.class, "getProjectileHitWidget") .registerSubtype(ABCallbackUnitToWidget.class, "unitToWidget") + + .registerSubtype(ABCallbackArgumentWidget.class, "argumentWidget") + .registerSubtype(ABCallbackReuseWidget.class, "reuseWidget") + .registerSubtype(ABCallbackReuseWidgetWithArguments.class, "reuseWidgetWithArguments") ; } @@ -544,7 +644,6 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsTimeOfDayInRange.class, "isTimeOfDayInRange") .registerSubtype(ABConditionGameplayConstantIsRelativeUpgradeCosts.class, "gameplayConstantIsRelativeUpgradeCosts") .registerSubtype(ABConditionGameplayConstantIsDefendCanDeflect.class, "gameplayConstantIsDefendCanDeflect") - .registerSubtype(ABConditionIsNewBehaviorCategoryInList.class, "isNewBehaviorCategoryInList") ; @@ -785,6 +884,9 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionCreateSubroutine.class, "createSubroutine") .registerSubtype(ABActionRunSubroutine.class, "runSubroutine") + .registerSubtype(ABActionRunReuseAction.class, "runReuseAction") + .registerSubtype(ABActionRunReuseActionWithArguments.class, "runReuseActionWithArguments") + .registerSubtype(ABActionSetFalseTimeOfDay.class, "setFalseTimeOfDay") ; } @@ -1032,6 +1134,7 @@ public static Gson create() { final RuntimeTypeAdapterFactory conditionTypeFactory = RuntimeTypeAdapterFactory .of(ABCondition.class, "type"); registerConditions(conditionTypeFactory); + registerBooleanCallbacks(conditionTypeFactory); gsonBuilder.registerTypeAdapterFactory(conditionTypeFactory); // ENUM CALLBACKS @@ -1072,7 +1175,7 @@ public static Gson create() { "getAutocastTypeFromString"); gsonBuilder.registerTypeAdapterFactory(autocastTypeFactory); - + return gsonBuilder.create(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java index 86bbdee5a..7921fc7d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java @@ -1,9 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; import java.util.List; +import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.definitions.impl.CAbilityTypeDefinitionAbilityBuilder; @@ -43,6 +45,9 @@ public class AbilityBuilderConfiguration { private List onEndCasting; private List onChannelTick; private List onEndChannel; + + private Map> reuseActions; + private Map reuseCallbacks; public AbilityBuilderConfiguration(AbilityBuilderParser parser, AbilityBuilderDupe dupe) { this.id = dupe.getId(); @@ -77,6 +82,9 @@ public AbilityBuilderConfiguration(AbilityBuilderParser parser, AbilityBuilderDu this.onEndCasting = parser.getOnEndCasting(); this.onChannelTick = parser.getOnChannelTick(); this.onEndChannel = parser.getOnEndChannel(); + + this.setReuseActions(parser.getReuseActions()); + this.setReuseCallbacks(parser.getReuseCallbacks()); } public CAbilityTypeDefinitionAbilityBuilder createDefinition() { @@ -331,4 +339,20 @@ public void setOnEndChannel(List onEndChannel) { this.onEndChannel = onEndChannel; } + public Map> getReuseActions() { + return reuseActions; + } + + public void setReuseActions(Map> reuseActions) { + this.reuseActions = reuseActions; + } + + public Map getReuseCallbacks() { + return reuseCallbacks; + } + + public void setReuseCallbacks(Map reuseCallbacks) { + this.reuseCallbacks = reuseCallbacks; + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java index 191b6bcc4..109afe221 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; public class AbilityBuilderOverrideFields { @@ -23,6 +22,34 @@ public class AbilityBuilderOverrideFields { private ABBooleanCallback physicalSpell; private ABBooleanCallback magicSpell; private ABBooleanCallback universalSpell; + + public void updateFromParent(AbilityBuilderOverrideFields parent) { + if (this.areaOverride == null) + this.areaOverride = parent.areaOverride; + if (this.rangeOverride == null) + this.rangeOverride = parent.rangeOverride; + if (this.castTimeOverride == null) + this.castTimeOverride = parent.castTimeOverride; + if (this.cooldownOverride == null) + this.cooldownOverride = parent.cooldownOverride; + if (this.manaCostOverride == null) + this.manaCostOverride = parent.manaCostOverride; + + if (this.autocastTypeOverride == null) + this.autocastTypeOverride = parent.autocastTypeOverride; + + if (this.onTooltipOverride == null) + this.onTooltipOverride = parent.onTooltipOverride; + if (this.offTooltipOverride == null) + this.offTooltipOverride = parent.offTooltipOverride; + + if (this.physicalSpell == null) + this.physicalSpell = parent.physicalSpell; + if (this.magicSpell == null) + this.magicSpell = parent.magicSpell; + if (this.universalSpell == null) + this.universalSpell = parent.universalSpell; + } public ABFloatCallback getAreaOverride() { return areaOverride; @@ -90,7 +117,5 @@ public ABBooleanCallback getUniversalSpell() { public void setUniversalSpell(ABBooleanCallback universalSpell) { this.universalSpell = universalSpell; } - - } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java index 1138690d9..fe1773c29 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java @@ -1,10 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +import java.util.HashMap; import java.util.List; import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.MeleeRangeTargetOverride; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.StatBuffFromDataField; @@ -12,6 +14,7 @@ public class AbilityBuilderParser { private List ids; + private String parentId; private AbilityBuilderType type; private AbilityBuilderSpecialDisplayFields displayFields; @@ -40,9 +43,100 @@ public class AbilityBuilderParser { private List onChannelTick; private List onEndChannel; + private Map> reuseActions; + private Map reuseCallbacks; + //Template only private AbilityBuilderParserTemplateFields templateFields; + + public void updateFromParent(AbilityBuilderParser parent) { + this.type = parent.type; + + if (parent.displayFields != null) { + if (this.displayFields == null) { + this.displayFields = new AbilityBuilderSpecialDisplayFields(); + } + this.displayFields.updateFromParent(parent.displayFields); + } + if (parent.specialFields != null) { + if (this.specialFields == null) { + this.specialFields = new AbilityBuilderSpecialConfigFields(); + } + this.specialFields.updateFromParent(parent.specialFields); + } + if (parent.overrideFields != null) { + if (this.overrideFields == null) { + this.overrideFields = new AbilityBuilderOverrideFields(); + } + this.overrideFields.updateFromParent(parent.overrideFields); + } + if (parent.templateFields != null) { + if (this.templateFields == null) { + this.templateFields = new AbilityBuilderParserTemplateFields(); + } + this.templateFields.updateFromParent(parent.templateFields); + } + + if (parent.reuseActions != null) { + if (this.reuseActions == null) { + this.reuseActions = new HashMap<>(); + } + for (String key : parent.reuseActions.keySet()) { + if (!this.reuseActions.containsKey(key)) { + this.reuseActions.put(key, parent.reuseActions.get(key)); + } + } + } + if (parent.reuseCallbacks != null) { + if (this.reuseCallbacks == null) { + this.reuseCallbacks = new HashMap<>(); + } + for (String key : parent.reuseCallbacks.keySet()) { + if (!this.reuseCallbacks.containsKey(key)) { + this.reuseCallbacks.put(key, parent.reuseCallbacks.get(key)); + } + } + } + + if (this.extraTargetConditions == null) + this.extraTargetConditions = parent.extraTargetConditions; + if (this.extraAutoTargetConditions == null) + this.extraAutoTargetConditions = parent.extraAutoTargetConditions; + if (this.extraAutoNoTargetConditions == null) + this.extraAutoNoTargetConditions = parent.extraAutoNoTargetConditions; + if (this.extraCastConditions == null) + this.extraCastConditions = parent.extraCastConditions; + if (this.onAddAbility == null) + this.onAddAbility = parent.onAddAbility; + if (this.onAddDisabledAbility == null) + this.onAddDisabledAbility = parent.onAddDisabledAbility; + if (this.onRemoveAbility == null) + this.onRemoveAbility = parent.onRemoveAbility; + if (this.onRemoveDisabledAbility == null) + this.onRemoveDisabledAbility = parent.onRemoveDisabledAbility; + if (this.onDeathPreCast == null) + this.onDeathPreCast = parent.onDeathPreCast; + if (this.onCancelPreCast == null) + this.onCancelPreCast = parent.onCancelPreCast; + if (this.onOrderIssued == null) + this.onOrderIssued = parent.onOrderIssued; + if (this.onActivate == null) + this.onActivate = parent.onActivate; + if (this.onDeactivate == null) + this.onDeactivate = parent.onDeactivate; + if (this.onLevelChange == null) + this.onLevelChange = parent.onLevelChange; + if (this.onBeginCasting == null) + this.onBeginCasting = parent.onBeginCasting; + if (this.onEndCasting == null) + this.onEndCasting = parent.onEndCasting; + if (this.onChannelTick == null) + this.onChannelTick = parent.onChannelTick; + if (this.onEndChannel == null) + this.onEndChannel = parent.onEndChannel; + } + public List getIds() { return ids; } @@ -51,6 +145,14 @@ public void setIds(List ids) { this.ids = ids; } + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + public AbilityBuilderType getType() { return type; } @@ -245,6 +347,22 @@ public void setOnEndChannel(List onEndChannel) { this.onEndChannel = onEndChannel; } + public Map> getReuseActions() { + return reuseActions; + } + + public void setReuseActions(Map> reuseActions) { + this.reuseActions = reuseActions; + } + + public Map getReuseCallbacks() { + return reuseCallbacks; + } + + public void setReuseCallbacks(Map reuseCallbacks) { + this.reuseCallbacks = reuseCallbacks; + } + public AbilityBuilderTemplateType getTemplateType() { return templateFields.getTemplateType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserTemplateFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserTemplateFields.java index b299781e2..fef092d85 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserTemplateFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserTemplateFields.java @@ -22,6 +22,28 @@ public class AbilityBuilderParserTemplateFields { private List statBuffsFromDataFields; private MeleeRangeTargetOverride meleeRangeTargetOverride; + public void updateFromParent(AbilityBuilderParserTemplateFields parent) { + if (this.templateType == null) + this.templateType = parent.templateType; + + if (this.addToAuraActions == null) + this.addToAuraActions = parent.addToAuraActions; + if (this.updateAuraLevelActions == null) + this.updateAuraLevelActions = parent.updateAuraLevelActions; + if (this.removeFromAuraActions == null) + this.removeFromAuraActions = parent.removeFromAuraActions; + + if (this.abilityIdsToAddPerLevel == null) + this.abilityIdsToAddPerLevel = parent.abilityIdsToAddPerLevel; + if (this.levellingAbilityIdsToAdd == null) + this.levellingAbilityIdsToAdd = parent.levellingAbilityIdsToAdd; + + if (this.statBuffsFromDataFields == null) + this.statBuffsFromDataFields = parent.statBuffsFromDataFields; + if (this.meleeRangeTargetOverride == null) + this.meleeRangeTargetOverride = parent.meleeRangeTargetOverride; + } + public AbilityBuilderTemplateType getTemplateType() { return templateType; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialConfigFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialConfigFields.java index ada9d5b73..fc9e22367 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialConfigFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialConfigFields.java @@ -38,6 +38,53 @@ public class AbilityBuilderSpecialConfigFields { private CBehaviorCategory behaviorCategory; + public void updateFromParent(AbilityBuilderSpecialConfigFields parent) { + if (this.bufferManaRequired == null) + this.bufferManaRequired = parent.bufferManaRequired; + if (this.manaDrainedPerSecond == null) + this.manaDrainedPerSecond = parent.manaDrainedPerSecond; + + if (this.pointTargeted == null) + this.pointTargeted = parent.pointTargeted; + if (this.targetedSpell == null) + this.targetedSpell = parent.targetedSpell; + + if (this.autoAquireTarget == null) + this.autoAquireTarget = parent.autoAquireTarget; + + if (this.pairAbilityId == null) + this.pairAbilityId = parent.pairAbilityId; + if (this.pairUnitId == null) + this.pairUnitId = parent.pairUnitId; + if (this.pairUnitTypeError == null) + this.pairUnitTypeError = parent.pairUnitTypeError; + if (this.cantTargetError == null) + this.cantTargetError = parent.cantTargetError; + if (this.cantPairError == null) + this.cantPairError = parent.cantPairError; + if (this.cantPairOffError == null) + this.cantPairOffError = parent.cantPairOffError; + if (this.pairSearchRadius == null) + this.pairSearchRadius = parent.pairSearchRadius; + if (this.autoTargetPartner == null) + this.autoTargetPartner = parent.autoTargetPartner; + if (this.maxPartners == null) + this.maxPartners = parent.maxPartners; + if (this.pairingOrderId == null) + this.pairingOrderId = parent.pairingOrderId; + if (this.pairingOffOrderId == null) + this.pairingOffOrderId = parent.pairingOffOrderId; + if (this.orderPairedUnit == null) + this.orderPairedUnit = parent.orderPairedUnit; + if (this.orderPairedUnitOrderId == null) + this.orderPairedUnitOrderId = parent.orderPairedUnitOrderId; + if (this.orderPairedUnitOffOrderId == null) + this.orderPairedUnitOffOrderId = parent.orderPairedUnitOffOrderId; + + if (this.behaviorCategory == null) + this.behaviorCategory = parent.behaviorCategory; + } + public ABIntegerCallback getBufferManaRequired() { return bufferManaRequired; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java index 635c5c934..280a53f9a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java @@ -20,6 +20,34 @@ public class AbilityBuilderSpecialDisplayFields { private ABBooleanCallback castToggleOff; private ABBooleanCallback separateOnAndOff; private ABIDCallback alternateUnitId; + + public void updateFromParent(AbilityBuilderSpecialDisplayFields parent) { + if (this.showOnAndOffIcons == null) + this.showOnAndOffIcons = parent.showOnAndOffIcons; + + if (this.foodCost == null) + this.foodCost = parent.foodCost; + if (this.goldCost == null) + this.goldCost = parent.goldCost; + if (this.lumberCost == null) + this.lumberCost = parent.lumberCost; + + if (this.hideAreaCursor == null) + this.hideAreaCursor = parent.hideAreaCursor; + if (this.instantCast == null) + this.instantCast = parent.instantCast; + if (this.castlessNoTarget == null) + this.castlessNoTarget = parent.castlessNoTarget; + + if (this.toggleable == null) + this.toggleable = parent.toggleable; + if (this.castToggleOff == null) + this.castToggleOff = parent.castToggleOff; + if (this.separateOnAndOff == null) + this.separateOnAndOff = parent.separateOnAndOff; + if (this.alternateUnitId == null) + this.alternateUnitId = parent.alternateUnitId; + } public ABBooleanCallback getShowOnAndOffIcons() { return showOnAndOffIcons; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderType.java index b32cc879f..a57285779 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderType.java @@ -17,6 +17,7 @@ public enum AbilityBuilderType implements CHandle { SMART, PASSIVE, TEMPLATE, + INHERIT, HIDDEN; @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java index 324064b10..2f9342496 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java @@ -3,7 +3,9 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import com.etheller.warsmash.units.GameObject; @@ -291,6 +293,9 @@ private void registerCodes() { AbilityBuilderFile behaviors = null; try { + List inheritingAbilities = new ArrayList<>(); + Map previousAbilityParsers = new HashMap<>(); + File abilityBehaviorsDir = new File("abilityBehaviors"); File[] abilityBehaviorFiles = abilityBehaviorsDir.listFiles(); if (abilityBehaviorFiles != null) { @@ -301,13 +306,17 @@ private void registerCodes() { try { behaviors = gson.fromJson(new FileReader(abilityBehaviorFile), AbilityBuilderFile.class); for (AbilityBuilderParser behavior : behaviors.getAbilityList()) { - if (behavior.getType().equals(AbilityBuilderType.TEMPLATE)) { + if (behavior.getType().equals(AbilityBuilderType.INHERIT)) { + inheritingAbilities.add(behavior); + } else if (behavior.getType().equals(AbilityBuilderType.TEMPLATE)) { for (AbilityBuilderDupe dupe : behavior.getIds()) { + previousAbilityParsers.put(dupe.getId(), behavior); this.codeToAbilityTypeDefinition.put(War3ID.fromString(dupe.getId()), new CAbilityTypeDefinitionAbilityTemplateBuilder(behavior)); } } else { for (AbilityBuilderDupe dupe : behavior.getIds()) { + previousAbilityParsers.put(dupe.getId(), behavior); AbilityBuilderConfiguration config = new AbilityBuilderConfiguration(behavior, dupe); this.codeToAbilityTypeDefinition.put(War3ID.fromString(config.getId()), config.createDefinition()); @@ -326,6 +335,40 @@ private void registerCodes() { } } } + + int prevIter = 1; + while (inheritingAbilities.size() > 0) { + List iter = inheritingAbilities; + inheritingAbilities = new ArrayList<>(); + + if (prevIter == 0) { + for (AbilityBuilderParser parser : iter) { + System.err.println("Couldn't parse INHERIT ability due to no parent ability definition: " + parser.getIds().get(0).getId()); + } + break; + } + prevIter = 0; + + for (AbilityBuilderParser parser : iter) { + if (parser.getParentId() == null) { + System.err.println("Couldn't parse INHERIT ability due to missing parent ID: " + parser.getIds().get(0).getId()); + continue; + } + AbilityBuilderParser parent = previousAbilityParsers.get(parser.getParentId()); + if (parent != null) { + parser.updateFromParent(parent); + for (AbilityBuilderDupe dupe : parser.getIds()) { + previousAbilityParsers.put(dupe.getId(), parser); + AbilityBuilderConfiguration config = new AbilityBuilderConfiguration(parser, dupe); + this.codeToAbilityTypeDefinition.put(War3ID.fromString(config.getId()), + config.createDefinition()); + prevIter++; + } + } else { + inheritingAbilities.add(parser); + } + } + } } catch (Exception e) { e.printStackTrace(); } From 7c20bb62f42e3ad2cbd18fb6e6ee0267358bbf83 Mon Sep 17 00:00:00 2001 From: Glasir Date: Fri, 28 Feb 2025 09:01:26 -0500 Subject: [PATCH 12/44] Major Transformation Improvements! * AB: Added Robo-goblin and Chemical Rage * AB: Updated Chaos to add health and mana rather than keeping the original ratio * AB: Updated transformation buffs to turn heros back on death * AB: Updated disabled spells to still show cooldowns * AB: Update If to null-check the branches * Core: Added upgrade tracking on units, so they can avoid applying the same upgrade twice * Core: Updated hero name logic, so multiple names are used and heros changing unit type also change names * Core: Updated transformations to properly handle upgrades * Core: Updated transformations to not swap hero abilities when changing between hero types * Core: Updated transformations to hide hero abilities when changing from hero -> non-hero and restore them when changing back * Core: Updated transformations to avoid messing up HP in certain scenarios * Core: Added StatBuff types for hero stats --- .../abilityBehaviors/Transformations.json | 853 ++++++++++++++---- core/assets/abilityBehaviors/activeBuffs.json | 245 +++++ .../etheller/warsmash/parsers/jass/Jass2.java | 10 +- .../viewer5/handlers/w3x/War3MapViewer.java | 15 +- .../CommandCardPopulatingAbilityVisitor.java | 2 +- .../handlers/w3x/simulation/CSimulation.java | 4 +- .../handlers/w3x/simulation/CUnit.java | 272 +++++- .../handlers/w3x/simulation/CUpgradeType.java | 8 +- .../abilities/AbstractCAbility.java | 21 +- .../w3x/simulation/abilities/CAbility.java | 2 + .../abilities/CAbilityDisableType.java | 3 +- .../simulation/abilities/CAbilityView.java | 2 + .../abilities/hero/CAbilityHero.java | 87 +- .../abilities/jass/CAbilityJass.java | 2 +- .../ability/AbilityBuilderActiveAbility.java | 2 + .../CAbilityAbilityBuilderActiveToggle.java | 4 +- .../CAbilityAbilityBuilderGenericActive.java | 31 +- .../GetInstantTransformationBuffVisitor.java | 14 +- ...AbilityAbilityBuilderStatAuraTemplate.java | 50 +- ...lityAbilityBuilderStatPassiveTemplate.java | 28 +- .../CBehaviorFinishTransformation.java | 25 +- .../ability/ABActionDisableAbility.java | 59 ++ .../action/ability/ABActionEnableAbility.java | 59 ++ .../stats/ABActionAddNonStackingStatBuff.java | 2 +- .../ABActionRecomputeStatBuffsOnUnit.java | 8 +- .../ABActionRemoveNonStackingStatBuff.java | 2 +- .../action/structural/ABActionIf.java | 12 +- .../structural/ABActionRunReuseAction.java | 4 +- .../ABActionRunReuseActionWithArguments.java | 4 +- .../action/unit/ABActionTransformUnit.java | 24 +- .../unit/ABActionTransformUnitInstant.java | 28 +- .../ABActionTransformedUnitAbilityAdd.java | 20 +- .../ABActionTransformedUnitAbilityRemove.java | 9 +- .../behavior/callback/ABCallbackNull.java | 23 + .../ABConditionIsToggleAbilityActive.java | 2 +- .../ABConditionIsTransformingToAlternate.java | 2 +- .../comparison/ABConditionIsIdEqual.java | 29 + .../condition/logical/ABConditionIsNull.java | 19 + .../condition/unit/ABConditionIsUnitType.java | 24 + .../ABTimedInstantTransformationBuff.java | 18 +- .../buff/ABTimedTransformationBuff.java | 25 +- .../core/AbilityBuilderGsonBuilder.java | 9 + .../handler/TransformationHandler.java | 65 +- .../parser/template/StatBuffType.java | 23 +- .../DelayInstantTransformationTimer.java | 13 +- .../w3x/simulation/data/CUnitData.java | 41 +- .../simulation/unit/CUnitAppliedUpgrade.java | 30 + .../unit/NonStackingStatBuffType.java | 65 +- .../upgrade/CUpgradeEffectAttackSpeed.java | 4 +- .../viewer5/handlers/w3x/ui/MeleeUI.java | 2 +- 50 files changed, 1870 insertions(+), 435 deletions(-) create mode 100644 core/assets/abilityBehaviors/activeBuffs.json create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CUnitAppliedUpgrade.java diff --git a/core/assets/abilityBehaviors/Transformations.json b/core/assets/abilityBehaviors/Transformations.json index 9d8588f54..4003091fa 100644 --- a/core/assets/abilityBehaviors/Transformations.json +++ b/core/assets/abilityBehaviors/Transformations.json @@ -219,6 +219,98 @@ } } }, + "reuseActions": { + "storeBaseType": [{ + "type": "if", + "condition": { + "type": "isNull", + "value": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }, + "thenActions": [{ + "type": "if", + "condition": { + "type": "not", + "condition": { + "type": "or", + "conditions": [{ + "type": "isUnitType", + "unit": { + "type": "getCastingUnit" + }, + "unitType": { + "type": "getAbilityDataAsID", + "dataField": "A" + } + },{ + "type": "isUnitType", + "unit": { + "type": "getCastingUnit" + }, + "unitType": { + "type": "getAbilityUnitId" + } + }] + } + }, + "thenActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getUnitType", + "unit": { + "type": "getCastingUnit" + } + } + }], + "elseActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getAbilityDataAsID", + "dataField": "A" + } + }] + }] + }], + "clearBaseType": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "null" + } + }] + }, "onAddDisabledAbility": [{ "type": "runReuseAction", "name": { @@ -231,109 +323,121 @@ "type": "isToggleAbilityActive" }, "thenActions": [{ - "type": "transformedUnitAbilityAdd", - "unit": { - "type": "getCastingUnit" - }, - "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" - }, - "alternateUnitId": { - "type": "getAbilityUnitId" - }, - "immediateLanding": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 2 - } - } - }, - "immediateTakeOff": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 4 - } - } - }, - "permanent": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 8 - } - } - }, - "requiresPayment": { - "type": "i2b", - "value": { - "type": "i&", - "value1": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "value2": { - "type": "rawInteger", - "value": 16 - } - } - }, - "altitudeAdjustmentDelay": { - "type": "getAbilityCastTime" - }, - "altitudeAdjustmentTime": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "landingDelayTime": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "transformTime": { - "type": "getAbilityDuration" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "buffId": { - "type": "getFirstBuffId" - }, - "onTransformActions": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "onTransform" - } - }], - "onUntransformActions": [{ "type": "runReuseAction", "name": { "type": "rawString", - "value": "onUnTransform" + "value": "storeBaseType" } - }] + },{ + "type": "transformedUnitAbilityAdd", + "unit": { + "type": "getCastingUnit" + }, + "baseUnitId": { + "type": "getAbilityDataAsID", + "dataField": "A" + }, + "alternateUnitId": { + "type": "getAbilityUnitId" + }, + "immediateLanding": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 2 + } + } + }, + "immediateTakeOff": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 4 + } + } + }, + "permanent": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 8 + } + } + }, + "requiresPayment": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 16 + } + } + }, + "altitudeAdjustmentDelay": { + "type": "getAbilityCastTime" + }, + "altitudeAdjustmentTime": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "landingDelayTime": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "transformTime": { + "type": "getAbilityDuration" + }, + "duration": { + "type": "getAbilityHeroDuration" + }, + "buffId": { + "type": "getFirstBuffId" + }, + "onTransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" + } + }], + "onUntransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "clearBaseType" + } + }] }], - "elseActions": [] + "elseActions": [] }], "onRemoveDisabledAbility": [{ "type": "transformedUnitAbilityRemove", @@ -341,8 +445,15 @@ "type": "getCastingUnit" }, "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } }, "alternateUnitId": { "type": "getAbilityUnitId" @@ -362,14 +473,33 @@ } }, "onUntransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "clearBaseType" + } + }] + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onLevelChange" + } + }], + "onBeginCasting": [{ "type": "runReuseAction", "name": { "type": "rawString", - "value": "onUnTransform" + "value": "storeBaseType" } - }] - }], - "onBeginCasting": [{ + },{ "type": "createTemporarySpellEffectOnUnit", "target": { "type": "getCastingUnit" @@ -384,8 +514,15 @@ "type": "getCastingUnit" }, "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } }, "alternateUnitId": { "type": "getAbilityUnitId" @@ -474,35 +611,50 @@ } }], "onUntransformActions": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "onUnTransform" - } - }] - },{ - "type": "if", - "condition": { - "type": "isTransformingToAlternate" - }, - "thenActions": [{ - "type": "activateToggledAbility" - },{ "type": "runReuseAction", "name": { "type": "rawString", - "value": "onTransformExtra" + "value": "onUnTransform" } - }], - "elseActions": [{ - "type": "deactivateToggledAbility" },{ "type": "runReuseAction", "name": { "type": "rawString", - "value": "onUnTransformExtra" + "value": "clearBaseType" } }] + },{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "isTransformingToAlternate" + } + }, + "thenActions": [{ + "type": "if", + "condition": { + "type": "isTransformingToAlternate" + }, + "thenActions": [{ + "type": "activateToggledAbility" + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransformExtra" + } + }], + "elseActions": [{ + "type": "deactivateToggledAbility" + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransformExtra" + } + }] + }] }] },{ "ids": [{"id":"Abur", "castId": "burrow", "uncastId": "unburrow"}], @@ -590,18 +742,18 @@ "buff": { "type": "getLastCreatedNonStackingStatBuff" } + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } }] - }, - "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "E" - } - }] + } },{ "ids": [{"id":"Acpf", "castId": "corporealform", "uncastId": "uncorporealform"}], "type": "INHERIT", @@ -645,6 +797,12 @@ "type": "isToggleAbilityActive" }, "thenActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "storeBaseType" + } + },{ "type": "transformedUnitAbilityAdd", "unit": { "type": "getCastingUnit" @@ -740,11 +898,17 @@ } }], "onUntransformActions": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "onUnTransform" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "clearBaseType" + } }] }], "elseActions": [{ @@ -761,8 +925,15 @@ "type": "getCastingUnit" }, "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } }, "alternateUnitId": { "type": "getAbilityUnitId" @@ -832,40 +1003,172 @@ }] } },{ - "ids": [{"id":"AEme", "castId": "metamorphosis"}], + "ids": [{"id":"ANcr", "castId": "chemicalrage"}], "type": "INHERIT", "parentId": "Arav", - "displayFields": { - "toggleable": { - "type": "rawBoolean", - "value": "false" - }, - "castToggleOff": { - "type": "rawBoolean", - "value": "false" - } - }, "reuseActions": { "onTransform": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } + "type": "disableAbility" }], "onUnTransform": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } + "type": "enableAbility" }] }, - "onAddDisabledAbility": [{ + "displayFields": { + "alternateUnitId": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "null" + } + } + }, + "onAddDisabledAbility": [], + "onBeginCasting": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "storeBaseType" + } + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "transformUnit", + "unit": { + "type": "getCastingUnit" + }, + "baseUnitId": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "alternateUnitId": { + "type": "getAbilityUnitId" + }, + "immediateLanding": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 2 + } + } + }, + "immediateTakeOff": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 4 + } + } + }, + "permanent": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 8 + } + } + }, + "requiresPayment": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 16 + } + } + }, + "altitudeAdjustmentDelay": { + "type": "getAbilityCastTime" + }, + "altitudeAdjustmentTime": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "landingDelayTime": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "transformTime": { + "type": "getAbilityDuration" + }, + "duration": { + "type": "getAbilityHeroDuration" + }, + "buffId": { + "type": "getFirstBuffId" + }, + "instantTransformAtDurationEnd": { + "type": "rawBoolean", + "value": "true" + }, + "onlyTransformToAlternate": { + "type": "rawBoolean", + "value": "true" + }, + "onTransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" + } + }], + "onUntransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "clearBaseType" + } + }] + }] + },{ + "ids": [{"id":"AEme", "castId": "metamorphosis"}], + "type": "INHERIT", + "parentId": "Arav", + "reuseActions": { + "setup": [{ "type": "createNonStackingStatBuff", "buffType": { "type": "getNonStackingStatBuffTypeFromString", @@ -881,18 +1184,43 @@ "type": "getAbilityDataAsFloat", "dataField": "E" } - }], - "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "E" - } - }], + }], + "onTransform": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onUnTransform": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + }] + }, "onBeginCasting": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "storeBaseType" + } + },{ "type": "createTemporarySpellEffectOnUnit", "target": { "type": "getCastingUnit" @@ -907,8 +1235,15 @@ "type": "getCastingUnit" }, "baseUnitId": { - "type": "getAbilityDataAsID", - "dataField": "A" + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } }, "alternateUnitId": { "type": "getAbilityUnitId" @@ -1001,13 +1336,153 @@ } }], "onUntransformActions": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "onUnTransform" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "clearBaseType" + } }] }] + },{ + "ids": [{"id":"ANrg", "castId": "robogoblin", "uncastId": "unrobogoblin"}], + "type": "INHERIT", + "parentId": "Arav", + "reuseActions": { + "setup": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "STR" + } + }, + "stackingKey": { + "type": "getAllowStackingKey" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "strbuff" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "DEF" + } + }, + "stackingKey": { + "type": "getAllowStackingKey" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "F" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "defbuff" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onTransform": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "strbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "defbuff" + } + } + }], + "onUnTransform": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "strbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "defbuff" + } + } + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "strbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "defbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "F" + } + }] + } },{ "ids": [{"id":"Acha"}], "type": "HIDDEN", @@ -1022,6 +1497,10 @@ "permanent": { "type": "rawBoolean", "value": "true" + }, + "keepRatios": { + "type": "rawBoolean", + "value": "false" } }] }] diff --git a/core/assets/abilityBehaviors/activeBuffs.json b/core/assets/abilityBehaviors/activeBuffs.json new file mode 100644 index 000000000..7ef0c430b --- /dev/null +++ b/core/assets/abilityBehaviors/activeBuffs.json @@ -0,0 +1,245 @@ +{ + "abilityList": [{ + "ids": [{"id":"Absk", "castId": "berserk"}], + "type": "NORMAL_NOTARGET", + "displayFields": { + "castlessNoTarget": { + "type": "rawBoolean", + "value": "true" + } + }, + "overrideFields": { + "physicalSpell": { + "type": "rawBoolean", + "value": "false" + }, + "magicSpell": { + "type": "rawBoolean", + "value": "false" + } + }, + "onAddAbility": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "berserk" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "berserk" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createDamageTakenModificationListener", + "actions": [{ + "type": "multiplyDamageTakenMultiplier", + "multiplier": { + "type": "f+", + "value1": { + "type": "rawFloat", + "value": 1 + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + }] + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getCastingUnit" + } + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "addDamageTakenModificationListener", + "targetUnit": { + "type": "getCastingUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenModificationListener" + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "removeDamageTakenModificationListener", + "targetUnit": { + "type": "getCastingUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenModificationListener" + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }] + }] +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index 207cf1ef5..d0a354136 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -8813,14 +8813,14 @@ public boolean call(final CUnit unit) { (arguments, globalScope, triggerScope) -> { final CUnit unit = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final NonStackingStatBuff buff = arguments.get(1).visit(ObjectJassValueVisitor.getInstance()); - unit.addNonStackingStatBuff(buff); + unit.addNonStackingStatBuff(simulation, buff); return null; }); jassProgramVisitor.getJassNativeManager().createNative("RemoveUnitNonStackingStatBonus", (arguments, globalScope, triggerScope) -> { final CUnit unit = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final NonStackingStatBuff buff = arguments.get(1).visit(ObjectJassValueVisitor.getInstance()); - unit.removeNonStackingStatBuff(buff); + unit.removeNonStackingStatBuff(simulation, buff); return null; }); jassProgramVisitor.getJassNativeManager().createNative("RecomputeStatBonusesOnUnit", @@ -8828,7 +8828,11 @@ public boolean call(final CUnit unit) { final CUnit unit = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final NonStackingStatBuffType whichBuffType = arguments.get(1) .visit(ObjectJassValueVisitor.getInstance()); - unit.computeDerivedFields(whichBuffType); + if (whichBuffType.isHeroStat()) { + unit.computeDerivedHeroFields(simulation, whichBuffType); + } else { + unit.computeDerivedFields(whichBuffType); + } return null; }); jassProgramVisitor.getJassNativeManager().createNative("UpdateNonStackingStatBonus", diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java index 462b86cae..d902f2990 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java @@ -944,7 +944,6 @@ private void loadUnitsAndItems(final Warcraft3MapRuntimeObjectData modifications throws IOException { final War3Map mpq = this.mapMpq; this.unitsReady = false; - this.renderUnitTypeData = new RenderUnitTypeData(modifications.getUnits(), mpq, this, this.unitAckSoundsTable, this.terrain.uberSplatTable); this.renderItemTypeData = new RenderItemTypeData(modifications.getItems(), mpq, this, this.miscData); @@ -962,15 +961,12 @@ private void loadUnitsAndItems(final Warcraft3MapRuntimeObjectData modifications final int customTeamColor = unit.getCustomTeamColor(); final float unitAngle = unit.getAngle(); final int editorConfigHitPointPercent = unit.getHitpoints(); + final int editorConfigManaAmount = unit.getMana(); final CWidget widgetCreated = createNewUnit(modifications, unitId, unitX, unitY, playerIndex, - customTeamColor, unitAngle); + customTeamColor, unitAngle, editorConfigHitPointPercent, editorConfigManaAmount); if (widgetCreated instanceof CUnit) { final CUnit unitCreated = (CUnit) widgetCreated; - if (editorConfigHitPointPercent > 0) { - unitCreated.setLife(this.simulation, - unitCreated.getMaximumLife() * (editorConfigHitPointPercent / 100f)); - } if (unit.getGoldAmount() != 0) { unitCreated.setGold(unit.getGoldAmount()); } @@ -987,6 +983,11 @@ private void loadUnitsAndItems(final Warcraft3MapRuntimeObjectData modifications private CWidget createNewUnit(final Warcraft3MapRuntimeObjectData modifications, final War3ID unitId, float unitX, float unitY, final int playerIndex, int customTeamColor, final float unitAngle) { + return createNewUnit(modifications, unitId, unitAngle, unitAngle, customTeamColor, customTeamColor, unitAngle, -1, -1); + } + + private CWidget createNewUnit(final Warcraft3MapRuntimeObjectData modifications, final War3ID unitId, float unitX, + float unitY, final int playerIndex, int customTeamColor, final float unitAngle, int editorConfigHitPointPercent, int editorConfigManaAmount) { Splat buildingUberSplat = null; SplatMover buildingUberSplatDynamicIngame = null; BufferedImage buildingPathingPixelMap = null; @@ -1024,7 +1025,7 @@ private CWidget createNewUnit(final Warcraft3MapRuntimeObjectData modifications, final float angle = (float) Math.toDegrees(unitAngle); final CUnit simulationUnit = this.simulation.internalCreateUnit(unitId, playerIndex, unitX, unitY, - angle, buildingPathingPixelMap); + angle, buildingPathingPixelMap, editorConfigHitPointPercent, editorConfigManaAmount); unitX = simulationUnit.getX(); unitY = simulationUnit.getY(); if (!renderUnitType.isAllowCustomTeamColor() || (customTeamColor == -1)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java index 98d8aa5c0..53075e866 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java @@ -679,7 +679,7 @@ public Void accept(final CAbilityHero ability) { if (this.multiSelect) { return null; } - if (this.menuBaseOrderId == 0) { + if (this.menuBaseOrderId == 0 && ability.isIconShowing()) { final int skillPoints = ability.getSkillPoints(); addCommandButton(ability, this.abilityDataUI.getSelectSkillUI(), ability.getHandleId(), OrderIds.skillmenu, 0, false, true, 0, 0, 0, 0, skillPoints != 0 ? skillPoints : -1); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java index 2a392c2d1..bed5153b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java @@ -290,9 +290,9 @@ public void internalUnregisterTimer(final CTimer timer) { } public CUnit internalCreateUnit(final War3ID typeId, final int playerIndex, final float x, final float y, - final float facing, final BufferedImage buildingPathingPixelMap) { + final float facing, final BufferedImage buildingPathingPixelMap, int editorConfigHitPointPercent, int editorConfigManaAmount) { final CUnit unit = this.unitData.create(this, playerIndex, typeId, x, y, facing, buildingPathingPixelMap, - this.handleIdAllocator); + this.handleIdAllocator, editorConfigHitPointPercent, editorConfigManaAmount); this.newUnits.add(unit); this.handleIdToUnit.put(unit.getHandleId(), unit); return unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index 6248a85de..06f2efbb7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.LinkedList; @@ -120,6 +121,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CFogState; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitAppliedUpgrade; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitBehaviorChangeListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CWidgetEvent; @@ -128,6 +130,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuffType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.upgrade.CUpgradeEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; @@ -186,6 +189,7 @@ public class CUnit extends CWidget { private final List abilities = new ArrayList<>(); private final List disabledAbilities = new ArrayList<>(); + private final Set appliedUpgrades = new HashSet<>(); private final List onTickTriggers = new ArrayList<>(); private CBehavior currentBehavior; @@ -411,7 +415,7 @@ public byte getInvisLevels() { return this.invisLevels; } - public void addNonStackingStatBuff(final NonStackingStatBuff buff) { + public void addNonStackingStatBuff(final CSimulation game, final NonStackingStatBuff buff) { if (buff.getBuffType() == NonStackingStatBuffType.ALLATK) { Map> buffKeyMap = this.nonStackingBuffs .get(NonStackingStatBuffType.MELEEATK); @@ -475,10 +479,14 @@ public void addNonStackingStatBuff(final NonStackingStatBuff buff) { } theList.add(buff); } - computeDerivedFields(buff.getBuffType()); + if (buff.getBuffType().isHeroStat()) { + computeDerivedHeroFields(game, buff.getBuffType()); + } else { + computeDerivedFields(buff.getBuffType()); + } } - public void removeNonStackingStatBuff(final NonStackingStatBuff buff) { + public void removeNonStackingStatBuff(final CSimulation game, final NonStackingStatBuff buff) { if (buff.getBuffType() == NonStackingStatBuffType.ALLATK) { Map> buffKeyMap = this.nonStackingBuffs .get(NonStackingStatBuffType.MELEEATK); @@ -527,7 +535,11 @@ public void removeNonStackingStatBuff(final NonStackingStatBuff buff) { System.err.println("From: " + getTypeId().asStringValue()); } } - computeDerivedFields(buff.getBuffType()); + if (buff.getBuffType().isHeroStat()) { + computeDerivedHeroFields(game, buff.getBuffType()); + } else { + computeDerivedFields(buff.getBuffType()); + } } public void addStateModBuff(final StateModBuff listener) { @@ -1350,11 +1362,161 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { this.mana = Math.min(this.mana, this.maximumMana); } break; + case STR: + case STRPCT: + case AGI: + case AGIPCT: + case INT: + case INTPCT: + throw new RuntimeException("Cannot run method with hero stat type"); default: break; } } + public void computeDerivedHeroFields(final CSimulation game, final NonStackingStatBuffType type) { + Map> buffKeyMap; + switch (type) { + case STRPCT: + case STR: + if (this.isHero()) { + float totalStrBuff = 0; + buffKeyMap = this.nonStackingBuffs.get(NonStackingStatBuffType.STR); + for (final String key : buffKeyMap.keySet()) { + Float buffForKey = null; + for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { + if (buffForKey == null) { + buffForKey = buff.getValue(); + } else { + if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { + buffForKey += buff.getValue(); + } else { + buffForKey = Math.max(buffForKey, buff.getValue()); + } + } + } + if (buffForKey == null) { + continue; + } + totalStrBuff += buffForKey; + } + buffKeyMap = this.nonStackingBuffs.get(NonStackingStatBuffType.STRPCT); + for (final String key : buffKeyMap.keySet()) { + Float buffForKey = null; + for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { + if (buffForKey == null) { + buffForKey = buff.getValue(); + } else { + if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { + buffForKey += buff.getValue(); + } else { + buffForKey = Math.max(buffForKey, buff.getValue()); + } + } + } + if (buffForKey == null) { + continue; + } + totalStrBuff += buffForKey * this.getHeroData().getStrength().getCurrentBase(); + } + this.getHeroData().setStrengthBuffBonus(game, this, Math.round(totalStrBuff)); + } + break; + case AGIPCT: + case AGI: + if (this.isHero()) { + float totalAgiBuff = 0; + buffKeyMap = this.nonStackingBuffs.get(NonStackingStatBuffType.AGI); + for (final String key : buffKeyMap.keySet()) { + Float buffForKey = null; + for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { + if (buffForKey == null) { + buffForKey = buff.getValue(); + } else { + if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { + buffForKey += buff.getValue(); + } else { + buffForKey = Math.max(buffForKey, buff.getValue()); + } + } + } + if (buffForKey == null) { + continue; + } + totalAgiBuff += buffForKey; + } + buffKeyMap = this.nonStackingBuffs.get(NonStackingStatBuffType.AGIPCT); + for (final String key : buffKeyMap.keySet()) { + Float buffForKey = null; + for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { + if (buffForKey == null) { + buffForKey = buff.getValue(); + } else { + if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { + buffForKey += buff.getValue(); + } else { + buffForKey = Math.max(buffForKey, buff.getValue()); + } + } + } + if (buffForKey == null) { + continue; + } + totalAgiBuff += buffForKey * this.getHeroData().getAgility().getCurrentBase(); + } + this.getHeroData().setAgilityBuffBonus(game, this, Math.round(totalAgiBuff)); + } + break; + case INTPCT: + case INT: + if (this.isHero()) { + float totalIntBuff = 0; + buffKeyMap = this.nonStackingBuffs.get(NonStackingStatBuffType.INT); + for (final String key : buffKeyMap.keySet()) { + Float buffForKey = null; + for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { + if (buffForKey == null) { + buffForKey = buff.getValue(); + } else { + if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { + buffForKey += buff.getValue(); + } else { + buffForKey = Math.max(buffForKey, buff.getValue()); + } + } + } + if (buffForKey == null) { + continue; + } + totalIntBuff += buffForKey; + } + buffKeyMap = this.nonStackingBuffs.get(NonStackingStatBuffType.INTPCT); + for (final String key : buffKeyMap.keySet()) { + Float buffForKey = null; + for (final NonStackingStatBuff buff : buffKeyMap.get(key)) { + if (buffForKey == null) { + buffForKey = buff.getValue(); + } else { + if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { + buffForKey += buff.getValue(); + } else { + buffForKey = Math.max(buffForKey, buff.getValue()); + } + } + } + if (buffForKey == null) { + continue; + } + totalIntBuff += buffForKey * this.getHeroData().getIntelligence().getCurrentBase(); + } + this.getHeroData().setIntelligenceBuffBonus(game, this, Math.round(totalIntBuff)); + } + break; + default: + throw new RuntimeException("Cannot run method with non-hero stat type"); + } + } + public NonStackingFx addNonStackingFx(final CSimulation game, final String stackingKey, final War3ID id, final CEffectType target) { List existingArts = this.nonStackingFx.get(stackingKey); @@ -1450,6 +1612,12 @@ private void initializeNonStackingBuffs() { this.nonStackingBuffs.put(NonStackingStatBuffType.MAXHPPCT, new HashMap<>(1)); this.nonStackingBuffs.put(NonStackingStatBuffType.MAXMP, new HashMap<>(1)); this.nonStackingBuffs.put(NonStackingStatBuffType.MAXMPPCT, new HashMap<>(1)); + this.nonStackingBuffs.put(NonStackingStatBuffType.STR, new HashMap<>(1)); + this.nonStackingBuffs.put(NonStackingStatBuffType.STRPCT, new HashMap<>(1)); + this.nonStackingBuffs.put(NonStackingStatBuffType.AGI, new HashMap<>(1)); + this.nonStackingBuffs.put(NonStackingStatBuffType.AGIPCT, new HashMap<>(1)); + this.nonStackingBuffs.put(NonStackingStatBuffType.INT, new HashMap<>(1)); + this.nonStackingBuffs.put(NonStackingStatBuffType.INTPCT, new HashMap<>(1)); } private void initializeListenerLists() { @@ -1689,25 +1857,29 @@ public int getMaximumLife() { return this.maximumLife; } - public void setTypeId(final CSimulation game, final War3ID typeId) { - setTypeId(game, typeId, true); + public void setTypeId(final CSimulation game, final War3ID typeId, final boolean keepRatios) { + setTypeId(game, typeId, keepRatios, true); } - public void setTypeId(final CSimulation game, final War3ID typeId, final boolean updateArt) { + public void setTypeId(final CSimulation game, final War3ID typeId, final boolean keepRatios, final boolean updateArt) { game.getWorldCollision().removeUnit(this); final CPlayer player = game.getPlayer(this.playerIndex); player.removeTechtreeUnlocked(game, this.typeId); + game.getUnitData().unapplyPlayerUpgradesToUnit(game, playerIndex, unitType, this); this.typeId = typeId; player.addTechtreeUnlocked(game, this.typeId); final float lifeRatio = this.maximumLife == 0 ? 1 : this.life / this.maximumLife; final float manaRatio = this.maximumMana == 0 ? Float.NaN : this.mana / this.maximumMana; final CUnitType previousUnitType = getUnitType(); this.unitType = game.getUnitData().getUnitType(typeId); - this.maximumMana = this.unitType.getManaMaximum(); - this.maximumLife = this.unitType.getMaxLife(); - this.life = lifeRatio * this.maximumLife; + this.baseMaximumMana += this.unitType.getManaMaximum() - previousUnitType.getManaMaximum(); + this.baseMaximumLife += this.unitType.getMaxLife() - previousUnitType.getMaxLife(); + this.maximumMana += this.unitType.getManaMaximum() - previousUnitType.getManaMaximum(); + this.maximumLife += this.unitType.getMaxLife() - previousUnitType.getMaxLife(); this.lifeRegen = this.unitType.getLifeRegen(); this.manaRegen = this.unitType.getManaRegen(); + computeAllDerivedFields(); + if (updateArt) { this.flyHeight = this.unitType.getDefaultFlyingHeight(); } @@ -1724,15 +1896,16 @@ public void setTypeId(final CSimulation game, final War3ID typeId, final boolean this.raisable = this.unitType.isRaise(); this.decays = this.unitType.isDecay(); final List sharedAbilities = new ArrayList(previousUnitType.getAbilityList()); - sharedAbilities.addAll(previousUnitType.getHeroAbilityList()); + //sharedAbilities.addAll(previousUnitType.getHeroAbilityList()); final List newIds = new ArrayList(this.unitType.getAbilityList()); - newIds.addAll(this.unitType.getHeroAbilityList()); + //newIds.addAll(this.unitType.getHeroAbilityList()); sharedAbilities.retainAll(newIds); // TODO Seems wasteful, but need to avoid messing up heros on transform final List persistedAbilities = new ArrayList<>(); final List removedAbilities = new ArrayList<>(); final List startingAbilities = new ArrayList<>(this.abilities); for (final CAbility ability : startingAbilities) { if (!ability.isPermanent() && !sharedAbilities.contains(ability.getAlias()) + && (!ability.isHero() || !this.unitType.isHero()) && !(ability.getAbilityCategory() == CAbilityCategory.BUFF)) { ability.onRemove(game, this); game.onAbilityRemovedFromUnit(this, ability); @@ -1761,18 +1934,29 @@ public void setTypeId(final CSimulation game, final War3ID typeId, final boolean this.abilities.add(persisted); } } - if (Float.isNaN(manaRatio)) { - this.mana = this.unitType.getManaInitial(); - } else { - this.mana = manaRatio * this.maximumMana; - } game.getWorldCollision().addUnit(this); for (final CAbility ability : persistedAbilities) { ability.onSetUnitType(game, this); game.onAbilityAddedToUnit(this, ability); } + game.getUnitData().applyPlayerUpgradesToUnit(game, playerIndex, unitType, this); computeAllDerivedFields(); computeAllUnitStates(game); + if (keepRatios) { + this.life = lifeRatio * this.maximumLife; + if (Float.isNaN(manaRatio)) { + this.mana = this.unitType.getManaInitial(); + } else { + this.mana = manaRatio * this.maximumMana; + } + } else { + this.life += this.unitType.getMaxLife() - previousUnitType.getMaxLife(); + if (Float.isNaN(manaRatio)) { + this.mana = this.unitType.getManaInitial(); + } else { + this.mana += this.unitType.getManaMaximum() - previousUnitType.getManaMaximum(); + } + } } public void setFacing(final float facing) { @@ -1933,7 +2117,7 @@ public boolean update(final CSimulation game) { if (this.unitType.getFoodMade() != 0) { player.setFoodCap(player.getFoodCap() - this.unitType.getFoodMade()); } - setTypeId(game, this.upgradeIdType); + setTypeId(game, this.upgradeIdType, true); this.upgradeIdType = null; } if (this.unitType.getFoodMade() != 0) { @@ -4758,6 +4942,55 @@ public boolean removeUnitType(final CSimulation game, final CUnitTypeJass whichU } return false; } + + public Set getAppliedUpgrades() { + return this.appliedUpgrades; + } + + public int getLevelOfAppliedUpgrade(War3ID id) { + CUnitAppliedUpgrade upgrade = getAppliedUpgrade(id); + if (upgrade != null) { + return upgrade.getLevel(); + } + return 0; + } + + private CUnitAppliedUpgrade getAppliedUpgrade(War3ID id) { + for (CUnitAppliedUpgrade upgrade : this.appliedUpgrades) { + if (upgrade.getType().getTypeId().equals(id)) { + return upgrade; + } + } + return null; + } + + public void applyUpgrade(CSimulation simulation, CUpgradeType upgradeType, int level) { + CUnitAppliedUpgrade upgrade = getAppliedUpgrade(upgradeType.getTypeId()); + if (upgrade != null) { + if (upgrade.getLevel() == level) { + return; + } + unapplyUpgrade(simulation, upgradeType, upgrade); + } + for (CUpgradeEffect upgradeEffect : upgradeType.getUpgradeEffects()) { + upgradeEffect.apply(simulation, this, level); + } + this.appliedUpgrades.add(new CUnitAppliedUpgrade(upgradeType, level)); + } + + public void unapplyUpgrade(CSimulation simulation, CUpgradeType upgradeType) { + CUnitAppliedUpgrade upgrade = getAppliedUpgrade(upgradeType.getTypeId()); + unapplyUpgrade(simulation, upgradeType, upgrade); + } + + public void unapplyUpgrade(CSimulation simulation, CUpgradeType upgradeType, CUnitAppliedUpgrade upgrade) { + if (upgrade != null) { + for (CUpgradeEffect upgradeEffect : upgradeType.getUpgradeEffects()) { + upgradeEffect.unapply(simulation, this, upgrade.getLevel()); + } + } + this.appliedUpgrades.remove(upgrade); + } public int getTriggerEditorCustomValue() { return this.triggerEditorCustomValue; @@ -5002,7 +5235,8 @@ public void fireResearchFinishEvents(final CSimulation game, final War3ID resear } public boolean isHero() { - return getHeroData() != null; // in future maybe do this with better performance + CAbility hdata = getHeroData(); + return hdata != null && !hdata.isDisabled(); // in future maybe do this with better performance } public boolean isUnitAlly(final CPlayer whichPlayer) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUpgradeType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUpgradeType.java index b60393a42..061ea0332 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUpgradeType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUpgradeType.java @@ -135,9 +135,7 @@ public List getRequirements() { } public void apply(CSimulation simulation, CUnit unit, int i) { - for (CUpgradeEffect upgradeEffect : getUpgradeEffects()) { - upgradeEffect.apply(simulation, unit, i); - } + unit.applyUpgrade(simulation, this, i); } public void apply(CSimulation simulation, int playerIndex, int i) { @@ -147,9 +145,7 @@ public void apply(CSimulation simulation, int playerIndex, int i) { } public void unapply(CSimulation simulation, CUnit unit, int i) { - for (CUpgradeEffect upgradeEffect : getUpgradeEffects()) { - upgradeEffect.unapply(simulation, unit, i); - } + unit.unapplyUpgrade(simulation, this); } public void unapply(CSimulation simulation, int playerIndex, int i) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java index 6e53e07cd..b3bc9b16f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java @@ -10,6 +10,7 @@ public abstract class AbstractCAbility extends CExtensibleHandleAbstract implements CAbility { private final int handleId; private byte disabled = 0; + private boolean hero = false; private boolean iconShowing = true; private boolean permanent = false; @@ -35,24 +36,34 @@ public War3ID getAlias() { return getCode(); } + @Override + public boolean isHero() { + return hero; + } + + public void setHero(boolean hero) { + this.hero = hero; + } + @Override public final boolean isDisabled() { return this.disabled != 0; } - protected void onSetDisabled(final boolean disabled, final CAbilityDisableType type) { + protected void onSetDisabled(final boolean disabled, final boolean wasDisabled, final CAbilityDisableType type) { } @Override public final void setDisabled(final boolean disabled, final CAbilityDisableType type) { + boolean wasDisabled = this.isDisabled(); if (disabled) { this.disabled |= type.getMask(); } else { this.disabled &= ~type.getMask(); } - onSetDisabled(disabled, type); + onSetDisabled(disabled, wasDisabled, type); } @Override @@ -102,12 +113,18 @@ public final void checkCanUse(final CSimulation game, final CUnit unit, final in if (isDisabled()) { receiver.disabled(); checkRequirementsMet(game, unit, receiver); + innerCheckCooldownDisabled(game,unit,orderId,receiver); } else { innerCheckCanUse(game, unit, orderId, receiver); } } + protected void innerCheckCooldownDisabled(final CSimulation game, final CUnit unit, final int orderId, + final AbilityActivationReceiver receiver) { + //do nothing + } + protected abstract void innerCheckCanUse(final CSimulation game, final CUnit unit, final int orderId, final AbilityActivationReceiver receiver); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java index 5801e4920..4cef40ba6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java @@ -42,6 +42,8 @@ public interface CAbility extends CAbilityView, CExtensibleHandle { CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId); + void setHero(boolean isHero); + void setDisabled(boolean disabled, CAbilityDisableType type); void setIconShowing(boolean iconShowing); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityDisableType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityDisableType.java index dca5d3837..f17e2357d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityDisableType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityDisableType.java @@ -8,7 +8,8 @@ public enum CAbilityDisableType implements CHandle { TRANSFORMATION((byte) 4), TRIGGER((byte) 8), ATTACKDISABLED((byte) 16), - PLAYER((byte) 32); + PLAYER((byte) 32), + ABILITYINTERNAL((byte) 64); private byte mask; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java index 3f5a86e48..775076d6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java @@ -31,6 +31,8 @@ void checkCanTarget(CSimulation game, CUnit unit, int orderId, AbilityPointTarge War3ID getCode(); + boolean isHero(); + boolean isDisabled(); boolean isIconShowing(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java index 1f4e98080..b90d670f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.hero; +import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -14,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.AbstractCAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.GetAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; @@ -29,13 +31,15 @@ public class CAbilityHero extends AbstractCAbility { private Set skillsAvailable; + private List learnedAbilities; private int xp; - private int heroLevel; + private int heroLevel = 0; private int skillPoints = 1; private HeroStatValue strength; private HeroStatValue agility; private HeroStatValue intelligence; + private int nameIndex; private String properName; private boolean awaitingRevive; private boolean reviving; @@ -43,31 +47,34 @@ public class CAbilityHero extends AbstractCAbility { public CAbilityHero(final int handleId, final List skillsAvailable) { super(handleId, War3ID.fromString("AHer")); this.skillsAvailable = new LinkedHashSet<>(skillsAvailable); + this.learnedAbilities = new ArrayList<>(); setPermanent(true); } @Override public void onAdd(final CSimulation game, final CUnit unit) { - this.heroLevel = 1; - this.xp = 0; - final CUnitType unitType = unit.getUnitType(); - this.strength = new HeroStatValue(unitType.getStartingStrength(), unitType.getStrengthPerLevel()); - this.agility = new HeroStatValue(unitType.getStartingAgility(), unitType.getAgilityPerLevel()); - this.intelligence = new HeroStatValue(unitType.getStartingIntelligence(), unitType.getIntelligencePerLevel()); - calculateDerivatedFields(game, unit); - - final int properNamesCount = unitType.getProperNamesCount(); - final int nameIndex = properNamesCount > 0 ? game.getSeededRandom().nextInt(properNamesCount) : 0; - + if (this.heroLevel == 0) { + this.heroLevel = 1; + this.xp = 0; + final CUnitType unitType = unit.getUnitType(); + this.strength = new HeroStatValue(unitType.getStartingStrength(), unitType.getStrengthPerLevel()); + this.agility = new HeroStatValue(unitType.getStartingAgility(), unitType.getAgilityPerLevel()); + this.intelligence = new HeroStatValue(unitType.getStartingIntelligence(), unitType.getIntelligencePerLevel()); + calculateDerivatedFields(game, unit); + + final int properNamesCount = unitType.getProperNamesCount(); + nameIndex = properNamesCount > 0 ? game.getSeededRandom().nextInt(properNamesCount) : 0; + + setHeroName(unitType); + } + } + + public void setHeroName(CUnitType unitType) { String properName; final List heroProperNames = unitType.getHeroProperNames(); - if (heroProperNames.size() > 0) { - if (nameIndex < heroProperNames.size()) { - properName = heroProperNames.get(nameIndex); - } - else { - properName = heroProperNames.get(heroProperNames.size() - 1); - } + int cnt = unitType.getProperNamesCount() > 0 ? unitType.getProperNamesCount() : heroProperNames.size(); + if (heroProperNames.size() > 0 && cnt > 0) { + properName = heroProperNames.get(nameIndex % cnt); } else { properName = WarsmashConstants.DEFAULT_STRING; @@ -106,6 +113,8 @@ private void learnSkill(final CSimulation game, final CUnit caster, final War3ID .getAbility(GetAbilityByRawcodeVisitor.getInstance().reset(skillId)); if (existingAbility == null) { final CAbility newAbility = abilityType.createAbility(game.getHandleIdAllocator().createId()); + newAbility.setHero(true); + this.learnedAbilities.add(newAbility); caster.add(game, newAbility); } else { @@ -117,6 +126,10 @@ private void learnSkill(final CSimulation game, final CUnit caster, final War3ID "NOTEXTERN: Ability is not yet programmed, unable to learn!"); } } + + public List getLearnedHeroAbilities() { + return this.learnedAbilities; + } public void selectHeroSkill(final CSimulation game, final CUnit caster, final War3ID skillId) { final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; @@ -312,6 +325,21 @@ public void setIntelligenceBase(final CSimulation game, final CUnit unit, final calculateDerivatedFields(game, unit); } + public void setStrengthBuffBonus(final CSimulation game, final CUnit unit, final int strengthBuffBonus) { + this.strength.setBuffBonus(strengthBuffBonus); + calculateDerivatedFields(game, unit); + } + + public void setAgilityBuffBonus(final CSimulation game, final CUnit unit, final int agilityBuffBonus) { + this.agility.setBuffBonus(agilityBuffBonus); + calculateDerivatedFields(game, unit); + } + + public void setIntelligenceBuffBonus(final CSimulation game, final CUnit unit, final int intelligenceBuffBonus) { + this.intelligence.setBuffBonus(intelligenceBuffBonus); + calculateDerivatedFields(game, unit); + } + public void addStrengthBonus(final CSimulation game, final CUnit unit, final int strengthBonus) { this.strength.setBonus(this.strength.getBonus() + strengthBonus); calculateDerivatedFields(game, unit); @@ -354,7 +382,7 @@ private HeroStatValue getStat(final CPrimaryAttribute attribute) { } } - private void calculateDerivatedFields(final CSimulation game, final CUnit unit) { + public void calculateDerivatedFields(final CSimulation game, final CUnit unit) { final CGameplayConstants gameplayConstants = game.getGameplayConstants(); final int prevStrength = this.strength.getCurrent(); final int prevAgility = this.agility.getCurrent(); @@ -457,6 +485,7 @@ public static final class HeroStatValue { private final float perLevelFactor; private int base; private int bonus; + private int buffbonus = 0; private int currentBase; private int current; @@ -467,7 +496,7 @@ private HeroStatValue(final int base, final float perLevelFactor) { public void calculate(final int level) { this.currentBase = this.base + (int) ((level - 1) * this.perLevelFactor); - this.current = this.currentBase + this.bonus; + this.current = this.currentBase + (this.bonus + this.buffbonus); } public void setBase(final int base) { @@ -478,6 +507,10 @@ public void setBonus(final int bonus) { this.bonus = bonus; } + public void setBuffBonus(final int buffbonus) { + this.buffbonus = buffbonus; + } + public int getBase() { return this.base; } @@ -490,18 +523,22 @@ public int getBonus() { return this.bonus; } + public int getBuffBonus() { + return this.buffbonus; + } + public int getCurrent() { return this.current; } public String getDisplayText() { String text = Integer.toString(this.currentBase); - if (this.bonus != 0) { - if (this.bonus > 0) { - text += "|cFF00FF00 +" + this.bonus + ""; + if ((this.bonus + this.buffbonus) != 0) { + if ((this.bonus + this.buffbonus) > 0) { + text += "|cFF00FF00 +" + (this.bonus + this.buffbonus) + ""; } else { - text += "|cFFFF0000 " + this.bonus + ""; + text += "|cFFFF0000 " + (this.bonus + this.buffbonus) + ""; } } return text; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java index a47d7d3b1..0e6e782ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java @@ -425,7 +425,7 @@ public void onSetUnitType(final CSimulation game, final CUnit unit) { } @Override - protected void onSetDisabled(final boolean disabled, final CAbilityDisableType type) { + protected void onSetDisabled(final boolean disabled, final boolean wasDisabled, final CAbilityDisableType type) { final List arguments = new ArrayList<>(); final StructJassValue structValue = getStructValue(); arguments.add(structValue); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java index a09fe053f..3fcbbe1c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java @@ -64,4 +64,6 @@ public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, fin War3ID getOffTooltipOverride(); + boolean isActive(); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java index 33f894494..243ae307a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java @@ -136,7 +136,7 @@ public void activate(final CSimulation game, final CUnit caster) { this.startCooldown(game, caster); if (this.manaDrainedPerSecond > 0) { this.timer.start(game); - caster.addNonStackingStatBuff(manaDrain); + caster.addNonStackingStatBuff(game, manaDrain); } if (config.getOnBeginCasting() != null) { for (ABAction action : config.getOnBeginCasting()) { @@ -150,7 +150,7 @@ public void deactivate(final CSimulation game, final CUnit caster) { this.active = false; if (this.manaDrainedPerSecond > 0) { timer.pause(game); - caster.removeNonStackingStatBuff(manaDrain); + caster.removeNonStackingStatBuff(game, manaDrain); } if (config.getOnEndCasting() != null) { for (ABAction action : config.getOnEndCasting()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index 3e01e031b..33ea96503 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -192,7 +192,7 @@ private void determineToggleableFields(CSimulation game, CUnit unit) { this.allowCastlessDeactivate = !config.getDisplayFields().getCastToggleOff().callback(game, unit, localStore, castId); } - if (toggleable && config.getDisplayFields() != null && config.getDisplayFields().getAlternateUnitId() != null) { + if (config.getDisplayFields() != null && config.getDisplayFields().getAlternateUnitId() != null) { if (unit.getTypeId() .equals(config.getDisplayFields().getAlternateUnitId().callback(game, unit, localStore, castId))) { this.active = true; @@ -444,6 +444,11 @@ public boolean isToggleOn() { return this.toggleable && this.active; } + @Override + public boolean isActive() { + return this.active; + } + @Override public int getAutoCastOnOrderId() { return this.autoCastOnId; @@ -504,6 +509,26 @@ protected ABBehavior createRangedBehavior(CUnit unit) { return beh; } + protected void innerCheckCooldownDisabled(final CSimulation game, final CUnit unit, final int orderId, + final AbilityActivationReceiver receiver) { + final int cooldownRemaining = unit.getCooldownRemainingTicks(game, getCooldownId()); + if (this.toggleable && this.active && this.allowCastlessDeactivate) { + if (cooldownRemaining > 0 && !(receiver instanceof MeleeUIAbilityActivationReceiver)) { + float cooldownLengthDisplay = unit.getCooldownLengthDisplayTicks(game, getCooldownId()) + * WarsmashConstants.SIMULATION_STEP_TIME; + receiver.cooldownNotYetReady(cooldownRemaining * WarsmashConstants.SIMULATION_STEP_TIME, + cooldownLengthDisplay); + } + } else { + if (cooldownRemaining > 0) { + float cooldownLengthDisplay = unit.getCooldownLengthDisplayTicks(game, getCooldownId()) + * WarsmashConstants.SIMULATION_STEP_TIME; + receiver.cooldownNotYetReady(cooldownRemaining * WarsmashConstants.SIMULATION_STEP_TIME, + cooldownLengthDisplay); + } + } + } + @Override protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final int orderId, final AbilityActivationReceiver receiver) { @@ -985,7 +1010,7 @@ public void activate(final CSimulation game, final CUnit caster) { this.active = true; if (this.manaDrain != null) { this.timer.start(game); - caster.addNonStackingStatBuff(manaDrain); + caster.addNonStackingStatBuff(game, manaDrain); } if (config.getOnActivate() != null) { for (ABAction action : config.getOnActivate()) { @@ -1005,7 +1030,7 @@ public void deactivate(final CSimulation game, final CUnit caster) { this.active = false; if (this.manaDrain != null) { timer.pause(game); - caster.removeNonStackingStatBuff(manaDrain); + caster.removeNonStackingStatBuff(game, manaDrain); } if (config.getOnDeactivate() != null) { for (ABAction action : config.getOnDeactivate()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java index 42f35ae2c..018a4f1db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java @@ -43,6 +43,7 @@ public static GetInstantTransformationBuffVisitor getInstance() { private CSimulation game; private Map localStore; private CUnitType newType; + private boolean keepRatios; private OnTransformationActions actions; private War3ID buffId; private boolean addAlternateTagAfter; @@ -51,11 +52,12 @@ public static GetInstantTransformationBuffVisitor getInstance() { private boolean permanent; public GetInstantTransformationBuffVisitor reset(CSimulation game, Map localStore, - CUnitType newType, OnTransformationActions actions, War3ID buffId, boolean addAlternateTagAfter, - float transformationTime, float duration, boolean permanent) { + CUnitType newType, final boolean keepRatios, OnTransformationActions actions, War3ID buffId, + boolean addAlternateTagAfter, float transformationTime, float duration, boolean permanent) { this.game = game; this.localStore = localStore; this.newType = newType; + this.keepRatios = keepRatios; this.actions = actions; this.buffId = buffId; this.addAlternateTagAfter = addAlternateTagAfter; @@ -81,8 +83,8 @@ public ABBuff accept(final GenericSingleIconActiveAbility ability) { public ABBuff accept(GenericSingleIconPassiveAbility ability) { if (ability instanceof AbilityBuilderPassiveAbility) { return new ABTimedInstantTransformationBuff(game.getHandleIdAllocator().createId(), localStore, actions, - buffId == null ? ability.getAlias() : buffId, duration, (AbilityBuilderPassiveAbility)ability, newType, !addAlternateTagAfter, - permanent, transformationTime); + buffId == null ? ability.getAlias() : buffId, duration, (AbilityBuilderPassiveAbility) ability, + newType, keepRatios, !addAlternateTagAfter, permanent, transformationTime); } return null; } @@ -91,8 +93,8 @@ public ABBuff accept(GenericSingleIconPassiveAbility ability) { public ABBuff accept(final GenericNoIconAbility ability) { if (ability instanceof AbilityBuilderPassiveAbility) { return new ABTimedInstantTransformationBuff(game.getHandleIdAllocator().createId(), localStore, actions, - buffId == null ? ability.getAlias() : buffId, duration, (AbilityBuilderPassiveAbility)ability, newType, !addAlternateTagAfter, - permanent, transformationTime); + buffId == null ? ability.getAlias() : buffId, duration, (AbilityBuilderPassiveAbility) ability, + newType, keepRatios, !addAlternateTagAfter, permanent, transformationTime); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java index 305431f7e..49682819a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java @@ -90,20 +90,20 @@ public CAbilityAbilityBuilderStatAuraTemplate(int handleId, War3ID code, War3ID this.leveled = levelData.size() > 1; } - private void removeExistingBuffs(StatBuffFromDataField statBuff) { + private void removeExistingBuffs(CSimulation game, StatBuffFromDataField statBuff) { for (CUnit unit : auraGroup) { - unit.removeNonStackingStatBuff(statBuff.getBuff()); + unit.removeNonStackingStatBuff(game, statBuff.getBuff()); if (statBuff.getSecondAtkBuff() != null) { - unit.removeNonStackingStatBuff(statBuff.getSecondAtkBuff()); + unit.removeNonStackingStatBuff(game, statBuff.getSecondAtkBuff()); } } } - private void addNewBuffs(StatBuffFromDataField statBuff) { + private void addNewBuffs(CSimulation game, StatBuffFromDataField statBuff) { for (CUnit unit : auraGroup) { - unit.addNonStackingStatBuff(statBuff.getBuff()); + unit.addNonStackingStatBuff(game, statBuff.getBuff()); if (statBuff.getSecondAtkBuff() != null) { - unit.addNonStackingStatBuff(statBuff.getSecondAtkBuff()); + unit.addNonStackingStatBuff(game, statBuff.getSecondAtkBuff()); } } } @@ -172,13 +172,13 @@ public void setLevel(CSimulation game, CUnit unit, int level) { switch (type) { case ALLATK: if (statBuff.getSecondAtkBuff() == null) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); - addNewBuffs(statBuff); + addNewBuffs(game, statBuff); } else if (statBuff.getBuff().getBuffType() != NonStackingStatBuffType.MELEEATK) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); - addNewBuffs(statBuff); + addNewBuffs(game, statBuff); } else { statBuff.getBuff().setValue(Float.parseFloat( levelData.get(getLevel() - 1).getData().get(statBuff.getDataField().getIndex()))); @@ -188,13 +188,13 @@ public void setLevel(CSimulation game, CUnit unit, int level) { break; case ALLATKPCT: if (statBuff.getSecondAtkBuff() == null) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); - addNewBuffs(statBuff); + addNewBuffs(game, statBuff); } else if (statBuff.getBuff().getBuffType() != NonStackingStatBuffType.MELEEATKPCT) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); - addNewBuffs(statBuff); + addNewBuffs(game, statBuff); } else { statBuff.getBuff().setValue(Float.parseFloat( levelData.get(getLevel() - 1).getData().get(statBuff.getDataField().getIndex()))); @@ -204,13 +204,13 @@ public void setLevel(CSimulation game, CUnit unit, int level) { break; default: if (statBuff.getSecondAtkBuff() != null) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); - addNewBuffs(statBuff); + addNewBuffs(game, statBuff); } else if (type != statBuff.getBuff().getBuffType()) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); - addNewBuffs(statBuff); + addNewBuffs(game, statBuff); } else { float parsedFloat; try { @@ -231,7 +231,11 @@ public void setLevel(CSimulation game, CUnit unit, int level) { } } for (CUnit unitA : auraGroup) { - unitA.computeDerivedFields(statBuff.getBuff().getBuffType()); + if (statBuff.getBuff().getBuffType().isHeroStat()) { + unitA.computeDerivedHeroFields(game, statBuff.getBuff().getBuffType()); + } else { + unitA.computeDerivedFields(statBuff.getBuff().getBuffType()); + } } } if (this.rangeOverride != null) { @@ -297,9 +301,9 @@ public void emptyAura(CSimulation game, CUnit unit) { public void addUnitToAura(CSimulation game, CUnit unit) { for (StatBuffFromDataField statBuff : this.statBuffDataFields) { - unit.addNonStackingStatBuff(statBuff.getBuff()); + unit.addNonStackingStatBuff(game, statBuff.getBuff()); if (statBuff.getSecondAtkBuff() != null) { - unit.addNonStackingStatBuff(statBuff.getSecondAtkBuff()); + unit.addNonStackingStatBuff(game, statBuff.getSecondAtkBuff()); } } if (buff != null) { @@ -313,9 +317,9 @@ public void removeUnitFromAura(CSimulation game, CUnit unit) { unit.removeNonStackingDisplayBuff(game, auraStackingKey, buff); } for (StatBuffFromDataField statBuff : this.statBuffDataFields) { - unit.removeNonStackingStatBuff(statBuff.getBuff()); + unit.removeNonStackingStatBuff(game, statBuff.getBuff()); if (statBuff.getSecondAtkBuff() != null) { - unit.removeNonStackingStatBuff(statBuff.getSecondAtkBuff()); + unit.removeNonStackingStatBuff(game, statBuff.getSecondAtkBuff()); } } auraGroup.remove(unit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java index 31dc20ebf..ee92b627f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java @@ -47,10 +47,10 @@ public CAbilityAbilityBuilderStatPassiveTemplate(int handleId, War3ID code, War3 } } - private void removeExistingBuffs(StatBuffFromDataField statBuff) { - this.caster.removeNonStackingStatBuff(statBuff.getBuff()); + private void removeExistingBuffs(CSimulation game, StatBuffFromDataField statBuff) { + this.caster.removeNonStackingStatBuff(game, statBuff.getBuff()); if (statBuff.getSecondAtkBuff() != null) { - this.caster.removeNonStackingStatBuff(statBuff.getSecondAtkBuff()); + this.caster.removeNonStackingStatBuff(game, statBuff.getSecondAtkBuff()); } } @@ -105,10 +105,10 @@ public void setLevel(CSimulation game, CUnit unit, int level) { switch (type) { case ALLATK: if (statBuff.getSecondAtkBuff() == null) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); } else if (statBuff.getBuff().getBuffType() != NonStackingStatBuffType.MELEEATK) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); } else { statBuff.getBuff().setValue(Float.parseFloat( @@ -117,10 +117,10 @@ public void setLevel(CSimulation game, CUnit unit, int level) { break; case ALLATKPCT: if (statBuff.getSecondAtkBuff() == null) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); } else if (statBuff.getBuff().getBuffType() != NonStackingStatBuffType.MELEEATKPCT) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); } else { statBuff.getBuff().setValue(Float.parseFloat( @@ -129,17 +129,21 @@ public void setLevel(CSimulation game, CUnit unit, int level) { break; default: if (statBuff.getSecondAtkBuff() != null) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); } else if (type != statBuff.getBuff().getBuffType()) { - removeExistingBuffs(statBuff); + removeExistingBuffs(game, statBuff); createNewBuffs(statBuff); } else { statBuff.getBuff().setValue(Float.parseFloat( levelData.get(getLevel() - 1).getData().get(statBuff.getDataField().getIndex()))); } } - caster.computeDerivedFields(statBuff.getBuff().getBuffType()); + if (statBuff.getBuff().getBuffType().isHeroStat()) { + caster.computeDerivedHeroFields(game, statBuff.getBuff().getBuffType()); + } else { + caster.computeDerivedFields(statBuff.getBuff().getBuffType()); + } } if (this.buff != null) { this.buff.setLevel(game, unit, level); @@ -157,7 +161,7 @@ public void onAdd(CSimulation game, CUnit unit) { game.getAbilityData().createAbility(getAlias(), game.getHandleIdAllocator().createId()); for (StatBuffFromDataField statBuff : this.statBuffDataFields) { - unit.addNonStackingStatBuff(statBuff.getBuff()); + unit.addNonStackingStatBuff(game, statBuff.getBuff()); } } @@ -175,7 +179,7 @@ public void removeBuffFromUnit(CSimulation game, CUnit unit) { unit.removeNonStackingDisplayBuff(game, auraStackingKey, buff); } for (StatBuffFromDataField statBuff : this.statBuffDataFields) { - unit.removeNonStackingStatBuff(statBuff.getBuff()); + unit.removeNonStackingStatBuff(game, statBuff.getBuff()); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java index 8d8c3875d..ad91a7cc8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java @@ -22,6 +22,7 @@ public class CBehaviorFinishTransformation implements CBehavior { private AbilityBuilderActiveAbility ability; private CUnitType baseTypeForDuration; private CUnitType newType; + private boolean keepRatios; private int visibleOrderId; private boolean permanent; private float duration; @@ -45,9 +46,9 @@ public class CBehaviorFinishTransformation implements CBehavior { private int castStartTick = 0; public CBehaviorFinishTransformation(Map localStore, final CUnit unit, - AbilityBuilderActiveAbility ability, CUnitType newType, OnTransformationActions actions, - boolean addAlternateTagAfter, final int visibleOrderId, boolean permanent, float duration, - float transformationTime, float landingDelay, float altitudeAdjustmentDelay, + AbilityBuilderActiveAbility ability, CUnitType newType, final boolean keepRatios, + OnTransformationActions actions, boolean addAlternateTagAfter, final int visibleOrderId, boolean permanent, + float duration, float transformationTime, float landingDelay, float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, boolean immediateLanding, boolean immediateTakeoff, War3ID buffId, CUnitType baseTypeForDuration, boolean instantTransformAtDurationEnd) { this.localStore = localStore; @@ -55,6 +56,7 @@ public CBehaviorFinishTransformation(Map localStore, final CUnit this.unit = unit; this.ability = ability; this.newType = newType; + this.keepRatios = keepRatios; this.visibleOrderId = visibleOrderId; this.permanent = permanent; this.duration = duration; @@ -87,26 +89,25 @@ public CBehaviorFinishTransformation(Map localStore, final CUnit public CBehavior update(CSimulation game) { if (this.castStartTick == 0) { this.castStartTick = game.getGameTurnTick(); - TransformationHandler.startSlowTransformation(game, localStore, unit, newType, actions, ability, + TransformationHandler.startSlowTransformation(game, localStore, unit, newType, keepRatios, actions, ability, addAlternateTagAfter, takingOff, landing, immediateTakeoff, immediateLanding, altitudeAdjustmentDelay, landingDelay, altitudeAdjustmentDuration); } final int ticksSinceCast = game.getGameTurnTick() - this.castStartTick; if (ticksSinceCast > this.transformationTickDuration) { - TransformationHandler.finishSlowTransformation(game, localStore, unit, newType, actions, ability, - addAlternateTagAfter, permanent, takingOff); + TransformationHandler.finishSlowTransformation(game, localStore, unit, newType, keepRatios, actions, + ability, addAlternateTagAfter, permanent, takingOff); if (instantTransformAtDurationEnd) { TransformationHandler.createInstantTransformBackBuff(game, localStore, unit, baseTypeForDuration, - actions.createUntransformActions(), ability, buffId, - addAlternateTagAfter, transformationTime, duration, permanent); + keepRatios, actions.createUntransformActions(), ability, buffId, addAlternateTagAfter, + transformationTime, duration, permanent); } else { TransformationHandler.createSlowTransformBackBuff(game, localStore, unit, baseTypeForDuration, - actions.createUntransformActions(), ability, buffId, - addAlternateTagAfter, transformationTime, duration, permanent, takingOff, landing, - immediateTakeoff, immediateLanding, altitudeAdjustmentDelay, landingDelay, - altitudeAdjustmentDuration); + keepRatios, actions.createUntransformActions(), ability, buffId, addAlternateTagAfter, + transformationTime, duration, permanent, takingOff, landing, immediateTakeoff, immediateLanding, + altitudeAdjustmentDelay, landingDelay, altitudeAdjustmentDuration); } return this.unit.pollNextOrderBehavior(game); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java new file mode 100644 index 000000000..5ff439e92 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java @@ -0,0 +1,59 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionDisableAbility implements ABSingleAction { + + private ABIDCallback alias; + private ABUnitCallback unit; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnit theUnit = caster; + if (this.unit != null) { + theUnit = this.unit.callback(game, caster, localStore, castId); + } + if (this.alias != null) { + final War3ID aliasId = this.alias.callback(game, caster, localStore, castId); + final AbilityBuilderAbility abil = theUnit + .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); + if (abil != null) { + abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); + } + } + else { + final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + String unitExpression; + if (this.unit != null) { + unitExpression = this.unit.generateJassEquivalent(jassTextGenerator); + } + else { + unitExpression = jassTextGenerator.getCaster(); + } + if (this.alias != null) { + return "JASSTODO"; + } + else { + return "JASSTODO"; + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java new file mode 100644 index 000000000..0a44a169f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java @@ -0,0 +1,59 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionEnableAbility implements ABSingleAction { + + private ABIDCallback alias; + private ABUnitCallback unit; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnit theUnit = caster; + if (this.unit != null) { + theUnit = this.unit.callback(game, caster, localStore, castId); + } + if (this.alias != null) { + final War3ID aliasId = this.alias.callback(game, caster, localStore, castId); + final AbilityBuilderAbility abil = theUnit + .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); + if (abil != null) { + abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); + } + } + else { + final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + String unitExpression; + if (this.unit != null) { + unitExpression = this.unit.generateJassEquivalent(jassTextGenerator); + } + else { + unitExpression = jassTextGenerator.getCaster(); + } + if (this.alias != null) { + return "JASSTODO"; + } + else { + return "JASSTODO"; + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java index 4cd3db00b..c4f0da2d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java @@ -20,7 +20,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { final CUnit unit = this.targetUnit.callback(game, caster, localStore, castId); - unit.computeDerivedFields(this.buffType.callback(game, caster, localStore, castId)); + NonStackingStatBuffType btype = this.buffType.callback(game, caster, localStore, castId); + if (btype.isHeroStat()) { + unit.computeDerivedHeroFields(game, btype); + } else { + unit.computeDerivedFields(btype); + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java index b51fa850f..9bf122b35 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java @@ -20,7 +20,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { if (condition.callback(game, caster, localStore, castId)) { - for (ABAction periodicAction : thenActions) { - periodicAction.runAction(game, caster, localStore, castId); + if (this.thenActions != null) { + for (ABAction periodicAction : thenActions) { + periodicAction.runAction(game, caster, localStore, castId); + } } } else { - for (final ABAction periodicAction : this.elseActions) { - periodicAction.runAction(game, caster, localStore, castId); + if (this.elseActions != null) { + for (final ABAction periodicAction : this.elseActions) { + periodicAction.runAction(game, caster, localStore, castId); + } } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java index 55160cf8a..a195910a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java @@ -30,10 +30,10 @@ public void runAction(final CSimulation game, final CUnit caster, final Map onTransformActions; private List onUntransformActions; @@ -67,8 +71,13 @@ public void runAction(CSimulation game, CUnit caster, Map localS } CUnitType targetType = null; + + boolean onlyToAlt = false; + if (onlyTransformToAlternate != null) { + onlyToAlt = onlyTransformToAlternate.callback(game, caster, localStore, castId); + } - if (u1.getTypeId().equals(altId)) { + if (!onlyToAlt && u1.getTypeId().equals(altId)) { // Transforming back targetType = game.getUnitData().getUnitType(baseId); if (targetType.equals(u1.getUnitType())) { @@ -106,9 +115,11 @@ public void runAction(CSimulation game, CUnit caster, Map localS return; } } - OnTransformationActions actions = new OnTransformationActions(goldCost, lumberCost, foodCost, onTransformActions, onUntransformActions); + OnTransformationActions actions = new OnTransformationActions(goldCost, lumberCost, foodCost, + onTransformActions, onUntransformActions); boolean perm = false; + boolean isKeepRatios = true; float dur = 0; float transTime = 0; float landTime = 0; @@ -121,6 +132,9 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (permanent != null) { perm = permanent.callback(game, caster, localStore, castId); } + if (keepRatios != null) { + isKeepRatios = keepRatios.callback(game, caster, localStore, castId); + } if (duration != null) { dur = duration.callback(game, caster, localStore, castId); } @@ -151,9 +165,9 @@ public void runAction(CSimulation game, CUnit caster, Map localS localStore.put(ABLocalStoreKeys.TRANSFORMINGTOALT + castId, addAlternateTagAfter); localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, - new CBehaviorFinishTransformation(localStore, u1, abil, targetType, actions, addAlternateTagAfter, - addAlternateTagAfter ? abil.getBaseOrderId() : abil.getOffOrderId(), perm, dur, transTime, - landTime, atlAdDelay, altAdTime, imLand, imTakeOff, theBuffId, + new CBehaviorFinishTransformation(localStore, u1, abil, targetType, isKeepRatios, actions, + addAlternateTagAfter, addAlternateTagAfter ? abil.getBaseOrderId() : abil.getOffOrderId(), perm, + dur, transTime, landTime, atlAdDelay, altAdTime, imLand, imTakeOff, theBuffId, game.getUnitData().getUnitType(baseId), instant)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java index 1f15f2515..56ea0f335 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java @@ -25,11 +25,15 @@ public class ABActionTransformUnitInstant implements ABAction { private ABIDCallback baseUnitId; private ABIDCallback alternateUnitId; + private ABBooleanCallback keepRatios; + private ABBooleanCallback permanent; // remove ability after transform private ABBooleanCallback requiresPayment; private ABFloatCallback transformTime; // the time the unit is locked for the transformation + private ABBooleanCallback onlyTransformToAlternate; + private ABFloatCallback duration; // the time before the unit is forced to change back (doesn't charge for it) private ABIDCallback buffId; @@ -73,7 +77,12 @@ public void runAction(CSimulation game, CUnit caster, Map localS CUnitType targetType = null; - if (u1.getTypeId().equals(altId)) { + boolean onlyToAlt = false; + if (onlyTransformToAlternate != null) { + onlyToAlt = onlyTransformToAlternate.callback(game, caster, localStore, castId); + } + + if (!onlyToAlt && u1.getTypeId().equals(altId)) { // Transforming back targetType = baseType; if (perm || targetType.equals(u1.getUnitType())) { @@ -114,12 +123,16 @@ public void runAction(CSimulation game, CUnit caster, Map localS } OnTransformationActions actions = new OnTransformationActions(goldCost, lumberCost, foodCost, onTransformActions, onUntransformActions); - OnTransformationActions unActions = new OnTransformationActions(-goldCost, -lumberCost, null, - null, onUntransformActions); + OnTransformationActions unActions = new OnTransformationActions(-goldCost, -lumberCost, null, null, + onUntransformActions); + boolean isKeepRatios = true; float dur = 0; float transTime = 0; War3ID theBuffId = null; + if (keepRatios != null) { + isKeepRatios = keepRatios.callback(game, caster, localStore, castId); + } if (permanent != null) { perm = permanent.callback(game, caster, localStore, castId); } @@ -137,14 +150,13 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (transTime > 0) { TransformationHandler.playMorphAnimation(u1, addAlternateTagAfter); new DelayInstantTransformationTimer(game, localStore, u1, actions, addAlternateTagAfter, transTime, - baseType, targetType, abil, theBuffId, transTime, dur).start(game); + baseType, targetType, isKeepRatios, abil, theBuffId, transTime, dur).start(game); } else { - TransformationHandler.instantTransformation(game, localStore, u1, targetType, actions, abil, + TransformationHandler.instantTransformation(game, localStore, u1, targetType, isKeepRatios, actions, abil, addAlternateTagAfter, perm, true); if (dur > 0) { - TransformationHandler.createInstantTransformBackBuff(game, localStore, u1, baseType, - unActions, abil, theBuffId, addAlternateTagAfter, - transTime, dur, perm); + TransformationHandler.createInstantTransformBackBuff(game, localStore, u1, baseType, isKeepRatios, unActions, abil, + theBuffId, addAlternateTagAfter, transTime, dur, perm); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java index 456887dea..f16430351 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java @@ -24,6 +24,8 @@ public class ABActionTransformedUnitAbilityAdd implements ABAction { private ABIDCallback baseUnitId; private ABIDCallback alternateUnitId; + private ABBooleanCallback keepRatios; + private ABBooleanCallback instantTransformAtDurationEnd; // should the transform back be instant? private ABBooleanCallback permanent; // remove ability after transform @@ -72,6 +74,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS boolean instant = false; boolean perm = false; boolean charge = false; + boolean isKeepRatios = true; float dur = 0; float transTime = 0; float landTime = 0; @@ -89,6 +92,9 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (this.requiresPayment != null) { charge = this.requiresPayment.callback(game, caster, localStore, castId); } + if (keepRatios != null) { + isKeepRatios = keepRatios.callback(game, caster, localStore, castId); + } if (duration != null) { dur = duration.callback(game, caster, localStore, castId); } @@ -123,7 +129,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS action.runAction(game, u1, localStore, castId); } } - + if (dur > 0 && !perm) { OnTransformationActions actions; if (charge) { @@ -131,7 +137,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS int lumberCost = 0; Integer foodCost = null; if (game.getGameplayConstants().isRelativeUpgradeCosts()) { - + goldCost = baseType.getGoldCost() - u1.getUnitType().getGoldCost(); lumberCost = baseType.getLumberCost() - u1.getUnitType().getLumberCost(); } else { @@ -142,18 +148,18 @@ public void runAction(CSimulation game, CUnit caster, Map localS } else { actions = new OnTransformationActions(onUntransformActions); } - + if (instant) { - TransformationHandler.createInstantTransformBackBuff(game, localStore, u1, baseType, + TransformationHandler.createInstantTransformBackBuff(game, localStore, u1, baseType, isKeepRatios, actions, abil, theBuffId, true, transTime, dur, perm); } else { boolean takingOff = u1.getMovementType() != MovementType.FLY && baseType.getMovementType() == MovementType.FLY; boolean landing = u1.getMovementType() == MovementType.FLY && baseType.getMovementType() != MovementType.FLY; - TransformationHandler.createSlowTransformBackBuff(game, localStore, u1, baseType, - actions, abil, theBuffId, true, transTime, dur, perm, - takingOff, landing, imTakeOff, imLand, atlAdDelay, landTime, altAdTime); + TransformationHandler.createSlowTransformBackBuff(game, localStore, u1, baseType, isKeepRatios, actions, + abil, theBuffId, true, transTime, dur, perm, takingOff, landing, imTakeOff, imLand, atlAdDelay, + landTime, altAdTime); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java index 77d184a62..dcb7765b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java @@ -21,6 +21,8 @@ public class ABActionTransformedUnitAbilityRemove implements ABAction { private ABIDCallback baseUnitId; private ABIDCallback alternateUnitId; + private ABBooleanCallback keepRatios; + private ABBooleanCallback permanent; private List onUntransformActions; @@ -51,7 +53,10 @@ public void runAction(CSimulation game, CUnit caster, Map localS return; } - + boolean isKeepRatios = true; + if (keepRatios != null) { + isKeepRatios = keepRatios.callback(game, caster, localStore, castId); + } CUnitType baseType = game.getUnitData().getUnitType(baseId); if (onUntransformActions != null) { @@ -59,7 +64,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS action.runAction(game, u1, localStore, castId); } } - TransformationHandler.setUnitID(game, localStore, u1, baseType, perm, null, abil, true); + TransformationHandler.setUnitID(game, localStore, u1, baseType, isKeepRatios, perm, null, abil, true); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java new file mode 100644 index 000000000..61874cb35 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; + +public class ABCallbackNull implements ABCallback { + + + @Override + public Object callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return null; + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "JASSTODO"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java index f830293eb..ec9dbf0c3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java @@ -16,7 +16,7 @@ public class ABConditionIsToggleAbilityActive extends ABCondition { public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); - return ability.isToggleOn(); + return ability.isActive(); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java index fd4fc9802..fb5e689ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java @@ -11,7 +11,7 @@ public class ABConditionIsTransformingToAlternate extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (boolean) localStore.get(ABLocalStoreKeys.TRANSFORMINGTOALT +castId); + return (Boolean) localStore.get(ABLocalStoreKeys.TRANSFORMINGTOALT +castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java new file mode 100644 index 000000000..97d769b4f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java @@ -0,0 +1,29 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; + +import java.util.Map; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsIdEqual extends ABCondition { + + private ABIDCallback id1; + private ABIDCallback id2; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + War3ID lA = id1.callback(game, caster, localStore, castId); + War3ID rA = id2.callback(game, caster, localStore, castId); + if (lA == null) { + if (rA == null) { + return true; + } + return false; + } + return lA.equals(rA); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java new file mode 100644 index 000000000..22a73d72b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsNull extends ABCondition { + + private ABCallback value; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return value.callback(game, caster, localStore, castId) == null; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java new file mode 100644 index 000000000..39e72f7ac --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsUnitType extends ABCondition { + + private ABUnitCallback unit; + private ABIDCallback unitType; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = unit.callback(game, caster, localStore, castId); + if (theUnit != null) { + return theUnit.getTypeId().equals(unitType.callback(game, caster, localStore, castId)); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java index cfb4b1c38..a142c9643 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java @@ -17,6 +17,7 @@ public class ABTimedInstantTransformationBuff extends ABGenericTimedBuff { private OnTransformationActions actions; private AbilityBuilderPassiveAbility abil; private CUnitType targetType; + private boolean keepRatios; private boolean addAlternateTagAfter; private boolean perm; private float dur; @@ -24,13 +25,15 @@ public class ABTimedInstantTransformationBuff extends ABGenericTimedBuff { public ABTimedInstantTransformationBuff(int handleId, Map localStore, OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderPassiveAbility ability, - CUnitType newType, boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { + CUnitType newType, final boolean keepRatios, boolean addAlternateTagAfter, boolean permanent, + float transformationDuration) { super(handleId, alias, duration, true, false, true, false); this.setIconShowing(false); this.localStore = localStore; this.actions = actions; this.abil = ability; this.targetType = newType; + this.keepRatios = keepRatios; this.addAlternateTagAfter = addAlternateTagAfter; this.perm = permanent; this.dur = transformationDuration; @@ -44,14 +47,23 @@ protected void onBuffAdd(CSimulation game, CUnit unit) { protected void onBuffRemove(CSimulation game, CUnit unit) { } + @Override + public void onDeath(CSimulation game, CUnit unit) { + if (unit.isHero()) { + TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, + addAlternateTagAfter, perm, true); + unit.remove(game, this); + } + } + @Override protected void onBuffExpire(CSimulation game, CUnit unit) { if (dur > 0) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); new DelayInstantTransformationTimer(game, localStore, unit, actions, addAlternateTagAfter, transTime, null, - targetType, abil, null, transTime, 0).start(game); + targetType, keepRatios, abil, null, transTime, 0).start(game); } else { - TransformationHandler.instantTransformation(game, localStore, unit, targetType, actions, abil, + TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java index 48014a500..f21d1a21f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java @@ -19,6 +19,7 @@ public class ABTimedTransformationBuff extends ABGenericTimedBuff { private OnTransformationActions actions; private AbilityBuilderActiveAbility abil; private CUnitType targetType; + private boolean keepRatios; private boolean addAlternateTagAfter; private boolean perm; private float dur; @@ -32,15 +33,16 @@ public class ABTimedTransformationBuff extends ABGenericTimedBuff { public ABTimedTransformationBuff(int handleId, Map localStore, OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderActiveAbility ability, CUnitType newType, - boolean addAlternateTagAfter, boolean permanent, float transformationDuration, float transformationTime, - float landingDelay, float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, - boolean immediateLanding, boolean immediateTakeoff) { + final boolean keepRatios, boolean addAlternateTagAfter, boolean permanent, float transformationDuration, + float transformationTime, float landingDelay, float altitudeAdjustmentDelay, + float altitudeAdjustmentDuration, boolean immediateLanding, boolean immediateTakeoff) { super(handleId, alias, duration, true, false, true, false); this.setIconShowing(false); this.localStore = localStore; this.actions = actions; this.abil = ability; this.targetType = newType; + this.keepRatios = keepRatios; this.addAlternateTagAfter = addAlternateTagAfter; this.perm = permanent; this.dur = transformationDuration; @@ -76,6 +78,15 @@ protected void onBuffAdd(CSimulation game, CUnit unit) { protected void onBuffRemove(CSimulation game, CUnit unit) { } + @Override + public void onDeath(CSimulation game, CUnit unit) { + if (unit.isHero()) { + TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, + addAlternateTagAfter, perm, true); + unit.remove(game, this); + } + } + @Override protected void onBuffExpire(CSimulation game, CUnit unit) { if (abil.isToggleOn()) { @@ -85,15 +96,15 @@ protected void onBuffExpire(CSimulation game, CUnit unit) { if (dur > 0) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); new DelayInstantTransformationTimer(game, localStore, unit, actions, addAlternateTagAfter, transTime, - null, targetType, abil, null, transTime, 0).start(game); + null, targetType, keepRatios, abil, null, transTime, 0).start(game); } else { - TransformationHandler.instantTransformation(game, localStore, unit, targetType, actions, abil, - addAlternateTagAfter, perm, true); + TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, + abil, addAlternateTagAfter, perm, true); } } else { unit.order(game, new COrderStartTransformation(new CBehaviorFinishTransformation(localStore, unit, abil, targetType, - actions, addAlternateTagAfter, + keepRatios, actions, addAlternateTagAfter, addAlternateTagAfter ? abil.getBaseOrderId() : abil.getOffOrderId(), perm, dur, transTime, landTime, atlAdDelay, altAdTime, imLand, imTakeOff, this.getAlias(), targetType, instantTransformation), abil.getBaseOrderId()), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index 7646bc264..d00935704 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -26,6 +26,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitqueue.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ABCallbackNull; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.*; @@ -579,6 +580,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa conditionTypeFactory.registerSubtype(ABConditionAnd.class, "and").registerSubtype(ABConditionOr.class, "or") .registerSubtype(ABConditionNot.class, "not").registerSubtype(ABConditionBool.class, "bool") .registerSubtype(ABConditionNotNull.class, "notNull") + .registerSubtype(ABConditionIsNull.class, "isNull") .registerSubtype(ABConditionFloatEqual.class, "f=") .registerSubtype(ABConditionFloatEq0.class, "f=0") @@ -616,6 +618,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsUnitEqual.class, "isUnitEqual") .registerSubtype(ABConditionIsAttackTypeEqual.class, "isAttackTypeEqual") .registerSubtype(ABConditionIsDamageTypeEqual.class, "isDamageTypeEqual") + .registerSubtype(ABConditionIsIdEqual.class, "isIdEqual") .registerSubtype(ABConditionIsOnCooldown.class, "isOnCooldown") .registerSubtype(ABConditionIsFlexAbilityTargeted.class, "isFlexAbilityTargeted") @@ -626,6 +629,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsTransformingToAlternate.class, "isTransformingToAlternate") + .registerSubtype(ABConditionIsUnitType.class, "isUnitType") .registerSubtype(ABConditionDoesUnitHaveBuff.class, "doesUnitHaveBuff") .registerSubtype(ABConditionIsUnitMaxHp.class, "isUnitMaxHp") .registerSubtype(ABConditionIsUnitMaxMp.class, "isUnitMaxMp") @@ -646,6 +650,8 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionGameplayConstantIsDefendCanDeflect.class, "gameplayConstantIsDefendCanDeflect") .registerSubtype(ABConditionIsNewBehaviorCategoryInList.class, "isNewBehaviorCategoryInList") + + ; } @@ -755,6 +761,8 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionResetCooldown.class, "resetCooldown") .registerSubtype(ABActionActivateToggledAbility.class, "activateToggledAbility") .registerSubtype(ABActionDeactivateToggledAbility.class, "deactivateToggledAbility") + .registerSubtype(ABActionEnableAbility.class, "enableAbility") + .registerSubtype(ABActionDisableAbility.class, "disableAbility") .registerSubtype(ABActionBeginChanneling.class, "beginChanneling") .registerSubtype(ABActionFinishChanneling.class, "finishChanneling") .registerSubtype(ABActionSetAbilityCastRange.class, "setAbilityCastRange") @@ -940,6 +948,7 @@ public static Gson create() { registerUnitQueueCallbacks(callbackTypeFactory); registerVisionModifierCallbacks(callbackTypeFactory); registerWidgetCallbacks(callbackTypeFactory); + callbackTypeFactory.registerSubtype(ABCallbackNull.class, "null"); gsonBuilder.registerTypeAdapterFactory(callbackTypeFactory); final RuntimeTypeAdapterFactory abilityCallbackTypeFactory = RuntimeTypeAdapterFactory diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java index 2ef6b0858..eb0cf58ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java @@ -28,14 +28,14 @@ public class TransformationHandler { public static void setUnitID(final CSimulation game, final Map localStore, final CUnit unit, - final CUnitType newType, final boolean addAlternateTagAfter, final OnTransformationActions actions, - final CAbility ability) { - setUnitID(game, localStore, unit, newType, addAlternateTagAfter, actions, ability, false); + final CUnitType newType, final boolean keepRatios, final boolean addAlternateTagAfter, + final OnTransformationActions actions, final CAbility ability) { + setUnitID(game, localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability, false); } public static void setUnitID(final CSimulation game, final Map localStore, final CUnit unit, - final CUnitType newType, final boolean addAlternateTagAfter, final OnTransformationActions actions, - final CAbility ability, final boolean updateArt) { + final CUnitType newType, final boolean keepRatios, final boolean addAlternateTagAfter, + final OnTransformationActions actions, final CAbility ability, final boolean updateArt) { final CPlayer pl = game.getPlayer(unit.getPlayerIndex()); if (actions != null) { pl.setGold(Math.max(pl.getGold() - actions.goldCost, 0)); @@ -50,15 +50,14 @@ public static void setUnitID(final CSimulation game, final Map l } } - unit.setTypeId(game, newType.getTypeId(), updateArt); + unit.setTypeId(game, newType.getTypeId(), keepRatios, updateArt); pl.setUnitFoodUsed(unit, newType.getFoodUsed()); pl.setUnitFoodMade(unit, newType.getFoodMade()); if (addAlternateTagAfter) { if (unit.getUnitAnimationListener().addSecondaryTag(SecondaryTag.ALTERNATE)) { unit.getUnitAnimationListener().forceResetCurrentAnimation(); } - } - else { + } else { if (unit.getUnitAnimationListener().removeSecondaryTag(SecondaryTag.ALTERNATE)) { unit.getUnitAnimationListener().forceResetCurrentAnimation(); } @@ -78,8 +77,7 @@ public static void playMorphAnimation(final CUnit unit, final boolean addAlterna if (addAlternateTagAfter) { unit.getUnitAnimationListener().removeSecondaryTag(SecondaryTag.ALTERNATE); unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.MORPH, SequenceUtils.EMPTY, 1.0f, true); - } - else { + } else { unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.MORPH, EnumSet.of(SecondaryTag.ALTERNATE), 1.0f, true); } @@ -87,8 +85,7 @@ public static void playMorphAnimation(final CUnit unit, final boolean addAlterna addAlternateTagAfter ? EnumSet.of(SecondaryTag.ALTERNATE) : SequenceUtils.EMPTY, true); if (addAlternateTagAfter) { unit.getUnitAnimationListener().addSecondaryTag(SecondaryTag.ALTERNATE); - } - else { + } else { unit.getUnitAnimationListener().removeSecondaryTag(SecondaryTag.ALTERNATE); } } @@ -96,8 +93,7 @@ public static void playMorphAnimation(final CUnit unit, final boolean addAlterna public static void setTags(final CUnit unit, final boolean addAlternateTagAfter) { if (addAlternateTagAfter) { unit.getUnitAnimationListener().addSecondaryTag(SecondaryTag.ALTERNATE); - } - else { + } else { unit.getUnitAnimationListener().removeSecondaryTag(SecondaryTag.ALTERNATE); } unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.STAND, @@ -105,9 +101,9 @@ public static void setTags(final CUnit unit, final boolean addAlternateTagAfter) } public static void beginTakingOff(final CSimulation game, final Map localStore, final CUnit unit, - final CUnitType newType, final OnTransformationActions actions, final CAbility ability, - final boolean addAlternateTagAfter, final boolean immediateTakeoff, final float altitudeAdjustmentDelay, - final float altitudeAdjustmentDuration) { + final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, + final CAbility ability, final boolean addAlternateTagAfter, final boolean immediateTakeoff, + final float altitudeAdjustmentDelay, final float altitudeAdjustmentDuration) { CTimer timer = (CTimer) localStore.get(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT); if (timer != null) { game.unregisterTimer(timer); @@ -117,11 +113,11 @@ public static void beginTakingOff(final CSimulation game, final Map localStore, - final CUnit unit, final CUnitType newType, final OnTransformationActions actions, final CAbility ability, - final boolean addAlternateTagAfter, final boolean takingOff, final boolean landing, + final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, + final CAbility ability, final boolean addAlternateTagAfter, final boolean takingOff, final boolean landing, final boolean immediateTakeoff, final boolean immediateLanding, final float altitudeAdjustmentDelay, final float landingDelay, final float altitudeAdjustmentDuration) { final CTimer timer = (CTimer) localStore.get(ABLocalStoreKeys.WAITING_ANIMATION); @@ -164,7 +159,7 @@ public static void startSlowTransformation(final CSimulation game, final Map localStore, - final CUnit unit, final CUnitType newType, final OnTransformationActions actions, + final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final boolean addAlternateTagAfter, final boolean permanent, final boolean takingOff) { if (!takingOff) { - TransformationHandler.setUnitID(game, localStore, unit, newType, addAlternateTagAfter, actions, ability); + TransformationHandler.setUnitID(game, localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, + ability); } if (permanent) { unit.remove(game, ability); @@ -191,14 +186,14 @@ public static void finishSlowTransformation(final CSimulation game, final Map localStore, - final CUnit unit, final CUnitType newType, final OnTransformationActions actions, + final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final boolean addAlternateTagAfter, final boolean permanent, final boolean playMorph) { if (newType.getTypeId().equals(unit.getTypeId())) { return; } System.err.println("setting " + newType.getTypeId() + " on " + unit.getTypeId()); - setUnitID(game, localStore, unit, newType, addAlternateTagAfter, actions, ability, false); + setUnitID(game, localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability, false); if (playMorph) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); } @@ -208,7 +203,7 @@ public static void instantTransformation(final CSimulation game, final Map localStore, - final CUnit unit, final CUnitType newType, final OnTransformationActions actions, + final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderActiveAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, final float transformationTime, final float duration, final boolean permanent, final boolean takingOff, final boolean landing, final boolean immediateTakeoff, final boolean immediateLanding, @@ -216,19 +211,19 @@ public static void createSlowTransformBackBuff(final CSimulation game, final Map if (addAlternateTagAfter && (duration > 0)) { unit.add(game, new ABTimedTransformationBuff(game.getHandleIdAllocator().createId(), localStore, actions, - buffId == null ? ability.getAlias() : buffId, duration, ability, newType, + buffId == null ? ability.getAlias() : buffId, duration, ability, newType, keepRatios, !addAlternateTagAfter, permanent, duration, transformationTime, landingDelay, altitudeAdjustmentDelay, altitudeAdjustmentDuration, immediateLanding, immediateTakeoff)); } } public static void createInstantTransformBackBuff(final CSimulation game, final Map localStore, - final CUnit unit, final CUnitType newType, final OnTransformationActions actions, + final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, final float transformationTime, final float duration, final boolean permanent) { if (addAlternateTagAfter && (duration > 0)) { final ABBuff thebuff = ability - .visit(GetInstantTransformationBuffVisitor.getInstance().reset(game, localStore, newType, actions, + .visit(GetInstantTransformationBuffVisitor.getInstance().reset(game, localStore, newType, keepRatios, actions, buffId, addAlternateTagAfter, transformationTime, duration, permanent)); if (thebuff != null) { unit.add(game, thebuff); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/StatBuffType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/StatBuffType.java index d3aec8360..4b15107b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/StatBuffType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/StatBuffType.java @@ -14,7 +14,10 @@ public enum StatBuffType { HPSTEAL, THORNS, MAXHP, - MAXMP; + MAXMP, + STR, + AGI, + INT; public NonStackingStatBuffType toNonStackingStatBuffType(boolean percentage) { @@ -73,6 +76,24 @@ public NonStackingStatBuffType toNonStackingStatBuffType(boolean percentage) { } else { return NonStackingStatBuffType.THORNS; } + case STR: + if (percentage) { + return NonStackingStatBuffType.STRPCT; + } else { + return NonStackingStatBuffType.STR; + } + case AGI: + if (percentage) { + return NonStackingStatBuffType.AGIPCT; + } else { + return NonStackingStatBuffType.AGI; + } + case INT: + if (percentage) { + return NonStackingStatBuffType.INTPCT; + } else { + return NonStackingStatBuffType.INT; + } case ATKSPD: return NonStackingStatBuffType.ATKSPD; case HPSTEAL: diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java index a87108724..15a38b777 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java @@ -18,6 +18,7 @@ public class DelayInstantTransformationTimer extends CTimer { private boolean addAlternateTagAfter; private CUnitType baseType; private CUnitType targetType; + private boolean keepRatios; private AbilityBuilderAbility abil; private boolean perm; private War3ID theBuffId; @@ -26,8 +27,8 @@ public class DelayInstantTransformationTimer extends CTimer { public DelayInstantTransformationTimer(CSimulation game, Map localStore, CUnit unit, OnTransformationActions actions, boolean addAlternateTagAfter, float delay, CUnitType baseType, - CUnitType targetType, AbilityBuilderAbility ability, War3ID buffId, float transformationTime, - float duration) { + CUnitType targetType, final boolean keepRatios, AbilityBuilderAbility ability, War3ID buffId, + float transformationTime, float duration) { super(); this.localStore = localStore; this.unit = unit; @@ -35,6 +36,7 @@ public DelayInstantTransformationTimer(CSimulation game, Map loc this.addAlternateTagAfter = addAlternateTagAfter; this.baseType = baseType; this.targetType = targetType; + this.keepRatios = keepRatios; this.abil = ability; this.theBuffId = buffId; this.transTime = transformationTime; @@ -44,12 +46,11 @@ public DelayInstantTransformationTimer(CSimulation game, Map loc } public void onFire(CSimulation game) { - TransformationHandler.instantTransformation(game, localStore, unit, targetType, actions, abil, + TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, false); if (dur > 0) { - TransformationHandler.createInstantTransformBackBuff(game, localStore, unit, baseType, - actions.createUntransformActions(), abil, theBuffId, - addAlternateTagAfter, transTime, dur, perm); + TransformationHandler.createInstantTransformBackBuff(game, localStore, unit, baseType, keepRatios, + actions.createUntransformActions(), abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java index a7a38e603..d4f59e497 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java @@ -28,6 +28,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.HandleIdAllocator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityMove; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.GetAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.CAutocastAbility; @@ -244,19 +245,20 @@ public CUnitData(final CGameplayConstants gameplayConstants, final ObjectData un public CUnit create(final CSimulation simulation, final int playerIndex, final War3ID typeId, final float x, final float y, final float facing, final BufferedImage buildingPathingPixelMap, - final HandleIdAllocator handleIdAllocator) { + final HandleIdAllocator handleIdAllocator, int editorConfigHitPointPercent, int editorConfigManaAmount) { final GameObject unitType = this.unitData.get(typeId.asStringValue()); final int handleId = handleIdAllocator.createId(); final CUnitType unitTypeInstance = getUnitTypeInstance(typeId, buildingPathingPixelMap, unitType); - final int life = unitTypeInstance.getMaxLife(); + final float life = editorConfigHitPointPercent > 0 ? unitTypeInstance.getMaxLife()* (editorConfigHitPointPercent / 100f) : unitTypeInstance.getMaxLife(); final float lifeRegen = unitTypeInstance.getLifeRegen(); final int manaInitial = unitTypeInstance.getManaInitial(); final int manaMaximum = unitTypeInstance.getManaMaximum(); final int speed = unitTypeInstance.getSpeed(); - final CUnit unit = new CUnit(handleId, playerIndex, x, y, life, typeId, facing, manaInitial, life, lifeRegen, - manaMaximum, speed, unitTypeInstance); + final CUnit unit = new CUnit(handleId, playerIndex, x, y, life, typeId, facing, + editorConfigManaAmount >= 0 ? editorConfigManaAmount : manaInitial, unitTypeInstance.getMaxLife(), + lifeRegen, manaMaximum, speed, unitTypeInstance); return unit; } @@ -457,15 +459,36 @@ public void addMissingDefaultAbilitiesToUnit(final CSimulation simulation, unit.add(simulation, new CAbilityRally(handleIdAllocator.createId())); } if (unitTypeInstance.isHero()) { - final List heroAbilityList = unitTypeInstance.getHeroAbilityList(); if (unit.getFirstAbilityOfType(CAbilityHero.class) != null) { final CAbilityHero abil = unit.getFirstAbilityOfType(CAbilityHero.class); - abil.setSkillsAvailable(heroAbilityList); - abil.recalculateAllStats(simulation, unit); + if (abil.isDisabled()) { + abil.setDisabled(false, CAbilityDisableType.TRANSFORMATION); + abil.setIconShowing(true); + for (CAbility habl : abil.getLearnedHeroAbilities()) { + unit.add(simulation, habl); + } + } + abil.setHeroName(unitTypeInstance); +// abil.setSkillsAvailable(heroAbilityList); + abil.calculateDerivatedFields(simulation, unit); } else { - unit.add(simulation, new CAbilityHero(handleIdAllocator.createId(), heroAbilityList)); + final List heroAbilityList = unitTypeInstance.getHeroAbilityList(); + final CAbilityHero abil = new CAbilityHero(handleIdAllocator.createId(), heroAbilityList); + unit.add(simulation, abil); // reset initial mana after the value is adjusted for hero data unit.setMana(manaInitial); + abil.recalculateAllStats(simulation, unit); + } + } else { + if (unit.getFirstAbilityOfType(CAbilityHero.class) != null) { + final CAbilityHero abil = unit.getFirstAbilityOfType(CAbilityHero.class); +// abil.setSkillsAvailable(heroAbilityList); + abil.calculateDerivatedFields(simulation, unit); + abil.setDisabled(true, CAbilityDisableType.TRANSFORMATION); + abil.setIconShowing(false); + for (CAbility habl : abil.getLearnedHeroAbilities()) { + unit.remove(simulation, habl); + } } } for (final War3ID ability : unitTypeInstance.getAbilityList()) { @@ -537,7 +560,7 @@ private CUnitType getUnitTypeInstance(final War3ID typeId, final BufferedImage b final CPrimaryAttribute primaryAttribute = CPrimaryAttribute .parsePrimaryAttribute(unitType.getFieldAsString(PRIMARY_ATTRIBUTE, 0)); - final String properNames = unitType.getFieldAsString(PROPER_NAMES, 0); + final String properNames = unitType.getField(PROPER_NAMES); final int properNamesCount = unitType.getFieldAsInteger(PROPER_NAMES_COUNT, 0); final boolean isBldg = unitType.getFieldAsBoolean(IS_BLDG, 0); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CUnitAppliedUpgrade.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CUnitAppliedUpgrade.java new file mode 100644 index 000000000..c2ef03f14 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CUnitAppliedUpgrade.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUpgradeType; + +public class CUnitAppliedUpgrade { + private int level; + private CUpgradeType type; + + public CUnitAppliedUpgrade(CUpgradeType type, int level) { + this.type = type; + this.level = level; + } + + public int getLevel() { + return level; + } + + public void setLevel(int level) { + this.level = level; + } + + public CUpgradeType getType() { + return type; + } + + public void setType(CUpgradeType type) { + this.type = type; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/NonStackingStatBuffType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/NonStackingStatBuffType.java index e9d383b95..c08534c84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/NonStackingStatBuffType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/NonStackingStatBuffType.java @@ -3,32 +3,41 @@ import com.etheller.interpreter.ast.util.CHandle; public enum NonStackingStatBuffType implements CHandle { - MELEEATK, - MELEEATKPCT, - RNGDATK, - RNGDATKPCT, - ATKSPD, - DEF, - DEFPCT, - HPGEN, - HPGENPCT, - MAXHPGENPCT, - MPGEN, - MPGENPCT, - MAXMPGENPCT, - MVSPD, - MVSPDPCT, - HPSTEAL, - THORNS, - THORNSPCT, + MELEEATK(false), + MELEEATKPCT(false), + RNGDATK(false), + RNGDATKPCT(false), + ATKSPD(false), + DEF(false), + DEFPCT(false), + HPGEN(false), + HPGENPCT(false), + MAXHPGENPCT(false), + MPGEN(false), + MPGENPCT(false), + MAXMPGENPCT(false), + MVSPD(false), + MVSPDPCT(false), + HPSTEAL(false), + THORNS(false), + THORNSPCT(false), - MAXHP, - MAXHPPCT, - MAXMP, - MAXMPPCT, + MAXHP(false), + MAXHPPCT(false), + MAXMP(false), + MAXMPPCT(false), + + STR(true), + STRPCT(true), + AGI(true), + AGIPCT(true), + INT(true), + INTPCT(true), - ALLATK, // These are for parsing - ALLATKPCT; + ALLATK(false), // These are for parsing + ALLATKPCT(false); + + private boolean heroStat; @Override public int getHandleId() { @@ -36,4 +45,12 @@ public int getHandleId() { } public static final NonStackingStatBuffType[] VALUES = values(); + + private NonStackingStatBuffType(final boolean hero) { + this.heroStat = hero; + } + + public boolean isHeroStat() { + return this.heroStat; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/upgrade/CUpgradeEffectAttackSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/upgrade/CUpgradeEffectAttackSpeed.java index 6a6c913b4..75f084da7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/upgrade/CUpgradeEffectAttackSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/upgrade/CUpgradeEffectAttackSpeed.java @@ -22,14 +22,14 @@ public CUpgradeEffectAttackSpeed(final float base, final float mod) { @Override public void apply(final CSimulation simulation, final CUnit unit, final int level) { this.buff.setValue(base + mod * level); - unit.addNonStackingStatBuff(buff); + unit.addNonStackingStatBuff(simulation, buff); unit.notifyAttacksChanged(); // rebuild - ui for selected unit maybe } @Override public void unapply(final CSimulation simulation, final CUnit unit, final int level) { this.buff.setValue(base + mod * level); - unit.removeNonStackingStatBuff(buff); + unit.removeNonStackingStatBuff(simulation, buff); unit.notifyAttacksChanged(); // rebuild - ui for selected unit maybe } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java index 1b657bf03..bb3a32759 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java @@ -3448,7 +3448,7 @@ else if (multiSelect) { } final CAbilityHero heroData = simulationUnit.getHeroData(); - final boolean hero = heroData != null; + final boolean hero = heroData != null && !heroData.isDisabled(); this.heroInfoPanel.setVisible(hero); if (hero) { final CPrimaryAttribute primaryAttribute = simulationUnit.getUnitType().getPrimaryAttribute(); From 45ca30dc0581059801cef362cf20fb3a6e69dd9b Mon Sep 17 00:00:00 2001 From: Glasir Date: Tue, 4 Mar 2025 04:30:18 -0500 Subject: [PATCH 13/44] Internal Improvements * Core: Pass autocast info into main spell actions. Allows detecting of when a spell was autocast vs regular cast * Core: Created Autocast type for spells that don't actually autocast, but just perform an action when autocast turns on and off * AB: Added Inline Condition callbacks and missing stored callbacks * AB: Added pathing checks * AB: Removed deprecated simple classes * AB: Implemented Submerge * Core: Fixed logic issue with hero name change --- .../abilityBehaviors/Transformations.json | 102 ++++- .../etheller/warsmash/parsers/jass/Jass2.java | 26 +- .../CommandCardPopulatingAbilityVisitor.java | 2 +- .../handlers/w3x/simulation/CUnit.java | 45 ++- .../abilities/AbstractCAbility.java | 2 +- .../w3x/simulation/abilities/CAbility.java | 8 +- .../simulation/abilities/CAbilityAttack.java | 16 +- .../abilities/CAbilityGenericDoNothing.java | 16 +- .../simulation/abilities/CAbilityMove.java | 16 +- .../simulation/abilities/CAbilityView.java | 12 +- .../abilities/autocast/AutocastType.java | 2 +- .../abilities/autocast/CAutocastAbility.java | 6 +- .../abilities/blight/CAbilityBlight.java | 14 +- .../build/AbstractCAbilityBuild.java | 10 +- .../build/CAbilityBuildInProgress.java | 16 +- .../abilities/build/CAbilityHumanBuild.java | 6 +- .../abilities/build/CAbilityHumanRepair.java | 15 +- .../abilities/build/CAbilityNagaBuild.java | 6 +- .../abilities/build/CAbilityNeutralBuild.java | 6 +- .../build/CAbilityNightElfBuild.java | 6 +- .../abilities/build/CAbilityOrcBuild.java | 6 +- .../abilities/build/CAbilityRepair.java | 15 +- .../abilities/build/CAbilityUndeadBuild.java | 6 +- .../cargohold/CAbilityCargoHold.java | 16 +- .../abilities/cargohold/CAbilityDrop.java | 6 +- .../cargohold/CAbilityDropInstant.java | 6 +- .../abilities/cargohold/CAbilityLoad.java | 12 +- .../cargohold/CAbilityStandDown.java | 8 +- .../abilities/combat/CAbilityColdArrows.java | 16 +- .../combat/CAbilityInvulnerable.java | 14 +- ...bilityGenericSingleIconPassiveAbility.java | 16 +- .../AbstractGenericAliasedAbility.java | 2 +- ...bstractGenericSingleIconActiveAbility.java | 20 +- .../harvest/CAbilityAcolyteHarvest.java | 6 +- .../abilities/harvest/CAbilityHarvest.java | 6 +- .../harvest/CAbilityReturnResources.java | 14 +- .../harvest/CAbilityWispHarvest.java | 6 +- .../abilities/hero/CAbilityHero.java | 64 ++- .../inventory/CAbilityInventory.java | 38 +- .../item/CAbilityItemAttackBonus.java | 14 +- .../item/CAbilityItemDefenseBonus.java | 14 +- .../item/CAbilityItemExperienceGain.java | 8 +- .../abilities/item/CAbilityItemHeal.java | 10 +- .../abilities/item/CAbilityItemLevelGain.java | 8 +- .../abilities/item/CAbilityItemLifeBonus.java | 14 +- .../abilities/item/CAbilityItemManaBonus.java | 6 +- .../item/CAbilityItemManaRegain.java | 10 +- .../item/CAbilityItemPermanentLifeGain.java | 8 +- .../item/CAbilityItemPermanentStatGain.java | 16 +- .../abilities/item/CAbilityItemStatBonus.java | 14 +- .../item/shop/CAbilityNeutralBuilding.java | 14 +- .../item/shop/CAbilitySellItems.java | 16 +- .../item/shop/CAbilityShopPurhaseItem.java | 14 +- .../abilities/jass/CAbilityJass.java | 16 +- .../simulation/abilities/jass/CBuffJass.java | 14 +- .../mine/CAbilityBlightedGoldMine.java | 14 +- .../abilities/mine/CAbilityEntangledMine.java | 14 +- .../abilities/mine/CAbilityGoldMine.java | 14 +- .../mine/CAbilityOverlayedMinableMine.java | 14 +- .../abilities/neutral/CAbilityWayGate.java | 22 +- .../nightelf/eattree/CAbilityEatTree.java | 8 +- .../nightelf/moonwell/CAbilityMoonWell.java | 15 +- .../root/CAbilityEntangleGoldMine.java | 10 +- .../abilities/nightelf/root/CAbilityRoot.java | 6 +- .../abilities/queue/CAbilityQueue.java | 16 +- .../abilities/queue/CAbilityRally.java | 16 +- .../abilities/queue/CAbilityReviveHero.java | 16 +- .../skills/CAbilityNoTargetSpellBase.java | 6 +- .../skills/CAbilityPointTargetSpellBase.java | 6 +- .../skills/CAbilityTargetSpellBase.java | 6 +- .../CAbilityUnitOrPointTargetSpellBase.java | 6 +- .../phoenix/CAbilityPhoenixFire.java | 14 +- .../neutral/sappers/CAbilityKaboom.java | 9 +- .../demonhunter/CAbilityImmolation.java | 10 +- .../demonhunter/CBuffImmolationCaster.java | 14 +- .../orc/blademaster/CBuffWhirlWindCaster.java | 14 +- .../abilities/skills/util/CBuffAuraBase.java | 16 +- .../abilities/skills/util/CBuffTimed.java | 14 +- .../test/CAbilityCarrionSwarmDummy.java | 6 +- .../abilities/test/CAbilityChannelTest.java | 6 +- .../abilities/test/CAbilityCoupleInstant.java | 6 +- .../abilities/upgrade/CAbilityUpgrade.java | 16 +- .../ability/AbilityBuilderActiveAbility.java | 8 +- ...AbilityAbilityBuilderActiveAutoTarget.java | 7 +- ...AbilityAbilityBuilderActiveFlexTarget.java | 14 +- ...yAbilityBuilderActiveFlexTargetSimple.java | 365 ------------------ .../CAbilityAbilityBuilderActiveNoTarget.java | 13 +- ...ityAbilityBuilderActiveNoTargetSimple.java | 140 ------- .../CAbilityAbilityBuilderActivePairing.java | 8 +- ...bilityAbilityBuilderActivePointTarget.java | 7 +- ...AbilityBuilderActivePointTargetSimple.java | 142 ------- .../CAbilityAbilityBuilderActiveToggle.java | 233 ----------- ...AbilityAbilityBuilderActiveUnitTarget.java | 7 +- ...yAbilityBuilderActiveUnitTargetSimple.java | 190 --------- .../CAbilityAbilityBuilderGenericActive.java | 43 ++- .../ability/CAbilityAbilityBuilderNoIcon.java | 16 +- ...ABAbilityTargetStillTargetableVisitor.java | 6 +- .../behavior/CBehaviorSendOrder.java | 2 +- .../ABActionActivateToggledAbility.java | 2 +- .../ABActionDeactivateToggledAbility.java | 2 +- .../ability/ABActionDisableAbility.java | 4 +- .../action/ability/ABActionEnableAbility.java | 4 +- .../behavior/callback/ABCallbackNull.java | 2 +- .../ABCallbackInlineConditionAbility.java | 24 ++ .../ABCallbackInlineConditionBoolean.java | 23 ++ .../ABCallbackInlineConditionBuff.java | 24 ++ .../ABCallbackGetStoredDestructableByKey.java | 36 ++ ...ABCallbackInlineConditionDestructable.java | 24 ++ ...llbackInlineConditionDestructableBuff.java | 24 ++ ...CallbackInlineConditionTimeOfDayEvent.java | 24 ++ .../ABCallbackInlineConditionFloat.java | 23 ++ .../ABCallbackInlineConditionFX.java | 24 ++ .../ABCallbackInlineConditionID.java | 24 ++ .../ABCallbackInlineConditionInteger.java | 23 ++ .../item/ABCallbackInlineConditionItem.java | 24 ++ .../ABCallbackInlineConditionLocation.java | 24 ++ .../ABCallbackInlineConditionLong.java | 23 ++ .../ABCallbackGetStoredOrderIdByKey.java | 35 ++ .../ABCallbackInlineConditionOrderId.java | 23 ++ .../ABCallbackInlineConditionPlayer.java | 24 ++ .../ABCallbackInlineConditionProjectile.java | 24 ++ ...ackInlineConditionNonStackingStatBuff.java | 24 ++ ...ABCallbackInlineConditionStateModBuff.java | 24 ++ .../ABCallbackGetStoredStringByKey.java | 34 ++ .../ABCallbackInlineConditionString.java | 23 ++ .../ABCallbackInlineConditionTarget.java | 24 ++ .../ABCallbackInlineConditionTimer.java | 24 ++ .../ABCallbackInlineConditionUnit.java | 23 ++ .../ABCallbackGetStoredUnitGroupByKey.java | 37 ++ .../ABCallbackInlineConditionUnitGroup.java | 24 ++ .../ABCallbackGetStoredUnitQueueByKey.java | 37 ++ .../ABCallbackInlineConditionUnitQueue.java | 24 ++ ...CallbackInlineConditionVisionModifier.java | 24 ++ .../ABCallbackGetStoredWidgetByKey.java | 36 ++ .../ABCallbackInlineConditionWidget.java | 24 ++ ...ConditionIsPassAllAbilityTargetChecks.java | 2 +- ...itionIsUnitPassAllAbilityTargetChecks.java | 2 +- .../ABConditionIsLocationDeepWater.java | 22 ++ .../ABConditionIsLocationFlyingOnly.java | 22 ++ .../ABConditionIsLocationShallowWater.java | 22 ++ .../ABConditionIsLocationWalkable.java | 22 ++ ...ABConditionIsLocationWalkableNonWater.java | 22 ++ ...onditionIsLocationPathableForUnitType.java | 25 ++ .../abilitybuilder/buff/ABBuff.java | 14 +- .../abilitybuilder/core/ABLocalStoreKeys.java | 6 + .../core/AbilityBuilderGsonBuilder.java | 44 ++- .../handler/TransformationHandler.java | 1 - .../parser/AbilityBuilderConfiguration.java | 10 + .../parser/AbilityBuilderParser.java | 11 + .../parser/AbilityBuilderType.java | 6 - .../impl/CAbilityTypeAbilityBuilder.java | 19 - .../behaviors/build/CBehaviorHumanBuild.java | 8 +- .../w3x/simulation/data/CUnitData.java | 8 +- .../orders/COrderDropItemAtPoint.java | 2 +- .../orders/COrderDropItemAtTargetWidget.java | 4 +- .../w3x/simulation/orders/COrderNoTarget.java | 21 +- .../simulation/orders/COrderTargetPoint.java | 13 +- .../simulation/orders/COrderTargetWidget.java | 13 +- .../viewer5/handlers/w3x/ui/MeleeUI.java | 40 +- .../AbilityBuilderSmashJassBrainstorm.java | 12 +- 160 files changed, 1781 insertions(+), 1756 deletions(-) delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTargetSimple.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTargetSimple.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTargetSimple.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java diff --git a/core/assets/abilityBehaviors/Transformations.json b/core/assets/abilityBehaviors/Transformations.json index 4003091fa..38ee07e61 100644 --- a/core/assets/abilityBehaviors/Transformations.json +++ b/core/assets/abilityBehaviors/Transformations.json @@ -311,6 +311,57 @@ } }] }, + "extraCastConditions": [{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "isLocationPathableForUnitType", + "location": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "unitType": { + "type": "getNonCurrentTransformType", + "baseUnitId": { + "type": "inlineConditionID", + "condition": { + "type": "isNull", + "value": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }, + "pass": { + "type": "getAbilityDataAsID", + "dataField": "A" + }, + "fail": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }, + "alternateUnitId": { + "type": "getAbilityUnitId" + } + } + }, + "reason": "UNABLE_TO_LAND_THERE" + }], "onAddDisabledAbility": [{ "type": "runReuseAction", "name": { @@ -1167,6 +1218,12 @@ "ids": [{"id":"AEme", "castId": "metamorphosis"}], "type": "INHERIT", "parentId": "Arav", + "displayFields": { + "toggleable": { + "type": "rawBoolean", + "value": "false" + } + }, "reuseActions": { "setup": [{ "type": "createNonStackingStatBuff", @@ -1186,13 +1243,15 @@ } }], "onTransform": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "deactivateToggledAbility" }], "onUnTransform": [{ "type": "removeNonStackingStatBuff", @@ -1483,6 +1542,35 @@ } }] } + },{ + "ids": [{"id":"ANsu", "castId": "submerge", "uncastId": "unsubmerge"}], + "type": "INHERIT", + "parentId": "Abur", + "extraCastConditions": [{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "isLocationDeepWater", + "location": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + } + }, + "reason": "UNABLE_TO_SUBMERGE_THERE" + }], + "reuseActions": { + "onUnTransform": [{ + "type": "addSecondaryAnimationTag", + "unit": { + "type": "getCastingUnit" + }, + "tag": { + "type": "rawString", + "value": "SWIM" + } + }] + } },{ "ids": [{"id":"Acha"}], "type": "HIDDEN", diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index d0a354136..b16aaa091 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -1007,11 +1007,11 @@ public JassValue call(final List arguments, final GlobalScope globalS AbilityPointTarget targetAsPoint = new AbilityPointTarget(whichLocation.x, whichLocation.y); for (final CAbility ability : whichUnit.getAbilities()) { ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, - activationReceiver); + false, activationReceiver); if (activationReceiver.isOk()) { final PointAbilityTargetCheckReceiver targetReceiver = PointAbilityTargetCheckReceiver.INSTANCE; ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, - targetAsPoint, targetReceiver.reset()); + false, targetAsPoint, targetReceiver.reset()); if (targetReceiver.getTarget() != null) { targetAsPoint = targetReceiver.getTarget(); abilityHandleId = ability.getHandleId(); @@ -1039,11 +1039,11 @@ public JassValue call(final List arguments, final GlobalScope globalS AbilityPointTarget targetAsPoint = new AbilityPointTarget((float) whichLocationX, (float) whichLocationY); for (final CAbility ability : whichUnit.getAbilities()) { - ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, activationReceiver); + ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, false, activationReceiver); if (activationReceiver.isOk()) { final PointAbilityTargetCheckReceiver targetReceiver = PointAbilityTargetCheckReceiver.INSTANCE; - ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, targetAsPoint, - targetReceiver.reset()); + ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, false, + targetAsPoint, targetReceiver.reset()); if (targetReceiver.getTarget() != null) { targetAsPoint = targetReceiver.getTarget(); abilityHandleId = ability.getHandleId(); @@ -1075,11 +1075,11 @@ public JassValue call(final List arguments, final GlobalScope globalS int abilityHandleId = 0; for (final CAbility ability : whichUnit.getAbilities()) { ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, - activationReceiver); + false, activationReceiver); if (activationReceiver.isOk()) { final CWidgetAbilityTargetCheckReceiver targetReceiver = CWidgetAbilityTargetCheckReceiver.INSTANCE; ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, - whichTarget, targetReceiver.reset()); + false, whichTarget, targetReceiver.reset()); if (targetReceiver.getTarget() != null) { whichTarget = targetReceiver.getTarget(); abilityHandleId = ability.getHandleId(); @@ -1106,11 +1106,11 @@ public JassValue call(final List arguments, final GlobalScope globalS int abilityHandleId = 0; for (final CAbility ability : whichUnit.getAbilities()) { ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, - activationReceiver); + false, activationReceiver); if (activationReceiver.isOk()) { final CWidgetAbilityTargetCheckReceiver targetReceiver = CWidgetAbilityTargetCheckReceiver.INSTANCE; ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, - whichTarget, targetReceiver.reset()); + false, whichTarget, targetReceiver.reset()); if (targetReceiver.getTarget() != null) { whichTarget = targetReceiver.getTarget(); abilityHandleId = ability.getHandleId(); @@ -1137,12 +1137,12 @@ public JassValue call(final List arguments, final GlobalScope globalS int abilityHandleId = 0; for (final CAbility ability : whichUnit.getAbilities()) { ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, - activationReceiver); + false, activationReceiver); if (activationReceiver.isOk()) { final BooleanAbilityTargetCheckReceiver targetReceiver = BooleanAbilityTargetCheckReceiver .getInstance(); ability.checkCanTargetNoTarget(CommonEnvironment.this.simulation, whichUnit, orderId, - targetReceiver.reset()); + false, targetReceiver.reset()); if (targetReceiver.isTargetable()) { abilityHandleId = ability.getHandleId(); } @@ -1165,12 +1165,12 @@ public JassValue call(final List arguments, final GlobalScope globalS int abilityHandleId = 0; for (final CAbility ability : whichUnit.getAbilities()) { ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, - activationReceiver); + false, activationReceiver); if (activationReceiver.isOk()) { final BooleanAbilityTargetCheckReceiver targetReceiver = BooleanAbilityTargetCheckReceiver .getInstance(); ability.checkCanTargetNoTarget(CommonEnvironment.this.simulation, whichUnit, orderId, - targetReceiver.reset()); + false, targetReceiver.reset()); if (targetReceiver.isTargetable()) { abilityHandleId = ability.getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java index 53075e866..532627d27 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java @@ -491,7 +491,7 @@ private void addCommandButton(final CAbility ability, final Texture icon, final return; } } - ability.checkCanUse(this.game, this.unit, orderId, this.previewCallback.reset()); + ability.checkCanUse(this.game, this.unit, orderId, false, this.previewCallback.reset()); if (!this.previewCallback.isOmitIconEntirely()) { if (requiresPatron) { this.previewCallback diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index 06f2efbb7..29f1966ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -2472,14 +2472,14 @@ public boolean autoAcquireTargets(final CSimulation game, final boolean disableM } public boolean autoAcquireAutocastTargets(final CSimulation game, final boolean disableMove) { - if ((this.autocastAbility != null) && !this.autocastAbility.isDisabled()) { + if ((this.autocastAbility != null) && !this.autocastAbility.isDisabled() && this.autocastAbility.getAutocastType() != AutocastType.NOAUTOCASTBEHAVIOR) { if (this.autocastAbility.getAutocastType() == AutocastType.NOTARGET) { final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); this.autocastAbility.checkCanAutoTargetNoTarget(game, this, this.autocastAbility.getBaseOrderId(), booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { - return this.order(game, this.autocastAbility.getBaseOrderId(), null); + return this.order(game, this.autocastAbility.getBaseOrderId(), null, true); } } else if (this.autocastAbility.getAutocastType() != AutocastType.NONE) { if (this.collisionRectangle != null) { @@ -2495,7 +2495,7 @@ public boolean autoAcquireAutocastTargets(final CSimulation game, final boolean game.getWorldCollision().enumUnitsInRect(tempRect, autocastTargetFinderEnum.reset(game, this, this.autocastAbility, disableMove)); if (autocastTargetFinderEnum.currentUnitTarget != null) { - this.order(game, this.autocastAbility.getBaseOrderId(), autocastTargetFinderEnum.currentUnitTarget); + this.order(game, this.autocastAbility.getBaseOrderId(), autocastTargetFinderEnum.currentUnitTarget, true); return true; } } @@ -2533,6 +2533,10 @@ public float getEndingDecayTime(final CSimulation game) { } public void order(final CSimulation game, final COrder order, final boolean queue) { + this.order(game, order, queue, false); + } + + public void order(final CSimulation game, final COrder order, final boolean queue, final boolean autoOrder) { if (isDead()) { return; } @@ -2547,7 +2551,7 @@ public void order(final CSimulation game, final COrder order, final boolean queu } // Allow the ability to response to the order without actually placing itself in // the queue, nor modifying (interrupting) the queue. - if (!ability.checkBeforeQueue(game, this, order.getOrderId(), order.getTarget(game))) { + if (!ability.checkBeforeQueue(game, this, order.getOrderId(), autoOrder, order.getTarget(game))) { // TODO is this a possible bug vector that the network request doesn't // checkCanUse like the UI before checkBeforeQueue is called?? order.fireEvents(game, this); @@ -2605,20 +2609,24 @@ public void order(final CSimulation game, final COrder order, final boolean queu } public boolean order(final CSimulation simulation, final int orderId, final AbilityTarget target) { + return this.order(simulation, orderId, target, false); + } + + public boolean order(final CSimulation simulation, final int orderId, final AbilityTarget target, final boolean autoOrder) { if (orderId == OrderIds.stop) { - order(simulation, new COrderNoTarget(0, orderId, false), false); + order(simulation, new COrderNoTarget(0, orderId, false), false, autoOrder); return true; } for (final CAbility ability : this.abilities) { final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; - ability.checkCanUse(simulation, this, orderId, activationReceiver); + ability.checkCanUse(simulation, this, orderId, false, activationReceiver); if (activationReceiver.isOk()) { if (target == null) { final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - ability.checkCanTargetNoTarget(simulation, this, orderId, booleanTargetReceiver); + ability.checkCanTargetNoTarget(simulation, this, orderId, false, booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { - order(simulation, new COrderNoTarget(ability.getHandleId(), orderId, false), false); + order(simulation, new COrderNoTarget(ability.getHandleId(), orderId, false, autoOrder), false, autoOrder); return true; } } else { @@ -2627,11 +2635,11 @@ public boolean order(final CSimulation simulation, final int orderId, final Abil public Boolean accept(final AbilityPointTarget target) { final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - ability.checkCanTarget(simulation, CUnit.this, orderId, target, booleanTargetReceiver); + ability.checkCanTarget(simulation, CUnit.this, orderId, false, target, booleanTargetReceiver); final boolean pointTargetable = booleanTargetReceiver.isTargetable(); if (pointTargetable) { - order(simulation, new COrderTargetPoint(ability.getHandleId(), orderId, target, false), - false); + order(simulation, new COrderTargetPoint(ability.getHandleId(), orderId, target, false, autoOrder), + false, autoOrder); } return pointTargetable; } @@ -2639,11 +2647,11 @@ public Boolean accept(final AbilityPointTarget target) { public Boolean acceptWidget(final CWidget target) { final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - ability.checkCanTarget(simulation, CUnit.this, orderId, target, booleanTargetReceiver); + ability.checkCanTarget(simulation, CUnit.this, orderId, false, target, booleanTargetReceiver); final boolean widgetTargetable = booleanTargetReceiver.isTargetable(); if (widgetTargetable) { order(simulation, new COrderTargetWidget(ability.getHandleId(), orderId, - target.getHandleId(), false), false); + target.getHandleId(), false, autoOrder), false, autoOrder); } return widgetTargetable; } @@ -4246,11 +4254,11 @@ public Void accept(final AbilityPointTarget target) { CAbility abilityToUse = null; for (final CAbility ability : this.trainedUnit.getAbilities()) { ability.checkCanUse(this.game, this.trainedUnit, this.rallyOrderId, - BooleanAbilityActivationReceiver.INSTANCE); + false, BooleanAbilityActivationReceiver.INSTANCE); if (BooleanAbilityActivationReceiver.INSTANCE.isOk()) { final BooleanAbilityTargetCheckReceiver targetCheckReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - ability.checkCanTarget(this.game, this.trainedUnit, this.rallyOrderId, target, targetCheckReceiver); + ability.checkCanTarget(this.game, this.trainedUnit, this.rallyOrderId, false, target, targetCheckReceiver); if (targetCheckReceiver.isTargetable()) { abilityToUse = ability; } @@ -4272,11 +4280,11 @@ private Void acceptWidget(final CSimulation game, final CUnit trainedUnit, final final CWidget target) { CAbility abilityToUse = null; for (final CAbility ability : trainedUnit.getAbilities()) { - ability.checkCanUse(game, trainedUnit, rallyOrderId, BooleanAbilityActivationReceiver.INSTANCE); + ability.checkCanUse(game, trainedUnit, rallyOrderId, false, BooleanAbilityActivationReceiver.INSTANCE); if (BooleanAbilityActivationReceiver.INSTANCE.isOk()) { final BooleanAbilityTargetCheckReceiver targetCheckReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - ability.checkCanTarget(game, trainedUnit, rallyOrderId, target, targetCheckReceiver); + ability.checkCanTarget(game, trainedUnit, rallyOrderId, false, target, targetCheckReceiver); if (targetCheckReceiver.isTargetable()) { abilityToUse = ability; } @@ -5616,9 +5624,6 @@ public void setFalseDeath(final boolean falseDeath) { } public void setAutocastAbility(final CAutocastAbility autocastAbility) { - if (this.autocastAbility != null) { - this.autocastAbility.setAutoCastOff(); - } this.autocastAbility = autocastAbility; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java index b3bc9b16f..9ac80d37b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java @@ -109,7 +109,7 @@ public CItem getItem() { @Override public final void checkCanUse(final CSimulation game, final CUnit unit, final int orderId, - final AbilityActivationReceiver receiver) { + boolean autoOrder, final AbilityActivationReceiver receiver) { if (isDisabled()) { receiver.disabled(); checkRequirementsMet(game, unit, receiver); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java index 4cef40ba6..26d8c40b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java @@ -34,13 +34,13 @@ public interface CAbility extends CAbilityView, CExtensibleHandle { void onCancelFromQueue(CSimulation game, CUnit unit, int orderId); /* return false to not do anything, such as for toggling autocast */ - boolean checkBeforeQueue(CSimulation game, CUnit caster, int orderId, AbilityTarget target); + boolean checkBeforeQueue(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target); - CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target); + CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target); - CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point); + CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point); - CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId); + CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder); void setHero(boolean isHero); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityAttack.java index 7679ce459..0e2754ed6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityAttack.java @@ -39,8 +39,8 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { if (target == unit) { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_SELF); return; // no attacking self ever @@ -102,13 +102,13 @@ else if (target instanceof CDestructable) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { return true; } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { switch (orderId) { case OrderIds.attack: receiver.targetOk(target); @@ -136,7 +136,7 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_UNIT_WITH_THIS_ACTION); } @@ -157,7 +157,7 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { CBehavior behavior = null; for (final CUnitAttack attack : caster.getCurrentAttacks()) { if (target.canBeTargetedBy(game, caster, attack.getTargetsAllowed())) { @@ -174,7 +174,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { switch (orderId) { case OrderIds.attack: if (caster.getAttackMoveBehavior() == null) { @@ -201,7 +201,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityGenericDoNothing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityGenericDoNothing.java index ca0d48fb4..e0c83a7d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityGenericDoNothing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityGenericDoNothing.java @@ -27,20 +27,20 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @@ -63,23 +63,23 @@ public void onTick(final CSimulation game, final CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { return false; } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return caster.pollNextOrderBehavior(game); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return caster.pollNextOrderBehavior(game); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityMove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityMove.java index 5b86dd179..49bc1b984 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityMove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityMove.java @@ -32,8 +32,8 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { switch (orderId) { case OrderIds.smart: case OrderIds.patrol: @@ -53,7 +53,7 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { switch (orderId) { case OrderIds.smart: case OrderIds.move: @@ -68,7 +68,7 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { switch (orderId) { case OrderIds.holdposition: receiver.targetOk(null); @@ -99,12 +99,12 @@ public void onTick(final CSimulation game, final CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { return true; } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { final boolean smart = orderId == OrderIds.smart; final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); if (targetUnit != null) { @@ -129,7 +129,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { if (orderId == OrderIds.patrol) { final CBehavior patrolBehavior = caster.getPatrolBehavior().reset(point); caster.setDefaultBehavior(patrolBehavior); @@ -141,7 +141,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { if (orderId == OrderIds.holdposition) { caster.setDefaultBehavior(caster.getHoldPositionBehavior()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java index 775076d6a..049c5f17f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java @@ -10,15 +10,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; public interface CAbilityView extends CHandle { - void checkCanUse(CSimulation game, CUnit unit, int orderId, AbilityActivationReceiver receiver); + void checkCanUse(CSimulation game, CUnit unit, int orderId, boolean autoOrder, AbilityActivationReceiver receiver); - void checkCanTarget(CSimulation game, CUnit unit, int orderId, CWidget target, - AbilityTargetCheckReceiver receiver); + void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, + CWidget target, AbilityTargetCheckReceiver receiver); - void checkCanTarget(CSimulation game, CUnit unit, int orderId, AbilityPointTarget target, - AbilityTargetCheckReceiver receiver); + void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, + AbilityPointTarget target, AbilityTargetCheckReceiver receiver); - void checkCanTargetNoTarget(CSimulation game, CUnit unit, int orderId, AbilityTargetCheckReceiver receiver); + void checkCanTargetNoTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, AbilityTargetCheckReceiver receiver); void checkRequirementsMet(CSimulation game, CUnit unit, AbilityActivationReceiver receiver); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/AutocastType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/AutocastType.java index de01f124e..6d831f55d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/AutocastType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/AutocastType.java @@ -13,7 +13,7 @@ public enum AutocastType implements CHandle { NEARESTENEMY, NOTARGET, - ATTACKREPLACEMENT; + NOAUTOCASTBEHAVIOR; @Override public int getHandleId() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/CAutocastAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/CAutocastAbility.java index 841361e9d..13c3ec636 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/CAutocastAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/CAutocastAbility.java @@ -16,9 +16,7 @@ public interface CAutocastAbility { boolean isAutoCastOn(); - void setAutoCastOn(final CUnit caster, final boolean autoCastOn); - - void setAutoCastOff(); + void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn); void checkCanAutoTarget(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver); @@ -30,6 +28,6 @@ void checkCanAutoTargetNoTarget(CSimulation game, CUnit unit, int orderId, AbilityTargetCheckReceiver receiver); void checkCanUse(final CSimulation game, final CUnit unit, final int orderId, - final AbilityActivationReceiver receiver); + boolean autoOrder, final AbilityActivationReceiver receiver); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/blight/CAbilityBlight.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/blight/CAbilityBlight.java index bd503be9e..d7433b2ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/blight/CAbilityBlight.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/blight/CAbilityBlight.java @@ -66,36 +66,36 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/AbstractCAbilityBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/AbstractCAbilityBuild.java index 497993efb..bc42fbc6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/AbstractCAbilityBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/AbstractCAbilityBuild.java @@ -92,14 +92,14 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { War3ID orderIdAsWar3ID = new War3ID(orderId); if (this.structuresBuilt.contains(orderIdAsWar3ID)) { final CUnitType unitTypeToCreate = game.getUnitData().getUnitType(orderIdAsWar3ID); @@ -122,13 +122,13 @@ public final void checkCanTarget(final CSimulation game, final CUnit unit, final @Override public final void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { return true; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java index ab4743803..1fa1d47c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java @@ -38,7 +38,7 @@ public void onTick(final CSimulation game, final CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { final CPlayer player = game.getPlayer(caster.getPlayerIndex()); if (caster.isUpgrading()) { player.removeTechtreeInProgress(caster.getUpgradeIdType()); @@ -65,18 +65,18 @@ public void onDeath(final CSimulation game, final CUnit caster) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @@ -87,20 +87,20 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { if (orderId == OrderIds.cancel) { receiver.targetOk(null); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanBuild.java index ac2f871f7..257a9c717 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanBuild.java @@ -38,13 +38,13 @@ public void onRemove(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return caster.pollNextOrderBehavior(game); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { final War3ID orderIdAsRawtype = new War3ID(orderId); final CUnitType unitType = game.getUnitData().getUnitType(orderIdAsRawtype); roundTargetPoint(point, unitType); @@ -57,7 +57,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java index 2c4485247..e6e23b2d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java @@ -124,18 +124,18 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return this.behaviorRepair.reset(game, target); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @@ -203,16 +203,11 @@ public AutocastType getAutocastType() { } @Override - public void setAutoCastOn(final CUnit caster, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn) { this.autocasting = autoCastOn; caster.setAutocastAbility(autoCastOn ? this : null); } - @Override - public void setAutoCastOff() { - this.autocasting = false; - } - @Override public boolean isAutoCastOn() { return autocasting; @@ -231,7 +226,7 @@ public int getAutoCastOffOrderId() { @Override public void checkCanAutoTarget(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver) { - this.checkCanTarget(game, unit, orderId, target, receiver); + this.checkCanTarget(game, unit, orderId, false, target, receiver); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNagaBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNagaBuild.java index f105adafd..806fc8ba4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNagaBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNagaBuild.java @@ -38,13 +38,13 @@ public void onRemove(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return caster.pollNextOrderBehavior(game); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { final War3ID orderIdAsRawtype = new War3ID(orderId); final CUnitType unitType = game.getUnitData().getUnitType(orderIdAsRawtype); roundTargetPoint(point, unitType); @@ -57,7 +57,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNeutralBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNeutralBuild.java index f92ebc032..62ae92fce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNeutralBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNeutralBuild.java @@ -32,19 +32,19 @@ public void onRemove(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return caster.pollNextOrderBehavior(game); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { // TODO Auto-generated method stub return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNightElfBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNightElfBuild.java index 6d7078126..00eaca5f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNightElfBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityNightElfBuild.java @@ -37,13 +37,13 @@ public void onRemove(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return caster.pollNextOrderBehavior(game); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { final War3ID orderIdAsRawtype = new War3ID(orderId); final CUnitType unitType = game.getUnitData().getUnitType(orderIdAsRawtype); roundTargetPoint(point, unitType); @@ -56,7 +56,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityOrcBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityOrcBuild.java index 7eea35253..fddcfb6a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityOrcBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityOrcBuild.java @@ -37,13 +37,13 @@ public void onRemove(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return caster.pollNextOrderBehavior(game); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { final War3ID orderIdAsRawtype = new War3ID(orderId); final CUnitType unitType = game.getUnitData().getUnitType(orderIdAsRawtype); roundTargetPoint(point, unitType); @@ -56,7 +56,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java index c7e8e3993..f315bd79e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java @@ -119,18 +119,18 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return this.behaviorRepair.reset(game, target); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @@ -190,7 +190,7 @@ public AutocastType getAutocastType() { } @Override - public void setAutoCastOn(final CUnit caster, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn) { this.autocasting = autoCastOn; caster.setAutocastAbility(autoCastOn ? this : null); } @@ -200,11 +200,6 @@ public boolean isAutoCastOn() { return autocasting ; } - @Override - public void setAutoCastOff() { - this.autocasting = false; - } - @Override public int getAutoCastOnOrderId() { return OrderIds.repairon; @@ -218,7 +213,7 @@ public int getAutoCastOffOrderId() { @Override public void checkCanAutoTarget(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver) { - this.checkCanTarget(game, unit, orderId, target, receiver); + this.checkCanTarget(game, unit, orderId, false, target, receiver); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityUndeadBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityUndeadBuild.java index 753598ad5..8b420a5fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityUndeadBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityUndeadBuild.java @@ -37,13 +37,13 @@ public void onRemove(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return caster.pollNextOrderBehavior(game); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { final War3ID orderIdAsRawtype = new War3ID(orderId); final CUnitType unitType = game.getUnitData().getUnitType(orderIdAsRawtype); roundTargetPoint(point, unitType); @@ -56,7 +56,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityCargoHold.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityCargoHold.java index 19fadcbbe..f140723d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityCargoHold.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityCargoHold.java @@ -52,7 +52,7 @@ public void onTick(final CSimulation game, final CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { if (orderId == OrderIds.unload) { final int targetIndex = cargoUnits.indexOf(target); if (targetIndex != -1) { @@ -64,7 +64,7 @@ public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, fina } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return caster.pollNextOrderBehavior(game); } @@ -78,18 +78,18 @@ public void dropUnitByIndex(final CSimulation game, final CUnit caster, final in @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { if (orderId == OrderIds.unload) { if (cargoUnits.contains(target)) { receiver.targetOk(target); @@ -105,13 +105,13 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDrop.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDrop.java index 88db70ec5..c681733a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDrop.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDrop.java @@ -43,18 +43,18 @@ public int getBaseOrderId() { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return this.behaviorDrop.reset(game, point); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDropInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDropInstant.java index 24acecf72..62fdb6ec5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDropInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityDropInstant.java @@ -35,18 +35,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { final CAbilityCargoHold cargoData = caster.getCargoData(); cargoData.unloadAllInstant(game, caster); return caster.pollNextOrderBehavior(game); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityLoad.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityLoad.java index eeb47f414..870fda50a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityLoad.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityLoad.java @@ -52,18 +52,18 @@ public int getBaseOrderId() { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return this.behaviorLoad.reset(game, target); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @@ -169,14 +169,14 @@ public static CAbilityLoad getTransportLoad(final CSimulation game, final CUnit if (potentialLoadAbility instanceof CAbilityLoad) { final CAbilityLoad abilityLoad = (CAbilityLoad) potentialLoadAbility; final BooleanAbilityActivationReceiver transportUnitReceiver = BooleanAbilityActivationReceiver.INSTANCE; - abilityLoad.checkCanUse(game, transport, OrderIds.smart, transportUnitReceiver); + abilityLoad.checkCanUse(game, transport, OrderIds.smart, false, transportUnitReceiver); // NOTE: disabled load ability should enable later in case of under construction // entangled gold mine if (transportUnitReceiver.isOk() || (ignoreDisabled && abilityLoad.isDisabled())) { final ExternStringMsgTargetCheckReceiver transportUnitTargetCheckReceiver = ExternStringMsgTargetCheckReceiver .getInstance(); - abilityLoad.checkCanTarget(game, transport, OrderIds.smart, caster, - transportUnitTargetCheckReceiver.reset()); + abilityLoad.checkCanTarget(game, transport, OrderIds.smart, false, + caster, transportUnitTargetCheckReceiver.reset()); if ((transportUnitTargetCheckReceiver.getTarget() != null) || (ignoreRange && (transportUnitTargetCheckReceiver .getExternStringKey() == CommandStringErrorKeys.TARGET_IS_OUTSIDE_RANGE))) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityStandDown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityStandDown.java index 4d80664af..f567eb7e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityStandDown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/cargohold/CAbilityStandDown.java @@ -39,18 +39,18 @@ public int getBaseOrderId() { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @@ -74,7 +74,7 @@ public boolean isToggleOn() { } @Override - public boolean checkBeforeQueue(CSimulation game, CUnit caster, int orderId, AbilityTarget target) { + public boolean checkBeforeQueue(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target) { CAbilityCargoHold cargoData = caster.getCargoData(); game.unitSoundEffectEvent(caster, cargoData.getAlias()); int goldWorkers = 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityColdArrows.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityColdArrows.java index cded53ab5..82ed647eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityColdArrows.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityColdArrows.java @@ -34,8 +34,8 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { switch (orderId) { case OrderIds.coldarrowstarg: receiver.targetOk(target); @@ -48,13 +48,13 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { switch (orderId) { case OrderIds.coldarrows: case OrderIds.uncoldarrows: @@ -89,7 +89,7 @@ public void onTick(final CSimulation game, final CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { switch (orderId) { case OrderIds.coldarrows: case OrderIds.uncoldarrows: @@ -101,7 +101,7 @@ public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, fina } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { CBehavior behavior = null; for (final CUnitAttack attack : caster.getCurrentAttacks()) { if (target.canBeTargetedBy(game, caster, attack.getTargetsAllowed())) { @@ -118,12 +118,12 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return caster.pollNextOrderBehavior(game); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityInvulnerable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityInvulnerable.java index ba5737768..c5f736ce4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityInvulnerable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/combat/CAbilityInvulnerable.java @@ -31,36 +31,36 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbilityGenericSingleIconPassiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbilityGenericSingleIconPassiveAbility.java index 98bf4195f..caa94c0d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbilityGenericSingleIconPassiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbilityGenericSingleIconPassiveAbility.java @@ -28,20 +28,20 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @@ -64,23 +64,23 @@ public void onTick(final CSimulation game, final CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { return false; } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return caster.pollNextOrderBehavior(game); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return caster.pollNextOrderBehavior(game); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericAliasedAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericAliasedAbility.java index 1072c4f6b..43a56a38f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericAliasedAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericAliasedAbility.java @@ -17,7 +17,7 @@ public AbstractGenericAliasedAbility(final int handleId, final War3ID code, fina @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { return true; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericSingleIconActiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericSingleIconActiveAbility.java index 17372526b..79700c3a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericSingleIconActiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericSingleIconActiveAbility.java @@ -18,30 +18,30 @@ public AbstractGenericSingleIconActiveAbility(final int handleId, final War3ID c @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { final int autoCastOnOrderId = getAutoCastOnOrderId(); final int autoCastOffOrderId = getAutoCastOffOrderId(); if (orderId != 0) { if (orderId == autoCastOnOrderId) { - setAutoCastOn(caster, true); + setAutoCastOn(game, caster, true); return false; } else if (orderId == autoCastOffOrderId) { - setAutoCastOn(caster, false); + setAutoCastOn(game, caster, false); return false; } else { - return super.checkBeforeQueue(game, caster, orderId, target); + return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } } else { - return super.checkBeforeQueue(game, caster, orderId, target); + return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { if (orderId == getBaseOrderId()) { innerCheckCanTarget(game, unit, orderId, target, receiver); } @@ -61,7 +61,7 @@ protected abstract void innerCheckCanSmartTarget(CSimulation game, CUnit unit, i @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { if (orderId == getBaseOrderId()) { innerCheckCanTarget(game, unit, orderId, target, receiver); } @@ -81,7 +81,7 @@ protected abstract void innerCheckCanSmartTarget(CSimulation game, CUnit unit, i @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { if ((orderId != 0) && ((orderId == getAutoCastOffOrderId()) || (orderId == getAutoCastOnOrderId()))) { receiver.targetOk(null); } @@ -146,7 +146,7 @@ public int getAutoCastOffOrderId() { return 0; } - public void setAutoCastOn(final CUnit unit, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit unit, final boolean autoCastOn) { } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityAcolyteHarvest.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityAcolyteHarvest.java index 7340f16fd..58e1a9988 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityAcolyteHarvest.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityAcolyteHarvest.java @@ -42,18 +42,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return this.behaviorAcolyteHarvest.reset(game, target); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return caster.pollNextOrderBehavior(game); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityHarvest.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityHarvest.java index ceaa96ee6..9415dcc44 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityHarvest.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityHarvest.java @@ -86,18 +86,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return this.behaviorHarvest.reset(game, target); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return caster.pollNextOrderBehavior(game); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { if (isToggleOn() && (orderId == OrderIds.returnresources)) { return this.behaviorReturnResources.reset(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityReturnResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityReturnResources.java index 2d09ec166..6e24b512a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityReturnResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityReturnResources.java @@ -47,36 +47,36 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityWispHarvest.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityWispHarvest.java index afaf5d443..ccc11e412 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityWispHarvest.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/harvest/CAbilityWispHarvest.java @@ -53,18 +53,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return this.behaviorWispHarvest.reset(game, target); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return caster.pollNextOrderBehavior(game); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java index b90d670f5..9e7e532df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java @@ -15,7 +15,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.AbstractCAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.GetAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; @@ -59,24 +58,25 @@ public void onAdd(final CSimulation game, final CUnit unit) { final CUnitType unitType = unit.getUnitType(); this.strength = new HeroStatValue(unitType.getStartingStrength(), unitType.getStrengthPerLevel()); this.agility = new HeroStatValue(unitType.getStartingAgility(), unitType.getAgilityPerLevel()); - this.intelligence = new HeroStatValue(unitType.getStartingIntelligence(), unitType.getIntelligencePerLevel()); + this.intelligence = new HeroStatValue(unitType.getStartingIntelligence(), + unitType.getIntelligencePerLevel()); calculateDerivatedFields(game, unit); - + final int properNamesCount = unitType.getProperNamesCount(); nameIndex = properNamesCount > 0 ? game.getSeededRandom().nextInt(properNamesCount) : 0; - + setHeroName(unitType); } } - + public void setHeroName(CUnitType unitType) { String properName; final List heroProperNames = unitType.getHeroProperNames(); - int cnt = unitType.getProperNamesCount() > 0 ? unitType.getProperNamesCount() : heroProperNames.size(); + int cnt = unitType.getProperNamesCount() > 0 ? Math.min(heroProperNames.size(), unitType.getProperNamesCount()) + : heroProperNames.size(); if (heroProperNames.size() > 0 && cnt > 0) { properName = heroProperNames.get(nameIndex % cnt); - } - else { + } else { properName = WarsmashConstants.DEFAULT_STRING; } this.properName = properName; @@ -98,7 +98,7 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, + public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final AbilityTarget target) { final War3ID orderIdAsRawtype = new War3ID(orderId); learnSkill(game, caster, orderIdAsRawtype); @@ -116,65 +116,63 @@ private void learnSkill(final CSimulation game, final CUnit caster, final War3ID newAbility.setHero(true); this.learnedAbilities.add(newAbility); caster.add(game, newAbility); - } - else { + } else { abilityType.setLevel(game, caster, existingAbility, existingAbility.getLevel() + 1); } - } - else { + } else { game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: Ability is not yet programmed, unable to learn!"); } } - + public List getLearnedHeroAbilities() { return this.learnedAbilities; } public void selectHeroSkill(final CSimulation game, final CUnit caster, final War3ID skillId) { final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; - checkCanUse(game, caster, skillId.getValue(), activationReceiver); + checkCanUse(game, caster, skillId.getValue(), false, activationReceiver); if (activationReceiver.isOk()) { learnSkill(game, caster, skillId); } } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, + final CWidget target) { return null; } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override - public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, + public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, final AbilityTargetCheckReceiver receiver) { final War3ID orderIdAsRawtype = new War3ID(orderId); if (this.skillsAvailable.contains(orderIdAsRawtype)) { receiver.targetOk(null); - } - else { + } else { receiver.orderIdNotAccepted(); } } @@ -198,20 +196,16 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final if ((abilityType == null) || (priorLevel < abilityType.getLevelCount())) { if (this.heroLevel >= heroRequiredLevel) { receiver.useOk(); - } - else { + } else { receiver.missingHeroLevelRequirement(heroRequiredLevel); } - } - else { + } else { receiver.techtreeMaximumReached(); } - } - else { + } else { receiver.noHeroSkillPointsAvailable(); } - } - else { + } else { receiver.useOk(); } } @@ -304,8 +298,7 @@ public void setHeroLevel(final CSimulation simulation, final CUnit unit, final i (int) Math.ceil( (neededTotalXp - this.xp) / simulation.getPlayer(unit.getPlayerIndex()).getHandicapXP()), showEffect); - } - else { + } else { // remove xp TODO } } @@ -536,8 +529,7 @@ public String getDisplayText() { if ((this.bonus + this.buffbonus) != 0) { if ((this.bonus + this.buffbonus) > 0) { text += "|cFF00FF00 +" + (this.bonus + this.buffbonus) + ""; - } - else { + } else { text += "|cFFFF0000 " + (this.bonus + this.buffbonus) + ""; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/inventory/CAbilityInventory.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/inventory/CAbilityInventory.java index 2b4784134..eefebaae2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/inventory/CAbilityInventory.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/inventory/CAbilityInventory.java @@ -80,7 +80,7 @@ public void onTick(final CSimulation game, final CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { if ((orderId >= OrderIds.itemdrag00) && (orderId <= OrderIds.itemdrag05)) { for (int i = 0; i < this.itemsHeld.length; i++) { if (this.itemsHeld[i] == target) { @@ -104,7 +104,7 @@ else if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { if (cAbility instanceof SingleOrderAbility) { forwardedOrderId = ((SingleOrderAbility) cAbility).getBaseOrderId(); } - final boolean checkResult = cAbility.checkBeforeQueue(game, caster, forwardedOrderId, target); + final boolean checkResult = cAbility.checkBeforeQueue(game, caster, forwardedOrderId, false, target); if (!checkResult) { // we will never call begin, so we need to consume a charge of perishables here // assuming this is a no-queue instant use perishable... later if we have some @@ -119,7 +119,7 @@ else if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { return checkResult; } } - return super.checkBeforeQueue(game, caster, orderId, target); + return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } private void consumePerishableCharge(final CSimulation game, final CUnit caster, final int slot, @@ -157,7 +157,7 @@ public boolean isDropItemsOnDeath() { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { final int slot = orderId - OrderIds.itemuse00; final List itemsHeldAbilitiesForSlot = this.itemsHeldAbilities[slot]; @@ -167,7 +167,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord if (ability instanceof SingleOrderAbility) { forwardedOrderId = ((SingleOrderAbility) ability).getBaseOrderId(); } - final CBehavior behavior = ability.begin(game, caster, forwardedOrderId, target); + final CBehavior behavior = ability.begin(game, caster, forwardedOrderId, false, target); final CItem cItem = this.itemsHeld[slot]; consumePerishableCharge(game, caster, slot, cItem); return behavior; @@ -192,7 +192,7 @@ public CBehavior beginDropItem(final CSimulation game, final CUnit caster, final @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { final int slot = orderId - OrderIds.itemuse00; final List itemsHeldAbilitiesForSlot = this.itemsHeldAbilities[slot]; @@ -202,7 +202,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord if (ability instanceof SingleOrderAbility) { forwardedOrderId = ((SingleOrderAbility) ability).getBaseOrderId(); } - final CBehavior behavior = ability.begin(game, caster, forwardedOrderId, point); + final CBehavior behavior = ability.begin(game, caster, forwardedOrderId, false, point); final CItem cItem = this.itemsHeld[slot]; consumePerishableCharge(game, caster, slot, cItem); return behavior; @@ -212,7 +212,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { final int slot = orderId - OrderIds.itemuse00; final List itemsHeldAbilitiesForSlot = this.itemsHeldAbilities[slot]; @@ -222,7 +222,7 @@ public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final if (ability instanceof SingleOrderAbility) { forwardedOrderId = ((SingleOrderAbility) ability).getBaseOrderId(); } - final CBehavior behavior = ability.beginNoTarget(game, caster, forwardedOrderId); + final CBehavior behavior = ability.beginNoTarget(game, caster, forwardedOrderId, false); final CItem cItem = this.itemsHeld[slot]; consumePerishableCharge(game, caster, slot, cItem); return behavior; @@ -232,8 +232,8 @@ public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { if (((orderId == OrderIds.getitem) || (orderId == OrderIds.smart)) && !target.isDead()) { if (target instanceof CItem) { if (this.canGetItems) { @@ -300,7 +300,7 @@ else if (hero.getFirstAbilityOfType(CAbilityShopPurhaseItem.class) != null) { if (ability instanceof SingleOrderAbility) { forwardedOrderId = ((SingleOrderAbility) ability).getBaseOrderId(); } - ability.checkCanTarget(game, unit, forwardedOrderId, target, receiver); + ability.checkCanTarget(game, unit, forwardedOrderId, false, target, receiver); } else { receiver.orderIdNotAccepted(); @@ -325,7 +325,7 @@ public int getSlot(final CItem target) { @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { if (orderId != OrderIds.dropitem) { if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { final int slot = orderId - OrderIds.itemuse00; @@ -336,7 +336,7 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o if (ability instanceof SingleOrderAbility) { forwardedOrderId = ((SingleOrderAbility) ability).getBaseOrderId(); } - ability.checkCanTarget(game, unit, forwardedOrderId, target, receiver); + ability.checkCanTarget(game, unit, forwardedOrderId, false, target, receiver); } else { receiver.orderIdNotAccepted(); @@ -353,7 +353,7 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { final int slot = orderId - OrderIds.itemuse00; final List itemsHeldAbilitiesForSlot = this.itemsHeldAbilities[slot]; @@ -363,7 +363,7 @@ public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, fin if (ability instanceof SingleOrderAbility) { forwardedOrderId = ((SingleOrderAbility) ability).getBaseOrderId(); } - ability.checkCanTargetNoTarget(game, unit, forwardedOrderId, receiver); + ability.checkCanTargetNoTarget(game, unit, forwardedOrderId, false, receiver); } else { receiver.orderIdNotAccepted(); @@ -391,7 +391,7 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final if (ability instanceof SingleOrderAbility) { forwardedOrderId = ((SingleOrderAbility) ability).getBaseOrderId(); } - ability.checkCanUse(game, unit, forwardedOrderId, receiver); + ability.checkCanUse(game, unit, forwardedOrderId, false, receiver); } else { receiver.notAnActiveAbility(); @@ -443,7 +443,7 @@ public int giveItem(final CSimulation simulation, final CUnit hero, final CItem final BooleanAbilityTargetCheckReceiver booleanUnitTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - abilityFromItem.checkCanTarget(simulation, hero, baseOrderId, hero, booleanUnitTargetReceiver); + abilityFromItem.checkCanTarget(simulation, hero, baseOrderId, false, hero, booleanUnitTargetReceiver); if (booleanUnitTargetReceiver.isTargetable()) { hero.order(simulation, new COrderTargetWidget(abilityFromItem.getHandleId(), baseOrderId, hero.getHandleId(), false), false); @@ -452,7 +452,7 @@ public int giveItem(final CSimulation simulation, final CUnit hero, final CItem final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); AbilityPointTarget tar = new AbilityPointTarget(hero.getX(), hero.getY()); - abilityFromItem.checkCanTarget(simulation, hero, baseOrderId, tar, booleanTargetReceiver); + abilityFromItem.checkCanTarget(simulation, hero, baseOrderId, false, tar, booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) {hero.order(simulation, new COrderTargetPoint(abilityFromItem.getHandleId(), baseOrderId, tar, false), false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemAttackBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemAttackBonus.java index 0d87af79d..2b2fa9c12 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemAttackBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemAttackBonus.java @@ -38,36 +38,36 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemDefenseBonus.java index 4460df539..da4164b45 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemDefenseBonus.java @@ -33,36 +33,36 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemExperienceGain.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemExperienceGain.java index e355e9726..616ae80b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemExperienceGain.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemExperienceGain.java @@ -34,7 +34,7 @@ public void onAdd(final CSimulation game, final CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { if (orderId == OrderIds.itemxpgain) { final CAbilityHero heroData = caster.getHeroData(); heroData.addXp(game, caster, this.xpToGain, true); @@ -60,18 +60,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemHeal.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemHeal.java index 4cb6ef89d..bbc57ff4f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemHeal.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemHeal.java @@ -100,29 +100,29 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { if ((target == null) && (orderId == getBaseOrderId())) { caster.heal(game, this.lifeToRegain); game.createTemporarySpellEffectOnUnit(caster, getAlias(), CEffectType.TARGET); caster.beginCooldown(game, CODE, cooldown); return false; } - return super.checkBeforeQueue(game, caster, orderId, target); + return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemLevelGain.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemLevelGain.java index c5a2bd41e..802186090 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemLevelGain.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemLevelGain.java @@ -34,7 +34,7 @@ public void onAdd(final CSimulation game, final CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { if (orderId == getBaseOrderId()) { final CAbilityHero heroData = caster.getHeroData(); heroData.setHeroLevel(game, caster, heroData.getHeroLevel() + levelsToGain, true); @@ -60,18 +60,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemLifeBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemLifeBonus.java index 953f13d31..49735a0e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemLifeBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemLifeBonus.java @@ -38,36 +38,36 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaBonus.java index 16e9b7e63..f730a647d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaBonus.java @@ -46,18 +46,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaRegain.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaRegain.java index 4341f25e4..ad52d8a0a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaRegain.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemManaRegain.java @@ -101,29 +101,29 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { if ((target == null) && (orderId == getBaseOrderId())) { caster.restoreMana(game, this.manaToRegain); game.createTemporarySpellEffectOnUnit(caster, getAlias(), CEffectType.CASTER); caster.beginCooldown(game, CODE, cooldown); return false; } - return super.checkBeforeQueue(game, caster, orderId, target); + return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemPermanentLifeGain.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemPermanentLifeGain.java index d8fb908a0..1514361f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemPermanentLifeGain.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemPermanentLifeGain.java @@ -33,7 +33,7 @@ public void onAdd(final CSimulation game, final CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { if (orderId == getBaseOrderId()) { final float life = caster.getLife(); final int maximumLife = caster.getMaximumLife(); @@ -61,18 +61,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemPermanentStatGain.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemPermanentStatGain.java index 195c3204a..7e3a5fee9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemPermanentStatGain.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemPermanentStatGain.java @@ -33,7 +33,7 @@ public void onAdd(final CSimulation game, final CUnit unit) { } @Override - public boolean checkBeforeQueue(CSimulation game, CUnit caster, int orderId, AbilityTarget target) { + public boolean checkBeforeQueue(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target) { if (orderId == OrderIds.itemstatgain) { final CAbilityHero heroData = caster.getHeroData(); heroData.addStrengthBase(game, caster, this.strength); @@ -56,36 +56,36 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { if (orderId == OrderIds.itemstatgain) { receiver.targetOk(null); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemStatBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemStatBonus.java index ba16fec47..eed8412d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemStatBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/CAbilityItemStatBonus.java @@ -45,36 +45,36 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityNeutralBuilding.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityNeutralBuilding.java index 43dd1685a..041bf9fa6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityNeutralBuilding.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityNeutralBuilding.java @@ -153,7 +153,7 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); if (showSelectUnitButton && (orderId == OrderIds.neutralinteract) && canSelectUnit(game, caster, targetUnit)) { final int playerIndex = targetUnit.getPlayerIndex(); @@ -165,20 +165,20 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { // TODO Auto-generated method stub return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { // TODO Auto-generated method stub return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { if (showSelectUnitButton && (orderId == OrderIds.neutralinteract) && canSelectUnit(game, unit, target.visit(AbilityTargetVisitor.UNIT))) { receiver.targetOk(target); @@ -190,13 +190,13 @@ && canSelectUnit(game, unit, target.visit(AbilityTargetVisitor.UNIT))) { @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilitySellItems.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilitySellItems.java index e3f6d344e..ce49bdd7f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilitySellItems.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilitySellItems.java @@ -66,20 +66,20 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public final void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { final int playerIndex = orderId & 0xFF; // TODO this is stupid, and should be passed as some "acting player" arg final int itemIndex = ((orderId & 0xFF00) >> 8) - 1; if ((itemIndex >= 0) && (itemIndex < this.itemsSold.size())) { @@ -92,7 +92,7 @@ public final void checkCanTargetNoTarget(final CSimulation game, final CUnit uni @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { return true; } @@ -111,18 +111,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { final int playerIndex = orderId & 0xFF; // TODO this is stupid, and should be passed as some "acting player" arg final int itemIndex = ((orderId & 0xFF00) >> 8) - 1; final CAbilityNeutralBuilding neutralBuildingData = caster.getNeutralBuildingData(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityShopPurhaseItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityShopPurhaseItem.java index 4558596ef..380193f0e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityShopPurhaseItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/item/shop/CAbilityShopPurhaseItem.java @@ -29,36 +29,36 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java index 0e6e782ee..f6303e045 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CAbilityJass.java @@ -122,7 +122,7 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { for (final CAbilityOrderButtonJass orderButton : this.orderButtons) { if ((orderButton.getType() == JassOrderButtonType.UNIT_TARGET) || (orderButton.getType() == JassOrderButtonType.UNIT_OR_POINT_TARGET)) { @@ -137,7 +137,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { for (final CAbilityOrderButtonJass orderButton : this.orderButtons) { if ((orderButton.getType() == JassOrderButtonType.POINT_TARGET) || (orderButton.getType() == JassOrderButtonType.UNIT_OR_POINT_TARGET)) { @@ -151,7 +151,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { for (final CAbilityOrderButtonJass orderButton : this.orderButtons) { if ((orderButton.getType() == JassOrderButtonType.INSTANT_NO_TARGET) || (orderButton.getType() == JassOrderButtonType.INSTANT_NO_TARGET_NO_INTERRUPT)) { @@ -165,8 +165,8 @@ public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { final RecordingAbilityTargetCheckReceiver delegateReceiver = RecordingAbilityTargetCheckReceiver .getInstance(); String errorMessage = null; @@ -195,7 +195,7 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { final RecordingAbilityTargetCheckReceiver delegateReceiver = RecordingAbilityTargetCheckReceiver .getInstance(); String errorMessage = null; @@ -225,7 +225,7 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { final RecordingAbilityTargetCheckReceiver delegateReceiver = RecordingAbilityTargetCheckReceiver .getInstance(); String errorMessage = null; @@ -286,7 +286,7 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { for (final CAbilityOrderButtonJass orderButton : this.orderButtons) { if (orderButton.getType() == JassOrderButtonType.INSTANT_NO_TARGET_NO_INTERRUPT) { if (orderButton.getOrderId() == orderId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CBuffJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CBuffJass.java index ffb095d03..8af51abec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CBuffJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CBuffJass.java @@ -140,36 +140,36 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityBlightedGoldMine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityBlightedGoldMine.java index f644a5075..45de6222d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityBlightedGoldMine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityBlightedGoldMine.java @@ -121,36 +121,36 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityEntangledMine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityEntangledMine.java index 96c698270..4f083fb9f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityEntangledMine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityEntangledMine.java @@ -70,36 +70,36 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.notAnActiveAbility(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.notAnActiveAbility(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.notAnActiveAbility(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityGoldMine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityGoldMine.java index eb62c2559..2f847f3dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityGoldMine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityGoldMine.java @@ -80,36 +80,36 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityOverlayedMinableMine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityOverlayedMinableMine.java index dbdb181e8..19b58450b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityOverlayedMinableMine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/mine/CAbilityOverlayedMinableMine.java @@ -78,36 +78,36 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/neutral/CAbilityWayGate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/neutral/CAbilityWayGate.java index 3b7f083e7..44a026e7c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/neutral/CAbilityWayGate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/neutral/CAbilityWayGate.java @@ -72,7 +72,7 @@ public void onCancelFromQueue(CSimulation game, CUnit unit, int orderId) { } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { final CUnit unitTarget = target.visit(AbilityTargetVisitor.UNIT); if (unitTarget != null) { if (!unitTarget.isMovementDisabled()) { @@ -93,18 +93,18 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget targ } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { + public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(CSimulation game, CUnit caster, int orderId, CWidget target, - AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder, + CWidget target, AbilityTargetCheckReceiver receiver) { if (orderId == ORDER_ID) { final CUnit unitTarget = target.visit(AbilityTargetVisitor.UNIT); if (unitTarget != null) { @@ -137,14 +137,14 @@ public void checkCanTarget(CSimulation game, CUnit caster, int orderId, CWidget } @Override - public void checkCanTarget(CSimulation game, CUnit unit, int orderId, AbilityPointTarget target, - AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, + AbilityPointTarget target, AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(CSimulation game, CUnit unit, int orderId, - AbilityTargetCheckReceiver receiver) { + boolean autoOrder, AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @@ -210,14 +210,14 @@ public static CAbilityWayGate getWayGateAbility(final CSimulation game, final CU if (potentialLoadAbility instanceof CAbilityWayGate) { final CAbilityWayGate abilityLoad = (CAbilityWayGate) potentialLoadAbility; final BooleanAbilityActivationReceiver transportUnitReceiver = BooleanAbilityActivationReceiver.INSTANCE; - abilityLoad.checkCanUse(game, transport, ORDER_ID, transportUnitReceiver); + abilityLoad.checkCanUse(game, transport, ORDER_ID, false, transportUnitReceiver); // NOTE: disabled load ability should enable later in case of under construction // entangled gold mine if (transportUnitReceiver.isOk() || (ignoreDisabled && abilityLoad.isDisabled())) { final ExternStringMsgTargetCheckReceiver transportUnitTargetCheckReceiver = ExternStringMsgTargetCheckReceiver .getInstance(); - abilityLoad.checkCanTarget(game, transport, ORDER_ID, caster, - transportUnitTargetCheckReceiver.reset()); + abilityLoad.checkCanTarget(game, transport, ORDER_ID, false, + caster, transportUnitTargetCheckReceiver.reset()); if ((transportUnitTargetCheckReceiver.getTarget() != null) || (ignoreRange && (transportUnitTargetCheckReceiver .getExternStringKey() == CommandStringErrorKeys.TARGET_IS_OUTSIDE_RANGE))) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/eattree/CAbilityEatTree.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/eattree/CAbilityEatTree.java index d8b050c9e..5fa9f1405 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/eattree/CAbilityEatTree.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/eattree/CAbilityEatTree.java @@ -59,13 +59,13 @@ public void onAdd(final CSimulation game, final CUnit unit) { } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { if (orderId == OrderIds.smart) { - super.checkCanTarget(game, unit, getBaseOrderId(), target, receiver); + super.checkCanTarget(game, unit, getBaseOrderId(), autoOrder, target, receiver); } else { - super.checkCanTarget(game, unit, orderId, target, receiver); + super.checkCanTarget(game, unit, orderId, autoOrder, target, receiver); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/moonwell/CAbilityMoonWell.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/moonwell/CAbilityMoonWell.java index 62efabdb1..b8fce542c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/moonwell/CAbilityMoonWell.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/moonwell/CAbilityMoonWell.java @@ -136,7 +136,7 @@ public boolean call(final CUnit enumUnit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { final CUnit unitTarget = target.visit(AbilityTargetVisitor.UNIT); if (unitTarget != null) { final float life = unitTarget.getLife(); @@ -169,12 +169,12 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @@ -230,7 +230,7 @@ public boolean isAutoCastOn() { } @Override - public void setAutoCastOn(final CUnit caster, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn) { this.autoCastActive = autoCastOn; caster.setAutocastAbility(autoCastOn ? this : null); } @@ -250,15 +250,10 @@ public int getAutoCastOffOrderId() { return OrderIds.replenishoff; } - @Override - public void setAutoCastOff() { - this.autoCastActive = false; - } - @Override public void checkCanAutoTarget(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver) { - this.checkCanTarget(game, unit, orderId, target, receiver); + this.checkCanTarget(game, unit, orderId, false, target, receiver); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityEntangleGoldMine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityEntangleGoldMine.java index bf70e5148..557fa509b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityEntangleGoldMine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityEntangleGoldMine.java @@ -75,12 +75,12 @@ public void populateData(final GameObject worldEditorAbility, final int level) { } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { if (orderId == OrderIds.entangleinstant) { orderId = getBaseOrderId(); } - super.checkCanTarget(game, unit, orderId, target, receiver); + super.checkCanTarget(game, unit, orderId, autoOrder, target, receiver); } @Override @@ -112,9 +112,9 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { instant = orderId == OrderIds.entangleinstant; - return super.begin(game, caster, orderId, target); + return super.begin(game, caster, orderId, autoOrder, target); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityRoot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityRoot.java index e21ead5a2..22680391c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityRoot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/root/CAbilityRoot.java @@ -164,13 +164,13 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { if (!this.rooted && (orderId == OrderIds.root)) { return this.behaviorRoot.reset(game, point); } @@ -178,7 +178,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { if (this.rooted && (orderId == OrderIds.unroot)) { return this.behaviorUproot.reset(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityQueue.java index 7926da535..f89163e50 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityQueue.java @@ -173,20 +173,20 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public final void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { if (this.unitsTrained.contains(new War3ID(orderId)) || this.researchesAvailable.contains(new War3ID(orderId))) { receiver.targetOk(null); } @@ -200,7 +200,7 @@ else if (orderId == OrderIds.cancel) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { return true; } @@ -219,18 +219,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { if (orderId == OrderIds.cancel) { caster.cancelBuildQueueItem(game, 0); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityRally.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityRally.java index 84767c1d0..29c414361 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityRally.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityRally.java @@ -42,8 +42,8 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { switch (orderId) { case OrderIds.smart: case OrderIds.setrally: @@ -57,7 +57,7 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { switch (orderId) { case OrderIds.smart: case OrderIds.setrally: @@ -71,31 +71,31 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { return true; } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { caster.setRallyPoint(target); return caster.pollNextOrderBehavior(game); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { caster.setRallyPoint(point); return caster.pollNextOrderBehavior(game); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityReviveHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityReviveHero.java index 8dda6f6a8..a260be327 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityReviveHero.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/queue/CAbilityReviveHero.java @@ -63,20 +63,20 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public final void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { final CUnit deadHero = game.getUnit(orderId); if ((deadHero != null) && (deadHero.getPlayerIndex() == unit.getPlayerIndex())) { receiver.targetOk(null); @@ -91,7 +91,7 @@ else if (orderId == OrderIds.cancel) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { return true; } @@ -110,18 +110,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { if (orderId == OrderIds.cancel) { caster.cancelBuildQueueItem(game, 0); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityNoTargetSpellBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityNoTargetSpellBase.java index 2e3d2f81a..4325165da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityNoTargetSpellBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityNoTargetSpellBase.java @@ -22,18 +22,18 @@ public void onAdd(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return this.behavior.reset(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityPointTargetSpellBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityPointTargetSpellBase.java index 5100bc498..73aed3a1f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityPointTargetSpellBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityPointTargetSpellBase.java @@ -23,18 +23,18 @@ public void onAdd(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return this.behavior.reset(game, point); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityTargetSpellBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityTargetSpellBase.java index 8a8811cf1..87b69a655 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityTargetSpellBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityTargetSpellBase.java @@ -23,18 +23,18 @@ public void onAdd(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return this.behavior.reset(game, target); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityUnitOrPointTargetSpellBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityUnitOrPointTargetSpellBase.java index f58ca84fa..c7e3067cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityUnitOrPointTargetSpellBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/CAbilityUnitOrPointTargetSpellBase.java @@ -24,18 +24,18 @@ public void onAdd(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return this.behavior.reset(game, target); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return this.behavior.reset(game, point); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/bloodmage/phoenix/CAbilityPhoenixFire.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/bloodmage/phoenix/CAbilityPhoenixFire.java index 358782532..a053a540f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/bloodmage/phoenix/CAbilityPhoenixFire.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/human/bloodmage/phoenix/CAbilityPhoenixFire.java @@ -78,36 +78,36 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.notAnActiveAbility(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.notAnActiveAbility(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.notAnActiveAbility(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java index b3b469531..bf97fcfc7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java @@ -110,7 +110,7 @@ private void explode(final CSimulation simulation, final CUnit caster) { } @Override - public void setAutoCastOn(final CUnit caster, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn) { this.autoCastOn = autoCastOn; caster.setAutocastAbility(autoCastOn ? this : null); } @@ -120,11 +120,6 @@ public boolean isAutoCastOn() { return autoCastOn; } - @Override - public void setAutoCastOff() { - this.autoCastOn = false; - } - @Override public AutocastType getAutocastType() { return AutocastType.NEARESTENEMY; @@ -134,7 +129,7 @@ public AutocastType getAutocastType() { @Override public void checkCanAutoTarget(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver) { - this.checkCanTarget(game, unit, orderId, target, receiver); + this.checkCanTarget(game, unit, orderId, false, target, receiver); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityImmolation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityImmolation.java index 9eb41500b..f65d39df3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityImmolation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CAbilityImmolation.java @@ -92,7 +92,7 @@ public void onTick(final CSimulation game, final CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { if (this.active && (orderId == OrderIds.unimmolation)) { deactivate(game, caster); return false; @@ -103,7 +103,7 @@ else if (!this.active && (orderId == OrderIds.immolation)) { } return false; } - return super.checkBeforeQueue(game, caster, orderId, target); + return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } public void activate(final CSimulation game, final CUnit caster) { @@ -121,18 +121,18 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CBuffImmolationCaster.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CBuffImmolationCaster.java index 3d0a31110..b8926f4a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CBuffImmolationCaster.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/nightelf/demonhunter/CBuffImmolationCaster.java @@ -78,36 +78,36 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/blademaster/CBuffWhirlWindCaster.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/blademaster/CBuffWhirlWindCaster.java index c52eb4a77..30a78612f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/blademaster/CBuffWhirlWindCaster.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/orc/blademaster/CBuffWhirlWindCaster.java @@ -88,36 +88,36 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffAuraBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffAuraBase.java index 3e88eefbf..fd28c16d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffAuraBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffAuraBase.java @@ -71,35 +71,35 @@ public void onCancelFromQueue(CSimulation game, CUnit unit, int orderId) { } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { return null; } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { + public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(CSimulation game, CUnit unit, int orderId, CWidget target, - AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, + CWidget target, AbilityTargetCheckReceiver receiver) { receiver.notAnActiveAbility(); } @Override - public void checkCanTarget(CSimulation game, CUnit unit, int orderId, AbilityPointTarget target, - AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, + AbilityPointTarget target, AbilityTargetCheckReceiver receiver) { receiver.notAnActiveAbility(); } @Override public void checkCanTargetNoTarget(CSimulation game, CUnit unit, int orderId, - AbilityTargetCheckReceiver receiver) { + boolean autoOrder, AbilityTargetCheckReceiver receiver) { receiver.notAnActiveAbility(); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffTimed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffTimed.java index c20e7213a..5ef232c04 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffTimed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffTimed.java @@ -59,36 +59,36 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCarrionSwarmDummy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCarrionSwarmDummy.java index 34e033d8a..95929a90c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCarrionSwarmDummy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCarrionSwarmDummy.java @@ -61,18 +61,18 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return this.behaviorCarrionSwarmDummy.reset(game, target); } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return this.behaviorCarrionSwarmDummy.reset(game, point); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return caster.pollNextOrderBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityChannelTest.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityChannelTest.java index 1e74ac6e9..73c5d5871 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityChannelTest.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityChannelTest.java @@ -46,18 +46,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return this.behaviorChannelTest; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return this.behaviorChannelTest; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return this.behaviorChannelTest; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCoupleInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCoupleInstant.java index 826396a4a..c092f1428 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCoupleInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/test/CAbilityCoupleInstant.java @@ -79,7 +79,7 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { // only from engine, not ever allowed by the checks if (target instanceof CUnit) { return this.behaviorCoupleInstant.reset(game, (CUnit) target); @@ -89,12 +89,12 @@ public CBehavior begin(final CSimulation game, final CUnit caster, final int ord @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return caster.pollNextOrderBehavior(game); } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { final PossiblePairFinderEnum possiblePairFinder = new PossiblePairFinderEnum(caster); game.getWorldCollision().enumUnitsInRect( new Rectangle(caster.getX() - this.area, caster.getY() - this.area, this.area * 2, this.area * 2), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/upgrade/CAbilityUpgrade.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/upgrade/CAbilityUpgrade.java index 3392d9c1e..ffbbfab65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/upgrade/CAbilityUpgrade.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/upgrade/CAbilityUpgrade.java @@ -106,20 +106,20 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final } @Override - public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public final void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public final void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { if (this.upgradesTo.contains(new War3ID(orderId))) { receiver.targetOk(null); } @@ -133,7 +133,7 @@ else if (orderId == OrderIds.cancel) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { return true; } @@ -152,18 +152,18 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { if (orderId == OrderIds.cancel) { caster.cancelUpgrade(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java index 3fcbbe1c5..53933b120 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java @@ -37,14 +37,14 @@ public interface AbilityBuilderActiveAbility extends AbilityBuilderAbility, CAut public void deactivate(final CSimulation game, final CUnit caster); - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver); + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver); public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver); + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver); public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver); + boolean autoOrder, final AbilityTargetCheckReceiver receiver); public void runOnOrderIssuedActions(CSimulation game, CUnit caster, int orderId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java index 5ffc11caf..f83ba8a6d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java @@ -45,8 +45,9 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord } @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { + public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { castId++; + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); CWidget target = autoTarget(game, caster); if (target != null) { this.runOnOrderIssuedActions(game, caster, orderId); @@ -106,12 +107,12 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord // Unused @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { return null; } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java index af7c5920b..28e7cdcce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java @@ -108,18 +108,20 @@ public void onAdd(CSimulation game, CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); if (!this.isTargetedSpell() && castless && orderId == this.getBaseOrderId()) { this.runBeginCastingActions(game, caster, orderId); this.runEndCastingActions(game, caster, orderId); return false; } - return super.checkBeforeQueue(game, caster, orderId, target); + return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { if (this.isTargetedSpell() && !this.isPointTarget()) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, target.visit(AbilityTargetVisitor.UNIT)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, target.visit(AbilityTargetVisitor.ITEM)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, target.visit(AbilityTargetVisitor.DESTRUCTABLE)); @@ -131,8 +133,9 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget targ } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { if (this.isTargetedSpell() && this.isPointTarget()) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, point); this.runOnOrderIssuedActions(game, caster, orderId); return this.behavior.reset(game, point); @@ -142,11 +145,12 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPoint } @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { + public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { if (!this.isTargetedSpell()) { if (castless) { return null; } else { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); this.runOnOrderIssuedActions(game, caster, orderId); return this.behavior.reset(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java deleted file mode 100644 index 2148b0e1a..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTargetSimple.java +++ /dev/null @@ -1,365 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; - -import java.util.List; -import java.util.Map; - -import com.etheller.warsmash.units.GameObject; -import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.CAbilitySpellBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.skills.CBehaviorNoTargetSpellBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.skills.CBehaviorTargetSpellBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIdUtils; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; - -@Deprecated -public class CAbilityAbilityBuilderActiveFlexTargetSimple extends CAbilitySpellBase { - private CBehavior behavior; - - List levelData; - private AbilityBuilderConfiguration config; - private Map localStore; - private int orderId; - private int autoCastOnId = 0; - private int autoCastOffId = 0; - private boolean autocasting = false; - private boolean initialized; - - private int castId = 0; - - private boolean targetedSpell = false; - private boolean pointTarget = false; - - public CAbilityAbilityBuilderActiveFlexTargetSimple(int handleId, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - Map localStore) { - super(handleId, alias); - this.levelData = levelData; - this.config = config; - this.localStore = localStore; - orderId = OrderIdUtils.getOrderId(config.getCastId()); - if (config.getAutoCastOnId() != null) { - autoCastOnId = OrderIdUtils.getOrderId(config.getAutoCastOnId()); - } - if (config.getAutoCastOffId() != null) { - autoCastOffId = OrderIdUtils.getOrderId(config.getAutoCastOffId()); - } - } - - private void setTargeted(CSimulation game, CUnit unit) { - if (config.getSpecialFields() != null && config.getSpecialFields().getTargetedSpell() != null) { - boolean result = true; - for (ABCondition condition : config.getSpecialFields().getTargetedSpell()) { - result = result && condition.callback(game, unit, localStore, castId); - } - this.targetedSpell = result; - } - } - private void setPointTarget(CSimulation game, CUnit unit) { - if (config.getSpecialFields() != null && config.getSpecialFields().getPointTargeted() != null) { - boolean result = true; - for (ABCondition condition : config.getSpecialFields().getPointTargeted()) { - result = result && condition.callback(game, unit, localStore, castId); - } - this.pointTarget = result; - } - } - private void setBehavior(final CUnit unit) { - if (this.targetedSpell) { - if (this.behavior == null || !(this.behavior instanceof CBehaviorTargetSpellBase)) { - this.behavior = new CBehaviorTargetSpellBase(unit, this); - } - } else { - if (this.behavior == null || !(this.behavior instanceof CBehaviorNoTargetSpellBase)) { - this.behavior = new CBehaviorNoTargetSpellBase(unit, this); - } - } - } - - public boolean isTargetedSpell() { - return this.targetedSpell; - } - - public boolean isPointTarget() { - return this.pointTarget; - } - - @Override - public void setLevel(CSimulation game, CUnit unit, int level) { - super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); - } - - @Override - public void populateData(GameObject worldEditorAbility, int level) { - if (this.initialized) { - CSimulation game = (CSimulation) this.localStore.get(ABLocalStoreKeys.GAME); - CUnit unit = (CUnit) this.localStore.get(ABLocalStoreKeys.THISUNIT); - this.setTargeted(game, unit); - this.setPointTarget(game, unit); - this.setBehavior(unit); - if (config.getOnLevelChange() != null) { - for (ABAction action : config.getOnLevelChange()) { - action.runAction(game, unit, this.localStore, castId); - } - } - } - this.initialized = true; - } - - @Override - public int getBaseOrderId() { - return this.orderId; - } - - public List getLevelData() { - return this.levelData; - } - - public AbilityBuilderConfiguration getConfig() { - return this.config; - } - - public Map getLocalStore() { - return this.localStore; - } - - @Override - public void onAdd(CSimulation game, CUnit unit) { - localStore.put(ABLocalStoreKeys.ISFLEXABILITY, this); - this.setTargeted(game, unit); - this.setPointTarget(game, unit); - this.setBehavior(unit); - localStore.put(ABLocalStoreKeys.GAME, game); - localStore.put(ABLocalStoreKeys.THISUNIT, unit); - if (config.getOnAddAbility() != null) { - for (ABAction action : config.getOnAddAbility()) { - action.runAction(game, unit, localStore, castId); - } - } - } - - @Override - public boolean doEffect(CSimulation simulation, CUnit unit, AbilityTarget target) { - this.castId++; - if (this.config.getOnBeginCasting() != null) { - if (this.isTargetedSpell()) { - if (this.isPointTarget() && target instanceof AbilityPointTarget) { - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + this.castId, target); - } else if (!this.isPointTarget()) { - final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, targetUnit); - final CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, targetDest); - final CItem targetItem = target.visit(AbilityTargetVisitor.ITEM); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, targetItem); - } - } - - for (ABAction action : this.config.getOnBeginCasting()) { - action.runAction(simulation, unit, this.localStore, castId); - } - - if (this.isTargetedSpell()) { - if (this.isPointTarget()) { - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + castId); - } else if (!this.isPointTarget()) { - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); - } - } - } - return false; - } - - @Override - protected void innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderId, - AbilityActivationReceiver receiver) { - if (config.getExtraCastConditions() != null) { - boolean result = true; - for (ABCondition condition : config.getExtraCastConditions()) { - result = result && condition.callback(game, unit, localStore, castId); - } - if (result) { - receiver.useOk(); - } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); - if (failReason != null) { - receiver.activationCheckFailed(failReason); - } else { - receiver.unknownReasonUseNotOk(); - } - } - } else { - receiver.useOk(); - } - } - - protected void innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, CWidget target, - AbilityTargetCheckReceiver receiver) { - if (this.config.getExtraTargetConditions() != null) { - final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, targetUnit); - final CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, targetDest); - final CItem targetItem = target.visit(AbilityTargetVisitor.ITEM); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, targetItem); - boolean result = true; - for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.callback(game, unit, localStore, castId); - } - if (result) { - receiver.targetOk(targetUnit); - } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); - if (failReason != null) { - receiver.targetCheckFailed(failReason); - } else { - receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_THIS_UNIT); - } - } - } else { - receiver.targetOk(target); - } - } - - protected void innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, AbilityPointTarget target, - AbilityTargetCheckReceiver receiver) { - if (this.config.getExtraTargetConditions() != null) { - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + this.castId, target); - boolean result = true; - for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.callback(game, unit, localStore, castId); - } - if (result) { - receiver.targetOk(target); - } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); - if (failReason != null) { - receiver.targetCheckFailed(failReason); - } else { - receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_THERE); - } - } - localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + this.castId); - } else { - receiver.targetOk(target); - } - } - - @Override - public int getAutoCastOnOrderId() { - return this.autoCastOnId; - } - - @Override - public int getAutoCastOffOrderId() { - return this.autoCastOffId; - } - - @Override - public boolean isAutoCastOn() { - return this.autocasting; - } - - @Override - public void setAutoCastOn(final CUnit caster, final boolean autoCastOn) { - this.autocasting = autoCastOn; - } - - @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { - if (this.isTargetedSpell() && !this.isPointTarget()) { - if (this.behavior instanceof CBehaviorTargetSpellBase) { - return ((CBehaviorTargetSpellBase) this.behavior).reset(game, target); - } else { - return null; - } - } else { - return null; - } - } - - @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { - if (this.isTargetedSpell() && this.isPointTarget()) { - if (this.behavior instanceof CBehaviorTargetSpellBase) { - return ((CBehaviorTargetSpellBase) this.behavior).reset(game, point); - } else { - return null; - } - } else { - return null; - } - } - - @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { - if (!this.isTargetedSpell()) { - if (this.behavior instanceof CBehaviorNoTargetSpellBase) { - return ((CBehaviorNoTargetSpellBase) this.behavior).reset(); - } else { - return null; - } - } else { - return null; - } - } - - @Override - protected void innerCheckCanTarget(CSimulation game, CUnit unit, int orderId, CWidget target, - AbilityTargetCheckReceiver receiver) { - if (this.isTargetedSpell() && !this.isPointTarget()) { - if (target.canBeTargetedBy(game, unit, getTargetsAllowed(), receiver)) { - if (!unit.isMovementDisabled() || unit.canReach(target, getCastRange())) { - this.innerCheckCanTargetSpell(game, unit, orderId, target, receiver); - } else { - receiver.targetCheckFailed(CommandStringErrorKeys.TARGET_IS_OUTSIDE_RANGE); - } - } - } else { - receiver.orderIdNotAccepted(); - } - } - - @Override - protected void innerCheckCanTarget(CSimulation game, CUnit unit, int orderId, AbilityPointTarget target, - AbilityTargetCheckReceiver receiver) { - if (this.isTargetedSpell() && this.isPointTarget()) { - if (!unit.isMovementDisabled() || unit.canReach(target, getCastRange())) { - this.innerCheckCanTargetSpell(game, unit, orderId, target, receiver); - } else { - receiver.targetCheckFailed(CommandStringErrorKeys.TARGET_IS_OUTSIDE_RANGE); - } - } else { - receiver.orderIdNotAccepted(); - } - } - - @Override - protected void innerCheckCanTargetNoTarget(CSimulation game, CUnit unit, int orderId, - AbilityTargetCheckReceiver receiver) { - if (!this.isTargetedSpell()) { - receiver.targetOk(null); - } else { - receiver.orderIdNotAccepted(); - } - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java index 49c25941d..4206ee821 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -52,18 +53,19 @@ protected void determineCastless(CUnit unit) { } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { return null; } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { return null; } @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); // System.err.println("Checking queue notarg level: " + active + " orderID : " + orderId + " offID: " + this.getOffOrderId()); if (castless && orderId == this.getBaseOrderId()) { @@ -80,15 +82,16 @@ public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, fina this.runEndCastingActions(game, caster, orderId); return false; } - return super.checkBeforeQueue(game, caster, orderId, target); + return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { + public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { this.castId++; if (castless) { return null; } else { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); this.runOnOrderIssuedActions(game, caster, orderId); this.behavior.setCastId(castId); return this.behavior.reset(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTargetSimple.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTargetSimple.java deleted file mode 100644 index d87cfa389..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTargetSimple.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; - -import java.util.List; -import java.util.Map; - -import com.etheller.warsmash.units.GameObject; -import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.CAbilityNoTargetSpellBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIdUtils; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; - -@Deprecated -public class CAbilityAbilityBuilderActiveNoTargetSimple extends CAbilityNoTargetSpellBase { - - List levelData; - private AbilityBuilderConfiguration config; - private Map localStore; - private int orderId; - private int autoCastOnId = 0; - private int autoCastOffId = 0; - private boolean autocasting = false; - private boolean initialized; - - private int castId = 0; - - public CAbilityAbilityBuilderActiveNoTargetSimple(int handleId, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - Map localStore) { - super(handleId, alias); - this.levelData = levelData; - this.config = config; - this.localStore = localStore; - orderId = OrderIdUtils.getOrderId(config.getCastId()); - if (config.getAutoCastOnId() != null) { - autoCastOnId = OrderIdUtils.getOrderId(config.getAutoCastOnId()); - } - if (config.getAutoCastOffId() != null) { - autoCastOffId = OrderIdUtils.getOrderId(config.getAutoCastOffId()); - } - } - - @Override - public void setLevel(CSimulation game, CUnit unit, int level) { - super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); - } - - @Override - public void populateData(GameObject worldEditorAbility, int level) { - if (this.initialized) { - if (config.getOnLevelChange() != null) { - CSimulation game = (CSimulation) this.localStore.get(ABLocalStoreKeys.GAME); - CUnit unit = (CUnit) this.localStore.get(ABLocalStoreKeys.THISUNIT); - for (ABAction action : config.getOnLevelChange()) { - action.runAction(game, unit, this.localStore, castId); - } - } - } - this.initialized = true; - } - - @Override - public int getBaseOrderId() { - return orderId; - } - - @Override - public void onAdd(CSimulation game, CUnit unit) { - super.onAdd(game, unit); - localStore.put(ABLocalStoreKeys.GAME, game); - localStore.put(ABLocalStoreKeys.THISUNIT, unit); - if (config.getOnAddAbility() != null) { - for (ABAction action : config.getOnAddAbility()) { - action.runAction(game, unit, localStore, castId); - } - } - } - - @Override - public boolean doEffect(CSimulation simulation, CUnit unit, AbilityTarget target) { - this.castId++; - if (config.getOnBeginCasting() != null) { - for (ABAction action : config.getOnBeginCasting()) { - action.runAction(simulation, unit, localStore, castId); - } - } - return false; - } - - @Override - protected void innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderId, AbilityActivationReceiver receiver) { - if (config.getExtraCastConditions() != null) { - boolean result = true; - for (ABCondition condition : config.getExtraCastConditions()) { - result = result && condition.callback(game, unit, localStore, castId); - } - if (result) { - receiver.useOk(); - } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); - if (failReason != null) { - receiver.activationCheckFailed(failReason); - } else { - receiver.unknownReasonUseNotOk(); - } - } - } else { - receiver.useOk(); - } - } - - @Override - public int getAutoCastOnOrderId() { - return this.autoCastOnId; - } - - @Override - public int getAutoCastOffOrderId() { - return this.autoCastOffId; - } - - @Override - public boolean isAutoCastOn() { - return this.autocasting; - } - - @Override - public void setAutoCastOn(final CUnit caster, final boolean autoCastOn) { - this.autocasting = autoCastOn; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java index 569a495ac..cfd13228c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java @@ -182,8 +182,9 @@ private boolean offOrderId(final int orderId) { // ---- // Non-Targeted @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { + public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { if (checkNoTargetOrderId(game, caster, orderId)) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); // System.err.println(caster.getUnitType().getName() + " Beginning NoTarget: " + orderId); boolean isOffId = orderId == this.getOffOrderId(); @@ -255,8 +256,9 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord // ---- // Targeted @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { this.castId++; + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); // System.err.println(caster.getUnitType().getName() + " Received pair target order: " + orderId + " (Base: " // + this.getBaseOrderId() + ", Internal: " + this.getPairOrderId(game, caster) + ")"); if (checkTargetPrimeOrderId(game, caster, orderId)) { @@ -463,7 +465,7 @@ public Integer orderPairedUnitOffOrderId(CSimulation game, CUnit caster) { // Not Used @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java index 4543ef20a..64c283943 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java @@ -38,13 +38,14 @@ public void onAdd(CSimulation game, CUnit unit) { } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { return null; } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { this.castId++; + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, point); this.runOnOrderIssuedActions(game, caster, orderId); this.behavior.setCastId(castId); @@ -52,7 +53,7 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPoint } @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { + public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTargetSimple.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTargetSimple.java deleted file mode 100644 index 78ec41e9f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTargetSimple.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; - -import java.util.List; -import java.util.Map; - -import com.etheller.warsmash.units.GameObject; -import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.CAbilityPointTargetSpellBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIdUtils; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; - -@Deprecated -public class CAbilityAbilityBuilderActivePointTargetSimple extends CAbilityPointTargetSpellBase { - - List levelData; - private AbilityBuilderConfiguration config; - private Map localStore; - private int orderId; - - private int castId = 0; - private boolean initialized = false; - - public CAbilityAbilityBuilderActivePointTargetSimple(int handleId, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - Map localStore) { - super(handleId, alias); - this.levelData = levelData; - this.config = config; - this.localStore = localStore; - orderId = OrderIdUtils.getOrderId(config.getCastId()); - } - - @Override - public void setLevel(CSimulation game, CUnit unit, int level) { - super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); - } - - @Override - public int getBaseOrderId() { - return orderId; - } - - @Override - public void populateData(GameObject worldEditorAbility, int level) { - if (this.initialized ) { - if (config.getOnLevelChange() != null) { - CSimulation game = (CSimulation) this.localStore.get(ABLocalStoreKeys.GAME); - CUnit unit = (CUnit) this.localStore.get(ABLocalStoreKeys.THISUNIT); - for (ABAction action : config.getOnLevelChange()) { - action.runAction(game, unit, this.localStore, castId); - } - } - } - this.initialized = true; - } - - @Override - public void onAdd(CSimulation game, CUnit unit) { - super.onAdd(game, unit); - localStore.put(ABLocalStoreKeys.GAME, game); - localStore.put(ABLocalStoreKeys.THISUNIT, unit); - if (config.getOnAddAbility() != null) { - for (ABAction action : config.getOnAddAbility()) { - action.runAction(game, unit, localStore, castId); - } - } - } - - @Override - public boolean doEffect(CSimulation simulation, CUnit unit, AbilityTarget target) { - this.castId++; - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, target); - if (config.getOnBeginCasting() != null) { - for (ABAction action : config.getOnBeginCasting()) { - action.runAction(simulation, unit, localStore, castId); - } - } - localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId); - return false; - } - - @Override - protected void innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderId, - AbilityActivationReceiver receiver) { - if (config.getExtraCastConditions() != null) { - boolean result = true; - for (ABCondition condition : config.getExtraCastConditions()) { - result = result && condition.callback(game, unit, localStore, castId); - } - if (result) { - receiver.useOk(); - } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); - if (failReason != null) { - receiver.activationCheckFailed(failReason); - } else { - receiver.unknownReasonUseNotOk(); - } - } - } else { - receiver.useOk(); - } - } - - @Override - protected void innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, AbilityPointTarget target, - AbilityTargetCheckReceiver receiver) { - if (this.config.getExtraTargetConditions() != null) { - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, target); - boolean result = true; - for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.callback(game, unit, localStore, castId); - } - if (result) { - receiver.targetOk(target); - } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); - if (failReason != null) { - receiver.targetCheckFailed(failReason); - } else { - receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_THERE); - } - } - localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId); - } else { - receiver.targetOk(target); - } - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java deleted file mode 100644 index 243ae307a..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveToggle.java +++ /dev/null @@ -1,233 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; - -import java.util.List; -import java.util.Map; - -import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.util.WarsmashConstants; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ManaDepletedCheckTimer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIdUtils; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.MeleeUIAbilityActivationReceiver; - -@Deprecated -public class CAbilityAbilityBuilderActiveToggle extends CAbilityAbilityBuilderGenericActive { - - protected int unorderId; - - protected boolean active; - - protected int bufferMana = 0; - protected int manaDrainedPerSecond = 0; - protected float duration = 0; - - private ManaDepletedCheckTimer timer; - private NonStackingStatBuff manaDrain; - - public CAbilityAbilityBuilderActiveToggle(int handleId, War3ID code, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - Map localStore) { - super(handleId, code, alias, levelData, config, localStore); - unorderId = OrderIdUtils.getOrderId(config.getUncastId()); - active = false; - - CAbilityTypeAbilityBuilderLevelData levelDataLevel = levelData.get(this.getLevel() - 1); - this.duration = levelDataLevel.getDurationNormal(); - } - - @Override - public void setLevel(CSimulation game, CUnit unit, int level) { - super.setLevel(game, unit, level); - CAbilityTypeAbilityBuilderLevelData levelDataLevel = this.levelData.get(this.getLevel() - 1); - this.duration = levelDataLevel.getDurationNormal(); - if (config.getSpecialFields() != null) { - if (config.getSpecialFields().getBufferManaRequired() != null) { - this.bufferMana = config.getSpecialFields().getBufferManaRequired().callback(game, unit, localStore, castId); - } - if (config.getSpecialFields().getManaDrainedPerSecond() != null) { - this.manaDrainedPerSecond = config.getSpecialFields().getManaDrainedPerSecond().callback(game, unit, localStore, castId); - } - } - manaDrain.setValue((-1 * this.manaDrainedPerSecond / this.duration)); - } - - @Override - public int getBaseOrderId() { - return this.active ? this.unorderId : this.orderId; - } - - @Override - public int getUIManaCost() { - return this.active ? 0 :this.manaCost + this.bufferMana; - } - - @Override - public boolean isToggleOn() { - return this.active; - } - - @Override - public void onAdd(CSimulation game, CUnit unit) { - timer = new ManaDepletedCheckTimer(unit, this); - localStore.put(ABLocalStoreKeys.ISTOGGLEDABILITY, this); - if (config.getSpecialFields() != null) { - if (config.getSpecialFields().getBufferManaRequired() != null) { - this.bufferMana = config.getSpecialFields().getBufferManaRequired().callback(game, unit, localStore, castId); - } - if (config.getSpecialFields().getManaDrainedPerSecond() != null) { - this.manaDrainedPerSecond = config.getSpecialFields().getManaDrainedPerSecond().callback(game, unit, localStore, castId); - } - } - manaDrain = new NonStackingStatBuff(NonStackingStatBuffType.MPGEN, NonStackingStatBuff.ALLOW_STACKING_KEY, (-1 * this.manaDrainedPerSecond / this.duration)); - super.onAdd(game, unit); - } - - @Override - public void onRemove(CSimulation game, CUnit unit) { - if (this.active) { - deactivate(game, unit); - } - super.onRemove(game, unit); - } - - @Override - public void onDeath(CSimulation game, CUnit unit) { - if (this.active) { - deactivate(game, unit); - } - super.onDeath(game, unit); - } - - @Override - public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { - if (this.active && (orderId == this.unorderId)) { - this.runOnOrderIssuedActions(game, caster, orderId); - deactivate(game, caster); - return false; - } else if (!this.active && (orderId == this.orderId)) { - if (caster.chargeMana(this.manaCost)) { - this.runOnOrderIssuedActions(game, caster, orderId); - activate(game, caster); - } - return false; - } - return super.checkBeforeQueue(game, caster, orderId, target); - } - - @Override - public void activate(final CSimulation game, final CUnit caster) { - this.castId++; - this.active = true; - this.startCooldown(game, caster); - if (this.manaDrainedPerSecond > 0) { - this.timer.start(game); - caster.addNonStackingStatBuff(game, manaDrain); - } - if (config.getOnBeginCasting() != null) { - for (ABAction action : config.getOnBeginCasting()) { - action.runAction(game, caster, localStore, castId); - } - } - } - - @Override - public void deactivate(final CSimulation game, final CUnit caster) { - this.active = false; - if (this.manaDrainedPerSecond > 0) { - timer.pause(game); - caster.removeNonStackingStatBuff(game, manaDrain); - } - if (config.getOnEndCasting() != null) { - for (ABAction action : config.getOnEndCasting()) { - action.runAction(game, caster, localStore, castId); - } - } - } - - @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { - return null; - } - - @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { - return null; - } - - @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { - return null; - } - - @Override - protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, CWidget target, - AbilityTargetCheckReceiver receiver) { - receiver.orderIdNotAccepted(); - return false; - } - - @Override - protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, AbilityPointTarget target, - AbilityTargetCheckReceiver receiver) { - receiver.orderIdNotAccepted(); - return false; - } - - @Override - protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, - AbilityTargetCheckReceiver receiver) { - if (this.active && (orderId == this.unorderId)) { - return true; - } else if (!this.active && (orderId == this.orderId)) { - return true; - } else { - receiver.orderIdNotAccepted(); - return false; - } - } - - @Override - protected void innerCheckCanUse(CSimulation game, CUnit unit, int orderId, AbilityActivationReceiver receiver) { - int cooldownRemaining = unit.getCooldownRemainingTicks(game, getAlias()); - if (!this.active) { - if (cooldownRemaining > 0) { - float cooldownLengthDisplay = unit.getCooldownLengthDisplayTicks(game, getAlias()) - * WarsmashConstants.SIMULATION_STEP_TIME; - receiver.cooldownNotYetReady(cooldownRemaining * WarsmashConstants.SIMULATION_STEP_TIME, cooldownLengthDisplay); - } else if (unit.getMana() < (this.manaCost + this.bufferMana)) { - receiver.activationCheckFailed(CommandStringErrorKeys.NOT_ENOUGH_MANA); - } else { - innerCheckExtraCastConditions(game, unit, cooldownRemaining, receiver); - } - } else { - if (cooldownRemaining > 0 && !(receiver instanceof MeleeUIAbilityActivationReceiver)) { - float cooldownLengthDisplay = unit.getCooldownLengthDisplayTicks(game, getAlias()) - * WarsmashConstants.SIMULATION_STEP_TIME; - receiver.cooldownNotYetReady(cooldownRemaining * WarsmashConstants.SIMULATION_STEP_TIME, cooldownLengthDisplay); - } - receiver.useOk(); - } - } - - @Override - protected boolean innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderId, - AbilityActivationReceiver receiver) { - return true; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java index 3daaa6b60..6de3d3f31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java @@ -34,10 +34,11 @@ public void onAdd(CSimulation game, CUnit unit) { } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { this.castId++; this.behavior.setCastId(castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, target.visit(AbilityTargetVisitor.UNIT)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, target.visit(AbilityTargetVisitor.ITEM)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, target.visit(AbilityTargetVisitor.DESTRUCTABLE)); @@ -46,12 +47,12 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget targ } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { + public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTargetSimple.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTargetSimple.java deleted file mode 100644 index fcbebd8a3..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTargetSimple.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; - -import java.util.List; -import java.util.Map; - -import com.etheller.warsmash.units.GameObject; -import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.CAbilityTargetSpellBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIdUtils; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; - -@Deprecated -public class CAbilityAbilityBuilderActiveUnitTargetSimple extends CAbilityTargetSpellBase { - - List levelData; - private AbilityBuilderConfiguration config; - private Map localStore; - private int orderId; - private int autoCastOnId = 0; - private int autoCastOffId = 0; - private boolean autocasting = false; - private boolean initialized; - - private int castId = 0; - - public CAbilityAbilityBuilderActiveUnitTargetSimple(int handleId, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - Map localStore) { - super(handleId, alias); - this.levelData = levelData; - this.config = config; - this.localStore = localStore; - orderId = OrderIdUtils.getOrderId(config.getCastId()); - if (config.getAutoCastOnId() != null) { - autoCastOnId = OrderIdUtils.getOrderId(config.getAutoCastOnId()); - } - if (config.getAutoCastOffId() != null) { - autoCastOffId = OrderIdUtils.getOrderId(config.getAutoCastOffId()); - } - } - - @Override - public void setLevel(CSimulation game, CUnit unit, int level) { - super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); - } - - @Override - public void populateData(GameObject worldEditorAbility, int level) { - if (this.initialized) { - if (config.getOnLevelChange() != null) { - CSimulation game = (CSimulation) this.localStore.get(ABLocalStoreKeys.GAME); - CUnit unit = (CUnit) this.localStore.get(ABLocalStoreKeys.THISUNIT); - for (ABAction action : config.getOnLevelChange()) { - action.runAction(game, unit, this.localStore, castId); - } - } - } - this.initialized = true; - } - - @Override - public int getBaseOrderId() { - return this.orderId; - } - - public List getLevelData() { - return this.levelData; - } - - public AbilityBuilderConfiguration getConfig() { - return this.config; - } - - public Map getLocalStore() { - return this.localStore; - } - - @Override - public void onAdd(CSimulation game, CUnit unit) { - super.onAdd(game, unit); - localStore.put(ABLocalStoreKeys.GAME, game); - localStore.put(ABLocalStoreKeys.THISUNIT, unit); - if (config.getOnAddAbility() != null) { - for (ABAction action : config.getOnAddAbility()) { - action.runAction(game, unit, localStore, castId); - } - } - } - - @Override - public boolean doEffect(CSimulation simulation, CUnit unit, AbilityTarget target) { - this.castId++; - CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); - if (targetUnit != null) { - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, targetUnit); - if (this.config.getOnBeginCasting() != null) { - for (ABAction action : this.config.getOnBeginCasting()) { - action.runAction(simulation, unit, this.localStore, castId); - } - } - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); - } - return false; - } - - @Override - protected void innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderId, - AbilityActivationReceiver receiver) { - if (config.getExtraCastConditions() != null) { - boolean result = true; - for (ABCondition condition : config.getExtraCastConditions()) { - result = result && condition.callback(game, unit, localStore, castId); - } - if (result) { - receiver.useOk(); - } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); - if (failReason != null) { - receiver.activationCheckFailed(failReason); - } else { - receiver.unknownReasonUseNotOk(); - } - } - } else { - receiver.useOk(); - } - } - - @Override - protected void innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, CWidget target, - AbilityTargetCheckReceiver receiver) { - if (target instanceof CUnit) { - final CUnit targetUnit = (CUnit) target; - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, targetUnit); - - if (this.config.getExtraTargetConditions() != null) { - boolean result = true; - for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.callback(game, unit, localStore, castId); - } - if (result) { - receiver.targetOk(targetUnit); - } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); - if (failReason != null) { - receiver.targetCheckFailed(failReason); - } else { - receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_THIS_UNIT); - } - } - } else { - receiver.targetOk(targetUnit); - } - } - } - - @Override - public int getAutoCastOnOrderId() { - return this.autoCastOnId; - } - - @Override - public int getAutoCastOffOrderId() { - return this.autoCastOffId; - } - - @Override - public boolean isAutoCastOn() { - return this.autocasting; - } - - @Override - public void setAutoCastOn(final CUnit caster, final boolean autoCastOn) { - this.autocasting = autoCastOn; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index 33ea96503..d3e730976 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -165,10 +165,6 @@ public void onAddDisabled(CSimulation game, CUnit unit) { action.runAction(game, unit, localStore, castId); } } - - if (this.autocastType == AutocastType.ATTACKREPLACEMENT) { - //game.createProjectile(unit, offTooltipOverride, bufferMana, autoCastOnId, autoCastOffId, area, active, unit, null) - } } @Override @@ -226,7 +222,7 @@ private void determineToggleableFields(CSimulation game, CUnit unit) { if (config.getDisplayFields() != null && config.getDisplayFields().getAlternateUnitId() != null) { if (unit.getTypeId().equals( - config.getDisplayFields().getAlternateUnitId().callback(game, unit, localStore, manaPerSec))) { + config.getDisplayFields().getAlternateUnitId().callback(game, unit, localStore, castId))) { this.active = true; } } @@ -465,17 +461,18 @@ public boolean isAutoCastOn() { } @Override - public void setAutoCastOn(final CUnit caster, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn) { + this.localStore.put(ABLocalStoreKeys.WASAUTOCASTON, this.autocasting); this.autocasting = autoCastOn; - if (this.autocastType == AutocastType.ATTACKREPLACEMENT) { - //caster.addAttackReplacement(null, CUnitAttackReplacementPriority.AUTOCAST); - } caster.setAutocastAbility(autoCastOn ? this : null); - } - - @Override - public void setAutoCastOff() { - this.autocasting = false; + this.localStore.put(ABLocalStoreKeys.ISAUTOCASTON, autoCastOn); + if (this.config.getOnChangeAutoCast() != null) { + for (ABAction action : this.config.getOnChangeAutoCast()) { + action.runAction(simulation, caster, localStore, -1); + } + } + this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTON); + this.localStore.remove(ABLocalStoreKeys.WASAUTOCASTON); } @Override @@ -597,8 +594,9 @@ protected abstract boolean innerCheckCanUseSpell(CSimulation game, CUnit unit, i AbilityActivationReceiver receiver); @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { + this.localStore.put(ABLocalStoreKeys.ISAUTOCAST, autoOrder); if (innerCheckCastOrderId(game, unit, orderId)) { innerCheckCanTarget(game, unit, orderId, target, receiver); } else if (orderId == OrderIds.smart) { @@ -646,7 +644,8 @@ public void checkCanAutoTarget(final CSimulation game, final CUnit unit, final i @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + this.localStore.put(ABLocalStoreKeys.ISAUTOCAST, autoOrder); if (innerCheckCastOrderId(game, unit, orderId)) { innerCheckCanTarget(game, unit, orderId, target, receiver); } else if (orderId == OrderIds.smart) { @@ -685,7 +684,8 @@ public void checkCanAutoTarget(final CSimulation game, final CUnit unit, final i @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { + this.localStore.put(ABLocalStoreKeys.ISAUTOCAST, autoOrder); if ((orderId != 0) && ((orderId == getAutoCastOffOrderId()) || (orderId == getAutoCastOnOrderId()))) { receiver.targetOk(null); } else if (innerCheckCastOrderId(game, unit, orderId)) { @@ -780,7 +780,7 @@ protected void innerCheckCanTargetNoTarget(CSimulation game, CUnit unit, int ord } protected boolean innerCheckCastOrderId(final CSimulation game, final CUnit unit, final int orderId) { - return (!this.active && orderId == getBaseOrderId()) + return ((!this.active || !this.toggleable) && orderId == getBaseOrderId()) || ((this.active || this.separateOnAndOff) && orderId == getOffOrderId()); } @@ -1041,13 +1041,14 @@ public void deactivate(final CSimulation game, final CUnit caster) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - final AbilityTarget target) { + boolean autoOrder, final AbilityTarget target) { + this.localStore.put(ABLocalStoreKeys.ISAUTOCAST, autoOrder); // System.err.println("Checking queue top level: " + active + " orderID : " + orderId + " offID: " + this.getOffOrderId()); if (this.allowCastlessDeactivate && this.toggleable && this.active && orderId == this.getOffOrderId()) { this.deactivate(game, caster); return false; } - return super.checkBeforeQueue(game, caster, orderId, target); + return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java index 0664f5f94..00761f961 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java @@ -273,17 +273,17 @@ public void onCancelFromQueue(CSimulation game, CUnit unit, int orderId) { } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, CWidget target) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { return null; } @Override - public CBehavior begin(CSimulation game, CUnit caster, int orderId, AbilityPointTarget point) { + public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId) { + public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { return null; } @@ -293,20 +293,20 @@ protected void innerCheckCanUse(CSimulation game, CUnit unit, int orderId, Abili } @Override - public void checkCanTarget(CSimulation game, CUnit unit, int orderId, CWidget target, - AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, + CWidget target, AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override - public void checkCanTarget(CSimulation game, CUnit unit, int orderId, AbilityPointTarget target, - AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, + AbilityPointTarget target, AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(CSimulation game, CUnit unit, int orderId, - AbilityTargetCheckReceiver receiver) { + boolean autoOrder, AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABAbilityTargetStillTargetableVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABAbilityTargetStillTargetableVisitor.java index c40332638..235122f6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABAbilityTargetStillTargetableVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABAbilityTargetStillTargetableVisitor.java @@ -44,7 +44,7 @@ public Boolean accept(final CUnit target) { return !target.isHidden(); } BooleanAbilityTargetCheckReceiver receiver = new BooleanAbilityTargetCheckReceiver<>(); - ability.checkCanTarget(simulation, unit, this.orderId, target, receiver); + ability.checkCanTarget(simulation, unit, this.orderId, false, target, receiver); return !target.isHidden() && receiver.isTargetable(); } @@ -55,7 +55,7 @@ public Boolean accept(final CDestructable target) { return !target.isDead(); } BooleanAbilityTargetCheckReceiver receiver = new BooleanAbilityTargetCheckReceiver<>(); - ability.checkCanTarget(simulation, unit, this.orderId, target, receiver); + ability.checkCanTarget(simulation, unit, this.orderId, false, target, receiver); return !target.isDead() && receiver.isTargetable(); } @@ -65,7 +65,7 @@ public Boolean accept(final CItem target) { return !target.isDead() && !target.isHidden(); } BooleanAbilityTargetCheckReceiver receiver = new BooleanAbilityTargetCheckReceiver<>(); - ability.checkCanTarget(simulation, unit, this.orderId, target, receiver); + ability.checkCanTarget(simulation, unit, this.orderId, false, target, receiver); return !target.isDead() && !target.isHidden() && receiver.isTargetable(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorSendOrder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorSendOrder.java index f9b0ee20c..a5e3c00bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorSendOrder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorSendOrder.java @@ -27,7 +27,7 @@ public CBehaviorSendOrder(final CUnit unit, CAbility ability, final int orderId, @Override public CBehavior update(CSimulation game) { - return ability.begin(game, unit, orderId, target); + return ability.begin(game, unit, orderId, false, target); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java index faa46fb2a..e828c7c7d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java @@ -16,7 +16,7 @@ public class ABActionActivateToggledAbility implements ABSingleAction { public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore - .get(ABLocalStoreKeys.ISTOGGLEDABILITY); + .get(ABLocalStoreKeys.ABILITY); ability.activate(game, caster); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java index f10061672..5525185af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java @@ -16,7 +16,7 @@ public class ABActionDeactivateToggledAbility implements ABSingleAction { public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore - .get(ABLocalStoreKeys.ISTOGGLEDABILITY); + .get(ABLocalStoreKeys.ABILITY); ability.deactivate(game, caster); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java index 5ff439e92..aec3e72bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java @@ -50,10 +50,10 @@ public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) unitExpression = jassTextGenerator.getCaster(); } if (this.alias != null) { - return "JASSTODO"; + return "TODOJASS"; } else { - return "JASSTODO"; + return "TODOJASS"; } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java index 0a44a169f..ffc5e129c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java @@ -50,10 +50,10 @@ public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) unitExpression = jassTextGenerator.getCaster(); } if (this.alias != null) { - return "JASSTODO"; + return "TODOJASS"; } else { - return "JASSTODO"; + return "TODOJASS"; } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java index 61874cb35..28270b0cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java @@ -17,7 +17,7 @@ public Object callback(CSimulation game, CUnit caster, Map local @Override public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { - return "JASSTODO"; + return "TODOJASS"; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java new file mode 100644 index 000000000..a15b81477 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionAbility extends ABAbilityCallback { + + private ABCondition condition; + private ABAbilityCallback pass; + private ABAbilityCallback fail; + + @Override + public CAbility callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java new file mode 100644 index 000000000..da0576dc3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionBoolean extends ABBooleanCallback { + + private ABCondition condition; + private ABBooleanCallback pass; + private ABBooleanCallback fail; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, int castBoolean) { + if (condition != null && condition.callback(game, caster, localStore, castBoolean)) { + return pass.callback(game, caster, localStore, castBoolean); + } + return fail.callback(game, caster, localStore, castBoolean); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java new file mode 100644 index 000000000..d2088d41e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionBuff extends ABBuffCallback { + + private ABCondition condition; + private ABBuffCallback pass; + private ABBuffCallback fail; + + @Override + public CBuff callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java new file mode 100644 index 000000000..3a439dfcb --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java @@ -0,0 +1,36 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetStoredDestructableByKey extends ABDestructableCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public CDestructable callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (CDestructable) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (CDestructable) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java new file mode 100644 index 000000000..6c6a979a1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionDestructable extends ABDestructableCallback { + + private ABCondition condition; + private ABDestructableCallback pass; + private ABDestructableCallback fail; + + @Override + public CDestructable callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java new file mode 100644 index 000000000..dc256af39 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionDestructableBuff extends ABDestructableBuffCallback { + + private ABCondition condition; + private ABDestructableBuffCallback pass; + private ABDestructableBuffCallback fail; + + @Override + public CDestructableBuff callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java new file mode 100644 index 000000000..620763bc4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; + +public class ABCallbackInlineConditionTimeOfDayEvent extends ABTimeOfDayEventCallback { + + private ABCondition condition; + private ABTimeOfDayEventCallback pass; + private ABTimeOfDayEventCallback fail; + + @Override + public ABTimeOfDayEvent callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java new file mode 100644 index 000000000..0b4399dc4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionFloat extends ABFloatCallback { + + private ABCondition condition; + private ABFloatCallback pass; + private ABFloatCallback fail; + + @Override + public Float callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java new file mode 100644 index 000000000..e49413fb7 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABCallbackInlineConditionFX extends ABFXCallback { + + private ABCondition condition; + private ABFXCallback pass; + private ABFXCallback fail; + + @Override + public SimulationRenderComponent callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java new file mode 100644 index 000000000..219ba8dd3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionID extends ABIDCallback { + + private ABCondition condition; + private ABIDCallback pass; + private ABIDCallback fail; + + @Override + public War3ID callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java new file mode 100644 index 000000000..3a804dd3c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionInteger extends ABIntegerCallback { + + private ABCondition condition; + private ABIntegerCallback pass; + private ABIntegerCallback fail; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java new file mode 100644 index 000000000..a4f771fa2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionItem extends ABItemCallback { + + private ABCondition condition; + private ABItemCallback pass; + private ABItemCallback fail; + + @Override + public CItem callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java new file mode 100644 index 000000000..6b05ce7ed --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionLocation extends ABLocationCallback { + + private ABCondition condition; + private ABLocationCallback pass; + private ABLocationCallback fail; + + @Override + public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java new file mode 100644 index 000000000..14ddaf57a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionLong extends ABLongCallback { + + private ABCondition condition; + private ABLongCallback pass; + private ABLongCallback fail; + + @Override + public Long callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java new file mode 100644 index 000000000..8a495790e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetStoredOrderIdByKey extends ABOrderIdCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (Integer) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (Integer) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java new file mode 100644 index 000000000..5c7184d3f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionOrderId extends ABOrderIdCallback { + + private ABCondition condition; + private ABOrderIdCallback pass; + private ABOrderIdCallback fail; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java new file mode 100644 index 000000000..4b8f7c1c0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; + +public class ABCallbackInlineConditionPlayer extends ABPlayerCallback { + + private ABCondition condition; + private ABPlayerCallback pass; + private ABPlayerCallback fail; + + @Override + public CPlayer callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java new file mode 100644 index 000000000..099984fd2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; + +public class ABCallbackInlineConditionProjectile extends ABProjectileCallback { + + private ABCondition condition; + private ABProjectileCallback pass; + private ABProjectileCallback fail; + + @Override + public CProjectile callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java new file mode 100644 index 000000000..1e67f299e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; + +public class ABCallbackInlineConditionNonStackingStatBuff extends ABNonStackingStatBuffCallback { + + private ABCondition condition; + private ABNonStackingStatBuffCallback pass; + private ABNonStackingStatBuffCallback fail; + + @Override + public NonStackingStatBuff callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java new file mode 100644 index 000000000..6bdf897ee --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; + +public class ABCallbackInlineConditionStateModBuff extends ABStateModBuffCallback { + + private ABCondition condition; + private ABStateModBuffCallback pass; + private ABStateModBuffCallback fail; + + @Override + public StateModBuff callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java new file mode 100644 index 000000000..325c9bf90 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java @@ -0,0 +1,34 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetStoredStringByKey extends ABStringCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public String callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (String) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (String) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java new file mode 100644 index 000000000..4c4e7548b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionString extends ABStringCallback { + + private ABCondition condition; + private ABStringCallback pass; + private ABStringCallback fail; + + @Override + public String callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java new file mode 100644 index 000000000..f4c506734 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionTarget extends ABTargetCallback { + + private ABCondition condition; + private ABTargetCallback pass; + private ABTargetCallback fail; + + @Override + public AbilityTarget callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java new file mode 100644 index 000000000..4340cd341 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; + +public class ABCallbackInlineConditionTimer extends ABTimerCallback { + + private ABCondition condition; + private ABTimerCallback pass; + private ABTimerCallback fail; + + @Override + public CTimer callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java new file mode 100644 index 000000000..16689665e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionUnit extends ABUnitCallback { + + private ABCondition condition; + private ABUnitCallback pass; + private ABUnitCallback fail; + + @Override + public CUnit callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java new file mode 100644 index 000000000..2a62e46ba --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java @@ -0,0 +1,37 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; + +import java.util.Map; +import java.util.Set; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetStoredUnitGroupByKey extends ABUnitGroupCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @SuppressWarnings("unchecked") + @Override + public Set callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (Set) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (Set) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java new file mode 100644 index 000000000..772c492e6 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; + +import java.util.Map; +import java.util.Set; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionUnitGroup extends ABUnitGroupCallback { + + private ABCondition condition; + private ABUnitGroupCallback pass; + private ABUnitGroupCallback fail; + + @Override + public Set callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java new file mode 100644 index 000000000..15a352971 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java @@ -0,0 +1,37 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; + +import java.util.Map; +import java.util.Queue; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetStoredUnitQueueByKey extends ABUnitQueueCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @SuppressWarnings("unchecked") + @Override + public Queue callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (Queue) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (Queue) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java new file mode 100644 index 000000000..a33b9c75e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; + +import java.util.Map; +import java.util.Queue; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionUnitQueue extends ABUnitQueueCallback { + + private ABCondition condition; + private ABUnitQueueCallback pass; + private ABUnitQueueCallback fail; + + @Override + public Queue callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java new file mode 100644 index 000000000..e3f6bd016 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; + +public class ABCallbackInlineConditionVisionModifier extends ABVisionModifierCallback { + + private ABCondition condition; + private ABVisionModifierCallback pass; + private ABVisionModifierCallback fail; + + @Override + public CFogModifier callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java new file mode 100644 index 000000000..7a765d140 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java @@ -0,0 +1,36 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetStoredWidgetByKey extends ABWidgetCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public CWidget callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (CWidget) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (CWidget) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java new file mode 100644 index 000000000..35ba42c1c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionWidget extends ABWidgetCallback { + + private ABCondition condition; + private ABWidgetCallback pass; + private ABWidgetCallback fail; + + @Override + public CWidget callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java index 5aeaa4369..f69ea3a4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java @@ -29,7 +29,7 @@ public Boolean callback(CSimulation game, CUnit casterUnit, Map final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - abil.checkCanTarget(game, theCaster, abil.getBaseOrderId(), target.callback(game, casterUnit, localStore, castId), booleanTargetReceiver); + abil.checkCanTarget(game, theCaster, abil.getBaseOrderId(), false, target.callback(game, casterUnit, localStore, castId), booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java index 5ef7a5ab7..541ad1038 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -29,7 +29,7 @@ public Boolean callback(CSimulation game, CUnit casterUnit, Map .getInstance().reset(); abil.checkCanTarget(game, theCaster, abil.getBaseOrderId(), - target.callback(game, casterUnit, localStore, castId), booleanTargetReceiver); + false, target.callback(game, casterUnit, localStore, castId), booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java new file mode 100644 index 000000000..7dbad38aa --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsLocationDeepWater extends ABCondition { + + private ABLocationCallback location; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + AbilityPointTarget loc = location.callback(game, caster, localStore, castId); + return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java new file mode 100644 index 000000000..7fac698ec --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsLocationFlyingOnly extends ABCondition { + + private ABLocationCallback location; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + AbilityPointTarget loc = location.callback(game, caster, localStore, castId); + return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.FLYABLE) && !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java new file mode 100644 index 000000000..295a4f0c9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsLocationShallowWater extends ABCondition { + + private ABLocationCallback location; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + AbilityPointTarget loc = location.callback(game, caster, localStore, castId); + return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java new file mode 100644 index 000000000..70834b02a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsLocationWalkable extends ABCondition { + + private ABLocationCallback location; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + AbilityPointTarget loc = location.callback(game, caster, localStore, castId); + return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java new file mode 100644 index 000000000..0aefb1ede --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsLocationWalkableNonWater extends ABCondition { + + private ABLocationCallback location; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + AbilityPointTarget loc = location.callback(game, caster, localStore, castId); + return !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java new file mode 100644 index 000000000..0b3d55d9a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unittype; + +import java.util.Map; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsLocationPathableForUnitType extends ABCondition { + + ABLocationCallback location; + ABIDCallback unitType; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, int castId) { + War3ID uType = unitType.callback(game, caster, localStore, castId); + AbilityPointTarget loc = location.callback(game, caster, localStore, castId); + return game.getPathingGrid().isPathable(loc.x, loc.y, game.getUnitData().getUnitType(uType).getMovementType()); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java index 0b836c545..531f54e82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java @@ -32,36 +32,36 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { return null; } @Override public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - final AbilityPointTarget point) { + boolean autoOrder, final AbilityPointTarget point) { return null; } @Override - public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId) { + public CBehavior beginNoTarget(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder) { return null; } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, - final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final CWidget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - final AbilityTargetCheckReceiver receiver) { + boolean autoOrder, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index e94271ca4..7c21ec10c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -28,6 +28,8 @@ public class ABLocalStoreKeys { public static final String CANTUSEREASON = "_cantUseReason"; + public static final String ISAUTOCAST = "_isAutoCast"; + public static final String ISTOGGLEDABILITY = "_toggledAbility"; public static final String ISFLEXABILITY = "_flexAbility"; public static final String ISPAIRABILITY = "_pairAbility"; @@ -177,6 +179,10 @@ public class ABLocalStoreKeys { public static final String POSTCHANGEBEHAVIOR = "_postChangeBehaviorj#"; public static final String BEHAVIORONGOING = "_behaviorOngoing#"; + // Autocast on/off actions + public static final String WASAUTOCASTON = "_wasAutocastOn"; + public static final String ISAUTOCASTON = "_isAutocastOn"; + public static String combineKey(String key, int castId) { return key + castId; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index d00935704..8a63ed8a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -59,10 +59,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.timer.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unittype.*; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.typeadapters.RuntimeTypeAdapterFactory; @@ -72,6 +74,7 @@ public abstract class AbilityBuilderGsonBuilder { private static void registerAbilityCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetStoredAbilityByKey.class, "getStoredAbilityByKey") + .registerSubtype(ABCallbackInlineConditionAbility.class, "inlineConditionAbility") .registerSubtype(ABCallbackGetPartnerAbility.class, "getPartnerAbility") .registerSubtype(ABCallbackGetReactionAbility.class, "getReactionAbility") .registerSubtype(ABCallbackGetLastCreatedAbility.class, "getLastCreatedAbility") @@ -133,6 +136,7 @@ private static void registerBehaviorChangeListenerCallbacks(RuntimeTypeAdapterFa private static void registerBooleanCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackRawBoolean.class, "rawBoolean") .registerSubtype(ABCallbackGetStoredBooleanByKey.class, "getStoredBooleanByKey") + .registerSubtype(ABCallbackInlineConditionBoolean.class, "inlineConditionBoolean") .registerSubtype(ABCallbackGetAbilityDataAsBoolean.class, "getAbilityDataAsBoolean") .registerSubtype(ABCallbackGetParentAbilityDataAsBoolean.class, "getParentAbilityDataAsBoolean") .registerSubtype(ABCallbackWasCastingInterrupted.class, "wasCastingInterrupted") @@ -151,6 +155,7 @@ private static void registerBooleanCallbacks(RuntimeTypeAdapterFactory callbackT private static void registerBuffCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetStoredBuffByKey.class, "getStoredBuffByKey") + .registerSubtype(ABCallbackInlineConditionBuff.class, "inlineConditionBuff") .registerSubtype(ABCallbackGetLastCreatedBuff.class, "getLastCreatedBuff") .registerSubtype(ABCallbackArgumentBuff.class, "argumentBuff") @@ -182,6 +187,8 @@ private static void registerDeathReplacementEffectCallbacks(RuntimeTypeAdapterFa private static void registerDestructableCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory + .registerSubtype(ABCallbackGetStoredDestructableByKey.class, "getStoredDestructableByKey") + .registerSubtype(ABCallbackInlineConditionDestructable.class, "inlineConditionDestructable") .registerSubtype(ABCallbackGetEnumDestructable.class, "getEnumDestructable") .registerSubtype(ABCallbackGetProjectileHitDestructable.class, "getProjectileHitDestructable") @@ -194,6 +201,7 @@ private static void registerDestructableBuffCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory .registerSubtype(ABCallbackGetLastCreatedDestructableBuff.class, "getLastCreatedDestructableBuff") .registerSubtype(ABCallbackGetStoredDestructableBuffByKey.class, "getStoredDestructableBuffByKey") + .registerSubtype(ABCallbackInlineConditionDestructableBuff.class, "inlineConditionDestructableBuff") .registerSubtype(ABCallbackArgumentDestructableBuff.class, "argumentDestructableBuff") .registerSubtype(ABCallbackReuseDestructableBuff.class, "reuseDestructableBuff") @@ -232,6 +240,7 @@ private static void registerFloatCallbacks(RuntimeTypeAdapterFactory callbackTyp .registerSubtype(ABCallbackFMaxValue.class, "fMaxValue") .registerSubtype(ABCallbackGetStoredFloatByKey.class, "getStoredFloatByKey") + .registerSubtype(ABCallbackInlineConditionFloat.class, "inlineConditionFloat") .registerSubtype(ABCallbackGetAbilityDataAsFloat.class, "getAbilityDataAsFloat") .registerSubtype(ABCallbackGetParentAbilityDataAsFloat.class, "getParentAbilityDataAsFloat") .registerSubtype(ABCallbackRandomFloat.class, "randomFloat") @@ -284,6 +293,7 @@ private static void registerSpecialFloatCallbacks(RuntimeTypeAdapterFactory call private static void registerFxCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetLastCreatedSpellEffect.class, "getLastCreatedSpellEffect") .registerSubtype(ABCallbackGetStoredFXByKey.class, "getStoredFXByKey") + .registerSubtype(ABCallbackInlineConditionFX.class, "inlineConditionFX") .registerSubtype(ABCallbackArgumentFX.class, "argumentFX") .registerSubtype(ABCallbackReuseFX.class, "reuseFX") @@ -292,6 +302,7 @@ private static void registerFxCallbacks(RuntimeTypeAdapterFactory callbackTypeFa private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetStoredIDByKey.class, "getStoredIDByKey") + .registerSubtype(ABCallbackInlineConditionID.class, "inlineConditionID") .registerSubtype(ABCallbackGetAbilityDataAsID.class, "getAbilityDataAsID") .registerSubtype(ABCallbackGetAbilityUnitId.class, "getAbilityUnitId") .registerSubtype(ABCallbackGetWar3IDFromString.class, "getWar3IDFromString") @@ -314,6 +325,7 @@ private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFa private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackRawInteger.class, "rawInteger") .registerSubtype(ABCallbackGetStoredIntegerByKey.class, "getStoredIntegerByKey") + .registerSubtype(ABCallbackInlineConditionInteger.class, "inlineConditionInteger") .registerSubtype(ABCallbackIterator.class, "iterator") .registerSubtype(ABCallbackGetAbilityDataAsInteger.class, "getAbilityDataAsInteger") @@ -363,8 +375,9 @@ private static void registerLightningCallbacks(RuntimeTypeAdapterFactory callbac private static void registerLocationCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackCreateLocationFromXY.class, "createLocationFromXY") - .registerSubtype(ABCallbackCreateLocationFromOffset.class, "createLocationFromOffset") + .registerSubtype(ABCallbackCreateLocationFromOffset.class, "createLocationFromOffset") .registerSubtype(ABCallbackGetStoredLocationByKey.class, "getStoredLocationByKey") + .registerSubtype(ABCallbackInlineConditionLocation.class, "inlineConditionLocation") .registerSubtype(ABCallbackGetTargetedLocation.class, "getTargetedLocation") .registerSubtype(ABCallbackCreateLocationFromTarget.class, "createLocationFromTarget") .registerSubtype(ABCallbackGetProjectileCurrentLocation.class, "getProjectileCurrentLocation") @@ -378,6 +391,7 @@ private static void registerLocationCallbacks(RuntimeTypeAdapterFactory callback private static void registerLongCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackRawLong.class, "rawLong") .registerSubtype(ABCallbackGetStoredLongByKey.class, "getStoredLongByKey") + .registerSubtype(ABCallbackInlineConditionLong.class, "inlineConditionLong") .registerSubtype(ABCallbackAddLong.class, "l+") .registerSubtype(ABCallbackSubtractLong.class, "l-") @@ -399,6 +413,8 @@ private static void registerLongCallbacks(RuntimeTypeAdapterFactory callbackType private static void registerOrderIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackRawID.class, "rawId") .registerSubtype(ABCallbackIdString.class, "idString") + .registerSubtype(ABCallbackGetStoredOrderIdByKey.class, "getStoredOrderIdByKey") + .registerSubtype(ABCallbackInlineConditionOrderId.class, "inlineConditionOrderId") .registerSubtype(ABCallbackArgumentOrderId.class, "argumentOrderId") .registerSubtype(ABCallbackReuseOrderId.class, "reuseOrderId") @@ -408,6 +424,7 @@ private static void registerOrderIdCallbacks(RuntimeTypeAdapterFactory callbackT private static void registerPlayerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetPlayerById.class, "getPlayerById") .registerSubtype(ABCallbackGetStoredPlayerByKey.class, "getStoredPlayerByKey") + .registerSubtype(ABCallbackInlineConditionPlayer.class, "inlineConditionPlayer") .registerSubtype(ABCallbackGetOwnerOfUnit.class, "getOwnerOfUnit") .registerSubtype(ABCallbackArgumentPlayer.class, "argumentPlayer") @@ -418,6 +435,7 @@ private static void registerPlayerCallbacks(RuntimeTypeAdapterFactory callbackTy private static void registerProjectileCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetLastCreatedProjectile.class, "getLastCreatedProjectile") .registerSubtype(ABCallbackGetStoredProjectileByKey.class, "getStoredProjectileByKey") + .registerSubtype(ABCallbackInlineConditionProjectile.class, "inlineConditionProjectile") .registerSubtype(ABCallbackGetThisProjectile.class, "getThisProjectile") @@ -435,6 +453,7 @@ private static void registerStatBuffCallbacks(RuntimeTypeAdapterFactory callback .registerSubtype(ABCallbackGetLastCreatedNonStackingStatBuff.class, "getLastCreatedNonStackingStatBuff") .registerSubtype(ABCallbackGetStoredNonStackingStatBuffByKey.class, "getStoredNonStackingStatBuffByKey") + .registerSubtype(ABCallbackInlineConditionNonStackingStatBuff.class, "inlineConditionNonStackingStatBuff") .registerSubtype(ABCallbackArgumentNonStackingStatBuff.class, "argumentNonStackingStatBuff") .registerSubtype(ABCallbackReuseNonStackingStatBuff.class, "reuseNonStackingStatBuff") @@ -446,6 +465,7 @@ private static void registerStateModBuffCallbacks(RuntimeTypeAdapterFactory call .registerSubtype(ABCallbackGetLastCreatedStateModBuff.class, "getLastCreatedStateModBuff") .registerSubtype(ABCallbackGetStoredStateModBuffByKey.class, "getStoredStateModBuffByKey") + .registerSubtype(ABCallbackInlineConditionStateModBuff.class, "inlineConditionStateModBuff") .registerSubtype(ABCallbackArgumentStateModBuff.class, "argumentStateModBuff") .registerSubtype(ABCallbackReuseStateModBuff.class, "reuseStateModBuff") @@ -454,6 +474,8 @@ private static void registerStateModBuffCallbacks(RuntimeTypeAdapterFactory call private static void registerStringCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackRawString.class, "rawString") + .registerSubtype(ABCallbackGetStoredStringByKey.class, "getStoredStringByKey") + .registerSubtype(ABCallbackInlineConditionString.class, "inlineConditionString") .registerSubtype(ABCallbackGetAbilityDataAsString.class, "getAbilityDataAsString") .registerSubtype(ABCallbackCatStrings.class, "catStrings") .registerSubtype(ABCallbackGetAliasAsString.class, "getAliasAsString") @@ -479,6 +501,7 @@ private static void registerTargetCallbacks(RuntimeTypeAdapterFactory callbackTy .registerSubtype(ABCallbackGetAbilityTarget.class, "getAbilityTarget") .registerSubtype(ABCallbackGetNewBehaviorTarget.class, "getNewBehaviorTarget") .registerSubtype(ABCallbackGetStoredTargetByKey.class, "getStoredTargetByKey") + .registerSubtype(ABCallbackInlineConditionTarget.class, "inlineConditionTarget") .registerSubtype(ABCallbackArgumentTarget.class, "argumentTarget") .registerSubtype(ABCallbackReuseTarget.class, "reuseTarget") @@ -488,6 +511,7 @@ private static void registerTargetCallbacks(RuntimeTypeAdapterFactory callbackTy private static void registerTimeOfDayEventCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetLastCreatedTimeOfDayEvent.class, "getLastCreatedTimeOfDayEvent") .registerSubtype(ABCallbackGetStoredTimeOfDayEventByKey.class, "getStoredTimeOfDayEventByKey") + .registerSubtype(ABCallbackInlineConditionTimeOfDayEvent.class, "inlineConditionTimeOfDayEvent") .registerSubtype(ABCallbackArgumentTimeOfDayEvent.class, "argumentTimeOfDayEvent") .registerSubtype(ABCallbackReuseTimeOfDayEvent.class, "reuseTimeOfDayEvent") @@ -499,6 +523,7 @@ private static void registerTimerCallbacks(RuntimeTypeAdapterFactory callbackTyp .registerSubtype(ABCallbackGetLastStartedTimer.class, "getLastStartedTimer") .registerSubtype(ABCallbackGetFiringTimer.class, "getFiringTimer") .registerSubtype(ABCallbackGetStoredTimerByKey.class, "getStoredTimerByKey") + .registerSubtype(ABCallbackInlineConditionTimer.class, "inlineConditionTimer") .registerSubtype(ABCallbackArgumentTimer.class, "argumentTimer") .registerSubtype(ABCallbackReuseTimer.class, "reuseTimer") @@ -519,6 +544,7 @@ private static void registerUnitCallbacks(RuntimeTypeAdapterFactory unitCallback .registerSubtype(ABCallbackGetAbilityTargetedUnit.class, "getAbilityTargetedUnit") .registerSubtype(ABCallbackGetAbilityPairedUnit.class, "getAbilityPairedUnit") .registerSubtype(ABCallbackGetStoredUnitByKey.class, "getStoredUnitByKey") + .registerSubtype(ABCallbackInlineConditionUnit.class, "inlineConditionUnit") .registerSubtype(ABCallbackGetParentCastingUnit.class, "getParentCastingUnit") .registerSubtype(ABCallbackGetProjectileHitUnit.class, "getProjectileHitUnit") .registerSubtype(ABCallbackGetLastCreatedUnit.class, "getLastCreatedUnit") @@ -539,6 +565,8 @@ private static void registerUnitCallbacks(RuntimeTypeAdapterFactory unitCallback private static void registerUnitGroupCallbacks(RuntimeTypeAdapterFactory unitGroupCallbackTypeFactory) { unitGroupCallbackTypeFactory.registerSubtype(ABCallbackGetUnitGroupByName.class, "getUnitGroupByName") .registerSubtype(ABCallbackGetLastCreatedUnitGroup.class, "getLastCreatedUnitGroup") + .registerSubtype(ABCallbackGetStoredUnitGroupByKey.class, "getStoredUnitGroupByKey") + .registerSubtype(ABCallbackInlineConditionUnitGroup.class, "inlineConditionUnitGroup") .registerSubtype(ABCallbackArgumentUnitGroup.class, "argumentUnitGroup") .registerSubtype(ABCallbackReuseUnitGroup.class, "reuseUnitGroup") @@ -548,6 +576,8 @@ private static void registerUnitGroupCallbacks(RuntimeTypeAdapterFactory unitGro private static void registerUnitQueueCallbacks(RuntimeTypeAdapterFactory unitGroupCallbackTypeFactory) { unitGroupCallbackTypeFactory.registerSubtype(ABCallbackGetUnitQueueByName.class, "getUnitQueueByName") .registerSubtype(ABCallbackGetLastCreatedUnitQueue.class, "getLastCreatedUnitQueue") + .registerSubtype(ABCallbackGetStoredUnitQueueByKey.class, "getStoredUnitQueueByKey") + .registerSubtype(ABCallbackInlineConditionUnitQueue.class, "inlineConditionUnitQueue") .registerSubtype(ABCallbackArgumentUnitQueue.class, "argumentUnitQueue") .registerSubtype(ABCallbackReuseUnitQueue.class, "reuseUnitQueue") @@ -557,6 +587,7 @@ private static void registerUnitQueueCallbacks(RuntimeTypeAdapterFactory unitGro private static void registerVisionModifierCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory .registerSubtype(ABCallbackGetStoredVisionModifierByKey.class, "getStoredVisionModifierByKey") + .registerSubtype(ABCallbackInlineConditionVisionModifier.class, "inlineConditionVisionModifier") .registerSubtype(ABCallbackGetLastCreatedVisionModifier.class, "getLastCreatedVisionModifier") .registerSubtype(ABCallbackArgumentVisionModifier.class, "argumentVisionModifier") @@ -569,6 +600,8 @@ private static void registerWidgetCallbacks(RuntimeTypeAdapterFactory callbackTy callbackTypeFactory .registerSubtype(ABCallbackGetProjectileHitWidget.class, "getProjectileHitWidget") .registerSubtype(ABCallbackUnitToWidget.class, "unitToWidget") + .registerSubtype(ABCallbackGetStoredWidgetByKey.class, "getStoredWidgetByKey") + .registerSubtype(ABCallbackInlineConditionWidget.class, "inlineConditionWidget") .registerSubtype(ABCallbackArgumentWidget.class, "argumentWidget") .registerSubtype(ABCallbackReuseWidget.class, "reuseWidget") @@ -643,6 +676,15 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionItemHasCharges.class, "itemHasCharges") .registerSubtype(ABConditionIsTimerActive.class, "isTimerActive") + + .registerSubtype(ABConditionIsLocationDeepWater.class, "isLocationDeepWater") + .registerSubtype(ABConditionIsLocationShallowWater.class, "isLocationShallowWater") + .registerSubtype(ABConditionIsLocationWalkable.class, "isLocationWalkable") + .registerSubtype(ABConditionIsLocationWalkableNonWater.class, "isLocationWalkableNonWater") + .registerSubtype(ABConditionIsLocationFlyingOnly.class, "isLocationFlyingOnly") + + .registerSubtype(ABConditionIsLocationPathableForUnitType.class, "isLocationPathableForUnitType") + .registerSubtype(ABConditionIsTimeOfDayInRange.class, "isTimeOfDayInRange") diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java index eb0cf58ea..219531d77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java @@ -192,7 +192,6 @@ public static void instantTransformation(final CSimulation game, final Map onOrderIssued; private List onActivate; private List onDeactivate; + private List onChangeAutoCast; private List onLevelChange; @@ -75,6 +76,7 @@ public AbilityBuilderConfiguration(AbilityBuilderParser parser, AbilityBuilderDu this.onOrderIssued = parser.getOnOrderIssued(); this.onActivate = parser.getOnActivate(); this.onDeactivate = parser.getOnDeactivate(); + this.onChangeAutoCast = parser.getOnChangeAutoCast(); this.onLevelChange = parser.getOnLevelChange(); @@ -299,6 +301,14 @@ public void setOnDeactivate(List onDeactivate) { this.onDeactivate = onDeactivate; } + public List getOnChangeAutoCast() { + return onChangeAutoCast; + } + + public void setOnChangeAutoCast(List onChangeAutoCast) { + this.onChangeAutoCast = onChangeAutoCast; + } + public List getOnLevelChange() { return onLevelChange; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java index fe1773c29..60a5ff27f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java @@ -35,6 +35,7 @@ public class AbilityBuilderParser { private List onOrderIssued; private List onActivate; private List onDeactivate; + private List onChangeAutoCast; private List onLevelChange; @@ -125,6 +126,8 @@ public void updateFromParent(AbilityBuilderParser parent) { this.onActivate = parent.onActivate; if (this.onDeactivate == null) this.onDeactivate = parent.onDeactivate; + if (this.onChangeAutoCast == null) + this.onChangeAutoCast = parent.onChangeAutoCast; if (this.onLevelChange == null) this.onLevelChange = parent.onLevelChange; if (this.onBeginCasting == null) @@ -307,6 +310,14 @@ public void setOnDeactivate(List onDeactivate) { this.onDeactivate = onDeactivate; } + public List getOnChangeAutoCast() { + return onChangeAutoCast; + } + + public void setOnChangeAutoCast(List onChangeAutoCast) { + this.onChangeAutoCast = onChangeAutoCast; + } + public List getOnBeginCasting() { return onBeginCasting; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderType.java index a57285779..916b34559 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderType.java @@ -5,16 +5,10 @@ public enum AbilityBuilderType implements CHandle { NORMAL_AUTOTARGET, NORMAL_PAIRING, - NORMAL_FLEXTARGET_SIMPLE, - NORMAL_UNITTARGET_SIMPLE, - NORMAL_POINTTARGET_SIMPLE, - NORMAL_NOTARGET_SIMPLE, NORMAL_FLEXTARGET, NORMAL_UNITTARGET, NORMAL_POINTTARGET, NORMAL_NOTARGET, - TOGGLE, - SMART, PASSIVE, TEMPLATE, INHERIT, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilder.java index 268c1880a..c0ffdc913 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilder.java @@ -35,31 +35,12 @@ public CAbility createAbility(int handleId) { localStore.put(ABLocalStoreKeys.CURRENTLEVEL, 1); localStore.put(ABLocalStoreKeys.ALIAS, getAlias()); localStore.put(ABLocalStoreKeys.CODE, getCode()); - CAbilitySpell ability; switch (parser.getType()) { case PASSIVE: return new CAbilityAbilityBuilderPassive(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); case HIDDEN: return new CAbilityAbilityBuilderNoIcon(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); - case TOGGLE: - return new CAbilityAbilityBuilderActiveToggle(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); - case NORMAL_NOTARGET_SIMPLE: - ability = new CAbilityAbilityBuilderActiveNoTargetSimple(handleId, getAlias(), getLevelData(), parser, localStore); - ability.populate(this.abilityEditorData, 1); - return ability; - case NORMAL_POINTTARGET_SIMPLE: - ability = new CAbilityAbilityBuilderActivePointTargetSimple(handleId, getAlias(), getLevelData(), parser, localStore); - ability.populate(this.abilityEditorData, 1); - return ability; - case NORMAL_UNITTARGET_SIMPLE: - ability = new CAbilityAbilityBuilderActiveUnitTargetSimple(handleId, getAlias(), getLevelData(), parser, localStore); - ability.populate(this.abilityEditorData, 1); - return ability; - case NORMAL_FLEXTARGET_SIMPLE: - ability = new CAbilityAbilityBuilderActiveFlexTargetSimple(handleId, getAlias(), getLevelData(), parser, localStore); - ability.populate(this.abilityEditorData, 1); - return ability; case NORMAL_FLEXTARGET: return new CAbilityAbilityBuilderActiveFlexTarget(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); case NORMAL_PAIRING: diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanBuild.java index 00475e6fd..1a6a311ed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanBuild.java @@ -115,14 +115,14 @@ protected CBehavior update(final CSimulation simulation, final boolean withinFac if (ability instanceof CAbilityHumanRepair) { final int baseOrderId = ((CAbilityHumanRepair) ability).getBaseOrderId(); ability.checkCanUse(simulation, this.unit, baseOrderId, - BooleanAbilityActivationReceiver.INSTANCE); + false, BooleanAbilityActivationReceiver.INSTANCE); if (BooleanAbilityActivationReceiver.INSTANCE.isOk()) { final BooleanAbilityTargetCheckReceiver targetCheckReceiver = BooleanAbilityTargetCheckReceiver .getInstance(); - ability.checkCanTarget(simulation, this.unit, baseOrderId, constructedStructure, - targetCheckReceiver.reset()); + ability.checkCanTarget(simulation, this.unit, baseOrderId, false, + constructedStructure, targetCheckReceiver.reset()); if (targetCheckReceiver.isTargetable()) { - return ability.begin(simulation, this.unit, baseOrderId, constructedStructure); + return ability.begin(simulation, this.unit, baseOrderId, false, constructedStructure); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java index d4f59e497..a40fe5cae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java @@ -371,12 +371,12 @@ public void addDefaultAbilitiesToUnit(final CSimulation simulation, final Handle } if (ability.equals(unitTypeInstance.getDefaultAutocastAbility()) && (createAbility instanceof CAutocastAbility)) { - ((CAutocastAbility) createAbility).setAutoCastOn(unit, true); + ((CAutocastAbility) createAbility).setAutoCastOn(simulation, unit, true); } } else { if (ability.equals(unitTypeInstance.getDefaultAutocastAbility()) && (existingAbility instanceof CAutocastAbility)) { - ((CAutocastAbility) existingAbility).setAutoCastOn(unit, true); + ((CAutocastAbility) existingAbility).setAutoCastOn(simulation, unit, true); } } } @@ -501,12 +501,12 @@ public void addMissingDefaultAbilitiesToUnit(final CSimulation simulation, } if (ability.equals(unitTypeInstance.getDefaultAutocastAbility()) && (createAbility instanceof CAutocastAbility)) { - ((CAutocastAbility) createAbility).setAutoCastOn(unit, true); + ((CAutocastAbility) createAbility).setAutoCastOn(simulation, unit, true); } } else { if (ability.equals(unitTypeInstance.getDefaultAutocastAbility()) && (existingAbility instanceof CAutocastAbility)) { - ((CAutocastAbility) existingAbility).setAutoCastOn(unit, true); + ((CAutocastAbility) existingAbility).setAutoCastOn(simulation, unit, true); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderDropItemAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderDropItemAtPoint.java index 3570de72e..b2729b50d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderDropItemAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderDropItemAtPoint.java @@ -50,7 +50,7 @@ public CBehavior begin(final CSimulation game, final CUnit caster) { game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: No such ability"); return caster.pollNextOrderBehavior(game); } - ability.checkCanUse(game, caster, this.orderId, this.abilityActivationReceiver.reset()); + ability.checkCanUse(game, caster, this.orderId, false, this.abilityActivationReceiver.reset()); if (this.abilityActivationReceiver.isUseOk()) { final CItem itemToDrop = (CItem) game.getWidget(this.itemHandleId); return ability.beginDropItem(game, caster, this.orderId, itemToDrop, this.target); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderDropItemAtTargetWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderDropItemAtTargetWidget.java index 410813d7c..17d3214c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderDropItemAtTargetWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderDropItemAtTargetWidget.java @@ -52,12 +52,12 @@ public CBehavior begin(final CSimulation game, final CUnit caster) { game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: No such ability"); return caster.pollNextOrderBehavior(game); } - ability.checkCanUse(game, caster, this.orderId, this.abilityActivationReceiver.reset()); + ability.checkCanUse(game, caster, this.orderId, false, this.abilityActivationReceiver.reset()); if (this.abilityActivationReceiver.isUseOk()) { final CItem itemToDrop = (CItem) game.getWidget(this.itemHandleId); final CUnit targetHero = (CUnit) game.getWidget(this.targetHeroHandleId); final ExternStringMsgTargetCheckReceiver targetReceiver = (ExternStringMsgTargetCheckReceiver) targetCheckReceiver; - ability.checkCanTarget(game, caster, this.orderId, targetHero, targetReceiver.reset()); + ability.checkCanTarget(game, caster, this.orderId, false, targetHero, targetReceiver.reset()); if (targetReceiver.getTarget() != null) { return ability.beginDropItem(game, caster, this.orderId, itemToDrop, targetHero); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderNoTarget.java index a271b1bda..322c5bce7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderNoTarget.java @@ -11,11 +11,17 @@ public class COrderNoTarget implements COrder { private final int abilityHandleId; private final int orderId; private final boolean queued; + private boolean autoOrder; public COrderNoTarget(final int abilityHandleId, final int orderId, final boolean queued) { + this(abilityHandleId, orderId, queued, false); + } + + public COrderNoTarget(final int abilityHandleId, final int orderId, final boolean queued, final boolean autoOrder) { this.abilityHandleId = abilityHandleId; this.orderId = orderId; this.queued = queued; + this.autoOrder = autoOrder; } @Override @@ -43,20 +49,19 @@ public CBehavior begin(final CSimulation game, final CUnit caster) { game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: No such ability"); return caster.pollNextOrderBehavior(game); } - ability.checkCanUse(game, caster, this.orderId, this.abilityActivationReceiver.reset()); + ability.checkCanUse(game, caster, this.orderId, this.autoOrder, this.abilityActivationReceiver.reset()); if (this.abilityActivationReceiver.isUseOk()) { final ExternStringMsgTargetCheckReceiver targetReceiver = (ExternStringMsgTargetCheckReceiver) targetCheckReceiver; - ability.checkCanTargetNoTarget(game, caster, this.orderId, targetReceiver); + ability.checkCanTargetNoTarget(game, caster, this.orderId, this.autoOrder, targetReceiver); if (targetReceiver.getExternStringKey() == null) { caster.fireOrderEvents(game, this); - return ability.beginNoTarget(game, caster, this.orderId); - } - else { - game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), targetReceiver.getExternStringKey()); + return ability.beginNoTarget(game, caster, this.orderId, this.autoOrder); + } else { + game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), + targetReceiver.getExternStringKey()); return caster.pollNextOrderBehavior(game); } - } - else { + } else { game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), this.abilityActivationReceiver.getExternStringKey()); return caster.pollNextOrderBehavior(game); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetPoint.java index 7600a0a36..d38266f29 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetPoint.java @@ -12,13 +12,20 @@ public class COrderTargetPoint implements COrder { private final int orderId; private final AbilityPointTarget target; private final boolean queued; + private boolean autoOrder; public COrderTargetPoint(final int abilityHandleId, final int orderId, final AbilityPointTarget target, final boolean queued) { + this(abilityHandleId, orderId, target, queued, false); + } + + public COrderTargetPoint(final int abilityHandleId, final int orderId, final AbilityPointTarget target, + final boolean queued, boolean autoOrder) { this.abilityHandleId = abilityHandleId; this.orderId = orderId; this.target = target; this.queued = queued; + this.autoOrder = autoOrder; } @Override @@ -48,13 +55,13 @@ public CBehavior begin(final CSimulation game, final CUnit caster) { game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: No such ability"); return caster.pollNextOrderBehavior(game); } - ability.checkCanUse(game, caster, this.orderId, this.abilityActivationReceiver.reset()); + ability.checkCanUse(game, caster, this.orderId, this.autoOrder, this.abilityActivationReceiver.reset()); if (this.abilityActivationReceiver.isUseOk()) { final ExternStringMsgTargetCheckReceiver targetReceiver = (ExternStringMsgTargetCheckReceiver) targetCheckReceiver; - ability.checkCanTarget(game, caster, this.orderId, this.target, targetReceiver); + ability.checkCanTarget(game, caster, this.orderId, this.autoOrder, this.target, targetReceiver); if (targetReceiver.getTarget() != null) { caster.fireOrderEvents(game, this); - return ability.begin(game, caster, this.orderId, this.target); + return ability.begin(game, caster, this.orderId, this.autoOrder, this.target); } else { game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), targetReceiver.getExternStringKey()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetWidget.java index df5dcc0f8..36302a79f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetWidget.java @@ -12,13 +12,20 @@ public class COrderTargetWidget implements COrder { private final int orderId; private final int targetHandleId; private final boolean queued; + private boolean autoOrder; public COrderTargetWidget(final int abilityHandleId, final int orderId, final int targetHandleId, final boolean queued) { + this(abilityHandleId, orderId, targetHandleId, queued, false); + } + + public COrderTargetWidget(final int abilityHandleId, final int orderId, final int targetHandleId, + final boolean queued, final boolean autoOrder) { this.abilityHandleId = abilityHandleId; this.orderId = orderId; this.targetHandleId = targetHandleId; this.queued = queued; + this.autoOrder = autoOrder; } @Override @@ -48,14 +55,14 @@ public CBehavior begin(final CSimulation game, final CUnit caster) { game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: No such ability"); return caster.pollNextOrderBehavior(game); } - ability.checkCanUse(game, caster, this.orderId, abilityActivationReceiver.reset()); + ability.checkCanUse(game, caster, this.orderId, this.autoOrder, abilityActivationReceiver.reset()); if (abilityActivationReceiver.isUseOk()) { final CWidget target = game.getWidget(this.targetHandleId); final ExternStringMsgTargetCheckReceiver targetReceiver = (ExternStringMsgTargetCheckReceiver) targetCheckReceiver; - ability.checkCanTarget(game, caster, this.orderId, target, targetReceiver.reset()); + ability.checkCanTarget(game, caster, this.orderId, this.autoOrder, target, targetReceiver.reset()); if (targetReceiver.getTarget() != null) { caster.fireOrderEvents(game, this); - return ability.begin(game, caster, this.orderId, targetReceiver.getTarget()); + return ability.begin(game, caster, this.orderId, this.autoOrder, targetReceiver.getTarget()); } else { game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), targetReceiver.getExternStringKey()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java index bb3a32759..7dff1f06c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java @@ -941,11 +941,11 @@ public void multiSelectIconClicked(final int index) { if ((index >= 0) && (index < cargoData.getCargoCount())) { final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; final CSimulation simulation = MeleeUI.this.war3MapViewer.simulation; - cargoData.checkCanUse(simulation, simulationUnit, OrderIds.unload, activationReceiver); + cargoData.checkCanUse(simulation, simulationUnit, OrderIds.unload, false, activationReceiver); if (activationReceiver.isOk()) { final CWidgetAbilityTargetCheckReceiver targetCheckReceiver = CWidgetAbilityTargetCheckReceiver.INSTANCE; - cargoData.checkCanTarget(simulation, simulationUnit, OrderIds.unload, unitInside, - targetCheckReceiver.reset()); + cargoData.checkCanTarget(simulation, simulationUnit, OrderIds.unload, false, + unitInside, targetCheckReceiver.reset()); if (targetCheckReceiver.getTarget() != null) { final CPlayer player = simulation.getPlayer(simulationUnit.getPlayerIndex()); MeleeUI.this.unitOrderListener.issueTargetOrder(simulationUnit.getHandleId(), @@ -1398,13 +1398,13 @@ public void onClick(final int abilityHandleId, final int orderId, final boolean } if (abilityToUse != null) { abilityToUse.checkCanUse(this.war3MapViewer.simulation, this.selectedUnit.getSimulationUnit(), orderId, - this.meleeUIAbilityActivationReceiver.reset(this, this.war3MapViewer.worldScene.audioContext, + false, this.meleeUIAbilityActivationReceiver.reset(this, this.war3MapViewer.worldScene.audioContext, this.selectedUnit)); if (this.meleeUIAbilityActivationReceiver.isUseOk()) { final BooleanAbilityTargetCheckReceiver noTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); abilityToUse.checkCanTargetNoTarget(this.war3MapViewer.simulation, - this.selectedUnit.getSimulationUnit(), orderId, noTargetReceiver); + this.selectedUnit.getSimulationUnit(), orderId, false, noTargetReceiver); if (noTargetReceiver.isTargetable()) { final boolean shiftDown = isShiftDown(); this.unitOrderListener.issueImmediateOrder(this.selectedUnit.getSimulationUnit().getHandleId(), @@ -1424,7 +1424,7 @@ public void onClick(final int abilityHandleId, final int orderId, final boolean final BooleanAbilityTargetCheckReceiver receiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); ability.checkCanTargetNoTarget(this.war3MapViewer.simulation, - otherSelectedUnit.getSimulationUnit(), this.activeCommandOrderId, receiver); + otherSelectedUnit.getSimulationUnit(), this.activeCommandOrderId, false, receiver); if (receiver.isTargetable()) { abilityToUse = ability; } @@ -2641,8 +2641,8 @@ public boolean call(final CWidget unit) { final ExternStringMsgTargetCheckReceiver targetReceiver = ExternStringMsgTargetCheckReceiver .getInstance().reset(); MeleeUI.this.activeCommand.checkCanTarget(MeleeUI.this.war3MapViewer.simulation, - MeleeUI.this.activeCommandUnit.getSimulationUnit(), MeleeUI.this.activeCommandOrderId, unit, - targetReceiver); + MeleeUI.this.activeCommandUnit.getSimulationUnit(), MeleeUI.this.activeCommandOrderId, false, + unit, targetReceiver); this.lastFailureMessage = targetReceiver.getExternStringKey(); return targetReceiver.getTarget() != null; } @@ -3608,7 +3608,7 @@ else if (multiSelect) { this.recycleStringBuilder.append("|n"); } inventory.checkCanUse(this.war3MapViewer.simulation, this.selectedUnit.getSimulationUnit(), - OrderIds.itemuse00 + index, this.activationReceiverPreviewCallback.reset()); + OrderIds.itemuse00 + index, false, this.activationReceiverPreviewCallback.reset()); this.recycleStringBuilder.append(uberTip); inventoryIcon.setCommandButtonData( inventoryEnabled ? iconUI.getIcon() : iconUI.getIconDisabled(), 0, @@ -4123,7 +4123,7 @@ else if (button == Input.Buttons.LEFT) { pointTargetReceiver.reset(); this.activeCommand.checkCanTarget(this.war3MapViewer.simulation, this.activeCommandUnit.getSimulationUnit(), this.activeCommandOrderId, - clickLocationTemp2, pointTargetReceiver); + false, clickLocationTemp2, pointTargetReceiver); final Vector2 target = pointTargetReceiver.getTarget(); if (target != null) { if ((this.activeCommand instanceof CAbilityAttack) @@ -4148,7 +4148,7 @@ else if (button == Input.Buttons.LEFT) { .reset(); ability.checkCanTarget(this.war3MapViewer.simulation, otherSelectedUnit.getSimulationUnit(), - this.activeCommandOrderId, clickLocationTemp2, receiver); + this.activeCommandOrderId, false, clickLocationTemp2, receiver); if (receiver.getTarget() != null) { abilityToUse = ability; targetToUse = receiver.getTarget(); @@ -4227,8 +4227,8 @@ else if (this.activeCommand instanceof CAbilityRally) { CWidget targetToUse = null; for (final CAbility ability : unit.getSimulationUnit().getAbilities()) { ability.checkCanTarget(this.war3MapViewer.simulation, unit.getSimulationUnit(), - OrderIds.smart, rayPickUnit.getSimulationWidget(), - CWidgetAbilityTargetCheckReceiver.INSTANCE); + OrderIds.smart, false, + rayPickUnit.getSimulationWidget(), CWidgetAbilityTargetCheckReceiver.INSTANCE); final CWidget targetWidget = CWidgetAbilityTargetCheckReceiver.INSTANCE.getTarget(); if (targetWidget != null) { abilityToUse = ability; @@ -4347,7 +4347,7 @@ private void useActiveCommandOnUnit(final boolean shiftDown, final RenderWidget final CWidgetAbilityTargetCheckReceiver receiver = CWidgetAbilityTargetCheckReceiver.INSTANCE .reset(); ability.checkCanTarget(this.war3MapViewer.simulation, otherSelectedUnit.getSimulationUnit(), - this.activeCommandOrderId, rayPickUnit.getSimulationWidget(), receiver); + this.activeCommandOrderId, false, rayPickUnit.getSimulationWidget(), receiver); if (receiver.getTarget() != null) { abilityToUse = ability; targetToUse = receiver.getTarget(); @@ -4392,10 +4392,10 @@ private void rightClickMove(final int screenX, final float worldScreenY) { if (unit.getSimulationUnit().getPlayerIndex() == this.war3MapViewer.getLocalPlayerIndex()) { for (final CAbility ability : unit.getSimulationUnit().getAbilities()) { ability.checkCanUse(this.war3MapViewer.simulation, unit.getSimulationUnit(), OrderIds.smart, - BooleanAbilityActivationReceiver.INSTANCE); + false, BooleanAbilityActivationReceiver.INSTANCE); if (BooleanAbilityActivationReceiver.INSTANCE.isOk()) { ability.checkCanTarget(this.war3MapViewer.simulation, unit.getSimulationUnit(), OrderIds.smart, - clickLocationTemp2, PointAbilityTargetCheckReceiver.INSTANCE); + false, clickLocationTemp2, PointAbilityTargetCheckReceiver.INSTANCE); final Vector2 target = PointAbilityTargetCheckReceiver.INSTANCE.getTarget(); if (target != null) { this.unitOrderListener.issuePointOrder(unit.getSimulationUnit().getHandleId(), @@ -4862,13 +4862,13 @@ public void queueIconClicked(final int index) { case 0: for (final CAbility ability : simulationUnit.getAbilities()) { ability.checkCanUse(this.war3MapViewer.simulation, simulationUnit, OrderIds.cancel, - BooleanAbilityActivationReceiver.INSTANCE); + false, BooleanAbilityActivationReceiver.INSTANCE); if (BooleanAbilityActivationReceiver.INSTANCE.isOk()) { final BooleanAbilityTargetCheckReceiver targetCheckReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); ability.checkCanTargetNoTarget(this.war3MapViewer.simulation, simulationUnit, OrderIds.cancel, - targetCheckReceiver); + false, targetCheckReceiver); if (targetCheckReceiver.isTargetable()) { this.unitOrderListener.issueImmediateOrder(simulationUnit.getHandleId(), ability.getHandleId(), OrderIds.cancel, false); @@ -4930,12 +4930,12 @@ public void onClick(final int abilityHandleId, final int orderId, final boolean final CSimulation game = MeleeUI.this.war3MapViewer.simulation; final ExternStringMsgAbilityActivationReceiver receiver = ExternStringMsgAbilityActivationReceiver.INSTANCE; receiver.reset(); - inventoryData.checkCanUse(game, simulationUnit, orderId, receiver); + inventoryData.checkCanUse(game, simulationUnit, orderId, false, receiver); if (receiver.isUseOk()) { final BooleanAbilityTargetCheckReceiver targetReceiver = BooleanAbilityTargetCheckReceiver .getInstance(); targetReceiver.reset(); - inventoryData.checkCanTargetNoTarget(game, simulationUnit, orderId, targetReceiver); + inventoryData.checkCanTargetNoTarget(game, simulationUnit, orderId, false, targetReceiver); if (targetReceiver.isTargetable()) { MeleeUI.this.unitOrderListener.issueImmediateOrder(simulationUnit.getHandleId(), inventoryData.getHandleId(), orderId, isShiftDown()); diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java index f4bbfcf6a..d796a023e 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java @@ -123,29 +123,19 @@ private static void generateJassForConf(final AbilityBuilderDupe dupe, break; case NORMAL_FLEXTARGET: break; - case NORMAL_FLEXTARGET_SIMPLE: - break; case NORMAL_NOTARGET: break; - case NORMAL_NOTARGET_SIMPLE: - break; case NORMAL_PAIRING: break; case NORMAL_POINTTARGET: break; - case NORMAL_POINTTARGET_SIMPLE: - break; case NORMAL_UNITTARGET: break; - case NORMAL_UNITTARGET_SIMPLE: - break; case PASSIVE: break; - case SMART: - break; case TEMPLATE: break; - case TOGGLE: + case INHERIT: break; } } From c2ee943d43ab9d16b0e6ef8317bc505e06cae93d Mon Sep 17 00:00:00 2001 From: Glasir Date: Fri, 7 Mar 2025 09:00:07 -0500 Subject: [PATCH 14/44] Adding simple buff/debuff abilities * Core: Added gameplay constants for default slows * Core: Added functions for modifying unit sizes, though without a transition period * AB: Changed some boolean callbacks to conditions * AB: Made updates to magic/phsyical settings on abilities and buffs * AB: Implemented many active buff and debuff spells ** Avatar, Unholy Frenzy, Frost Armor, Bloodlust, and Divine Shield ** Cripple, Howl of Terror, and Soul Burn * Core: Fixed issue with hero bonus stats --- core/assets/abilityBehaviors/activeBuffs.json | 1030 ++++++++++++++++- .../abilityBehaviors/activeDebuffs.json | 1025 ++++++++++++++++ .../abilityBehaviors/generalPassives.json | 313 +++++ .../abilityBehaviors/humanUnitActives.json | 2 +- .../viewer5/handlers/w3x/War3MapViewer.java | 15 + .../w3x/simulation/CGameplayConstants.java | 22 + .../handlers/w3x/simulation/CSimulation.java | 4 + .../abilities/hero/CAbilityHero.java | 9 +- .../CAbilityAbilityBuilderGenericActive.java | 1 + .../ability/CAbilityAbilityBuilderNoIcon.java | 3 +- .../CAbilityAbilityBuilderPassive.java | 3 +- .../behavior/action/ABActionAddSlowBuff.java | 38 + .../abilities/ABActionAbilitySetShowIcon.java | 27 + .../buff/ABActionCreateTimedArtBuff.java | 2 +- .../action/buff/ABActionCreateTimedBuff.java | 17 +- .../buff/ABActionCreateTimedTickingBuff.java | 18 +- .../ABActionCreateTimedTickingPausedBuff.java | 17 +- ...ActionCreateTimedTickingPostDeathBuff.java | 18 +- .../action/unit/ABActionDispelBuffs.java | 2 +- .../unit/ABActionMultiplyUnitScale.java | 27 + ...BConditionIsTriggeringDamageAnAttack.java} | 6 +- .../ABConditionIsTriggeringDamageRanged.java} | 6 +- .../ABCallbackGetThisAbility.java | 24 + .../buffcallbacks/ABCallbackEnumBuff.java | 25 + .../ABConditionWasCastingInterrupted.java} | 4 +- .../buff/ABConditionIsBuffMagic.java | 21 + ...ameplayConstantCanDisableDivineShield.java | 15 + .../ABConditionIsProjectileReflected.java} | 4 +- .../unit/ABConditionIsUnitMagicImmune.java | 22 + .../abilitybuilder/core/ABLocalStoreKeys.java | 1 + .../core/AbilityBuilderGsonBuilder.java | 27 +- .../util/SimulationRenderController.java | 2 + 32 files changed, 2718 insertions(+), 32 deletions(-) create mode 100644 core/assets/abilityBehaviors/activeDebuffs.json create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks/ABCallbackIsTriggeringDamageAnAttack.java => internalConditions/ABConditionIsTriggeringDamageAnAttack.java} (74%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks/ABCallbackIsTriggeringDamageRanged.java => internalConditions/ABConditionIsTriggeringDamageRanged.java} (74%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{callback/booleancallbacks/ABCallbackWasCastingInterrupted.java => condition/ability/ABConditionWasCastingInterrupted.java} (89%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{callback/booleancallbacks/ABCallbackIsProjectileReflected.java => condition/projectile/ABConditionIsProjectileReflected.java} (90%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java diff --git a/core/assets/abilityBehaviors/activeBuffs.json b/core/assets/abilityBehaviors/activeBuffs.json index 7ef0c430b..f8fd8f61e 100644 --- a/core/assets/abilityBehaviors/activeBuffs.json +++ b/core/assets/abilityBehaviors/activeBuffs.json @@ -18,7 +18,7 @@ "value": "false" } }, - "onAddAbility": [{ + "onAddDisabledAbility": [{ "type": "createNonStackingStatBuff", "buffType": { "type": "getNonStackingStatBuffTypeFromString", @@ -241,5 +241,1033 @@ "dataField": "B" } }] + },{ + "ids": [{"id":"AHav", "castId": "avatar"}], + "type": "NORMAL_NOTARGET", + "displayFields": { + "castlessNoTarget": { + "type": "rawBoolean", + "value": "true" + } + }, + "onAddDisabledAbility": [{ + "type": "createStateModBuff", + "buffType": "MAGIC_IMMUNE" + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "DEF" + } + }, + "stackingKey": { + "type": "rawString", + "value": "avatar" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "defbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MAXHP" + } + }, + "stackingKey": { + "type": "rawString", + "value": "avatar" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "hpbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ALLATK" + } + }, + "stackingKey": { + "type": "rawString", + "value": "avatar" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createDamageTakenModificationListener", + "actions": [{ + "type": "if", + "condition": { + "type": "isAttackTypeEqual", + "attackType1": { + "type": "getTriggeringAttackType" + }, + "attackType2": { + "type": "getAttackTypeFromString", + "id": { + "type": "rawString", + "value": "SPELLS" + } + } + }, + "thenActions": [{ + "type": "multiplyDamageTakenMultiplier", + "multiplier": { + "type": "f-", + "value1": { + "type": "rawFloat", + "value": 1 + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + } + }], + "elseActions": [] + }] + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getWar3IDFromString", + "id": "BHav" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getCastingUnit" + } + }, + "showTimedLifeBar": { + "type": "rawBoolean", + "value": "true" + }, + "onAddActions": [{ + "type": "disableAbility" + },{ + "type": "dispelBuffs", + "filter": { + "type": "isBuffMagic", + "buff": { + "type": "enumBuff" + } + } + },{ + "type": "multiplyUnitScale", + "unit": { + "type": "getBuffedUnit" + }, + "value": { + "type": "rawFloat", + "value": "1.5" + } + },{ + "type": "addSecondaryAnimationTag", + "unit": { + "type": "getBuffedUnit" + }, + "tag": { + "type": "rawString", + "value": "ALTERNATE" + } + },{ + "type": "playAnimation", + "unit": { + "type": "getBuffedUnit" + }, + "tag": { + "type": "rawString", + "value": "MORPH" + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "defbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "hpbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + } + },{ + "type": "addDamageTakenModificationListener", + "targetUnit": { + "type": "getBuffedUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenModificationListener" + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }], + "onRemoveActions": [{ + "type": "enableAbility" + },{ + "type": "multiplyUnitScale", + "unit": { + "type": "getBuffedUnit" + }, + "value": { + "type": "rawFloat", + "value": "0.66666666666667" + } + },{ + "type": "removeSecondaryAnimationTag", + "unit": { + "type": "getBuffedUnit" + }, + "tag": { + "type": "rawString", + "value": "ALTERNATE" + } + },{ + "type": "playAnimation", + "unit": { + "type": "getBuffedUnit" + }, + "tag": { + "type": "rawString", + "value": "MORPH" + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "defbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "hpbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + } + },{ + "type": "removeDamageTakenModificationListener", + "targetUnit": { + "type": "getBuffedUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenModificationListener" + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "defbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "hpbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + }] + },{ + "ids": [{"id":"Auhf", "castId": "unholyfrenzy"}], + "type": "NORMAL_UNITTARGET", + "onAddDisabledAbility": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "unholyfrenzy" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getAbilityTargetedUnit" + }, + "onHitActions": [{ + "type": "createTimedTickingBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + }, + "positive": { + "type": "isUnitShareSpells", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getBuffedUnit" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }] + },{ + "ids": [{"id":"AUfu", "castId": "frostarmor", "autoCastOnId": "frostarmoron", "autoCastOffId": "frostarmoroff", "autoCastType": "ATTACKINGENEMY"}, + {"id":"AUfa", "castId": "frostarmor"}], + "type": "NORMAL_UNITTARGET", + "extraAutoTargetConditions": [{ + "type": "not", + "condition": { + "type": "doesUnitHaveBuff", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + } + }], + "onAddDisabledAbility": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "DEF" + } + }, + "stackingKey": { + "type": "rawString", + "value": "frostarmor" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "createDamageTakenListener", + "actions": [{ + "type": "if", + "condition": { + "type": "and", + "conditions": [{ + "type": "isTriggeringDamageAnAttack" + },{ + "type": "not", + "condition": { + "type": "isTriggeringDamageRanged" + } + },{ + "type": "not", + "condition": { + "type": "isUnitMagicImmune", + "unit": { + "type": "getAttackingUnit" + } + } + }] + }, + "thenActions": [{ + "type": "addSlowBuff", + "unit": { + "type": "getAttackingUnit" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackingUnit" + } + } + }] + }] + }], + "onEndCasting": [{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getAbilityTargetedUnit" + }, + "onHitActions": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "addDamageTakenListener", + "targetUnit": { + "type": "getBuffedUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenListener" + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "removeDamageTakenListener", + "targetUnit": { + "type": "getBuffedUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenListener" + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }] + },{ + "ids": [{"id":"Ablo", "castId": "bloodlust", "autoCastOnId": "bloodluston", "autoCastOffId": "bloodlustoff", "autoCastType": "ATTACKINGENEMY"}], + "type": "NORMAL_UNITTARGET", + "extraAutoTargetConditions": [{ + "type": "not", + "condition": { + "type": "doesUnitHaveBuff", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + } + }], + "onAddDisabledAbility": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "bloodlust" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "bloodlust" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onEndCasting": [{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getAbilityTargetedUnit" + }, + "onHitActions": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + }, + "onAddActions": [{ + "type": "multiplyUnitScale", + "unit": { + "type": "getBuffedUnit" + }, + "value": { + "type": "f+", + "value1": { + "type": "rawFloat", + "value": 1.0 + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + }], + "onRemoveActions": [{ + "type": "multiplyUnitScale", + "unit": { + "type": "getBuffedUnit" + }, + "value": { + "type": "f/", + "value1": { + "type": "rawFloat", + "value": 1.0 + }, + "value2": { + "type": "f+", + "value1": { + "type": "rawFloat", + "value": 1.0 + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }] + },{ + "ids": [{"id":"AHds", "castId": "divineshield", "uncastId": "undivineshield"}], + "type": "NORMAL_NOTARGET", + "displayFields": { + "castlessNoTarget": { + "type": "rawBoolean", + "value": "true" + }, + "toggleable": { + "type": "and", + "conditions": [{ + "type": "getAbilityDataAsBoolean", + "dataField": "A" + },{ + "type": "gameplayConstantCanDisableDivineShield" + }] + }, + "castToggleOff": { + "type": "rawBoolean", + "value": "false" + } + }, + "onAddDisabledAbility": [{ + "type": "createStateModBuff", + "buffType": "INVULNERABLE" + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getCastingUnit" + } + }, + "onAddActions": [{ + "type": "if", + "condition": { + "type": "and", + "conditions": [{ + "type": "getAbilityDataAsBoolean", + "dataField": "A" + },{ + "type": "gameplayConstantCanDisableDivineShield" + }] + }, + "elseActions": [{ + "type": "disableAbility" + }] + },{ + "type": "dispelBuffs", + "filter": { + "type": "isBuffMagic", + "buff": { + "type": "enumBuff" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }], + "onRemoveActions": [{ + "type": "enableAbility" + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }], + "onDeactivate": [{ + "type": "removeBuff", + "target": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/activeDebuffs.json b/core/assets/abilityBehaviors/activeDebuffs.json new file mode 100644 index 000000000..103fb4f20 --- /dev/null +++ b/core/assets/abilityBehaviors/activeDebuffs.json @@ -0,0 +1,1025 @@ +{ + "abilityList": [{ + "ids": [{"id":"Acri", "castId": "cripple"}], + "type": "NORMAL_UNITTARGET", + "onAddDisabledAbility": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "cripple" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "cripple" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ALLATKPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "cripple" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getAbilityTargetedUnit" + }, + "onHitActions": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + }] + },{ + "ids": [{"id":"ANht", "castId": "howlofterror"}], + "type": "NORMAL_NOTARGET", + "onAddDisabledAbility": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ALLATKPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "howlofterror" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "DEF" + } + }, + "stackingKey": { + "type": "rawString", + "value": "howlofterror" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "defbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "HPGEN" + } + }, + "stackingKey": { + "type": "rawString", + "value": "howlofterror" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "hpbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MPGEN" + } + }, + "stackingKey": { + "type": "rawString", + "value": "howlofterror" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mpbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "iterateUnitsInRangeOfUnitMatchingCondition", + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + }, + "iterationActions": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getEnumUnit" + } + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "defbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "hpbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mpbuff" + } + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "defbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "hpbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mpbuff" + } + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getEnumUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }], + "originUnit": { + "type": "getCastingUnit" + }, + "range": { + "type": "getAbilityArea" + } + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "defbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "hpbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mpbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + }] + },{ + "ids": [{"id":"ANso", "castId": "soulburn"}], + "type": "NORMAL_UNITTARGET", + "onAddDisabledAbility": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ALLATKPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "soulburn" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "soulburn" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "soulburn" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "DISABLE_SPELLS" + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getAbilityTargetedUnit" + }, + "onHitActions": [{ + "type": "createTimedTickingBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "onAddActions": [{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getBuffedUnit" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }], + "delaySeconds": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }], + "onRemoveActions": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + } + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/generalPassives.json b/core/assets/abilityBehaviors/generalPassives.json index 9338c0bd4..08b47e9c0 100644 --- a/core/assets/abilityBehaviors/generalPassives.json +++ b/core/assets/abilityBehaviors/generalPassives.json @@ -2247,5 +2247,318 @@ "type": "getLastCreatedBehaviorChangeListener" } }] + },{ + "ids": [{"id":"Aamk"}], + "type": "PASSIVE", + "onAddDisabledAbility": [{ + "type": "abilitySetShowIcon", + "ability": { + "type": "getThisAbility" + }, + "show": { + "type": "not", + "condition": { + "type": "getAbilityDataAsBoolean", + "dataField": "D" + } + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "AGI" + } + }, + "stackingKey": { + "type": "getAllowStackingKey" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "agibuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "INT" + } + }, + "stackingKey": { + "type": "getAllowStackingKey" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "intbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "STR" + } + }, + "stackingKey": { + "type": "getAllowStackingKey" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "strbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onAddAbility": [{ + "type": "abilitySetShowIcon", + "ability": { + "type": "getThisAbility" + }, + "show": { + "type": "not", + "condition": { + "type": "getAbilityDataAsBoolean", + "dataField": "D" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "agibuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "intbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "strbuff" + } + } + }], + "onLevelChange": [{ + "type": "abilitySetShowIcon", + "ability": { + "type": "getThisAbility" + }, + "show": { + "type": "not", + "condition": { + "type": "getAbilityDataAsBoolean", + "dataField": "D" + } + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "agibuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "intbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "strbuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "recomputeStatBuffsOnUnit", + "targetUnit": { + "type": "getCastingUnit" + }, + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "AGI" + } + } + },{ + "type": "recomputeStatBuffsOnUnit", + "targetUnit": { + "type": "getCastingUnit" + }, + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "INT" + } + } + },{ + "type": "recomputeStatBuffsOnUnit", + "targetUnit": { + "type": "getCastingUnit" + }, + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "STR" + } + } + }], + "onRemoveAbility": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "agibuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "intbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "strbuff" + } + } + }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/humanUnitActives.json b/core/assets/abilityBehaviors/humanUnitActives.json index 827257cd4..54f3d661e 100644 --- a/core/assets/abilityBehaviors/humanUnitActives.json +++ b/core/assets/abilityBehaviors/humanUnitActives.json @@ -673,7 +673,7 @@ }] }] },{ - "ids": [{"id":"Ahea", "castId": "heal", "autoCastOnId": "healon", "autoCastOffId": "healoff", "autoCastType": "NEARESTVALID"}], + "ids": [{"id":"Ahea", "castId": "heal", "autoCastOnId": "healon", "autoCastOffId": "healoff", "autoCastType": "NEARESTVALID"},{"id":"Anhe", "castId": "heal", "autoCastOnId": "healon", "autoCastOffId": "healoff", "autoCastType": "NEARESTVALID"}], "type": "NORMAL_UNITTARGET", "overrideFields": { "universalSpell": { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java index d902f2990..ea930554e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java @@ -3177,6 +3177,21 @@ public void unitUpdatedType(final CUnit simulationUnit, final War3ID typeId) { typeData.getScalingValue()); } + @Override + public void changeUnitScale(final CUnit unit, final float scale, final boolean multiplier) { + final RenderUnit renderPeer = War3MapViewer.this.unitToRenderPeer.get(unit); + if (multiplier) { + renderPeer.selectionScale *= scale; + Vector3 newScale = new Vector3(renderPeer.instance.localScale); + newScale.scl(scale); + renderPeer.instance.setScale(new float[]{newScale.x,newScale.y,newScale.z}); + } else { + renderPeer.selectionScale = scale; + renderPeer.instance.setScale(new float[]{scale,scale,scale}); + } + + } + @Override public void changeUnitColor(final CUnit unit, final int playerIndex) { final RenderUnit renderPeer = War3MapViewer.this.unitToRenderPeer.get(unit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java index ab94625fa..ae2d0bd7e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java @@ -33,9 +33,14 @@ public class CGameplayConstants { private final float foggedAttackRevealRadius; private final float defenseArmor; + + private final boolean canDisableDivineShield; private final float[] etherealDamageBonus; private final boolean etherealDamageBonusAlly; + + private final float frostAttackSpeedDecrease; + private final float frostMoveSpeedDecrease; private final boolean magicImmuneResistsDamage; private final boolean magicImmuneResistsLeech; @@ -151,6 +156,8 @@ public CGameplayConstants(final DataTable parsedDataTable) { this.fogFlashTime = miscData.getFieldFloatValue("FogFlashTime"); this.dyingRevealRadius = miscData.getFieldFloatValue("DyingRevealRadius"); this.foggedAttackRevealRadius = miscData.getFieldFloatValue("FoggedAttackRevealRadius"); + + this.canDisableDivineShield = miscData.getFieldValue("CanDeactivateDivineShield") != 0; final CDefenseType[] defenseTypeOrder = { CDefenseType.SMALL, CDefenseType.MEDIUM, CDefenseType.LARGE, CDefenseType.FORT, CDefenseType.NORMAL, CDefenseType.HERO, CDefenseType.DIVINE, CDefenseType.NONE, }; @@ -212,6 +219,9 @@ public CGameplayConstants(final DataTable parsedDataTable) { } } this.etherealDamageBonusAlly = miscData.getFieldValue("EtherealDamageBonusAlly") != 0; + + this.frostAttackSpeedDecrease = miscData.getFieldFloatValue("FrostAttackSpeedDecrease"); + this.frostMoveSpeedDecrease = miscData.getFieldFloatValue("FrostMoveSpeedDecrease"); this.magicImmuneResistsDamage = miscData.getFieldValue("MagicImmunesResistDamage") != 0; this.magicImmuneResistsLeech = miscData.getFieldValue("MagicImmunesResistLeech") != 0; @@ -394,6 +404,10 @@ public float getDefenseArmor() { return this.defenseArmor; } + public boolean isCanDisableDivineShield() { + return canDisableDivineShield; + } + public float[] getEtherealDamageBonus() { return etherealDamageBonus; } @@ -402,6 +416,14 @@ public boolean isEtherealDamageBonusAlly() { return etherealDamageBonusAlly; } + public float getFrostAttackSpeedDecrease() { + return frostAttackSpeedDecrease; + } + + public float getFrostMoveSpeedDecrease() { + return frostMoveSpeedDecrease; + } + public boolean isMagicImmuneResistsDamage() { return magicImmuneResistsDamage; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java index bed5153b8..16bd1adba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java @@ -1114,6 +1114,10 @@ private void setupCreatedUnit(final CUnit unit) { } } + public void changeUnitScale(final CUnit unit, final float scale, boolean multiplier) { + this.simulationRenderController.changeUnitScale(unit, scale, multiplier); + } + public void changeUnitColor(final CUnit unit, final int playerIndex) { this.simulationRenderController.changeUnitColor(unit, playerIndex); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java index 9e7e532df..0c723aa96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/hero/CAbilityHero.java @@ -24,6 +24,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.data.CAbilityData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; @@ -389,11 +390,11 @@ public void calculateDerivatedFields(final CSimulation game, final CUnit unit) { final int deltaIntelligence = currentIntelligence - prevIntelligence; final int currentAgility = this.agility.getCurrent(); final int currentAgilityBase = this.agility.getCurrentBase(); - final int currentAgilityBonus = this.agility.getBonus(); + final int currentAgilityBonus = this.agility.getBonus() + this.agility.getBuffBonus(); final HeroStatValue primaryAttributeStat = getStat(unit.getUnitType().getPrimaryAttribute()); final int primaryAttributeBase = primaryAttributeStat.getCurrentBase(); - final int primaryAttributeBonus = primaryAttributeStat.getBonus(); + final int primaryAttributeBonus = primaryAttributeStat.getBonus() + primaryAttributeStat.getBuffBonus(); final float agiAttackSpeedBonus = gameplayConstants.getAgiAttackSpeedBonus() * currentAgility; for (final CUnitAttack attack : unit.getUnitSpecificAttacks()) { attack.setPrimaryAttributePermanentDamageBonus( @@ -436,11 +437,11 @@ public void recalculateAllStats(final CSimulation game, final CUnit unit) { final int currentIntelligence = this.intelligence.getCurrent(); final int currentAgility = this.agility.getCurrent(); final int currentAgilityBase = this.agility.getCurrentBase(); - final int currentAgilityBonus = this.agility.getBonus(); + final int currentAgilityBonus = this.agility.getBonus() + this.agility.getBuffBonus(); final HeroStatValue primaryAttributeStat = getStat(unit.getUnitType().getPrimaryAttribute()); final int primaryAttributeBase = primaryAttributeStat.getCurrentBase(); - final int primaryAttributeBonus = primaryAttributeStat.getBonus(); + final int primaryAttributeBonus = primaryAttributeStat.getBonus() + primaryAttributeStat.getBuffBonus(); final float agiAttackSpeedBonus = gameplayConstants.getAgiAttackSpeedBonus() * currentAgility; for (final CUnitAttack attack : unit.getUnitSpecificAttacks()) { attack.setPrimaryAttributePermanentDamageBonus( diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index d3e730976..88fa7bfa4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -298,6 +298,7 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.hideAreaCursor = this.config.getDisplayFields().getHideAreaCursor().callback(game, unit, localStore, this.getLevel()); } + localStore.put(ABLocalStoreKeys.ISABILITYMAGIC, this.magic); localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, this.physical); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java index 00761f961..35c621eea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java @@ -46,7 +46,8 @@ public CAbilityAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, Lis GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); final int levels = editorData.getFieldAsInteger(AbilityFields.LEVELS, 0); localStore.put(ABLocalStoreKeys.ISABILITYLEVELED, levels > 1); - localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, true); + localStore.put(ABLocalStoreKeys.ISABILITYMAGIC, false); + localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, false); } protected void setSpellFields(CSimulation game, CUnit unit) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java index 8adb7a3d0..ff1ce3304 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java @@ -46,7 +46,8 @@ public CAbilityAbilityBuilderPassive(int handleId, War3ID code, War3ID alias, GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); final int levels = editorData.getFieldAsInteger(AbilityFields.LEVELS, 0); localStore.put(ABLocalStoreKeys.ISABILITYLEVELED, levels > 1); - localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, true); + localStore.put(ABLocalStoreKeys.ISABILITYMAGIC, false); + localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, false); } protected void setSpellFields(CSimulation game, CUnit unit) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java new file mode 100644 index 000000000..9714922d5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java @@ -0,0 +1,38 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.util.CBuffSlow; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionAddSlowBuff implements ABSingleAction { + + private ABUnitCallback unit; + private ABFloatCallback duration; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final CAbility ability = new CBuffSlow(game.getHandleIdAllocator().createId(), War3ID.fromString("Bfro"), + this.duration.callback(game, caster, localStore, castId), + game.getGameplayConstants().getFrostAttackSpeedDecrease(), + game.getGameplayConstants().getFrostMoveSpeedDecrease()); + this.unit.callback(game, caster, localStore, castId).add(game, ability); + localStore.put(ABLocalStoreKeys.LASTADDEDBUFF, ability); + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "AddUnitAbility(" + this.unit.generateJassEquivalent(jassTextGenerator) + ", CreateSlowBuffAU(" + + jassTextGenerator.getTriggerLocalStore() + ", " + + this.duration.generateJassEquivalent(jassTextGenerator) + "))"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java new file mode 100644 index 000000000..5cacdfe6b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java @@ -0,0 +1,27 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionAbilitySetShowIcon implements ABSingleAction { + + private ABAbilityCallback ability; + private ABBooleanCallback show; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + ability.callback(game, caster, localStore, castId).setIconShowing(show.callback(game, caster, localStore, castId)); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "JASSTODO"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java index 4e7ac4ff9..08fe5f331 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -40,7 +40,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, @@ -52,7 +54,16 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, @@ -52,7 +54,16 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, @@ -52,7 +54,16 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, @@ -52,8 +54,18 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localS if (source != null) { theCaster = source.callback(game, theCaster, localStore, castId); } - CUnit theTarget = null; + CUnit theTarget = caster; if (target != null) { theTarget = target.callback(game, theCaster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java new file mode 100644 index 000000000..75b2e5dd9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java @@ -0,0 +1,27 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionMultiplyUnitScale implements ABSingleAction { + + private ABUnitCallback unit; + private ABFloatCallback value; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + game.changeUnitScale(targetUnit, value.callback(game, caster, localStore, castId), true); + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "JASSTODO"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java similarity index 74% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackIsTriggeringDamageAnAttack.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java index 9ca3a15f0..38d92c42b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackIsTriggeringDamageAnAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABCallbackIsTriggeringDamageAnAttack extends ABBooleanCallback { +public class ABConditionIsTriggeringDamageAnAttack extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java similarity index 74% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackIsTriggeringDamageRanged.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java index e319eba16..305a121d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackIsTriggeringDamageRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABCallbackIsTriggeringDamageRanged extends ABBooleanCallback { +public class ABConditionIsTriggeringDamageRanged extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java new file mode 100644 index 000000000..2bd2a9ee3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetThisAbility extends ABAbilityCallback { + + @Override + public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (CAbility) localStore.get(ABLocalStoreKeys.ABILITY); + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ABILITY", JassTextGeneratorType.AbilityHandle); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java new file mode 100644 index 000000000..d873c8fa9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackEnumBuff extends ABBuffCallback { + + @Override + public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return (CBuff) localStore.get(ABLocalStoreKeys.ENUMBUFF); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ENUMBUFF", JassTextGeneratorType.BuffHandle); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackWasCastingInterrupted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackWasCastingInterrupted.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java index 12ed39d39..2d32efa0a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackWasCastingInterrupted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; import java.util.Map; @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABCallbackWasCastingInterrupted extends ABCondition { +public class ABConditionWasCastingInterrupted extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java new file mode 100644 index 000000000..05e9044b4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsBuffMagic extends ABCondition { + + ABBuffCallback buff; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CBuff theBuff = buff.callback(game, caster, localStore, castId); + return theBuff.isMagic(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java new file mode 100644 index 000000000..b66847aac --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionGameplayConstantCanDisableDivineShield extends ABCondition { + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return game.getGameplayConstants().isCanDisableDivineShield(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIsProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIsProjectileReflected.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java index 0b0f691cd..682f22239 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIsProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.projectile; import java.util.Map; @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; -public class ABCallbackIsProjectileReflected extends ABCondition { +public class ABConditionIsProjectileReflected extends ABCondition { private ABProjectileCallback projectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java new file mode 100644 index 000000000..ed080e7a4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsUnitMagicImmune extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = unit.callback(game, caster, localStore, castId); + if (theUnit != null) { + return theUnit.isMagicImmune(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index 7c21ec10c..33f5d34c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -34,6 +34,7 @@ public class ABLocalStoreKeys { public static final String ISFLEXABILITY = "_flexAbility"; public static final String ISPAIRABILITY = "_pairAbility"; public static final String ISABILITYLEVELED = "_isAbilityLeveld"; + public static final String ISABILITYMAGIC = "_isAbilityMagic"; public static final String ISABILITYPHYSICAL = "_isAbilityPhysical"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index 8a63ed8a9..9642b5285 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -1,6 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable.*; @@ -8,8 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.floatingtext.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.gamestate.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.item.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player.ABActionGiveResourcesToPlayer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player.ABActionSetAbilityEnabledForPlayer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural.*; @@ -56,12 +56,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.projectile.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.timer.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unittype.*; @@ -78,6 +80,7 @@ private static void registerAbilityCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetPartnerAbility.class, "getPartnerAbility") .registerSubtype(ABCallbackGetReactionAbility.class, "getReactionAbility") .registerSubtype(ABCallbackGetLastCreatedAbility.class, "getLastCreatedAbility") + .registerSubtype(ABCallbackGetThisAbility.class, "getThisAbility") .registerSubtype(ABCallbackArgumentAbility.class, "argumentAbility") .registerSubtype(ABCallbackReuseAbility.class, "reuseAbility") @@ -139,11 +142,6 @@ private static void registerBooleanCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackInlineConditionBoolean.class, "inlineConditionBoolean") .registerSubtype(ABCallbackGetAbilityDataAsBoolean.class, "getAbilityDataAsBoolean") .registerSubtype(ABCallbackGetParentAbilityDataAsBoolean.class, "getParentAbilityDataAsBoolean") - .registerSubtype(ABCallbackWasCastingInterrupted.class, "wasCastingInterrupted") - .registerSubtype(ABCallbackIsTriggeringDamageAnAttack.class, "isTriggeringDamageAnAttack") - .registerSubtype(ABCallbackIsTriggeringDamageRanged.class, "isTriggeringDamageRanged") - - .registerSubtype(ABCallbackIsProjectileReflected.class, "isProjectileReflected") .registerSubtype(ABCallbackIntegerToBoolean.class, "i2b") @@ -157,6 +155,7 @@ private static void registerBuffCallbacks(RuntimeTypeAdapterFactory callbackType callbackTypeFactory.registerSubtype(ABCallbackGetStoredBuffByKey.class, "getStoredBuffByKey") .registerSubtype(ABCallbackInlineConditionBuff.class, "inlineConditionBuff") .registerSubtype(ABCallbackGetLastCreatedBuff.class, "getLastCreatedBuff") + .registerSubtype(ABCallbackEnumBuff.class, "enumBuff") .registerSubtype(ABCallbackArgumentBuff.class, "argumentBuff") .registerSubtype(ABCallbackReuseBuff.class, "reuseBuff") @@ -670,6 +669,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsUnitEnemy.class, "isUnitEnemy") .registerSubtype(ABConditionIsUnitDead.class, "isUnitDead") .registerSubtype(ABConditionIsUnitTraining.class, "isUnitTraining") + .registerSubtype(ABConditionIsUnitMagicImmune.class, "isUnitMagicImmune") .registerSubtype(ABConditionIsUnitShareSpells.class, "isUnitShareSpells") .registerSubtype(ABConditionIsItemAbility.class, "isItemAbility") @@ -684,9 +684,17 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsLocationFlyingOnly.class, "isLocationFlyingOnly") .registerSubtype(ABConditionIsLocationPathableForUnitType.class, "isLocationPathableForUnitType") + + .registerSubtype(ABConditionWasCastingInterrupted.class, "wasCastingInterrupted") + .registerSubtype(ABConditionIsTriggeringDamageAnAttack.class, "isTriggeringDamageAnAttack") + .registerSubtype(ABConditionIsTriggeringDamageRanged.class, "isTriggeringDamageRanged") + + .registerSubtype(ABConditionIsProjectileReflected.class, "isProjectileReflected") + .registerSubtype(ABConditionIsBuffMagic.class, "isBuffMagic") + .registerSubtype(ABConditionGameplayConstantCanDisableDivineShield.class, "gameplayConstantCanDisableDivineShield") .registerSubtype(ABConditionIsTimeOfDayInRange.class, "isTimeOfDayInRange") .registerSubtype(ABConditionGameplayConstantIsRelativeUpgradeCosts.class, "gameplayConstantIsRelativeUpgradeCosts") .registerSubtype(ABConditionGameplayConstantIsDefendCanDeflect.class, "gameplayConstantIsDefendCanDeflect") @@ -765,7 +773,9 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionSetMp.class, "setMp") .registerSubtype(ABActionAddMp.class, "addMp") .registerSubtype(ABActionSubtractMp.class, "subtractMp") + .registerSubtype(ABActionMultiplyUnitScale.class, "multiplyUnitScale") .registerSubtype(ABActionAddStunBuff.class, "addStunBuff") + .registerSubtype(ABActionAddSlowBuff.class, "addSlowBuff") .registerSubtype(ABActionKillUnit.class, "killUnit") .registerSubtype(ABActionRemoveUnit.class, "removeUnit") .registerSubtype(ABActionHideUnit.class, "hideUnit") @@ -820,6 +830,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionAddBuff.class, "addBuff") .registerSubtype(ABActionAddNonStackingDisplayBuff.class, "addNonStackingDisplayBuff") .registerSubtype(ABActionRemoveBuff.class, "removeBuff") + .registerSubtype(ABActionDispelBuffs.class, "dispelBuffs") .registerSubtype(ABActionRemoveNonStackingDisplayBuff.class, "removeNonStackingDisplayBuff") .registerSubtype(ABActionCreatePassiveBuff.class, "createPassiveBuff") .registerSubtype(ABActionCreateTargetingBuff.class, "createTargetingBuff") @@ -919,9 +930,9 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionCreateUnitVisionModifier.class, "createUnitVisionModifier") .registerSubtype(ABActionCreateLocationVisionModifier.class, "createLocationVisionModifier") .registerSubtype(ABActionRemoveVisionModifier.class, "removeVisionModifier") - .registerSubtype(ABActionSetBurrowPlaceholder.class, "setBurrowPlaceholder") + .registerSubtype(ABActionAbilitySetShowIcon.class, "abilitySetShowIcon") .registerSubtype(ABActionCreateTimeOfDayEvent.class, "createTimeOfDayEvent") diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java index 6758c4116..ea78f2293 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java @@ -164,4 +164,6 @@ SimulationRenderComponentModel createSpellEffectOverDestructable(CUnit source, C boolean isTerrainWater(float x, float y); + void changeUnitScale(CUnit unit, float scale, boolean multiplier); + } From d446cc45e8c2148b83390fa5cfb0f0c1931265b0 Mon Sep 17 00:00:00 2001 From: Glasir Date: Fri, 7 Mar 2025 09:04:39 -0500 Subject: [PATCH 15/44] !Fixed issue that broke unit creation! --- .../etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java index ea930554e..1c9906d6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java @@ -983,7 +983,7 @@ private void loadUnitsAndItems(final Warcraft3MapRuntimeObjectData modifications private CWidget createNewUnit(final Warcraft3MapRuntimeObjectData modifications, final War3ID unitId, float unitX, float unitY, final int playerIndex, int customTeamColor, final float unitAngle) { - return createNewUnit(modifications, unitId, unitAngle, unitAngle, customTeamColor, customTeamColor, unitAngle, -1, -1); + return createNewUnit(modifications, unitId, unitX, unitY, playerIndex, customTeamColor, unitAngle, -1, -1); } private CWidget createNewUnit(final Warcraft3MapRuntimeObjectData modifications, final War3ID unitId, float unitX, From 8cd35aa3d4d6af55f7d42da610c4da39cca1ebef Mon Sep 17 00:00:00 2001 From: Glasir Date: Tue, 8 Apr 2025 06:55:39 -0400 Subject: [PATCH 16/44] Attack Modification Abilities! **Main Features** - Added Attack Modifications - Modifications can change art and other projectile settings - Modifications can add Pre- and Post- damage listeners - Modifications can block each other to prevent multiples from applying - Attacks can be launched with a locked Modifier (Arrow abilities) - Ability Builder core feature improvements - Inheritance - Abilities can inherit from other definitions. - Anything defined in the inheritor will overwrite the inherited data - Reuse Actions/Callbacks - Subfunctions that can be called repeatedly (with arguments if needed) - Inheriting abilities can overwrite specific Reuse actions without overwriting others - Compatibility for abilities can now be configured from the warsmash.ini file - The default file has been updated to include a setting to load Locust in comptibility mode, due to how it is used by triggers in many old systems **Minor Improvements to Ability Builder Features** - Added defaults to some actions/callback where we can assume the caster/ability - Beginning to look at standardization of some older actions (such as changing 'targetUnit' to 'unit') - Added Inline Conditionals for simple types - Added actions to invoke other abilities or attacks - Added ability to create and use Widget Events (based on Trigger events) - Added iteration with sorting, so iteration can start from the closest units - Added a variety of AOE damage actions, with different options for different types of falloff - Added new actions for other new features noted here (attack modifiers, click disable, unique flags/values) - Properly added Item callbacks (they were present, but not registered) - Allow isValidTarget checks to return false on a null target (for attack ground) - Updated buff stacking to allow more control over what buffs stack and what don't - Added a projectile setting on WeaponTypes, to distinguish between those that have traveling projectiles **Minor Improvements to Core Features** - Added new state mods for: - Enabling Attacks (orbs) - Paused (be careful using this on normal buffs, as they won't tick) - Unselectable (has a mask of player IDs to determine who cannot select) - Untargetable (has a mask of player IDs to determine who cannot target) - Unenumable (not included in area enums) - Disable All (combines attack/move/spells) - Disable Move - Block Repair (repair/Human build) - Block Training (unit/research) - Block Construction (build/upgrade) - Updated Stun state mod with an option to not modify animations during stun (value >1) - Added New Damage Flags - Allow Summon-only damage to damage invulnerable summons if the constant is set - Added Nonlethal flag for damage that cannot kill a unit - Allowed Invulnerable units to die from damage or setting life to 0 - Added Neutral targeting (previously missing from canBeTargetedBy) - Added autocast type FARTHESTVALID for Parasite, which has different logic than others - Added event hooks for Construction Cancel and Upgrade Start/Cancel/Finish - Added Upgrades Changed to the Unit State Listener - Improved handling of Artillery attacks - No longer sets the target to a point (as attack modifications want to check the target unit) - The Attack Settings can now hold values needed for tracking features that previous depended on those settings - Specifically, the impactZ of the projectile - Added ALINE in a few places that were only checking for ARTILLERY - Updated the Accuracy Check to allow other effects on Artillery misses (same for missile splash) - Added "ClickDisable" for abilities, that shows a disabled icon, but doesn't disable the function of the ability (for black arrow bonus) - Added Unique Flags and Unique Values on Abilities/Buffs/Units, which allow external functions to set arbitrary values - Added Visibility Groups for buffs. Buffs in a group will only display a single icon. - Added vision modifier for projectiles, for specific spells (such as sentinal) - Added priorities to post-damage listeners **Spell Implementations** - Attack Modifications - Critical Strike (rewritten to use proper functions this time) - Wind Walk (properly working now) - Autocast Arrows - Searing Arrows - Orb of Annihilation - Black Arrows - Cold Arrows - Incinerate (and the passive) - Poison Arrows - Items - Mask of Death - Orb of Corruption - Orb of Frost - Orb of Freezing (unused) - Orb of Fire - Orb of Lightning (Old) (not working as Purge is not implemented) - Orb of Venom - "Orb of Spell Bonus" - Orb of Darkness - Orb of Slow - Orb of Lightning (not working as Purge is not implemented - Low Priority - Corrosive Breath - Freezing Breath - Liquid Fire - Feedback - Envenomed Spears/Slow Poison/Poison Sting - Flack Cannons - Frag Shards - Barrage - (Still Missing - Burning Oil, due to complication of the damage AOE effect) - Lowest Priority - Lightning Attack - Plague Cloud (Meat Wagon) (the cloud doesn't have a damage aura yet though) - Frost Attack/Frost Breath - Spider Attack - Post-damage Splash - Pulverize - Cleaving Attack (currently based on post-armor damage rather than pre-armor damage) - Post-Death Summons - Black Arrow (used by Orb of Darkness) - Doom - Parasite - Transformations - Phoenix Morphing (Egg Related) - Passives - Locust - (updated Truesight abilities to disable while a building is being constructed) - Do-Nothings - Flying Machine Bombs - Storm Hammers - Moon Glaive - Vorpal Blades **Known Issues:** - Cleaving Attack is using post-armor damage, not pre-armor damage - Orb of Lightning is not working, as Purge is not implemented - AB use of cast time is a bit off from the real game --- .../AttackReplacementActives.json | 1372 +++++++++++ .../AttackReplacementPassivesItems.json | 1807 ++++++++++++++ .../AttackReplacementPassivesNonItem.json | 562 +++++ ...ReplacementPassivesNonItemLowPriority.json | 2174 +++++++++++++++++ ...lacementPassivesNonItemLowestPriority.json | 837 +++++++ .../AttackReplacementPassivesPostDamage.json | 315 +++ .../assets/abilityBehaviors/DeathSummons.json | 832 +++++++ core/assets/abilityBehaviors/DoNothings.json | 176 ++ .../abilityBehaviors/Transformations.json | 566 +++++ core/assets/abilityBehaviors/activeBuffs.json | 2 +- .../abilityBehaviors/activeDebuffs.json | 2 +- core/assets/abilityBehaviors/auras.json | 10 - .../abilityBehaviors/generalPassives.json | 516 ++-- .../abilityBehaviors/humanUnitActives.json | 2 +- .../neutralHeroUnitActives.json | 2 +- .../abilityBehaviors/orcHeroActives.json | 617 +++-- .../abilityBehaviors/undeadUnitActives.json | 2 +- .../incineratePassive.json | 267 ++ .../locust.json | 219 ++ .../parasite.json | 412 ++++ .../rejuvenation.json | 0 core/assets/warsmash.ini | 9 +- .../etheller/warsmash/parsers/jass/Jass2.java | 9 + .../scope/CommonTriggerExecutionScope.java | 41 + .../warsmash/util/WarsmashConstants.java | 3 + .../viewer5/handlers/w3x/War3MapViewer.java | 253 +- .../w3x/rendersim/RenderProjectile.java | 16 +- .../handlers/w3x/rendersim/RenderUnit.java | 2 +- .../CommandCardPopulatingAbilityVisitor.java | 92 +- .../w3x/simulation/CGameplayConstants.java | 6 + .../handlers/w3x/simulation/CSimulation.java | 51 +- .../handlers/w3x/simulation/CUnit.java | 633 ++++- .../w3x/simulation/CUnitStateListener.java | 9 + .../w3x/simulation/CWorldCollision.java | 10 +- .../abilities/AbstractCAbility.java | 31 + .../w3x/simulation/abilities/CAbility.java | 9 + .../abilities/CAbilityDisableType.java | 2 +- .../simulation/abilities/CAbilityView.java | 1 + .../abilities/autocast/AutocastType.java | 1 + .../abilities/autocast/CAutocastAbility.java | 2 +- .../build/CAbilityBuildInProgress.java | 2 +- .../abilities/build/CAbilityHumanRepair.java | 7 +- .../abilities/build/CAbilityRepair.java | 7 +- .../abilities/generic/AbstractCBuff.java | 5 + ...bstractGenericSingleIconActiveAbility.java | 6 +- .../simulation/abilities/generic/CBuff.java | 2 + .../nightelf/moonwell/CAbilityMoonWell.java | 6 +- .../neutral/sappers/CAbilityKaboom.java | 6 +- .../abilities/skills/util/CBuffSlow.java | 4 +- .../abilities/skills/util/CBuffStun.java | 5 + ...yTargetStillAliveAndTargetableVisitor.java | 1 - .../ability/AbilityBuilderAbility.java | 10 + .../ability/AbilityBuilderActiveAbility.java | 11 + ...AbilityAbilityBuilderActiveAutoTarget.java | 16 + ...AbilityAbilityBuilderActiveFlexTarget.java | 29 + .../CAbilityAbilityBuilderActiveNoTarget.java | 14 +- .../CAbilityAbilityBuilderActivePairing.java | 10 +- ...bilityAbilityBuilderActivePointTarget.java | 13 +- ...AbilityAbilityBuilderActiveUnitTarget.java | 9 +- .../CAbilityAbilityBuilderGenericActive.java | 153 +- .../ability/CAbilityAbilityBuilderNoIcon.java | 84 + .../CAbilityAbilityBuilderPassive.java | 84 + .../behavior/CBehaviorAbilityBuilderBase.java | 16 +- .../CBehaviorFinishTransformation.java | 6 +- .../behavior/action/ABActionAddAbility.java | 20 +- .../behavior/action/ABActionAddSlowBuff.java | 37 +- .../behavior/action/ABActionAddStunBuff.java | 37 +- .../action/ABActionCreateAbilityFromId.java | 18 +- .../action/ABActionCreateLightningEffect.java | 14 +- .../ABActionCreateSpellEffectAtLocation.java | 11 +- .../ABActionCreateSpellEffectAtPoint.java | 10 +- .../ABActionCreateSpellEffectOnUnit.java | 15 +- ...nCreateTemporarySpellEffectAtLocation.java | 10 +- ...tionCreateTemporarySpellEffectAtPoint.java | 10 +- ...ctionCreateTemporarySpellEffectOnUnit.java | 10 +- .../action/ABActionDeleteStoredKey.java | 18 + .../action/ABActionRemoveAbility.java | 19 +- .../ABActionAbilityAddUniqueFlag.java | 32 + .../ABActionAbilityAttemptToApplyEffect.java | 58 + .../ABActionAbilityRemoveUniqueFlag.java | 32 + .../ABActionAbilityRemoveUniqueValue.java | 31 + .../abilities/ABActionAbilitySetShowIcon.java | 14 +- .../ABActionAbilityStoreUniqueValue.java | 33 + .../ability/ABActionAddTargetAllowed.java | 17 +- .../ability/ABActionClickDisableAbility.java | 43 + .../ability/ABActionClickEnableAbility.java | 43 + .../ability/ABActionDisableAbility.java | 28 +- .../ability/ABActionDisableAbilityById.java | 59 + .../action/ability/ABActionEnableAbility.java | 28 +- .../ability/ABActionEnableAbilityById.java | 59 + .../ability/ABActionRemoveTargetAllowed.java | 17 +- .../attack/ABActionAddAttackModifier.java | 22 + .../attack/ABActionCreateAttackModifier.java | 37 + .../attack/ABActionFireModifiedAttack.java | 72 + .../attack/ABActionRemoveAttackModifier.java | 22 + .../attack/ABActionStartModifiedAttack.java | 63 + ...ABActionAttackModifierAddAnimationTag.java | 23 + ...onAttackModifierAddPostDamageListener.java | 22 + ...ionAttackModifierAddPreDamageListener.java | 22 + ...ActionAttackModifierApplyAllArtFields.java | 30 + .../ABActionAttackModifierApplyArt.java | 27 + ...BActionAttackModifierApplyArtAndSpeed.java | 28 + ...ActionAttackModifierApplyDefaultSpeed.java | 21 + ...tackModifierPreventOtherModifications.java | 20 + ...PreventOtherSamePriorityModifications.java | 20 + ...ctionAttackModifierRemoveAnimationTag.java | 23 + ...ttackModifierRemovePostDamageListener.java | 22 + ...AttackModifierRemovePreDamageListener.java | 22 + .../ABActionAttackModifierSetAttackArc.java | 24 + ...ctionAttackModifierSetAttackDeathTime.java | 24 + ...ABActionAttackModifierSetAttackHoming.java | 23 + ...BActionAttackModifierSetAttackImpactZ.java | 24 + ...ABActionAttackModifierSetAttackStartZ.java | 24 + ...ABActionAttackModifierSetSplashFields.java | 41 + ...ABCallbackGetModifiedAttackAttackType.java | 19 + ...ABCallbackGetModifiedAttackDamageType.java | 19 + ...ABCallbackGetModifiedAttackWeaponType.java | 19 + .../behavior/action/buff/ABActionAddBuff.java | 6 +- .../buff/ABActionBuffAddUniqueFlag.java | 32 + .../buff/ABActionBuffRemoveUniqueFlag.java | 32 + .../buff/ABActionBuffRemoveUniqueValue.java | 24 + .../buff/ABActionBuffStoreUniqueValue.java | 26 + .../buff/ABActionCreatePassiveBuff.java | 13 + .../buff/ABActionCreateTargetingBuff.java | 12 +- .../buff/ABActionCreateTimedArtBuff.java | 35 +- .../action/buff/ABActionCreateTimedBuff.java | 57 +- .../buff/ABActionCreateTimedLifeBuff.java | 2 +- ...ActionCreateTimedPausedExpirationBuff.java | 123 + .../ABActionCreateTimedTargetingBuff.java | 20 +- .../buff/ABActionCreateTimedTickingBuff.java | 50 +- .../ABActionCreateTimedTickingPausedBuff.java | 49 +- ...ActionCreateTimedTickingPostDeathBuff.java | 35 +- .../ABActionCreateTimeOfDayEvent.java | 2 +- .../ABActionRegisterTimeOfDayEvent.java | 2 +- .../ABActionRegisterUniqueTimeOfDayEvent.java | 2 +- .../ABActionUnregisterTimeOfDayEvent.java | 2 +- .../widget/ABActionCreateWidgetEvent.java | 32 + .../widget/ABActionRegisterWidgetEvent.java | 27 + .../widget/ABActionUnregisterWidgetEvent.java | 27 + ...teLocationTargetedCollisionProjectile.java | 1 - ...ctionCreateLocationTargetedProjectile.java | 1 - ...reateLocationTargetedPseudoProjectile.java | 1 - ...CreateUnitTargetedCollisionProjectile.java | 1 - .../ABActionCreateUnitTargetedProjectile.java | 44 +- ...ionCreateUnitTargetedPseudoProjectile.java | 1 - ...eOfLocationMatchingConditionWithSort.java} | 65 +- ...RangeOfUnitMatchingConditionWithSort.java} | 65 +- .../ABActionChangeAttackActionToMovement.java | 39 + .../action/unit/ABActionCreateUnit.java | 29 +- .../action/unit/ABActionDamageArea.java | 118 + .../unit/ABActionDamageAttackSplash.java | 158 ++ .../action/unit/ABActionDamageBurst.java | 138 ++ .../action/unit/ABActionDamageSplash.java | 158 ++ .../action/unit/ABActionDamageTarget.java | 6 +- .../ABActionForceBeginCreatedBehavior.java | 30 + .../action/unit/ABActionSubtractMp.java | 6 +- .../action/unit/ABActionTransformUnit.java | 11 +- .../ABActionTransformedUnitAbilityAdd.java | 4 +- .../ABActionTransformedUnitAbilityRemove.java | 4 +- .../ABActionAddAttackPostDamageListener.java | 4 +- .../ABActionAddUnitStateListener.java | 24 + ...BActionCreateAttackPostDamageListener.java | 4 +- .../ABActionCreateUnitStateListener.java | 37 + ...BActionRemoveAttackPostDamageListener.java | 4 +- .../ABActionRemoveUnitStateListener.java | 22 + .../ABActionDeathReplacementSetReviving.java | 1 - ...DamageListenerLockDamageModifications.java | 19 + .../ABCallbackGetAttackBaseDamage.java | 19 + ...BCallbackGetAttackMaximumSplashRadius.java | 19 + .../ABCallbackGetAttackType.java | 19 + .../ABCallbackGetDamageType.java | 19 + .../ABCallbackGetWeaponType.java | 19 + .../ABConditionIsAttackArtillery.java | 27 + .../ABConditionIsAttackHoming.java | 19 + ...onditionIsUnitValidSplashDamageTarget.java | 53 + .../unitstate/ABActionUpdateStateModBuff.java | 25 + ...BActionCreateProjectileVisionModifier.java | 30 + .../ABCallbackGetAbilityById.java | 27 + .../attack/ABAttackModifierCallback.java | 14 + ...BCallbackGetLastCreatedAttackModifier.java | 17 + ...BCallbackGetStoredAttackModifierByKey.java | 25 + .../ABAttackSettingsCallback.java | 14 + .../ABCallbackGetCurrentAttackSettings.java | 18 + ...BCallbackGetLastCreatedAttackSettings.java | 17 + ...BCallbackGetStoredAttackSettingsByKey.java | 25 + ...BCallbackGetAbilityUniqueValueBoolean.java | 30 + .../ABCallbackGetBuffUniqueValueBoolean.java | 30 + .../buffcallbacks/ABCallbackGetBuffById.java | 34 + .../buffcallbacks/ABCallbackThisBuff.java | 25 + .../ABCallbackGetAttackedDestructable.java | 20 + .../ABCallbackGetDefenseTypeFromString.java | 20 + .../ABCallbackGetStoredAttackTypeByKey.java | 30 + .../ABCallbackGetStoredDamageTypeByKey.java | 30 + .../ABCallbackGetStoredDefenseTypeByKey.java | 30 + .../ABCallbackGetStoredWeaponTypeByKey.java | 30 + .../ABCallbackGetUnitDefenseType.java | 20 + .../ABCallbackGetWeaponTypeFromString.java | 32 + .../ABCallbackRawWeaponType.java | 18 + .../enumcallbacks/ABDefenseTypeCallback.java | 13 + .../enumcallbacks/ABWeaponTypeCallback.java | 13 + .../ABCallbackArgumentWidgetEvent.java | 35 + .../ABCallbackGetLastCreatedWidgetEvent.java | 17 + .../ABCallbackGetStoredWidgetEventByKey.java | 26 + .../ABCallbackInlineConditionWidgetEvent.java | 24 + .../ABCallbackReuseWidgetEvent.java | 43 + ...CallbackReuseWidgetEventWithArguments.java | 50 + .../ABWidgetEventCallback.java | 15 + .../ABCallbackGetAbilityCastTime.java | 12 +- .../ABCallbackGetAbilityUniqueValueFloat.java | 31 + .../ABCallbackGetBuffUniqueValueFloat.java | 31 + .../ABCallbackGetDistanceBetweenUnits.java | 22 + .../ABCallbackGetUnitCurrentHp.java | 2 +- .../ABCallbackGetUnitCurrentMana.java | 2 +- .../ABCallbackGetAbilityUniqueValueId.java | 33 + ...ABCallbackGetAbilityCastTimeAsInteger.java | 11 +- ...BCallbackGetAbilityUniqueValueInteger.java | 31 + .../ABCallbackGetBuffUniqueValueInteger.java | 31 + .../ABCallbackGetItemSlot.java | 35 + .../ABCallbackGetUnitMaximumHp.java | 19 + .../ABCallbackGetUnitMaximumMp.java | 19 + .../ABCallbackIntegerZeroIfNull.java | 18 + .../integercallbacks/ABCallbackIterator.java | 2 - .../ABCallbackTruncateFloatToInteger.java | 18 + .../item/ABCallbackGetAttackedItem.java | 20 + .../item/ABCallbackGetLastCreatedItem.java | 17 + .../item/ABCallbackGetStoredItemByKey.java | 26 + ...llbackGetLastCreatedUnitStateListener.java | 17 + ...llbackGetStoredUnitStateListenerByKey.java | 25 + .../ABUnitStateListenerCallback.java | 14 + .../ABCallbackCreateLocationFromOffset.java | 8 +- .../ABCallbackGetAttackImpactLocation.java | 17 + .../ABCallbackGetAttackTargetLocation.java | 23 + .../ABCallbackGetGroundAttackedLocation.java | 20 + .../ABCallbackGetAbilityDataAsLong.java | 37 + .../ABCallbackGetAbilityUniqueValueLong.java | 31 + .../ABCallbackGetBuffUniqueValueLong.java | 31 + .../ABCallbackPlayerMaskAllPlayers.java | 21 + .../ABCallbackPlayerMaskExcludePlayers.java | 24 + .../ABCallbackPlayerMaskIncludePlayers.java | 24 + .../ABCallbackGetAbilityHandleAsString.java | 18 + ...ABCallbackGetAbilityUniqueValueString.java | 30 + .../ABCallbackGetBuffHandleAsString.java | 18 + .../ABCallbackGetBuffUniqueValueString.java | 30 + .../stringcallbacks/ABCallbackIdToString.java | 18 + .../ABCallbackGetAttackedUnit.java | 5 +- .../unitcallbacks/ABCallbackGetCompUnit1.java | 26 + .../unitcallbacks/ABCallbackGetCompUnit2.java | 26 + .../ABCallbackDestructableToWidget.java | 19 + .../widget/ABCallbackItemToWidget.java | 19 + .../ABConditionIsDestructableValidTarget.java | 18 +- ...itionIsUnitPassAllAbilityTargetChecks.java | 7 +- .../ABConditionIsUnitValidTarget.java | 23 +- .../condition/ABConditionIsValidTarget.java | 31 +- .../ABConditionDoesAbilityHaveUniqueFlag.java | 23 + .../ability/ABConditionIsAutoCastOn.java | 24 + .../ability/ABConditionIsDisabled.java | 19 + .../ability/ABConditionWasAutoCastOn.java | 24 + .../attack/ABConditionIsAttackProjectile.java | 18 + .../attack/ABConditionIsAttackRanged.java | 18 + .../ABConditionDoesBuffHaveUniqueFlag.java | 23 + .../ABConditionIsDefenseTypeEqual.java | 28 + .../ABConditionIsDefenseTypeInList.java | 28 + .../ABConditionIsWeaponTypeEqual.java | 28 + .../unit/ABConditionDoesUnitHaveBuff.java | 5 +- .../unit/ABConditionIsUnitBuilding.java | 5 +- .../unit/ABConditionIsUnitConstructing.java | 25 + ...onditionIsUnitConstructingOrUpgrading.java | 25 + .../condition/unit/ABConditionIsUnitDead.java | 5 +- .../condition/unit/ABConditionIsUnitHero.java | 25 + .../unit/ABConditionIsUnitHeroDuration.java | 23 + .../unit/ABConditionIsUnitHidden.java | 25 + .../unit/ABConditionIsUnitMagicImmune.java | 5 +- .../unit/ABConditionIsUnitMaxHp.java | 5 +- .../unit/ABConditionIsUnitMaxMp.java | 5 +- .../unit/ABConditionIsUnitSummoned.java | 26 + .../unit/ABConditionIsUnitTraining.java | 5 +- .../condition/unit/ABConditionIsUnitType.java | 5 +- .../unit/ABConditionIsUnitUpgrading.java | 25 + ...BConditionSuccessfullyChargeResources.java | 65 + .../unit/ABConditionUnitHasResearch.java | 27 + .../abilitybuilder/buff/ABBuff.java | 49 + .../abilitybuilder/buff/ABBuffSlow.java | 100 + .../abilitybuilder/buff/ABBuffStun.java | 68 + .../buff/ABGenericTimedBuff.java | 20 +- .../abilitybuilder/buff/ABTimedBuff.java | 36 + .../buff/ABTimedPausedExpirationBuff.java | 26 + .../buff/ABTimedTickingBuff.java | 3 + .../buff/ABTimedTickingPausedBuff.java | 5 +- .../buff/ABTimedTransformationBuff.java | 34 +- .../buff/CPausedTickingBuff.java | 8 + .../abilitybuilder/core/ABLocalStoreKeys.java | 28 +- .../core/AbilityBuilderGsonBuilder.java | 253 +- .../handler/TransformationHandler.java | 3 +- .../iterstructs/ABUnitComparator.java | 38 + .../listener/ABAttackEvasionListener.java | 4 +- .../listener/ABAttackModifier.java | 138 ++ .../listener/ABAttackPostDamageListener.java | 29 +- .../listener/ABAttackPreDamageListener.java | 53 +- .../ABAttackProjReactionListener.java | 4 +- .../listener/ABDamageTakenListener.java | 4 +- .../ABDamageTakenModificationListener.java | 4 +- ...BFinalDamageTakenModificationListener.java | 4 +- .../listener/ABUnitStateListener.java | 210 ++ .../parser/AbilityBuilderConfiguration.java | 13 + .../parser/AbilityBuilderParser.java | 14 + .../parser/AbilityBuilderParserUtil.java | 8 +- .../AbilityBuilderSpecialDisplayFields.java | 16 + .../behaviors/BehaviorAbilityVisitor.java | 5 + .../BehaviorNextBehaviorVisitor.java | 35 + .../behaviors/BehaviorTargetUnitVisitor.java | 5 + .../behaviors/BehaviorTargetVisitor.java | 5 + .../simulation/behaviors/CBehaviorAttack.java | 39 +- .../behaviors/CBehaviorCategory.java | 3 +- .../simulation/behaviors/CBehaviorMove.java | 4 + .../simulation/behaviors/CBehaviorStun.java | 9 +- .../behaviors/CBehaviorVisitor.java | 2 + .../behaviors/build/CBehaviorHumanBuild.java | 5 +- .../behaviors/build/CBehaviorHumanRepair.java | 2 +- .../behaviors/build/CBehaviorOrcBuild.java | 5 +- .../behaviors/build/CBehaviorRepair.java | 2 +- .../behaviors/build/CBehaviorUndeadBuild.java | 5 +- .../simulation/combat/CBaseDamageFlags.java | 11 + .../w3x/simulation/combat/CDamageFlags.java | 4 + .../w3x/simulation/combat/CTargetType.java | 3 +- .../w3x/simulation/combat/CWeaponType.java | 27 +- .../combat/attacks/CUnitAttack.java | 91 +- .../combat/attacks/CUnitAttackInstant.java | 21 +- .../combat/attacks/CUnitAttackMissile.java | 39 +- .../attacks/CUnitAttackMissileBounce.java | 15 +- .../attacks/CUnitAttackMissileLine.java | 17 +- .../attacks/CUnitAttackMissileSplash.java | 78 +- .../combat/attacks/CUnitAttackNormal.java | 14 +- .../CUnitAttackPostDamageListener.java | 6 +- .../CUnitAttackPreDamageListener.java | 10 +- .../CUnitDefaultAccuracyCheckListener.java | 25 +- .../CUnitDefaultLifestealListener.java | 10 +- .../replacement/CUnitAttackModifier.java | 22 + .../CUnitAttackReplacementEffect.java | 39 - .../CUnitAttackReplacementPriority.java | 23 - .../replacement/CUnitAttackSettings.java | 228 ++ .../replacement/CUnitPriorityLoopData.java | 33 + .../projectile/CAttackProjectileInstant.java | 7 +- .../projectile/CAttackProjectileMissile.java | 9 +- .../combat/projectile/CProjectile.java | 5 +- .../w3x/simulation/data/CAbilityData.java | 159 +- .../w3x/simulation/data/CUnitData.java | 8 +- .../w3x/simulation/players/CPlayer.java | 30 +- .../vision/CProjectileVisionFogModifier.java | 82 + .../w3x/simulation/unit/CWidgetEvent.java | 4 + .../w3x/simulation/unit/StateModBuffType.java | 12 +- .../util/SimulationRenderController.java | 7 +- .../viewer5/handlers/w3x/ui/MeleeUI.java | 12 + .../scope/trigger/RemovableTriggerEvent.java | 3 +- 353 files changed, 18866 insertions(+), 1395 deletions(-) create mode 100644 core/assets/abilityBehaviors/AttackReplacementActives.json create mode 100644 core/assets/abilityBehaviors/AttackReplacementPassivesItems.json create mode 100644 core/assets/abilityBehaviors/AttackReplacementPassivesNonItem.json create mode 100644 core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json create mode 100644 core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowestPriority.json create mode 100644 core/assets/abilityBehaviors/AttackReplacementPassivesPostDamage.json create mode 100644 core/assets/abilityBehaviors/DeathSummons.json create mode 100644 core/assets/abilityBehaviors/DoNothings.json create mode 100644 core/assets/abilityBehaviors_compatibility/incineratePassive.json create mode 100644 core/assets/abilityBehaviors_compatibility/locust.json create mode 100644 core/assets/abilityBehaviors_compatibility/parasite.json rename core/assets/{abilityBehaviors/compatibility => abilityBehaviors_compatibility}/rejuvenation.json (100%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbilityById.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbilityById.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionAddAttackModifier.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/{ => timeofday}/ABActionCreateTimeOfDayEvent.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/{ => timeofday}/ABActionRegisterTimeOfDayEvent.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/{ => timeofday}/ABActionRegisterUniqueTimeOfDayEvent.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/{ => timeofday}/ABActionUnregisterTimeOfDayEvent.java (95%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/{ABActionIterateUnitsInRangeOfLocation.java => ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java} (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/{ABActionIterateUnitsInRangeOfUnit.java => ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java} (60%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackThisBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastOn.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastOn.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/CPausedTickingBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackModifier.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackReplacementEffect.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackReplacementPriority.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackSettings.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitPriorityLoopData.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/vision/CProjectileVisionFogModifier.java diff --git a/core/assets/abilityBehaviors/AttackReplacementActives.json b/core/assets/abilityBehaviors/AttackReplacementActives.json new file mode 100644 index 000000000..5e2212689 --- /dev/null +++ b/core/assets/abilityBehaviors/AttackReplacementActives.json @@ -0,0 +1,1372 @@ +{ + "abilityList": [{ + "ids": [{"id":"AHfa", "castId": "flamingarrowstarg", "autoCastOnId": "flamingarrows", "autoCastOffId": "unflamingarrows", "autoCastType": "NOAUTOCASTBEHAVIOR"}], + "type": "NORMAL_UNITTARGET", + "reuseActions": { + "onHit": [{ + "type": "addBonusDamageDealt", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 2 + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "if", + "condition": { + "type": "successfullyChargeResources", + "mana": { + "type": "getAbilityManaCost" + } + }, + "thenActions": [{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onModify" + } + },{ + "type": "attackModifierPreventOtherModifications" + }] + }] + }], + "onChangeAutoCast": [{ + "type": "if", + "condition": { + "type": "isAutoCastOn" + }, + "thenActions": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "elseActions": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + },{ + "type": "fireModifiedAttack", + "target": { + "type": "getAbilityTargetedUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + }, + "showMissOnFailure": { + "type": "not", + "condition": { + "type": "isDisabled" + } + } + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "levelChange" + } + }] + },{ + "ids": [{"id":"Afak", "castId": "flamingattacktarg", "autoCastOnId": "flamingattack", "autoCastOffId": "unflamingattack", "autoCastType": "NOAUTOCASTBEHAVIOR"}], + "type": "INHERIT", + "parentId": "AHfa", + "reuseActions": { + "onHit": [{ + "type": "addBonusDamageDealt", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }], + "onModify": [{ + "type": "attackModifierSetSplashFields", + "areaOfEffectFullDamage": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "areaOfEffectMediumDamage": { + "type": "getAbilityDataAsInteger", + "dataField": "E" + }, + "areaOfEffectSmallDamage": { + "type": "f2i", + "value": { + "type": "getAbilityArea" + } + }, + "damageFactorMedium": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "damageFactorSmall": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + }] + } + },{ + "ids": [{"id":"ANba", "castId": "blackarrow", "autoCastOnId": "blackarrowon", "autoCastOffId": "blackarrowoff", "autoCastType": "NOAUTOCASTBEHAVIOR"}], + "type": "INHERIT", + "parentId": "AHfa", + "reuseActions": { + "onHit": [{ + "type": "addBonusDamageDealt", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "onRemoveActions": [{ + "type": "if", + "condition": { + "type": "isUnitDead", + "unit": { + "type": "getBuffedUnit" + } + }, + "thenActions": [{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "getUnitLocation", + "unit": { + "type": "getBuffedUnit" + } + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getBuffedUnit" + } + } + },{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getSecondBuffId" + }, + "duration": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + } + },{ + "ids": [{"id":"AHca", "castId": "coldarrowstarg", "autoCastOnId": "coldarrows", "autoCastOffId": "uncoldarrows", "autoCastType": "NOAUTOCASTBEHAVIOR"}], + "type": "INHERIT", + "parentId": "AHfa", + "reuseActions": { + "setup": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "inlineConditionString", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 2 + } + } + }, + "pass": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "frostArrows" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getCastingUnit" + } + }] + }, + "fail": { + "type": "rawString", + "value": "frostArrows" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "inlineConditionString", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 4 + } + } + }, + "pass": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "frostArrows" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getCastingUnit" + } + }] + }, + "fail": { + "type": "rawString", + "value": "frostArrows" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "buffId" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "inlineConditionID", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 7 + } + } + }, + "pass": { + "type": "getSecondBuffId" + }, + "fail": { + "type": "getFirstBuffId" + } + } + }], + "levelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }], + "onHit": [{ + "type": "addBonusDamageDealt", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "buffId" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "stacks": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 7 + } + } + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + } + },{ + "type": "deleteStoredKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + },{ + "type": "deleteStoredKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + } + },{ + "ids": [{"id":"ANia", "castId": "incineratearrow", "autoCastOnId": "incineratearrowon", "autoCastOffId": "incineratearrowoff", "autoCastType": "NOAUTOCASTBEHAVIOR"}], + "type": "INHERIT", + "parentId": "AHfa", + "reuseActions": { + "explode": [{ + "type": "createTimer", + "timeout": { + "type": "getAbilityDataAsFloat", + "dataField": "F" + }, + "actions": [{ + "type": "damageBurst", + "source": { + "type": "getBuffCastingUnit" + }, + "target": { + "type": "getUnitLocation", + "unit": { + "type": "getBuffedUnit" + } + }, + "validTarget": { + "type": "isUnitEnemy", + "unit": { + "type": "getEnumUnit" + } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "fullDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "partialDamage": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "partialDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + }] + }], + "onHit": [{ + "type": "if", + "condition": { + "type": "doesUnitHaveBuff", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "thenActions": [{ + "type": "buffStoreUniqueValue", + "buff": { + "type": "getBuffById", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "key": { + "type": "rawString", + "value": "incinerate" + }, + "valueToStore": { + "type": "f+", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "value2": { + "type": "getBuffUniqueValueFloat", + "buff": { + "type": "getBuffById", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "key": { + "type": "rawString", + "value": "incinerate" + } + } + } + },{ + "type": "addBonusDamageDealt", + "value": { + "type": "getBuffUniqueValueFloat", + "buff": { + "type": "getBuffById", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "key": { + "type": "rawString", + "value": "incinerate" + } + } + }], + "elseActions": [{ + "type": "addBonusDamageDealt", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }] + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "uniqueValues": { + "incinerate": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "onAddActions": [{ + "type": "setExplodesOnDeath", + "unit": { + "type": "getBuffedUnit" + }, + "explodes": { + "type": "rawBoolean", + "value": "true" + }, + "buffId": { + "type": "getFirstBuffId" + } + }], + "onRemoveActions": [{ + "type": "if", + "condition": { + "type": "isUnitDead", + "unit": { + "type": "getBuffedUnit" + } + }, + "thenActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "explode" + } + }], + "elseActions": [{ + "type": "setExplodesOnDeath", + "unit": { + "type": "getBuffedUnit" + }, + "explodes": { + "type": "rawBoolean", + "value": "false" + }, + "buffId": { + "type": "getFirstBuffId" + } + }] + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + } + },{ + "ids": [{"id":"AEpa", "castId": "poisonarrowstarg", "autoCastOnId": "poisonarrows", "autoCastOffId": "unpoisonarrows", "autoCastType": "NOAUTOCASTBEHAVIOR"}], + "type": "INHERIT", + "parentId": "AHfa", + "reuseActions": { + "setup": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "inlineConditionString", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "E" + }, + "value2": { + "type": "rawInteger", + "value": 2 + } + } + }, + "pass": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "poisonarrows" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getCastingUnit" + } + }] + }, + "fail": { + "type": "rawString", + "value": "poisonarrows" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "inlineConditionString", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "E" + }, + "value2": { + "type": "rawInteger", + "value": 4 + } + } + }, + "pass": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "poisonarrows" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getCastingUnit" + } + }] + }, + "fail": { + "type": "rawString", + "value": "poisonarrows" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "buffId" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "inlineConditionID", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "E" + }, + "value2": { + "type": "rawInteger", + "value": 7 + } + } + }, + "pass": { + "type": "getSecondBuffId" + }, + "fail": { + "type": "getFirstBuffId" + } + } + }], + "levelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }], + "onHit": [{ + "type": "addBonusDamageDealt", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "buffId" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "visibilityGroup": { + "type": "id2s", + "value": { + "type": "getAlias" + } + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "stacks": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "E" + }, + "value2": { + "type": "rawInteger", + "value": 7 + } + } + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + } + },{ + "type": "deleteStoredKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + },{ + "type": "deleteStoredKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + },{ + "type": "createTimedTickingBuff", + "buffId": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "buffId" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "showIcon": { + "type": "rawBoolean", + "value": "false" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "stacks": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "E" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + }, + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "damageTarget", + "source": { + "type": "getBuffCastingUnit" + }, + "target": { + "type": "getBuffedUnit" + }, + "nonlethal": { + "type": "not", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "E" + }, + "value2": { + "type": "rawInteger", + "value": 8 + } + } + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + } + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json new file mode 100644 index 000000000..6268e91f7 --- /dev/null +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json @@ -0,0 +1,1807 @@ +{ + "abilityList": [{ + "ids": [{"id":"AIva"}], + "type": "HIDDEN", + "onAddDisabledAbility": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "HPSTEAL" + } + }, + "stackingKey": { + "type": "getAllowStackingKey" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getAttackingUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "addAttackPostDamageListener", + "unit": { + "type": "getAttackingUnit" + }, + "listener": { + "type": "getLastCreatedAttackPostDamageListener" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackPostDamageListener", + "priority": { + "type": "rawInteger", + "value": 1 + }, + "actions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getAttackingUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "removeAttackPostDamageListener", + "unit": { + "type": "getAttackingUnit" + }, + "listener": { + "type": "getLastCreatedAttackPostDamageListener" + } + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getAttackingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 3 + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "recomputeStatBuffsOnUnit", + "targetUnit": { + "type": "getCastingUnit" + }, + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "HPSTEAL" + } + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + },{ + "ids": [{"id":"AIDB"}], + "type": "HIDDEN", + "onAddDisabledAbility": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ALLATK" + } + }, + "stackingKey": { + "type": "getAllowStackingKey" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "storeValueLocally", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "_atkBuff" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "ENABLE_ATTACK", + "value": { + "type": "getAbilityDataAsLong", + "dataField": "E" + } + },{ + "type": "storeValueLocally", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "_atkEnb" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "i+", + "value1": { + "type": "rawInteger", + "value": 4 + }, + "value2": { + "type": "i0IfNull", + "value": { + "type": "getItemSlot" + } + } + }, + "preLaunchModification": [{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierApplyDefaultSpeed" + }], + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onModify" + } + },{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierPreventOtherModifications" + }] + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }], + "onAddAbility": [{ + "type": "createSpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "effectType": "TARGET" + },{ + "type": "storeValueLocally", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "_orbEff" + }, + "valueToStore": { + "type": "getLastCreatedSpellEffect" + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "_atkBuff" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "_atkEnb" + } + } + },{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "_atkBuff" + } + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "updateStateModBuff", + "buff": { + "type": "getStoredStateModBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "_atkEnb" + } + }, + "value": { + "type": "getAbilityDataAsLong", + "dataField": "E" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "levelChange" + } + }], + "onRemoveAbility": [{ + "type": "removeSpellEffect", + "effectToRemove": { + "type": "getStoredFXByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "_orbEff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "_atkBuff" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "_atkEnb" + } + } + },{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "cleanup" + } + }] + },{ + "ids": [{"id":"AIcb"}], + "type": "INHERIT", + "parentId": "AIDB", + "reuseActions": { + "setup": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "DEF" + } + }, + "stackingKey": { + "type": "rawString", + "value": "orbOfCorrupt" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + }], + "levelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + }], + "onHit": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + } + },{ + "ids": [{"id":"AIob"}], + "type": "INHERIT", + "parentId": "AIDB", + "reuseActions": { + "onHit": [{ + "type": "addSlowBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "unit": { + "type": "getAttackedUnit" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + } + }] + } + },{ + "ids": [{"id":"AIzb"}], + "type": "INHERIT", + "parentId": "AIDB", + "reuseActions": { + "onHit": [{ + "type": "addStunBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "unit": { + "type": "getAttackedUnit" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + } + }] + } + },{ + "ids": [{"id":"AIfb"}], + "type": "INHERIT", + "parentId": "AIDB", + "reuseActions": { + "setup": [{ + "type": "createAttackPostDamageListener", + "priority": { + "type": "rawInteger", + "value": 1 + }, + "actions": [{ + "type": "if", + "condition": { + "type": "getStoredBooleanByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "hit" + } + }, + "thenActions": [{ + "type": "damageBurst", + "source": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getUnitLocation", + "unit": { + "type": "getAttackedUnit" + } + }, + "validTarget": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getEnumUnit" + } + },{ + "type": "not", + "condition": { + "type": "isUnitEqual", + "unit1": { + "type": "getAttackedUnit" + }, + "unit2": { + "type": "getEnumUnit" + } + } + }] + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "fullDamageRadius": { + "type": "getAbilityArea" + } + }], + "elseActions": [{ + "type": "if", + "condition": { + "type": "isAttackProjectile" + }, + "thenActions": [{ + "type": "damageBurst", + "source": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getUnitLocation", + "unit": { + "type": "getAttackedUnit" + } + }, + "validTarget": { + "type": "isUnitValidTarget", + "target": { + "type": "getEnumUnit" + } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "fullDamageRadius": { + "type": "getAbilityArea" + } + }] + }] + },{ + "type": "storeValueLocally", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "hit" + }, + "valueToStore": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "storeValueLocally", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "hit" + }, + "valueToStore": { + "type": "rawBoolean", + "value": "false" + } + }], + "onModify": [{ + "type": "attackModifierAddPostDamageListener", + "listener": { + "type": "getLastCreatedAttackPostDamageListener" + } + }], + "onHit": [{ + "type": "storeValueLocally", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "hit" + }, + "valueToStore": { + "type": "rawBoolean", + "value": "true" + } + }] + } + },{ + "ids": [{"id":"AIsb"}], + "type": "INHERIT", + "parentId": "AIDB", + "reuseActions": { + "addAbility": [{ + "type": "createAbilityFromId", + "id": { + "type": "getAbilityUnitId" + } + },{ + "type": "clickDisableAbility", + "ability": { + "type": "getLastCreatedAbility" + } + },{ + "type": "if", + "condition": { + "type": "isItemAbility" + }, + "thenActions": [{ + "type": "abilitySetShowIcon", + "ability": { + "type": "getLastCreatedAbility" + }, + "show": { + "type": "rawBoolean", + "value": false + } + }] + },{ + "type": "addAbility", + "ability": { + "type": "getLastCreatedAbility" + } + }], + "removeAbility": [{ + "type": "removeAbility", + "ability": { + "type": "getLastCreatedAbility" + } + }], + "setup": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "addAbility" + } + }], + "levelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "removeAbility" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "addAbility" + } + }], + "cleanup": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "removeAbility" + } + }], + "onHit": [{ + "type": "if", + "condition": { + "type": "f<", + "value1": { + "type": "randomBoundedFloat", + "bound": { + "type": "rawFloat", + "value": 100 + } + }, + "value2": { + "type": "inlineConditionFloat", + "condition": { + "type": "isUnitHero", + "unit": { + "type": "getAttackedUnit" + } + }, + "pass": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "fail": { + "type": "inlineConditionFloat", + "condition": { + "type": "isUnitSummoned", + "unit": { + "type": "getAttackedUnit" + } + }, + "pass": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "fail": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + } + }, + "thenActions": [{ + "type": "abilityAttemptToApplyEffect", + "ability": { + "type": "getLastCreatedAbility" + }, + "source": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getAttackedUnit" + } + }] + }] + } + },{ + "ids": [{"id":"AIlb"}], + "type": "INHERIT", + "parentId": "AIDB", + "reuseActions": { + "onHit": [{ + "type": "abilityAttemptToApplyEffect", + "ability": { + "type": "getAbilityById", + "id": { + "type": "getWar3IDFromString", + "id": "AIlp" + } + }, + "source": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getAttackedUnit" + } + }] + } + },{ + "ids": [{"id":"AIpb"}], + "type": "INHERIT", + "parentId": "AIDB", + "reuseActions": { + "setup": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getAbilityById", + "id": { + "type": "getWar3IDFromString", + "id": "Apo2" + } + } + },{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }, + "thenActions": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "inlineConditionString", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityUniqueValueInteger", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "dataD" + } + }, + "value2": { + "type": "rawInteger", + "value": 2 + } + } + }, + "pass": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "poisonarrows" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getCastingUnit" + } + }] + }, + "fail": { + "type": "rawString", + "value": "poisonarrows" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityUniqueValueFloat", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "dataC" + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "inlineConditionString", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityUniqueValueInteger", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "dataD" + } + }, + "value2": { + "type": "rawInteger", + "value": 4 + } + } + }, + "pass": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "poisonarrows" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getCastingUnit" + } + }] + }, + "fail": { + "type": "rawString", + "value": "poisonarrows" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityUniqueValueFloat", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "dataB" + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "buffId" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "inlineConditionID", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityUniqueValueInteger", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "dataD" + } + }, + "value2": { + "type": "rawInteger", + "value": 7 + } + } + }, + "pass": { + "type": "getAbilityUniqueValueId", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "buff2" + } + }, + "fail": { + "type": "getAbilityUniqueValueId", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "buff1" + } + } + } + }] + }], + "levelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }], + "onHit": [{ + "type": "if", + "condition": { + "type": "isNull", + "value": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }, + "thenActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }] + },{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }, + "thenActions": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "buffId" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "duration": { + "type": "inlineConditionFloat", + "condition": { + "type": "isUnitHeroDuration", + "unit": { + "type": "getAttackedUnit" + } + }, + "pass": { + "type": "getAbilityUniqueValueFloat", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "heroDur" + } + }, + "fail": { + "type": "getAbilityUniqueValueFloat", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "dur" + } + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "stacks": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityUniqueValueInteger", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "dataD" + } + }, + "value2": { + "type": "rawInteger", + "value": 7 + } + } + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + } + },{ + "type": "deleteStoredKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + },{ + "type": "deleteStoredKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + },{ + "type": "createTimedTickingBuff", + "buffId": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "buffId" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "showIcon": { + "type": "rawBoolean", + "value": "false" + }, + "duration": { + "type": "inlineConditionFloat", + "condition": { + "type": "isUnitHeroDuration", + "unit": { + "type": "getAttackedUnit" + } + }, + "pass": { + "type": "getAbilityUniqueValueFloat", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "heroDur" + } + }, + "fail": { + "type": "getAbilityUniqueValueFloat", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "dur" + } + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "stacks": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityUniqueValueInteger", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "dataD" + } + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + }, + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "damageTarget", + "source": { + "type": "getBuffCastingUnit" + }, + "target": { + "type": "getBuffedUnit" + }, + "nonlethal": { + "type": "not", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityUniqueValueInteger", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "dataD" + } + }, + "value2": { + "type": "rawInteger", + "value": 8 + } + } + } + }, + "damage": { + "type": "getAbilityUniqueValueFloat", + "ability": { + "type": "getStoredAbilityByKey", + "key": { + "type": "rawString", + "value": "poisonData" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "key": { + "type": "rawString", + "value": "dataA" + } + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + } + },{ + "ids": [{"id":"Apo2"}], + "type": "HIDDEN", + "reuseActions": { + "setup": [{ + "type": "abilityStoreUniqueValue", + "key": { + "type": "rawString", + "value": "dataA" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "abilityStoreUniqueValue", + "key": { + "type": "rawString", + "value": "dataB" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "abilityStoreUniqueValue", + "key": { + "type": "rawString", + "value": "dataC" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "abilityStoreUniqueValue", + "key": { + "type": "rawString", + "value": "dataD" + }, + "valueToStore": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + } + },{ + "type": "abilityStoreUniqueValue", + "key": { + "type": "rawString", + "value": "dur" + }, + "valueToStore": { + "type": "getAbilityDuration" + } + },{ + "type": "abilityStoreUniqueValue", + "key": { + "type": "rawString", + "value": "heroDur" + }, + "valueToStore": { + "type": "getAbilityHeroDuration" + } + },{ + "type": "abilityStoreUniqueValue", + "key": { + "type": "rawString", + "value": "buff1" + }, + "valueToStore": { + "type": "getFirstBuffId" + } + },{ + "type": "abilityStoreUniqueValue", + "key": { + "type": "rawString", + "value": "buff2" + }, + "valueToStore": { + "type": "getSecondBuffId" + } + }] + }, + "onAddAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }], + "onRemoveAbility": [{ + "type": "abilityRemoveUniqueValue", + "key": { + "type": "rawString", + "value": "dataA" + } + },{ + "type": "abilityRemoveUniqueValue", + "key": { + "type": "rawString", + "value": "dataB" + } + },{ + "type": "abilityRemoveUniqueValue", + "key": { + "type": "rawString", + "value": "dataC" + } + },{ + "type": "abilityRemoveUniqueValue", + "key": { + "type": "rawString", + "value": "dataD" + } + },{ + "type": "abilityRemoveUniqueValue", + "key": { + "type": "rawString", + "value": "dur" + } + },{ + "type": "abilityRemoveUniqueValue", + "key": { + "type": "rawString", + "value": "heroDur" + } + },{ + "type": "abilityRemoveUniqueValue", + "key": { + "type": "rawString", + "value": "buff1" + } + },{ + "type": "abilityRemoveUniqueValue", + "key": { + "type": "rawString", + "value": "buff2" + } + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItem.json b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItem.json new file mode 100644 index 000000000..a3bca939b --- /dev/null +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItem.json @@ -0,0 +1,562 @@ +{ + "abilityList": [{ + "ids": [{"id":"AHbh"},{"id":"AOcr"},{"id":"ANdb"}], + "type": "PASSIVE", + "onAddDisabledAbility": [{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "if", + "condition": { + "type": "f!=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }, + "thenActions": [{ + "type": "addDamageDealtMultiplier", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }] + },{ + "type": "addBonusDamageDealt", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "if", + "condition": { + "type": "f!=0", + "value": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + } + }, + "thenActions": [{ + "type": "addStunBuff", + "unit": { + "type": "getAttackedUnit" + }, + "buffId": { + "type": "inlineConditionID", + "condition": { + "type": "isNull", + "value": { + "type": "getFirstBuffId" + } + }, + "pass": { + "type": "getWar3IDFromString", + "id": "BPSE" + }, + "fail": { + "type": "getFirstBuffId" + } + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + } + }] + },{ + "type": "if", + "condition": { + "type": "rawBoolean", + "value": "false" + }, + "thenActions": [{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "crit" + }, + "valueToStore": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "if", + "condition": { + "type": "bool", + "bool": { + "type": "getAbilityDataAsBoolean", + "dataField": "E" + } + }, + "thenActions": [{ + "type": "preDamageListenerSetMiss", + "miss": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "true" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "nomiss" + }, + "valueToStore": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "createEvasionListener", + "conditions": [{ + "type": "f<", + "value1": { + "type": "randomFloat" + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 1 + }, + "preLaunchCondition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "preLaunchModification": [{ + "type": "if", + "condition": { + "type": "f<", + "value1": { + "type": "randomBoundedFloat", + "bound": { + "type": "rawFloat", + "value": 100 + } + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "thenActions": [{ + "type": "attackModifierAddAnimationTag", + "tag": { + "type": "rawString", + "value": "SLAM" + } + },{ + "type": "attackModifierApplyArt" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "isCritting" + }, + "valueToStore": { + "type": "rawBoolean", + "value": "true" + } + }], + "elseActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "isCritting" + }, + "valueToStore": { + "type": "rawBoolean", + "value": "false" + } + }] + }], + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "if", + "condition": { + "type": "getStoredBooleanByKey", + "key": { + "type": "rawString", + "value": "isCritting" + } + }, + "thenActions": [{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getStoredAttackPreDamageListenerByKey", + "key": { + "type": "rawString", + "value": "crit" + } + } + }] + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + },{ + "type": "addAttackPreDamageListener", + "targetUnit": { + "type": "getCastingUnit" + }, + "priority": { + "type": "rawPriority", + "priority": "ACCURACY" + }, + "listener": { + "type": "getStoredAttackPreDamageListenerByKey", + "key": { + "type": "rawString", + "value": "nomiss" + } + } + },{ + "type": "addEvasionListener", + "targetUnit": { + "type": "getCastingUnit" + }, + "listener": { + "type": "getLastCreatedEvasionListener" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + },{ + "type": "removeAttackPreDamageListener", + "targetUnit": { + "type": "getCastingUnit" + }, + "priority": { + "type": "rawPriority", + "priority": "ACCURACY" + }, + "listener": { + "type": "getStoredAttackPreDamageListenerByKey", + "key": { + "type": "rawString", + "value": "nomiss" + } + } + },{ + "type": "removeEvasionListener", + "targetUnit": { + "type": "getCastingUnit" + }, + "listener": { + "type": "getLastCreatedEvasionListener" + } + }] + },{ + "ids": [{"id":"ANic"}], + "type": "PASSIVE", + "reuseActions": { + "explode": [{ + "type": "createTimer", + "timeout": { + "type": "getAbilityDataAsFloat", + "dataField": "F" + }, + "actions": [{ + "type": "damageBurst", + "source": { + "type": "getBuffCastingUnit" + }, + "target": { + "type": "getUnitLocation", + "unit": { + "type": "getBuffedUnit" + } + }, + "validTarget": { + "type": "isUnitEnemy", + "unit": { + "type": "getEnumUnit" + } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "fullDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "partialDamage": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "partialDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + }] + }], + "onHit": [{ + "type": "if", + "condition": { + "type": "doesUnitHaveBuff", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "thenActions": [{ + "type": "buffStoreUniqueValue", + "buff": { + "type": "getBuffById", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "key": { + "type": "rawString", + "value": "incinerate" + }, + "valueToStore": { + "type": "f+", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "value2": { + "type": "getBuffUniqueValueFloat", + "buff": { + "type": "getBuffById", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "key": { + "type": "rawString", + "value": "incinerate" + } + } + } + },{ + "type": "addBonusDamageDealt", + "value": { + "type": "getBuffUniqueValueFloat", + "buff": { + "type": "getBuffById", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "key": { + "type": "rawString", + "value": "incinerate" + } + } + }], + "elseActions": [{ + "type": "addBonusDamageDealt", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }] + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "uniqueValues": { + "incinerate": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "onAddActions": [{ + "type": "setExplodesOnDeath", + "unit": { + "type": "getBuffedUnit" + }, + "explodes": { + "type": "rawBoolean", + "value": "true" + }, + "buffId": { + "type": "getFirstBuffId" + } + }], + "onRemoveActions": [{ + "type": "if", + "condition": { + "type": "isUnitDead", + "unit": { + "type": "getBuffedUnit" + } + }, + "thenActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "explode" + } + }], + "elseActions": [{ + "type": "setExplodesOnDeath", + "unit": { + "type": "getBuffedUnit" + }, + "explodes": { + "type": "rawBoolean", + "value": "false" + }, + "buffId": { + "type": "getFirstBuffId" + } + }] + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 5 + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json new file mode 100644 index 000000000..868c472d6 --- /dev/null +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json @@ -0,0 +1,2174 @@ +{ + "abilityList": [{ + "ids": [{"id":"Acor"}], + "type": "PASSIVE", + "onAddDisabledAbility": [{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 10 + }, + "preLaunchCondition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "preLaunchModification": [{ + "type": "attackModifierAddAnimationTag", + "tag": { + "type": "rawString", + "value": "SPELL" + } + },{ + "type": "attackModifierPreventOtherModifications" + }], + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + },{ + "ids": [{"id":"Afrz"}], + "type": "PASSIVE", + "reuseActions": { + "setup": [{ + "type": "createStateModBuff", + "buffType": "STUN", + "value": { + "type": "rawLong", + "value": 2 + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "stun" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "DISABLE_ALL" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "dAll" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "BLOCK_REPAIR", + "value": { + "type": "playerMaskAllPlayers" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "bRep" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "BLOCK_TRAINING" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "bTrn" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "BLOCK_CONSTRUCTION" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "bCon" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + }], + "onHit": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "onAddActions": [{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "stun" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "dAll" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "bRep" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "bTrn" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "bCon" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }], + "onRemoveActions": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "stun" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "dAll" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "bRep" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "bTrn" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "bCon" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 10 + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierApplyArt" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + },{ + "ids": [{"id":"Aliq"}], + "type": "PASSIVE", + "reuseActions": { + "setup": [{ + "type": "createStateModBuff", + "buffType": "BLOCK_REPAIR", + "value": { + "type": "playerMaskAllPlayers" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "liqfire" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "liqfire" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "onHit": [{ + "type": "createTimedTickingBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "stacks": { + "type": "rawBoolean", + "value": "false" + }, + "onAddActions": [{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "damageTarget", + "source": { + "type": "getBuffCastingUnit" + }, + "target": { + "type": "getBuffedUnit" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }], + "onRemoveActions": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 10 + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onLevelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + }] + },{ + "ids": [{"id":"Afbk"}], + "type": "PASSIVE", + "reuseActions": { + "burnMana": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mana" + }, + "valueToStore": { + "type": "fMin", + "value1": { + "type": "getUnitCurrentMana", + "unit": { + "type": "getAttackedUnit" + } + }, + "value2": { + "type": "argumentFloat", + "name": { + "type": "rawString", + "value": "burn" + } + } + } + },{ + "type": "subtractMp", + "unit": { + "type": "getAttackedUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "mana" + } + } + },{ + "type": "addBonusDamageDealt", + "value": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "mana" + } + }, + "value2": { + "type": "argumentFloat", + "name": { + "type": "rawString", + "value": "ratio" + } + } + } + }], + "onHit": [{ + "type": "if", + "condition": { + "type": "isUnitHero", + "unit": { + "type": "getAttackedUnit" + } + }, + "thenActions": [{ + "type": "runReuseActionWithArguments", + "name": { + "type": "rawString", + "value": "burnMana" + }, + "arguments": { + "burn": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "ratio": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + } + }], + "elseActions": [{ + "type": "runReuseActionWithArguments", + "name": { + "type": "rawString", + "value": "burnMana" + }, + "arguments": { + "burn": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "ratio": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + }] + },{ + "type": "damageTarget", + "source": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getAttackedUnit" + }, + "onlyDamageSummons": { + "type": "rawBoolean", + "value": "true" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getAttackedUnit" + }, + "effectType": "SPECIAL" + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 10 + }, + "condition": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + },{ + "type": "or", + "conditions": [{ + "type": "i!=0", + "value": { + "type": "getUnitMaximumMp", + "unit": { + "type": "getAttackedUnit" + } + } + },{ + "type": "isUnitSummoned", + "unit": { + "type": "getAttackedUnit" + } + }] + }] + }, + "modification": [{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + },{ + "ids": [{"id":"Aven"}], + "type": "PASSIVE", + "reuseCallbacks": { + "stackingKey": { + "type": "rawString", + "value": "venSp" + } + }, + "reuseActions": { + "setup": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "inlineConditionString", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 2 + } + } + }, + "pass": { + "type": "catStrings", + "stringList": [{ + "type": "reuseString", + "name": { + "type": "rawString", + "value": "stackingKey" + } + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getCastingUnit" + } + }] + }, + "fail": { + "type": "reuseString", + "name": { + "type": "rawString", + "value": "stackingKey" + } + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "inlineConditionString", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 4 + } + } + }, + "pass": { + "type": "catStrings", + "stringList": [{ + "type": "reuseString", + "name": { + "type": "rawString", + "value": "stackingKey" + } + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getCastingUnit" + } + }] + }, + "fail": { + "type": "reuseString", + "name": { + "type": "rawString", + "value": "stackingKey" + } + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "buffId" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "inlineConditionID", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 7 + } + } + }, + "pass": { + "type": "getSecondBuffId" + }, + "fail": { + "type": "getFirstBuffId" + } + } + }], + "levelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }], + "onHit": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "buffId" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "visibilityGroup": { + "type": "id2s", + "value": { + "type": "getAlias" + } + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "stacks": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 7 + } + } + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + } + },{ + "type": "deleteStoredKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + },{ + "type": "deleteStoredKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + },{ + "type": "createTimedTickingBuff", + "buffId": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "buffId" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "showIcon": { + "type": "rawBoolean", + "value": "false" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "stacks": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + }, + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "damageTarget", + "source": { + "type": "getBuffCastingUnit" + }, + "target": { + "type": "getBuffedUnit" + }, + "nonlethal": { + "type": "not", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 8 + } + } + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 10 + }, + "preLaunchModification": [{ + "type": "attackModifierApplyArt" + }], + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "levelChange" + } + }] + },{ + "ids": [{"id":"Apoi"}], + "type": "INHERIT", + "parentId": "Aven", + "reuseCallbacks": { + "stackingKey": { + "type": "rawString", + "value": "poiAtk" + } + } + },{ + "ids": [{"id":"Aspo"}], + "type": "INHERIT", + "parentId": "Aven", + "reuseCallbacks": { + "stackingKey": { + "type": "rawString", + "value": "slowPo" + } + } + },{ + "ids": [{"id":"Aflk"}], + "type": "PASSIVE", + "onAddDisabledAbility": [{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "damageSplash", + "source": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getUnitLocation", + "unit": { + "type": "getAttackedUnit" + } + }, + "validTarget": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getEnumUnit" + } + },{ + "type": "not", + "condition": { + "type": "isUnitEqual", + "unit1": { + "type": "getAttackedUnit" + }, + "unit2": { + "type": "getEnumUnit" + } + } + }] + }, + "isAttack": { + "type": "rawBoolean", + "value": "true" + }, + "isRanged": { + "type": "isAttackRanged" + }, + "attackType": { + "type": "getAttackType" + }, + "damageType": { + "type": "getDamageType" + }, + "fullDamage": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "fullDamageRadius": { + "type": "getAbilityArea" + }, + "mediumDamage": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "mediumDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "smallDamage": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + }, + "smallDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "extraActions": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getEnumUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + }] + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 10 + }, + "modification": [{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + },{ + "ids": [{"id":"Afsh"}], + "type": "PASSIVE", + "onAddDisabledAbility": [{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getAttackImpactLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + },{ + "type": "damageSplash", + "source": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getAttackImpactLocation" + }, + "validTarget": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getEnumUnit" + } + },{ + "type": "isDefenseTypeInList", + "defenseType": { + "type": "getUnitDefenseType", + "unit": { + "type": "getEnumUnit" + } + }, + "list": [{ + "type": "getDefenseTypeFromString", + "id": { + "type": "rawString", + "value": "MEDIUM" + } + },{ + "type": "getDefenseTypeFromString", + "id": { + "type": "rawString", + "value": "NONE" + } + }] + }] + }, + "isAttack": { + "type": "rawBoolean", + "value": "true" + }, + "isRanged": { + "type": "isAttackRanged" + }, + "attackType": { + "type": "getAttackType" + }, + "damageType": { + "type": "getDamageType" + }, + "fullDamage": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "fullDamageRadius": { + "type": "getAbilityArea" + }, + "mediumDamage": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "mediumDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "smallDamage": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + }, + "smallDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "extraActions": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getEnumUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + }] + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 10 + }, + "modification": [{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + },{ + "ids": [{"id":"Aroc"}], + "type": "PASSIVE", + "onAddDisabledAbility": [{ + "type": "createAttackPreDamageListener", + "useCastId": { + "type": "rawBoolean", + "value": "false" + }, + "actions": [{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "useCastId": { + "type": "rawBoolean", + "value": "false" + }, + "priority": { + "type": "rawInteger", + "value": 10 + }, + "condition": { + "type": "isWeaponTypeEqual", + "weaponType1": { + "type": "getWeaponType" + }, + "weaponType2": { + "type": "getWeaponTypeFromString", + "id": { + "type": "rawString", + "value": "MISSILE" + } + } + }, + "modification": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "fired" + }, + "valueToStore": { + "type": "rawInteger", + "value": 0 + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "damage" + }, + "valueToStore": { + "type": "getAttackBaseDamage" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkT" + }, + "valueToStore": { + "type": "getAttackType" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "damT" + }, + "valueToStore": { + "type": "getDamageType" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "cnt" + }, + "valueToStore": { + "type": "iMin", + "value1": { + "type": "f2i", + "value": { + "type": "ceil", + "value": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "value2": { + "type": "getAttackBaseDamage" + } + } + } + }, + "value2": { + "type": "inlineConditionInteger", + "condition": { + "type": "i>", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 0 + } + }, + "pass": { + "type": "i+", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "fail": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + } + } + } + },{ + "type": "iterateUnitsInRangeOfUnitMatchingConditionWithSort", + "originUnit": { + "type": "getAttackingUnit" + }, + "range": { + "type": "getAbilityArea" + }, + "condition": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + },{ + "type": "not", + "condition": { + "type": "isUnitEqual", + "unit1": { + "type": "getAttackedUnit" + }, + "unit2": { + "type": "getMatchingUnit" + } + } + }] + }, + "sort": { + "type": "f2i", + "value": { + "type": "f-", + "value1": { + "type": "getDistanceBetweenUnits", + "origin": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getCompUnit1" + } + }, + "value2": { + "type": "getDistanceBetweenUnits", + "origin": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getCompUnit2" + } + } + } + }, + "iterationActions": [{ + "type": "if", + "condition": { + "type": "or", + "conditions": [{ + "type": "i=0", + "value": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "cnt" + } + } + },{ + "type": "i<", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "fired" + } + }, + "value2": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "cnt" + } + } + }] + }, + "thenActions": [{ + "type": "createUnitTargetedProjectile", + "source": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getEnumUnit" + }, + "id": { + "type": "getAlias" + }, + "onHit": [{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getProjectileHitUnit" + }, + "attackType": { + "type": "getStoredAttackTypeByKey", + "key": { + "type": "rawString", + "value": "atkT" + } + }, + "damageType": { + "type": "getStoredDamageTypeByKey", + "key": { + "type": "rawString", + "value": "damT" + } + }, + "damage": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "damage" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "fired" + }, + "valueToStore": { + "type": "i-", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "fired" + } + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + },{ + "type": "if", + "condition": { + "type": "i=0", + "value": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "fired" + } + } + }, + "thenActions": [{ + "type": "cleanUpCastInstance" + }] + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "fired" + }, + "valueToStore": { + "type": "i+", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "fired" + } + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + }] + }] + },{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowestPriority.json b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowestPriority.json new file mode 100644 index 000000000..3d6c3b803 --- /dev/null +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowestPriority.json @@ -0,0 +1,837 @@ +{ + "abilityList": [{ + "ids": [{"id":"Alit"}], + "type": "HIDDEN", + "onAddDisabledAbility": [{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 11 + }, + "preLaunchModification": [{ + "type": "attackModifierApplyArt", + "applyArtIfMissing": { + "type": "rawBoolean", + "value": "true" + } + }], + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "attackModifierApplyArtAndSpeed", + "applyArtIfMissing": { + "type": "rawBoolean", + "value": "true" + } + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getAttackedUnit" + }, + "effectType": "TARGET" + },{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getLastCreatedLightningEffect" + } + }, + "thenActions": [{ + "type": "removeLightningEffect", + "effect": { + "type": "getLastCreatedLightningEffect" + } + }] + },{ + "type": "createLightningEffect", + "origin": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getAttackedUnit" + }, + "duration": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + },{ + "ids": [{"id":"Apts"}], + "type": "PASSIVE", + "reuseActions": { + "setup": [{ + "type": "createStateModBuff", + "buffType": "INVULNERABLE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "invulBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "MAGIC_IMMUNE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mimBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "UNSELECTABLE", + "value": { + "type": "playerMaskAllPlayers" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "selBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "UNENUMERABLE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "enumBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + }], + "onHit": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "getAttackImpactLocation" + }, + "facing": { + "type": "rawFloat", + "value": 225 + } + },{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getWar3IDFromString", + "id": "Bplg" + }, + "duration": { + "type": "getAbilityDuration" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "invulBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "mimBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "selBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "enumBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 11 + }, + "modification": [{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "levelChange" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + },{ + "ids": [{"id":"Afra"}], + "type": "PASSIVE", + "reuseActions": { + "onHit": [{ + "type": "if", + "condition": { + "type": "and", + "conditions": [{ + "type": "not", + "condition": { + "type": "isAttackArtillery" + } + },{ + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }] + }, + "thenActions": [{ + "type": "addSlowBuff", + "unit": { + "type": "getAttackedUnit" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + } + }] + },{ + "type": "iterateUnitsInRangeOfLocationMatchingCondition", + "location": { + "type": "getAttackImpactLocation" + }, + "range": { + "type": "i2f", + "value": { + "type": "getAttackMaximumSplashRadius" + } + }, + "condition": { + "type": "or", + "conditions": [{ + "type": "and", + "conditions": [{ + "type": "isAttackArtillery" + },{ + "type": "isUnitEqual", + "unit1": { + "type": "getMatchingUnit" + }, + "unit2": { + "type": "getAttackedUnit" + } + },{ + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + }] + },{ + "type": "and", + "conditions": [{ + "type": "not", + "condition": { + "type": "isUnitEqual", + "unit1": { + "type": "getMatchingUnit" + }, + "unit2": { + "type": "getAttackedUnit" + } + } + },{ + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + },{ + "type": "isUnitValidSplashDamageTarget", + "unit": { + "type": "getMatchingUnit" + } + }] + }] + }, + "iterationActions": [{ + "type": "addSlowBuff", + "unit": { + "type": "getEnumUnit" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getEnumUnit" + } + } + }] + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 11 + }, + "modification": [{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "levelChange" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + },{ + "ids": [{"id":"Afrb"}], + "type": "HIDDEN", + "reuseActions": { + "onHit": [{ + "type": "if", + "condition": { + "type": "and", + "conditions": [{ + "type": "not", + "condition": { + "type": "isAttackArtillery" + } + },{ + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }] + }, + "thenActions": [{ + "type": "addSlowBuff", + "unit": { + "type": "getAttackedUnit" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + } + }] + },{ + "type": "iterateUnitsInRangeOfLocationMatchingCondition", + "location": { + "type": "getAttackImpactLocation" + }, + "range": { + "type": "i2f", + "value": { + "type": "getAttackMaximumSplashRadius" + } + }, + "condition": { + "type": "or", + "conditions": [{ + "type": "and", + "conditions": [{ + "type": "isAttackArtillery" + },{ + "type": "isUnitEqual", + "unit1": { + "type": "getMatchingUnit" + }, + "unit2": { + "type": "getAttackedUnit" + } + },{ + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + }] + },{ + "type": "and", + "conditions": [{ + "type": "not", + "condition": { + "type": "isUnitEqual", + "unit1": { + "type": "getMatchingUnit" + }, + "unit2": { + "type": "getAttackedUnit" + } + } + },{ + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + },{ + "type": "isUnitValidSplashDamageTarget", + "unit": { + "type": "getMatchingUnit" + } + }] + }] + }, + "iterationActions": [{ + "type": "addSlowBuff", + "unit": { + "type": "getEnumUnit" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getEnumUnit" + } + } + }] + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 11 + }, + "modification": [{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "levelChange" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + },{ + "ids": [{"id":"Aspa"}], + "type": "HIDDEN", + "reuseActions": { + "onHit": [{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getAttackedUnit" + } + }, + "thenActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "settings" + }, + "valueToStore": { + "type": "getCurrentAttackSettings" + } + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getWar3IDFromString", + "id": "Bspa" + }, + "duration": { + "type": "getAbilityDuration" + }, + "showIcon": { + "type": "rawBoolean", + "value": "false" + }, + "stacks": { + "type": "rawBoolean", + "value": "true" + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "onRemoveActions": [{ + "type": "createUnitTargetedProjectile", + "source": { + "type": "getBuffedUnit" + }, + "target": { + "type": "getBuffCastingUnit" + }, + "settings": { + "type": "getStoredAttackSettingsByKey", + "key": { + "type": "rawString", + "value": "settings" + } + } + },{ + "type": "cleanUpCastInstance" + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + },{ + "type": "createAttackPreDamageListener", + "useCastId": { + "type": "rawBoolean", + "value": "false" + }, + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 11 + }, + "modification": [{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierSetAttackArc", + "arc": { + "type": "rawFloat", + "value": 0.0 + } + },{ + "type": "attackModifierSetAttackStartZ", + "z": { + "type": "rawFloat", + "value": 0.0 + } + },{ + "type": "attackModifierSetAttackImpactZ", + "impactZ": { + "type": "rawFloat", + "value": 0.0 + } + },{ + "type": "attackModifierSetAttackDeathTime", + "deathTime": { + "type": "rawFloat", + "value": 0.0 + } + },{ + "type": "attackModifierSetAttackHoming", + "homing": { + "type": "rawBoolean", + "value": "true" + } + },{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "levelChange" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesPostDamage.json b/core/assets/abilityBehaviors/AttackReplacementPassivesPostDamage.json new file mode 100644 index 000000000..fae83806d --- /dev/null +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesPostDamage.json @@ -0,0 +1,315 @@ +{ + "abilityList": [{ + "ids": [{"id":"Awar"}], + "type": "PASSIVE", + "onAddDisabledAbility": [{ + "type": "createAttackPostDamageListener", + "priority": { + "type": "rawInteger", + "value": 0 + }, + "actions": [{ + "type": "createSoundEffectOnUnit", + "unit": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + } + },{ + "type": "damageBurst", + "source": { + "type": "getAttackingUnit" + }, + "target": { + "type": "getUnitLocation", + "unit": { + "type": "getAttackingUnit" + } + }, + "validTarget": { + "type": "isUnitValidTarget", + "target": { + "type": "getEnumUnit" + } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "ENHANCED" + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "fullDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "partialDamage": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "value2": { + "type": "rawFloat", + "value": 2.0 + } + }, + "partialDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "extraActions": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getEnumUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + }] + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 1 + }, + "preLaunchCondition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "preLaunchModification": [{ + "type": "if", + "condition": { + "type": "f<", + "value1": { + "type": "randomBoundedFloat", + "bound": { + "type": "rawFloat", + "value": 100 + } + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "thenActions": [{ + "type": "attackModifierAddAnimationTag", + "tag": { + "type": "rawString", + "value": "SLAM" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "pulving" + }, + "valueToStore": { + "type": "rawBoolean", + "value": "true" + } + }], + "elseActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "pulving" + }, + "valueToStore": { + "type": "rawBoolean", + "value": "false" + } + }] + }], + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "if", + "condition": { + "type": "getStoredBooleanByKey", + "key": { + "type": "rawString", + "value": "pulving" + } + }, + "thenActions": [{ + "type": "attackModifierAddPostDamageListener", + "listener": { + "type": "getLastCreatedAttackPostDamageListener" + } + }] + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + },{ + "ids": [{"id":"ANca"}], + "type": "PASSIVE", + "onAddDisabledAbility": [{ + "type": "createAttackPostDamageListener", + "priority": { + "type": "rawInteger", + "value": 0 + }, + "actions": [{ + "type": "damageArea", + "source": { + "type": "getAttackingUnit" + }, + "target": { + "type": "createLocationFromOffset", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getAttackingUnit" + } + }, + "dist": { + "type": "getAbilityArea" + }, + "angle": { + "type": "getUnitFacing", + "unit": { + "type": "getAttackingUnit" + } + }, + "angleInDegrees": { + "type": "rawBoolean", + "value": "true" + } + }, + "validTarget": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getEnumUnit" + } + },{ + "type": "not", + "condition": { + "type": "isUnitEqual", + "unit1": { + "type": "getAttackedUnit" + }, + "unit2": { + "type": "getEnumUnit" + } + } + }] + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "ENHANCED" + } + }, + "damage": { + "type": "f*", + "value1": { + "type": "getTotalDamageDealt" + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "radius": { + "type": "getAbilityArea" + }, + "extraActions": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getEnumUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + }] + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 1 + }, + "preLaunchCondition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "preLaunchModification": [{ + "type": "attackModifierAddAnimationTag", + "tag": { + "type": "rawString", + "value": "SLAM" + } + }], + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "attackModifierAddPostDamageListener", + "listener": { + "type": "getLastCreatedAttackPostDamageListener" + } + },{ + "type": "attackModifierApplyArt" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/DeathSummons.json b/core/assets/abilityBehaviors/DeathSummons.json new file mode 100644 index 000000000..862e5e305 --- /dev/null +++ b/core/assets/abilityBehaviors/DeathSummons.json @@ -0,0 +1,832 @@ +{ + "abilityList": [{ + "ids": [{"id":"ANbs", "castId": "blackarrow"}], + "type": "NORMAL_UNITTARGET", + "overrideFields": { + "universalSpell": { + "type": "rawBoolean", + "value": "true" + } + }, + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "onRemoveActions": [{ + "type": "if", + "condition": { + "type": "isUnitDead", + "unit": { + "type": "getBuffedUnit" + } + }, + "thenActions": [{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "owner": { + "type": "getOwnerOfUnit", + "unit": { + "type": "getBuffCastingUnit" + } + }, + "loc": { + "type": "getUnitLocation", + "unit": { + "type": "getBuffedUnit" + } + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getBuffedUnit" + } + } + },{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getSecondBuffId" + }, + "duration": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }] + },{ + "type": "addBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + },{ + "ids": [{"id":"ANdo", "castId": "doom"}], + "type": "NORMAL_UNITTARGET", + "reuseActions": { + "setup": [{ + "type": "createStateModBuff", + "buffType": "DISABLE_SPELLS" + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + },{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getAbilityTargetedUnit" + }, + "onHitActions": [{ + "type": "createTimedTickingBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "onAddActions": [{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "damageTarget", + "source": { + "type": "getBuffCastingUnit" + }, + "target": { + "type": "getBuffedUnit" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }], + "onRemoveActions": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "if", + "condition": { + "type": "isUnitDead", + "unit": { + "type": "getBuffedUnit" + } + }, + "thenActions": [{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "owner": { + "type": "getOwnerOfUnit", + "unit": { + "type": "getBuffCastingUnit" + } + }, + "loc": { + "type": "getUnitLocation", + "unit": { + "type": "getBuffedUnit" + } + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getBuffedUnit" + } + } + },{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getSecondBuffId" + }, + "duration": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + },{ + "type": "cleanUpCastInstance" + }] + }] + }] + },{ + "type": "addBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "levelChange" + } + }] + },{ + "ids": [{"id":"ANpa", "castId": "parasite", "autoCastOnId": "parasiteon", "autoCastOffId": "parasiteoff", "autoCastType": "FARTHESTVALID"}], + "type": "NORMAL_UNITTARGET", + "overrideFields": { + "castTimeOverride": { + "type": "rawFloat", + "value": 0.0 + } + }, + "extraTargetConditions": [{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "not", + "condition": { + "type": "isUnitSummoned", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + }, + "reason": "UNABLE_TO_TARGET_SUMMONED_UNITS" + }], + "extraAutoTargetConditions": [{ + "type": "not", + "condition": { + "type": "doesUnitHaveBuff", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + } + }], + "reuseActions": { + "setup": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "inlineConditionString", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 2 + } + } + }, + "pass": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "parasite" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getCastingUnit" + } + }] + }, + "fail": { + "type": "rawString", + "value": "parasite" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "inlineConditionString", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 4 + } + } + }, + "pass": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "parasite" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getCastingUnit" + } + }] + }, + "fail": { + "type": "rawString", + "value": "parasite" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "levelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createUnitTargetedProjectile", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getAlias" + }, + "onHit": [{ + "type": "checkAbilityProjReaction", + "target": { + "type": "getProjectileHitUnit" + }, + "projectile": { + "type": "getReactionAbilityProjectile" + }, + "onHitActions": [{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getProjectileHitUnit" + }, + "onHitActions": [{ + "type": "createTimedTickingBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getProjectileHitUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "stacks": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 7 + } + } + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "damageTarget", + "source": { + "type": "getBuffCastingUnit" + }, + "target": { + "type": "getBuffedUnit" + }, + "nonlethal": { + "type": "not", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 8 + } + } + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + } + },{ + "type": "deleteStoredKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "mvbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + },{ + "type": "deleteStoredKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "asbuff" + },{ + "type": "getBuffHandleAsString", + "buff": { + "type": "thisBuff" + } + }] + } + },{ + "type": "if", + "condition": { + "type": "isUnitDead", + "unit": { + "type": "getBuffedUnit" + } + }, + "thenActions": [{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "E" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "owner": { + "type": "getOwnerOfUnit", + "unit": { + "type": "getBuffCastingUnit" + } + }, + "loc": { + "type": "getUnitLocation", + "unit": { + "type": "getBuffedUnit" + } + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getBuffedUnit" + } + } + },{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getSecondBuffId" + }, + "duration": { + "type": "getAbilityCastTime" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + },{ + "type": "cleanUpCastInstance" + }] + }] + }] + },{ + "type": "addBuff", + "target": { + "type": "getProjectileHitUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }] + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "levelChange" + } + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/DoNothings.json b/core/assets/abilityBehaviors/DoNothings.json new file mode 100644 index 000000000..5da3830dd --- /dev/null +++ b/core/assets/abilityBehaviors/DoNothings.json @@ -0,0 +1,176 @@ +{ + "abilityList": [{ + "ids": [{"id":"Agyb"},{"id":"Asth"},{"id":"Amgl"},{"id":"Aimp"}], + "type": "PASSIVE" + },{ + "ids": [{"id":"Aspi"}], + "type": "HIDDEN", + "onAddAbility": [{ + "type": "if", + "condition": { + "type": "unitHasResearch", + "researchId": { + "type": "getWar3IDFromString", + "id": "Rosp" + } + }, + "thenActions": [{ + "type": "createSpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "effectType": "TARGET" + }], + "elseActions": [{ + "type": "createUnitStateListener", + "onUpgradesChanged": [{ + "type": "if", + "condition": { + "type": "and", + "conditions": [{ + "type": "isNull", + "value": { + "type": "getLastCreatedSpellEffect" + } + },{ + "type": "unitHasResearch", + "researchId": { + "type": "getWar3IDFromString", + "id": "Rosp" + } + }] + }, + "thenActions": [{ + "type": "createSpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "effectType": "TARGET" + }] + }] + },{ + "type": "addUnitStateListener", + "unit": { + "type": "getCastingUnit" + }, + "listener": { + "type": "getLastCreatedUnitStateListener" + } + }] + }], + "onRemoveAbility": [{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getLastCreatedSpellEffect" + } + }, + "thenActions": [{ + "type": "removeSpellEffect", + "effectToRemove": { + "type": "getLastCreatedSpellEffect" + } + }] + },{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getLastCreatedUnitStateListener" + } + }, + "thenActions": [{ + "type": "removeUnitStateListener", + "effectToRemove": { + "type": "getLastCreatedUnitStateListener" + } + }] + }] + },{ + "ids": [{"id":"Arbr"}], + "type": "HIDDEN", + "onAddAbility": [{ + "type": "if", + "condition": { + "type": "unitHasResearch", + "researchId": { + "type": "getWar3IDFromString", + "id": "Rorb" + } + }, + "thenActions": [{ + "type": "createSpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "effectType": "TARGET" + }], + "elseActions": [{ + "type": "createUnitStateListener", + "onUpgradesChanged": [{ + "type": "if", + "condition": { + "type": "and", + "conditions": [{ + "type": "isNull", + "value": { + "type": "getLastCreatedSpellEffect" + } + },{ + "type": "unitHasResearch", + "researchId": { + "type": "getWar3IDFromString", + "id": "Rorb" + } + }] + }, + "thenActions": [{ + "type": "createSpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "effectType": "TARGET" + }] + }] + },{ + "type": "addUnitStateListener", + "unit": { + "type": "getCastingUnit" + }, + "listener": { + "type": "getLastCreatedUnitStateListener" + } + }] + }], + "onRemoveAbility": [{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getLastCreatedSpellEffect" + } + }, + "thenActions": [{ + "type": "removeSpellEffect", + "effectToRemove": { + "type": "getLastCreatedSpellEffect" + } + }] + },{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getLastCreatedUnitStateListener" + } + }, + "thenActions": [{ + "type": "removeUnitStateListener", + "effectToRemove": { + "type": "getLastCreatedUnitStateListener" + } + }] + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/Transformations.json b/core/assets/abilityBehaviors/Transformations.json index 38ee07e61..21145cca9 100644 --- a/core/assets/abilityBehaviors/Transformations.json +++ b/core/assets/abilityBehaviors/Transformations.json @@ -1591,5 +1591,571 @@ "value": "false" } }] + },{ + "ids": [{"id":"Aphx"}], + "type": "HIDDEN", + "reuseActions": { + "storeBaseType": [{ + "type": "if", + "condition": { + "type": "isNull", + "value": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }, + "thenActions": [{ + "type": "if", + "condition": { + "type": "not", + "condition": { + "type": "or", + "conditions": [{ + "type": "isUnitType", + "unit": { + "type": "getCastingUnit" + }, + "unitType": { + "type": "getAbilityDataAsID", + "dataField": "A" + } + },{ + "type": "isUnitType", + "unit": { + "type": "getCastingUnit" + }, + "unitType": { + "type": "getAbilityUnitId" + } + }] + } + }, + "thenActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getUnitType", + "unit": { + "type": "getCastingUnit" + } + } + }], + "elseActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getAbilityDataAsID", + "dataField": "A" + } + }] + }] + }], + "clearBaseType": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "null" + } + }], + "onTransform": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "invuln" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "magim" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "setHp", + "target": { + "type": "getListenerUnit" + }, + "amount": { + "type": "rawFloat", + "value": 100 + }, + "isPercent": { + "type": "rawBoolean", + "value": "true" + } + }], + "onUnTransform": [{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + }] + }, + "onAddDisabledAbility": [{ + "type": "createStateModBuff", + "buffType": "INVULNERABLE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "invuln" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "MAGIC_IMMUNE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "magim" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "HPGENPCT" + } + }, + "stackingKey": { + "type": "getAllowStackingKey" + }, + "value": { + "type": "rawFloat", + "value": -1 + } + },{ + "type": "createDeathReplacementEffect", + "actions": [{ + "type": "if", + "condition": { + "type": "not", + "condition": { + "type": "isUnitType", + "unit": { + "type": "getCastingUnit" + }, + "unitType": { + "type": "getAbilityUnitId" + } + } + }, + "thenActions": [{ + "type": "setReviving" + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "invuln" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "magim" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "setHp", + "target": { + "type": "getCastingUnit" + }, + "amount": { + "type": "rawFloat", + "value": 1 + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "storeBaseType" + } + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "transformUnit", + "unit": { + "type": "getCastingUnit" + }, + "baseUnitId": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "baseType" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + }, + "alternateUnitId": { + "type": "getAbilityUnitId" + }, + "immediateLanding": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 2 + } + } + }, + "immediateTakeOff": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 4 + } + } + }, + "permanent": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 8 + } + } + }, + "requiresPayment": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 16 + } + } + }, + "altitudeAdjustmentDelay": { + "type": "getAbilityCastTime" + }, + "altitudeAdjustmentTime": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "landingDelayTime": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "transformTime": { + "type": "getAbilityDuration" + }, + "duration": { + "type": "getAbilityHeroDuration" + }, + "buffId": { + "type": "getWar3IDFromString", + "id": "Bphx" + }, + "onTransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" + } + }], + "onUntransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "clearBaseType" + } + }] + },{ + "type": "forceBeginCreatedBehavior" + }] + }] + },{ + "type": "if", + "condition": { + "type": "isUnitType", + "unit": { + "type": "getCastingUnit" + }, + "unitType": { + "type": "getAbilityUnitId" + } + }, + "thenActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "storeBaseType" + } + },{ + "type": "transformedUnitAbilityAdd", + "unit": { + "type": "getCastingUnit" + }, + "baseUnitId": { + "type": "getAbilityDataAsID", + "dataField": "A" + }, + "alternateUnitId": { + "type": "getAbilityUnitId" + }, + "immediateLanding": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 2 + } + } + }, + "immediateTakeOff": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 4 + } + } + }, + "permanent": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 8 + } + } + }, + "requiresPayment": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 16 + } + } + }, + "altitudeAdjustmentDelay": { + "type": "getAbilityCastTime" + }, + "altitudeAdjustmentTime": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "landingDelayTime": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "transformTime": { + "type": "getAbilityDuration" + }, + "duration": { + "type": "getAbilityHeroDuration" + }, + "buffId": { + "type": "getWar3IDFromString", + "id": "Bphx" + }, + "onTransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" + } + }], + "onUntransformActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onUnTransform" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "clearBaseType" + } + }] + }] + }], + "onAddAbility": [{ + "type": "addDeathReplacementEffect", + "target": { + "type": "getCastingUnit" + }, + "priority": { + "type": "rawPriority", + "priority": "PHOENIXREVIVE" + }, + "listener": { + "type": "getLastCreatedDeathReplacement" + } + }], + "onRemoveAbility": [{ + "type": "removeDeathReplacementEffect", + "target": { + "type": "getCastingUnit" + }, + "priority": { + "type": "rawPriority", + "priority": "PHOENIXREVIVE" + }, + "listener": { + "type": "getLastCreatedDeathReplacement" + } + }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/activeBuffs.json b/core/assets/abilityBehaviors/activeBuffs.json index f8fd8f61e..216610929 100644 --- a/core/assets/abilityBehaviors/activeBuffs.json +++ b/core/assets/abilityBehaviors/activeBuffs.json @@ -729,7 +729,7 @@ "periodicActions": [{ "type": "damageTarget", "source": { - "type": "getCastingUnit" + "type": "getBuffCastingUnit" }, "target": { "type": "getBuffedUnit" diff --git a/core/assets/abilityBehaviors/activeDebuffs.json b/core/assets/abilityBehaviors/activeDebuffs.json index 103fb4f20..f301e3d8a 100644 --- a/core/assets/abilityBehaviors/activeDebuffs.json +++ b/core/assets/abilityBehaviors/activeDebuffs.json @@ -872,7 +872,7 @@ "periodicActions": [{ "type": "damageTarget", "source": { - "type": "getCastingUnit" + "type": "getBuffCastingUnit" }, "target": { "type": "getBuffedUnit" diff --git a/core/assets/abilityBehaviors/auras.json b/core/assets/abilityBehaviors/auras.json index a457a693c..6a929bdf3 100644 --- a/core/assets/abilityBehaviors/auras.json +++ b/core/assets/abilityBehaviors/auras.json @@ -110,16 +110,6 @@ "percentageBooleanField": "B" }] } - },{ - "ids": [{"id":"AIva"}], - "type": "TEMPLATE", - "templateFields": { - "templateType": "PASSIVE_STATS", - "statBuffsFromDataFields": [{ - "type": "HPSTEAL", - "dataField": "A" - }] - } },{ "ids": [{"id":"AIas"}], "type": "TEMPLATE", diff --git a/core/assets/abilityBehaviors/generalPassives.json b/core/assets/abilityBehaviors/generalPassives.json index 08b47e9c0..848df5006 100644 --- a/core/assets/abilityBehaviors/generalPassives.json +++ b/core/assets/abilityBehaviors/generalPassives.json @@ -223,220 +223,6 @@ "type": "getLastCreatedBuff" } }] - },{ - "ids": [{"id":"AHbh"},{"id":"AOcr"},{"id":"ANdb"}], - "type": "PASSIVE", - "onAddAbility": [{ - "type": "createAttackPreDamageListener", - "actions": [{ - "type": "if", - "condition": { - "type": "and", - "conditions": [{ - "type": "isUnitValidTarget", - "target": { - "type": "getAttackedUnit" - } - },{ - "type": "f<", - "value1": { - "type": "randomBoundedFloat", - "bound": { - "type": "rawFloat", - "value": 100 - } - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - }] - }, - "thenActions": [{ - "type": "if", - "condition": { - "type": "f!=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - }, - "thenActions": [{ - "type": "addDamageDealtMultiplier", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - - }], - "elseActions": [] - },{ - "type": "addBonusDamageDealt", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - },{ - "type": "addStunBuff", - "target": { - "type": "getAttackedUnit" - }, - "buffId": { - "type": "getFirstBuffId" - }, - "duration": { - "type": "getAbilityDuration", - "target": { - "type": "getAttackedUnit" - } - } - },{ - "type": "setStacking", - "allowStacking": { - "type": "rawBoolean", - "value": "false" - }, - "allowSamePriorityStacking": { - "type": "rawBoolean", - "value": "false" - } - }], - "elseActions": [] - }] - },{ - "type": "addAttackPreDamageListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "priority": { - "type": "rawPriority", - "priority": "CRITBASH" - }, - "listener": { - "type": "getLastCreatedAttackPreDamageListener" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "crit" - }, - "valueToStore": { - "type": "getLastCreatedAttackPreDamageListener" - } - },{ - "type": "createAttackPreDamageListener", - "actions": [{ - "type": "if", - "condition": { - "type": "bool", - "bool": { - "type": "getAbilityDataAsBoolean", - "dataField": "E" - } - }, - "thenActions": [{ - "type": "preDamageListenerSetMiss", - "miss": { - "type": "rawBoolean", - "value": "false" - } - },{ - "type": "setStacking", - "allowStacking": { - "type": "rawBoolean", - "value": "true" - }, - "allowSamePriorityStacking": { - "type": "rawBoolean", - "value": "false" - } - }], - "elseActions": [] - }] - },{ - "type": "addAttackPreDamageListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "priority": { - "type": "rawPriority", - "priority": "ACCURACY" - }, - "listener": { - "type": "getLastCreatedAttackPreDamageListener" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "nomiss" - }, - "valueToStore": { - "type": "getLastCreatedAttackPreDamageListener" - } - },{ - "type": "createEvasionListener", - "conditions": [{ - "type": "f<", - "value1": { - "type": "randomFloat" - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - } - }] - },{ - "type": "addEvasionListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "listener": { - "type": "getLastCreatedEvasionListener" - } - }], - "onRemoveAbility": [{ - "type": "removeAttackPreDamageListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "priority": { - "type": "rawPriority", - "priority": "CRITBASH" - }, - "listener": { - "type": "getStoredAttackPreDamageListenerByKey", - "key": { - "type": "rawString", - "value": "crit" - } - } - },{ - "type": "removeAttackPreDamageListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "priority": { - "type": "rawPriority", - "priority": "ACCURACY" - }, - "listener": { - "type": "getStoredAttackPreDamageListenerByKey", - "key": { - "type": "rawString", - "value": "nomiss" - } - } - },{ - "type": "removeEvasionListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "listener": { - "type": "getLastCreatedEvasionListener" - } - }] },{ "ids": [{"id":"AEev"}], "type": "PASSIVE", @@ -1071,7 +857,7 @@ "type": "if", "condition": { "type": "isNewBehaviorCategoryInList", - "list": ["ATTACK","SPELL"] + "list": ["ATTACK","SPELL","BUILD"] }, "thenActions": [{ "type": "removeBuff", @@ -1736,7 +1522,8 @@ },{ "ids": [{"id":"Agyv"},{"id":"Adts"},{"id":"Adet"},{"id":"Abdt"},{"id":"Atru"}], "type": "PASSIVE", - "onAddAbility": [{ + "reuseActions": { + "setup": [{ "type": "createStateModBuff", "buffType": "DETECTOR", "value": { @@ -1752,22 +1539,89 @@ "type": "getAbilityCastRange" } } - },{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" + }], + "detect": [{ + "type": "createSpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "effectType": "CASTER" + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }], + "undetect": [{ + "type": "removeSpellEffect", + "effectToRemove": { + "type": "getLastCreatedSpellEffect" + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }], + "onAddAbility": [{ + "type": "if", + "condition": { + "type": "isUnitConstructing" + }, + "thenActions": [{ + "type": "createWidgetEvent", + "eventType": "EVENT_UNIT_CONSTRUCT_FINISH", + "widget": { + "type": "u2w", + "unit": { + "type": "getCastingUnit" + } + }, + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "detect" + } + },{ + "type": "unregisterWidgetEvent", + "event": { + "type": "getLastCreatedWidgetEvent" + } + }] + },{ + "type": "registerWidgetEvent", + "event": { + "type": "getLastCreatedWidgetEvent" + } + }], + "elseActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "detect" } + }] }], "onRemoveAbility": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "undetect" } }] },{ @@ -2560,5 +2414,209 @@ } } }] + },{ + "ids": [{"id":"Aloc"}], + "type": "HIDDEN", + "onAddDisabledAbility": [{ + "type": "createStateModBuff", + "buffType": "INVULNERABLE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "invuln" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "UNENUMERABLE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "unenum" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "UNSELECTABLE", + "value": { + "type": "playerMaskAllPlayers" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "unsel" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "UNTARGETABLE", + "value": { + "type": "playerMaskAllPlayers" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "untar" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + }], + "onAddAbility": [{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "invuln" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "unenum" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "unsel" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "untar" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }], + "onRemoveAbility": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "invuln" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "unenum" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "unsel" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "untar" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/humanUnitActives.json b/core/assets/abilityBehaviors/humanUnitActives.json index 54f3d661e..0a8947dcd 100644 --- a/core/assets/abilityBehaviors/humanUnitActives.json +++ b/core/assets/abilityBehaviors/humanUnitActives.json @@ -1528,7 +1528,7 @@ "type": "if", "condition": { "type": "isNewBehaviorCategoryInList", - "list": ["ATTACK","SPELL"] + "list": ["ATTACK","SPELL","BUILD"] }, "thenActions": [{ "type": "removeBuff", diff --git a/core/assets/abilityBehaviors/neutralHeroUnitActives.json b/core/assets/abilityBehaviors/neutralHeroUnitActives.json index 1347cad37..3d4a5af62 100644 --- a/core/assets/abilityBehaviors/neutralHeroUnitActives.json +++ b/core/assets/abilityBehaviors/neutralHeroUnitActives.json @@ -78,7 +78,7 @@ }], "elseActions": [{ "type": "subtractMp", - "target": { + "unit": { "type": "getListenerUnit" }, "amount": { diff --git a/core/assets/abilityBehaviors/orcHeroActives.json b/core/assets/abilityBehaviors/orcHeroActives.json index fdfbbe61f..5822ae659 100644 --- a/core/assets/abilityBehaviors/orcHeroActives.json +++ b/core/assets/abilityBehaviors/orcHeroActives.json @@ -8,9 +8,172 @@ "value": "true" } }, - "onAddAbility": [{ + "reuseActions": { + "addStateMods": [{ + "type": "changeAttackActionToMovement" + },{ + "type": "addBehaviorChangeListener", + "unit": { + "type": "getBuffedUnit" + }, + "listener": { + "type": "getLastCreatedBehaviorChangeListener" + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "invisBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "dcstBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "datkBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }], + "removeStateMods": [{ + "type": "removeBehaviorChangeListener", + "unit": { + "type": "getBuffedUnit" + }, + "listener": { + "type": "getLastCreatedBehaviorChangeListener" + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "invisBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "dcstBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "datkBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }] + }, + "onAddDisabledAbility": [{ "type": "createStateModBuff", "buffType": "INVISIBLE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "invisBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "DISABLE_AUTO_CAST" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "dcstBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "DISABLE_AUTO_ATTACK" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "datkBuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } },{ "type": "createNonStackingStatBuff", "buffType": { @@ -28,6 +191,128 @@ "type": "getAbilityDataAsFloat", "dataField": "B" } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "if", + "condition": { + "type": "bool", + "bool": { + "type": "getAbilityDataAsBoolean", + "dataField": "D" + } + }, + "thenActions": [{ + "type": "preDamageListenerSetMiss", + "miss": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "true" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "nomiss" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "addBonusDamageDealt", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "lockDamageModifications" + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 0 + }, + "preLaunchModification": [{ + "type": "if", + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "thenActions": [{ + "type": "attackModifierAddAnimationTag", + "tag": { + "type": "rawString", + "value": "SLAM" + } + },{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + }], + "elseActions": [{ + "type": "removeBuff", + "target": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }], + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "removeBuff", + "target": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + },{ + "type": "createBehaviorChangeListener", + "actions": [{ + "type": "if", + "condition": { + "type": "isNewBehaviorCategoryInList", + "list": ["SPELL"] + }, + "thenActions": [{ + "type": "removeBuff", + "target": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] }], "onLevelChange": [{ "type": "updateNonStackingStatBuff", @@ -40,14 +325,57 @@ } }], "onEndCasting": [{ - "type": "createTimedBuff", - "buffId": { - "type": "getFirstBuffId" - }, - "duration": { - "type": "getAbilityHeroDuration" - }, - "onAddActions": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityHeroDuration" + }, + "onAddActions": [{ + "type": "disableAbility" + },{ + "type": "setUnitMovementTypeNoCollision", + "unit": { + "type": "getBuffedUnit" + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "addAttackModifier", + "unit": { + "type": "getBuffedUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + },{ + "type": "addAttackPreDamageListener", + "targetUnit": { + "type": "getBuffedUnit" + }, + "priority": { + "type": "rawPriority", + "priority": "ACCURACY" + }, + "listener": { + "type": "getStoredAttackPreDamageListenerByKey", + "key": { + "type": "rawString", + "value": "nomiss" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ "type": "if", "condition": { "type": "f!=0", @@ -57,167 +385,146 @@ } }, "thenActions": [{ - "type": "createTimer", - "timeout": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - }, - "actions": [{ - "type": "setUnitMovementTypeNoCollision", - "unit": { - "type": "getBuffedUnit" - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" + "type": "createTimer", + "timeout": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "addStateMods" } }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "fadeTimer" + }, + "valueToStore": { + "type": "getLastCreatedTimer" + } },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "fadeTimer" + "type": "setUnitFadeTimer", + "targetUnit": { + "type": "getBuffedUnit" }, - "valueToStore": { + "timer": { "type": "getLastCreatedTimer" } - },{ - "type": "setUnitFadeTimer", - "targetUnit": { - "type": "getBuffedUnit" - }, - "timer": { - "type": "getLastCreatedTimer" - } }], "elseActions": [{ - "type": "setUnitMovementTypeNoCollision", - "unit": { - "type": "getBuffedUnit" - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] - }], - "onRemoveActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "addStateMods" + } + }] + }], + "onRemoveActions": [{ + "type": "enableAbility" + },{ + "type": "setUnitMovementTypeNoCollision", + "unit": { + "type": "getBuffedUnit" + }, + "active": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "removeAttackModifier", + "unit": { + "type": "getBuffedUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + },{ + "type": "removeAttackPreDamageListener", + "targetUnit": { + "type": "getBuffedUnit" + }, + "priority": { + "type": "rawPriority", + "priority": "ACCURACY" + }, + "listener": { + "type": "getStoredAttackPreDamageListenerByKey", + "key": { + "type": "rawString", + "value": "nomiss" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "if", + "condition": { + "type": "f!=0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "thenActions": [{ "type": "if", "condition": { - "type": "f!=0", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" + "type": "isTimerActive", + "timer": { + "type": "getStoredTimerByKey", + "key": { + "type": "rawString", + "value": "fadeTimer" + } } }, "thenActions": [{ - "type": "if", - "condition": { - "type": "isTimerActive", - "timer": { - "type": "getStoredTimerByKey", - "key": { - "type": "rawString", - "value": "fadeTimer" - } + "type": "removeTimer", + "timer": { + "type": "getStoredTimerByKey", + "key": { + "type": "rawString", + "value": "fadeTimer" } - }, - "thenActions": [{ - "type": "removeTimer", - "timer": { - "type": "getStoredTimerByKey", - "key": { - "type": "rawString", - "value": "fadeTimer" - } - } - }], - "elseActions": [{ - "type": "setUnitMovementTypeNoCollision", - "unit": { - "type": "getBuffedUnit" - }, - "active": { - "type": "rawBoolean", - "value": "false" - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] + } }], "elseActions": [{ - "type": "setUnitMovementTypeNoCollision", - "unit": { - "type": "getBuffedUnit" - }, - "active": { - "type": "rawBoolean", - "value": "false" - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - }] - }] - },{ - "type": "addBuff", - "target": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedBuff" - } - }] + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "removeStateMods" + } + }] + }], + "elseActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "removeStateMods" + } + }] + }] + },{ + "type": "addBuff", + "target": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/undeadUnitActives.json b/core/assets/abilityBehaviors/undeadUnitActives.json index 5c25376f0..d8f2297a1 100644 --- a/core/assets/abilityBehaviors/undeadUnitActives.json +++ b/core/assets/abilityBehaviors/undeadUnitActives.json @@ -465,7 +465,7 @@ }, "thenActions": [{ "type": "subtractMp", - "target": { + "unit": { "type": "getCastingUnit" }, "amount": { diff --git a/core/assets/abilityBehaviors_compatibility/incineratePassive.json b/core/assets/abilityBehaviors_compatibility/incineratePassive.json new file mode 100644 index 000000000..fd09b79f7 --- /dev/null +++ b/core/assets/abilityBehaviors_compatibility/incineratePassive.json @@ -0,0 +1,267 @@ +{ + "abilityList": [{ + "ids": [{"id":"ANic"}], + "type": "PASSIVE", + "reuseActions": { + "explode": [{ + "type": "createTimer", + "timeout": { + "type": "getAbilityDataAsFloat", + "dataField": "F" + }, + "actions": [{ + "type": "damageBurst", + "source": { + "type": "getBuffCastingUnit" + }, + "target": { + "type": "getUnitLocation", + "unit": { + "type": "getBuffedUnit" + } + }, + "validTarget": { + "type": "isUnitEnemy", + "unit": { + "type": "getEnumUnit" + } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "fullDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "partialDamage": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "partialDamageRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + }] + }], + "onHit": [{ + "type": "if", + "condition": { + "type": "doesUnitHaveBuff", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "thenActions": [{ + "type": "buffStoreUniqueValue", + "buff": { + "type": "getBuffById", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "key": { + "type": "rawString", + "value": "incinerate" + }, + "valueToStore": { + "type": "f+", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "value2": { + "type": "getBuffUniqueValueFloat", + "buff": { + "type": "getBuffById", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "key": { + "type": "rawString", + "value": "incinerate" + } + } + } + },{ + "type": "addBonusDamageDealt", + "value": { + "type": "getBuffUniqueValueFloat", + "buff": { + "type": "getBuffById", + "unit": { + "type": "getAttackedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + }, + "key": { + "type": "rawString", + "value": "incinerate" + } + } + }], + "elseActions": [{ + "type": "addBonusDamageDealt", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }] + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAttackedUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "uniqueValues": { + "incinerate": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "onAddActions": [{ + "type": "setExplodesOnDeath", + "unit": { + "type": "getBuffedUnit" + }, + "explodes": { + "type": "rawBoolean", + "value": "true" + }, + "buffId": { + "type": "getFirstBuffId" + } + }], + "onRemoveActions": [{ + "type": "if", + "condition": { + "type": "isUnitDead", + "unit": { + "type": "getBuffedUnit" + } + }, + "thenActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "explode" + } + }], + "elseActions": [{ + "type": "setExplodesOnDeath", + "unit": { + "type": "getBuffedUnit" + }, + "explodes": { + "type": "rawBoolean", + "value": "false" + }, + "buffId": { + "type": "getFirstBuffId" + } + }] + }] + },{ + "type": "addBuff", + "target": { + "type": "getAttackedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "createAttackPreDamageListener", + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 1 + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getAttackedUnit" + } + }, + "modification": [{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors_compatibility/locust.json b/core/assets/abilityBehaviors_compatibility/locust.json new file mode 100644 index 000000000..0895cb1e3 --- /dev/null +++ b/core/assets/abilityBehaviors_compatibility/locust.json @@ -0,0 +1,219 @@ +{ + "abilityList": [{ + "ids": [{"id":"Aloc"}], + "type": "HIDDEN", + "onAddDisabledAbility": [{ + "type": "createStateModBuff", + "buffType": "INVULNERABLE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "invuln" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "UNENUMERABLE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "unenum" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "UNSELECTABLE", + "value": { + "type": "playerMaskAllPlayers" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "unsel" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "UNTARGETABLE", + "value": { + "type": "playerMaskAllPlayers" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "untar" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createUnitStateListener", + "onHideStateChanged": [{ + "type": "if", + "condition": { + "type": "isUnitHidden", + "unit": { + "type": "getCastingUnit" + } + }, + "thenActions": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "unenum" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "unsel" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "removeUnitStateListener", + "unit": { + "type": "getCastingUnit" + }, + "listener": { + "type": "getLastCreatedUnitStateListener" + } + }] + }] + }], + "onAddAbility": [{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "invuln" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "unenum" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "unsel" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "untar" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addUnitStateListener", + "unit": { + "type": "getCastingUnit" + }, + "listener": { + "type": "getLastCreatedUnitStateListener" + } + }], + "onRemoveAbility": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getCastingUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "invuln" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors_compatibility/parasite.json b/core/assets/abilityBehaviors_compatibility/parasite.json new file mode 100644 index 000000000..a4a6585ff --- /dev/null +++ b/core/assets/abilityBehaviors_compatibility/parasite.json @@ -0,0 +1,412 @@ +{ + "abilityList": [{ + "ids": [{"id":"ANpa", "castId": "parasite", "autoCastOnId": "parasiteon", "autoCastOffId": "parasiteoff", "autoCastType": "FARTHESTVALID"}], + "type": "NORMAL_UNITTARGET", + "overrideFields": { + "castTimeOverride": { + "type": "rawFloat", + "value": 0.0 + } + }, + "extraTargetConditions": [{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "not", + "condition": { + "type": "isUnitSummoned", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + }, + "reason": "UNABLE_TO_TARGET_SUMMONED_UNITS" + }], + "extraAutoTargetConditions": [{ + "type": "not", + "condition": { + "type": "doesUnitHaveBuff", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + } + }], + "reuseActions": { + "setup": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "parasite" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "parasite" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "levelChange": [{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createUnitTargetedProjectile", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getAlias" + }, + "onHit": [{ + "type": "checkAbilityProjReaction", + "target": { + "type": "getProjectileHitUnit" + }, + "projectile": { + "type": "getReactionAbilityProjectile" + }, + "onHitActions": [{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getProjectileHitUnit" + }, + "onHitActions": [{ + "type": "if", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 7 + } + } + }, + "elseActions": [{ + "type": "createTimedTickingBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getProjectileHitUnit" + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "onAddActions": [{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "addNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "damageTarget", + "source": { + "type": "getBuffCastingUnit" + }, + "target": { + "type": "getBuffedUnit" + }, + "nonlethal": { + "type": "not", + "condition": { + "type": "i2b", + "value": { + "type": "i&", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "D" + }, + "value2": { + "type": "rawInteger", + "value": 8 + } + } + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }], + "delaySeconds": { + "type": "rawFloat", + "value": 1 + }, + "unique": { + "type": "getUnitHandleAsString", + "unit": { + "type": "getBuffedUnit" + } + } + }], + "onRemoveActions": [{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + } + },{ + "type": "removeNonStackingStatBuff", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + } + },{ + "type": "if", + "condition": { + "type": "isUnitDead", + "unit": { + "type": "getBuffedUnit" + } + }, + "thenActions": [{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "E" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "owner": { + "type": "getOwnerOfUnit", + "unit": { + "type": "getBuffCastingUnit" + } + }, + "loc": { + "type": "getUnitLocation", + "unit": { + "type": "getBuffedUnit" + } + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getBuffedUnit" + } + } + },{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getSecondBuffId" + }, + "duration": { + "type": "getAbilityCastTime" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + },{ + "type": "cleanUpCastInstance" + }] + }] + }] + },{ + "type": "addBuff", + "target": { + "type": "getProjectileHitUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }] + }] + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "levelChange" + } + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/compatibility/rejuvenation.json b/core/assets/abilityBehaviors_compatibility/rejuvenation.json similarity index 100% rename from core/assets/abilityBehaviors/compatibility/rejuvenation.json rename to core/assets/abilityBehaviors_compatibility/rejuvenation.json diff --git a/core/assets/warsmash.ini b/core/assets/warsmash.ini index 809aa4dbf..d1b82f4f6 100644 --- a/core/assets/warsmash.ini +++ b/core/assets/warsmash.ini @@ -64,4 +64,11 @@ InputHotkeyMode=1 // using RoC Beta MDX assets with TFT format converted textures while activating // this setting, meaning that it probably won't work for you unless you know // what you're doing. -ParseReignOfChaosBetaModelsInstead=0 \ No newline at end of file +ParseReignOfChaosBetaModelsInstead=0 + +// Some abilities can be loaded in compatibility mode to more closely mirror the +// way those abilities work in War3. This usually involves causing those abilities +// to act in stranger or less predictable ways. +// +// The setting can be a list of IDs, or just "all" to load all possible abilities +AbilityCompatibility=Aloc,ANpa diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index b16aaa091..aa290f621 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -5061,6 +5061,15 @@ public JassValue call(final List arguments, final GlobalScope globalS return new HandleJassValue(unitType, ((CommonTriggerExecutionScope) triggerScope).getKillingUnit()); }); + jassProgramVisitor.getJassNativeManager().createNative("GetEventDamageSource", + (arguments, globalScope, triggerScope) -> { + return new HandleJassValue(unitType, + ((CommonTriggerExecutionScope) triggerScope).getDamageSource()); + }); + jassProgramVisitor.getJassNativeManager().createNative("GetEventDamage", + (arguments, globalScope, triggerScope) -> { + return RealJassValue.of(((CommonTriggerExecutionScope) triggerScope).getDamageTaken()); + }); jassProgramVisitor.getJassNativeManager().createNative("GetTriggerUnit", (arguments, globalScope, triggerScope) -> { return new HandleJassValue(unitType, diff --git a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java index c284e09c1..488aa6e9c 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java +++ b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java @@ -92,6 +92,8 @@ public class CommonTriggerExecutionScope extends TriggerExecutionScope { private String enumFilePath; // Warsmash only private Map triggerLocalStore; // warsmash only private int triggerCastId; // Warsmash only + private float damageTaken; + private CUnit damageSource; private JassGameEventsWar3 triggerEventId; @@ -172,6 +174,8 @@ private void copyFrom(final CommonTriggerExecutionScope parentScope) { this.enumFilePath = parentScope.enumFilePath; this.triggerLocalStore = parentScope.triggerLocalStore; this.triggerEventId = parentScope.triggerEventId; + this.damageTaken = parentScope.damageTaken; + this.damageSource = parentScope.damageSource; } public CUnit getEnumUnit() { @@ -454,6 +458,14 @@ public int getTriggerCastId() { return this.triggerCastId; } + public float getDamageTaken() { + return this.damageTaken; + } + + public CUnit getDamageSource() { + return this.damageSource; + } + public static CommonTriggerExecutionScope filterScope(final TriggerExecutionScope parentScope, final CUnit filterUnit) { final CommonTriggerExecutionScope scope = new CommonTriggerExecutionScope(parentScope.getTriggeringTrigger(), @@ -544,6 +556,16 @@ public static CommonTriggerExecutionScope unitLeaveRegionScope(final JassGameEve return scope; } + public static CommonTriggerExecutionScope simpleUnitScope(final JassGameEventsWar3 triggerEventId, + final Trigger trigger, final CUnit unit, final CPlayerJass player) { + final CommonTriggerExecutionScope scope = new CommonTriggerExecutionScope(trigger, TriggerExecutionScope.EMPTY); + scope.triggeringUnit = unit; + scope.triggeringPlayer = player; + scope.triggerWidget = unit; + scope.triggerEventId = triggerEventId; + return scope; + } + public static CommonTriggerExecutionScope playerHeroLevelScope(final JassGameEventsWar3 triggerEventId, final Trigger trigger, final CUnit hero) { final CommonTriggerExecutionScope scope = new CommonTriggerExecutionScope(trigger, TriggerExecutionScope.EMPTY); @@ -676,6 +698,16 @@ public static CommonTriggerExecutionScope unitConstructFinishScope(final JassGam return scope; } + public static CommonTriggerExecutionScope unitConstructCancelScope(final JassGameEventsWar3 triggerEventId, + final Trigger trigger, final CUnit cancelledStructure, final CUnit constructingUnit) { + final CommonTriggerExecutionScope scope = new CommonTriggerExecutionScope(trigger, TriggerExecutionScope.EMPTY); + scope.triggerWidget = cancelledStructure; + scope.triggeringUnit = cancelledStructure; + scope.cancelledStructure = cancelledStructure; + scope.triggerEventId = triggerEventId; + return scope; + } + public static CommonTriggerExecutionScope unitTrainFinishScope(final JassGameEventsWar3 triggerEventId, final Trigger trigger, final CUnit trainingUnit, final CUnit trainedUnit) { final CommonTriggerExecutionScope scope = new CommonTriggerExecutionScope(trigger, TriggerExecutionScope.EMPTY); @@ -750,6 +782,15 @@ public static CommonTriggerExecutionScope unitSpellPointScope(final JassGameEven return scope; } + public static CommonTriggerExecutionScope unitDamageTakenScope(final JassGameEventsWar3 triggerEventId, + final Trigger trigger, final CUnit damagedUnit, final CUnit source, final float damage) { + final CommonTriggerExecutionScope scope = new CommonTriggerExecutionScope(trigger, TriggerExecutionScope.EMPTY); + scope.damageTaken = damage; + scope.damageSource = source; + scope.triggeringUnit = damagedUnit; + return scope; + } + public static CommonTriggerExecutionScope unitSpellNoTargetScope(final JassGameEventsWar3 triggerEventId, final Trigger trigger, final CAbility spellAbility, final CUnit spellAbilityUnit, final War3ID spellAbilityId) { diff --git a/core/src/com/etheller/warsmash/util/WarsmashConstants.java b/core/src/com/etheller/warsmash/util/WarsmashConstants.java index f32a12b49..767624fc8 100644 --- a/core/src/com/etheller/warsmash/util/WarsmashConstants.java +++ b/core/src/com/etheller/warsmash/util/WarsmashConstants.java @@ -63,6 +63,8 @@ public class WarsmashConstants { public static final boolean SHOW_FPS = true; + public static List ABILITY_COMPATIBILITY = null; + public static void loadConstants(final GameObject emulatorConstants, final DataTable warsmashIni) { MAX_PLAYERS = emulatorConstants.getFieldValue("MaxPlayers"); GAME_VERSION = emulatorConstants.getFieldValue("GameVersion"); @@ -104,6 +106,7 @@ public static void loadConstants(final GameObject emulatorConstants, final DataT } } RACE_MANAGER.build(); + ABILITY_COMPATIBILITY = emulatorConstants.getFieldAsList("AbilityCompatibility"); } public static final String getGameId() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java index 1c9906d6f..587c5c865 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java @@ -133,6 +133,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackInstant; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissile; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; @@ -495,8 +496,7 @@ public GenericResource loadMapGeneric(final String path, final FetchDataTypeName final LoadGenericCallback callback) { if (this.mapMpq == null) { return this.loadGeneric(path, dataType, callback); - } - else { + } else { return this.loadGeneric(path, dataType, callback, this.dataSource); } } @@ -507,8 +507,7 @@ public static War3Map beginLoadingMap(final DataSource gameDataSource, final Str final File mapFile = new File(mapFilePath); if (mapFile.exists()) { return new War3Map(gameDataSource, mapFile); - } - else { + } else { throw new IllegalArgumentException("No such map file: " + mapFilePath); } } @@ -525,8 +524,7 @@ public WTS preloadWTS(final War3Map map) { try { this.preloadedWTS = Warcraft3MapObjectData.loadWTS(map); return this.preloadedWTS; - } - catch (final IOException e) { + } catch (final IOException e) { throw new RuntimeException(e); } } @@ -563,8 +561,7 @@ public SimulationRenderComponentLightning createLightning(final War3ID lightning source.setLifeSpanRemaining(duration); target.setLifeSpanRemaining(duration); } - } - else { + } else { source.setLifeSpanRemaining(lightningEffectModel.getDuration()); target.setLifeSpanRemaining(lightningEffectModel.getDuration()); } @@ -619,8 +616,7 @@ public void spawnFxOnOrigin(final RenderUnit renderUnit, final String heroLevelU if ((index != -1) && false) { final MdxNode attachment = renderUnit.instance.getAttachment(index); modelInstance.setParent(attachment); - } - else { + } else { modelInstance.setLocation(renderUnit.location); } @@ -655,8 +651,7 @@ private void loadSounds() { public void loadAfterUI() throws IOException { if (this.unitsAndItemsLoaded) { loadUnitsAndItems(this.allObjectData, this.lastLoadedMapInformation); - } - else { + } else { throw new IllegalStateException("transcription of JS has not loaded a map and has no JS async promises"); } @@ -736,14 +731,12 @@ private void loadDoodadsAndDestructibles(final Warcraft3MapRuntimeObjectData mod pathingTextureImage = TgaFile.readTGA(pathingTexture, this.mapMpq.getResourceAsStream(pathingTexture)); this.filePathToPathingMap.put(pathingTexture.toLowerCase(), pathingTextureImage); - } - catch (final Exception exc) { + } catch (final Exception exc) { exc.printStackTrace(); } } } - } - else { + } else { pathingTextureImage = null; } if (pathingTextureImage != null) { @@ -856,8 +849,7 @@ private void createDestructableOrDoodad(final War3ID doodadId, final Warcraft3Ma if (row != null) { createNewDestructable(doodadId, row, doodadVariation, location, facingRadians, lifePercent, scale); } - } - else { + } else { createDoodad(row, doodadVariation, location, facingRadians, scale); } } @@ -886,15 +878,13 @@ private MdxModel getDoodadModel(final int doodadVariation, final GameObject row) String path; if (this.mapMpq.has(fileVar)) { path = fileVar; - } - else { + } else { path = file; } MdxModel model; if (this.mapMpq.has(path)) { model = (MdxModel) load(path, this.mapPathSolver, this.solverParams); - } - else { + } else { model = (MdxModel) load(fileVar, this.mapPathSolver, this.solverParams); } return model; @@ -987,7 +977,8 @@ private CWidget createNewUnit(final Warcraft3MapRuntimeObjectData modifications, } private CWidget createNewUnit(final Warcraft3MapRuntimeObjectData modifications, final War3ID unitId, float unitX, - float unitY, final int playerIndex, int customTeamColor, final float unitAngle, int editorConfigHitPointPercent, int editorConfigManaAmount) { + float unitY, final int playerIndex, int customTeamColor, final float unitAngle, + int editorConfigHitPointPercent, int editorConfigManaAmount) { Splat buildingUberSplat = null; SplatMover buildingUberSplatDynamicIngame = null; BufferedImage buildingPathingPixelMap = null; @@ -997,8 +988,7 @@ private CWidget createNewUnit(final Warcraft3MapRuntimeObjectData modifications, if (sloc.equals(unitId)) { // path = "Objects\\StartLocation\\StartLocation.mdx"; this.startLocations[playerIndex] = new Vector2(unitX, unitY); - } - else { + } else { final RenderUnitType renderUnitType = this.renderUnitTypeData.get(unitId); if (renderUnitType == null) { final RenderItemType renderItemType = this.renderItemTypeData.get(unitId); @@ -1015,12 +1005,10 @@ private CWidget createNewUnit(final Warcraft3MapRuntimeObjectData modifications, renderItem.shadow = createUnitShadow(renderItemType.getRenderShadowType(), unitX, unitY); return simulationItem; - } - else { + } else { System.err.println("Unknown unit ID: " + unitId); } - } - else { + } else { buildingPathingPixelMap = renderUnitType.getBuildingPathingPixelMap(); final float angle = (float) Math.toDegrees(unitAngle); @@ -1031,8 +1019,7 @@ private CWidget createNewUnit(final Warcraft3MapRuntimeObjectData modifications, if (!renderUnitType.isAllowCustomTeamColor() || (customTeamColor == -1)) { if (renderUnitType.getTeamColor() != -1) { customTeamColor = renderUnitType.getTeamColor(); - } - else { + } else { customTeamColor = this.simulation.getPlayer(playerIndex).getColor(); } } @@ -1044,8 +1031,7 @@ private CWidget createNewUnit(final Warcraft3MapRuntimeObjectData modifications, if (texturePath != null) { if (this.unitsReady) { buildingUberSplatDynamicIngame = addUberSplatIngame(unitX, unitY, texturePath, s); - } - else { + } else { if (!this.terrain.splats.containsKey(texturePath)) { this.terrain.splats.put(texturePath, new Splat()); } @@ -1116,16 +1102,14 @@ public BufferedImage loadPathingTexture(final String pathingTexture) { if (pathingTexture.toLowerCase().endsWith(".tga")) { buildingPathingPixelMap = TgaFile.readTGA(pathingTexture, this.mapMpq.getResourceAsStream(pathingTexture)); - } - else { + } else { try (InputStream stream = this.mapMpq.getResourceAsStream(pathingTexture)) { buildingPathingPixelMap = ImageIO.read(stream); System.out.println("LOADING BLP PATHING: " + pathingTexture); } } this.filePathToPathingMap.put(pathingTexture.toLowerCase(), buildingPathingPixelMap); - } - catch (final Exception exc) { + } catch (final Exception exc) { System.err.println("Failure to get pathing: " + exc.getClass() + ":" + exc.getMessage()); } } @@ -1185,8 +1169,7 @@ public void update() { this.updateTime -= WarsmashConstants.SIMULATION_STEP_TIME; this.simulation.update(); this.gameTurnManager.turnCompleted(this.simulation.getGameTurnTick()); - } - else { + } else { if (this.updateTime > (WarsmashConstants.SIMULATION_STEP_TIME * 3)) { this.gameTurnManager.framesSkipped(this.updateTime / WarsmashConstants.SIMULATION_STEP_TIME); this.updateTime = 0; @@ -1309,8 +1292,7 @@ public void doSelectUnit(final List units) { final CPlayer localPlayer = this.simulation.getPlayer(this.localPlayerIndex); if (!localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.PASSIVE)) { allyKey = "e:"; - } - else if (localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.SHARED_CONTROL)) { + } else if (localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.SHARED_CONTROL)) { allyKey = "f:"; } } @@ -1328,8 +1310,7 @@ else if (localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.SHARED_C if (unit.getInstance().hidden()) { splatInstance.hide(); } - } - else { + } else { if (!splats.containsKey(path)) { splats.put(path, new Splat()); } @@ -1429,8 +1410,7 @@ public void showUnitMouseOverHighlight(final RenderWidget unit) { final CPlayer localPlayer = this.simulation.getPlayer(this.localPlayerIndex); if (!localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.PASSIVE)) { allyKey = "e:"; - } - else if (localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.SHARED_CONTROL)) { + } else if (localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.SHARED_CONTROL)) { allyKey = "f:"; } } @@ -1448,8 +1428,7 @@ else if (localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.SHARED_C if (unit.getInstance().hidden()) { splatInstance.hide(); } - } - else { + } else { if (!splats.containsKey(path)) { splats.put(path, new Splat()); } @@ -1518,8 +1497,7 @@ public void getClickLocation(final Vector3 out, final int screenX, final int scr if (intersectWithWater) { RenderMathUtils.intersectRayTriangles(gdxRayHeap, this.terrain.softwareWaterAndGroundMesh.vertices, this.terrain.softwareWaterAndGroundMesh.indices, 3, out); - } - else { + } else { RenderMathUtils.intersectRayTriangles(gdxRayHeap, this.terrain.softwareGroundMesh.vertices, this.terrain.softwareGroundMesh.indices, 3, out); } @@ -1528,8 +1506,7 @@ public void getClickLocation(final Vector3 out, final int screenX, final int scr this.walkableObjectsTree.intersect(rectangleHeap, this.walkablesIntersectionFinder.reset(gdxRayHeap)); if (this.walkablesIntersectionFinder.found) { out.set(this.walkablesIntersectionFinder.intersection); - } - else { + } else { final float oldZ = out.z; out.z = Math.max(getWalkableRenderHeight(out.x, out.y), this.terrain.getGroundHeight(out.x, out.y)); @@ -1586,8 +1563,7 @@ public RenderWidget rayPickUnit(final float x, final float y, final CWidgetFilte if (intersectionHeap.z > groundHeight) { if ((entity == null) && !unit.isIntersectedOnMeshAlways()) { entity = unit; - } - else { + } else { if (instance.intersectRayWithMeshSlow(gdxRayHeap, intersectionHeap)) { if (intersectionHeap.z > this.terrain.getGroundHeight(intersectionHeap.x, intersectionHeap.y)) { @@ -1616,11 +1592,9 @@ public Object call(final InputStream data) { stringBuilder.append(line); stringBuilder.append("\n"); } - } - catch (final UnsupportedEncodingException e) { + } catch (final UnsupportedEncodingException e) { throw new RuntimeException(e); - } - catch (final IOException e) { + } catch (final IOException e) { throw new RuntimeException(e); } return new MappedData(stringBuilder.toString()); @@ -1640,11 +1614,9 @@ public Object call(final InputStream data) { stringBuilder.append(line); stringBuilder.append("\n"); } - } - catch (final UnsupportedEncodingException e) { + } catch (final UnsupportedEncodingException e) { throw new RuntimeException(e); - } - catch (final IOException e) { + } catch (final IOException e) { throw new RuntimeException(e); } return stringBuilder.toString(); @@ -1772,8 +1744,7 @@ public String blp(String iconPath) { public SceneLightManager createLightManager(final boolean simple) { if (simple) { return new W3xScenePortraitLightManager(this, this.lightDirection); - } - else { + } else { return new W3xSceneWorldLightManager(this); } } @@ -2015,8 +1986,7 @@ public List getEffectAttachmentUIList(final War3ID alias, fi default: throw new IllegalArgumentException("Unsupported effect type: " + effectType); } - } - else { + } else { final BuffUI buffUI = War3MapViewer.this.abilityDataUI.getBuffUI(alias); if (buffUI != null) { switch (effectType) { @@ -2035,8 +2005,7 @@ public List getEffectAttachmentUIList(final War3ID alias, fi default: throw new IllegalArgumentException("Unsupported effect type: " + effectType); } - } - else { + } else { return null; } } @@ -2069,8 +2038,7 @@ public EffectAttachmentUI getEffectAttachmentUI(final War3ID alias, final CEffec default: throw new IllegalArgumentException("Unsupported effect type: " + effectType); } - } - else { + } else { final BuffUI buffUI = War3MapViewer.this.abilityDataUI.getBuffUI(alias); if (buffUI != null) { switch (effectType) { @@ -2089,8 +2057,7 @@ public EffectAttachmentUI getEffectAttachmentUI(final War3ID alias, final CEffec default: throw new IllegalArgumentException("Unsupported effect type: " + effectType); } - } - else { + } else { return null; } } @@ -2120,8 +2087,7 @@ public RenderSpellEffect addSpecialEffectTarget(final String modelName, final CW + "\", attachPointName=\"" + attachPointNames + "\""); if (WarsmashConstants.ENABLE_DEBUG) { throw nullPointerException; - } - else { + } else { nullPointerException.printStackTrace(); } } @@ -2154,15 +2120,13 @@ public RenderSpellEffect addSpecialEffectTarget(final String modelName, final CW final MdxNode attachment = renderUnit.instance.getAttachment(index); modelInstance.setParent(attachment); modelInstance.setLocation(0, 0, 0); - } - else { + } else { // TODO This is not consistent with War3, is it? Should look nice though. modelInstance.setLocation(renderUnit.location); yaw = (float) Math.toRadians(renderUnit.getSimulationUnit().getFacing()); } } - } - else { + } else { modelInstance.setLocation(0, 0, 0); } modelInstance.setScene(War3MapViewer.this.worldScene); @@ -2174,12 +2138,10 @@ public RenderSpellEffect addSpecialEffectTarget(final String modelName, final CW War3MapViewer.this.projectiles.add(renderAttackInstant); return renderAttackInstant; } - } - else if (targetWidget instanceof CItem) { + } else if (targetWidget instanceof CItem) { // TODO this is stupid api, who would do this? throw new UnsupportedOperationException("API for addSpecialEffectTarget() on item is NYI"); - } - else if (targetWidget instanceof CDestructable) { + } else if (targetWidget instanceof CDestructable) { // TODO this is stupid api, who would do this? throw new UnsupportedOperationException("API for addSpecialEffectTarget() on destructable is NYI"); } @@ -2216,8 +2178,7 @@ public static MdxModel loadModelMdx(final DataSource dataSource, final ModelView final String mdxPath = mdx(path); if (dataSource.has(mdxPath)) { return (MdxModel) modelViewer.load(mdxPath, pathSolver, solverParams); - } - else { + } else { final String mdlPath = mdl(mdxPath); if (dataSource.has(mdlPath)) { return (MdxModel) modelViewer.load(mdlPath, pathSolver, solverParams); @@ -2250,8 +2211,7 @@ public void setBlight(float whichLocationX, float whichLocationY, final float ra final GroundTexture currentTex = this.terrain.groundTextures.get(corner.getGroundTexture()); if (currentTex.isBuildable()) { changedData |= corner.setBlight(blighted); - } - else { + } else { continue; } @@ -2326,23 +2286,20 @@ private MapLoader(final War3Map war3Map, final War3MapW3i w3iFile, final int loc dataSources.add(compoundDataSource); if (WarsmashConstants.FIX_FLAT_FILES_TILESET_LOADING) { dataSources.add(new SubdirDataSource(compoundDataSource, this.tileset + ".mpq/")); - } - else { + } else { try (InputStream mapStream = compoundDataSource.getResourceAsStream(this.tileset + ".mpq")) { if (mapStream == null) { dataSources.add(new SubdirDataSource(compoundDataSource, this.tileset + ".mpq/")); dataSources.add(new SubdirDataSource(compoundDataSource, "_tilesets/" + this.tileset + ".w3mod/")); - } - else { + } else { final byte[] mapData = IOUtils.toByteArray(mapStream); sbc = new SeekableInMemoryByteChannel(mapData); final DataSource internalMpqContentsDataSource = new MpqDataSource(new MPQArchive(sbc), sbc); dataSources.add(internalMpqContentsDataSource); } - } - catch (final IOException exc) { + } catch (final IOException exc) { dataSources.add(new SubdirDataSource(compoundDataSource, this.tileset + ".mpq/")); dataSources.add( new SubdirDataSource(compoundDataSource, "_tilesets/" + this.tileset + ".w3mod/")); @@ -2355,15 +2312,13 @@ private MapLoader(final War3Map war3Map, final War3MapW3i w3iFile, final int loc // Custom data dataSources.add(new SubdirDataSource(compoundDataSource, "Custom_V" + WarsmashConstants.GAME_VERSION + "\\")); - } - else { + } else { // Melee data dataSources.add(new SubdirDataSource(compoundDataSource, "Melee_V" + WarsmashConstants.GAME_VERSION + "\\")); } this.tilesetSource = new CompoundDataSource(dataSources); - } - catch (final MPQException e) { + } catch (final MPQException e) { throw new RuntimeException(e); } }); @@ -2424,8 +2379,7 @@ private MapLoader(final War3Map war3Map, final War3MapW3i w3iFile, final int loc if (War3MapViewer.this.preloadedWTS != null) { War3MapViewer.this.allObjectData = War3MapViewer.this.mapMpq .readModifications(War3MapViewer.this.preloadedWTS); - } - else { + } else { War3MapViewer.this.allObjectData = War3MapViewer.this.mapMpq.readModifications(); } }); @@ -2443,12 +2397,12 @@ private MapLoader(final War3Map war3Map, final War3MapW3i w3iFile, final int loc public CAttackProjectile createAttackProjectile(final CSimulation simulation, final float launchX, final float launchY, final float launchFacing, final CUnit source, final CUnitAttackMissile unitAttack, final AbilityTarget target, - final float damage, final int bounceIndex, - final CUnitAttackListener attackListener) { + final float damage, final int bounceIndex, final CUnitAttackListener attackListener, + final CUnitAttackSettings settings) { final War3ID typeId = source.getTypeId(); - final int projectileSpeed = unitAttack.getProjectileSpeed(); - final float projectileArc = unitAttack.getProjectileArc(); - final String missileArt = unitAttack.getProjectileArt(); + final int projectileSpeed = settings.getProjectileSpeed(); + final float projectileArc = settings.getProjectileArc(); + final String missileArt = settings.getProjectileArt(); final float projectileLaunchX = simulation.getUnitData().getProjectileLaunchX(typeId); final float projectileLaunchY = simulation.getUnitData().getProjectileLaunchY(typeId); final float projectileLaunchZ = simulation.getUnitData().getProjectileLaunchZ(typeId); @@ -2462,10 +2416,10 @@ public CAttackProjectile createAttackProjectile(final CSimulation simulation, - (projectileLaunchX * cosFacing); final float height = War3MapViewer.this.terrain.getGroundHeight(x, y) - + source.getFlyHeight() + projectileLaunchZ; + + (settings.getZ() != null ? settings.getZ() : (source.getFlyHeight() + projectileLaunchZ)); final CAttackProjectile simulationAttackProjectile = new CAttackProjectileMissile(x, y, projectileSpeed, target, source, damage, unitAttack, bounceIndex, - attackListener); + attackListener, settings); final MdxModel model = loadModelMdx(missileArt); if (model != null) { @@ -2474,14 +2428,19 @@ public CAttackProjectile createAttackProjectile(final CSimulation simulation, modelInstance.setScene(War3MapViewer.this.worldScene); if (bounceIndex == 0) { SequenceUtils.randomBirthSequence(modelInstance); - } - else { + } else { SequenceUtils.randomStandSequence(modelInstance); } modelInstance.setLocation(x, y, height); final RenderProjectile renderAttackProjectile = new RenderProjectile( simulationAttackProjectile, modelInstance, height, projectileArc, War3MapViewer.this); + if (settings.getImpactZ() != null) { + renderAttackProjectile.setImpactZ(War3MapViewer.this, settings.getImpactZ()); + } + if (settings.getArtDeathTime() != null) { + renderAttackProjectile.setDeathTime(settings.getArtDeathTime()); + } War3MapViewer.this.projectiles.add(renderAttackProjectile); } @@ -2498,8 +2457,6 @@ public CAbilityProjectile createProjectile(final CSimulation cSimulation, final War3ID typeId = source.getTypeId(); final AbilityUI spellDataUI = War3MapViewer.this.abilityDataUI.getUI(spellAlias); final EffectAttachmentUIMissile abilityMissileArt = spellDataUI.getMissileArt(0); - final String modelPath = abilityMissileArt == null ? "" - : abilityMissileArt.getModelPath(); final float projectileArc = abilityMissileArt == null ? 0 : abilityMissileArt.getArc(); final String missileArt = abilityMissileArt == null ? "" : abilityMissileArt.getModelPath(); @@ -2540,6 +2497,60 @@ public CAbilityProjectile createProjectile(final CSimulation cSimulation, return simulationAbilityProjectile; } + @Override + public CAbilityProjectile createProjectile(final CSimulation cSimulation, + final float launchX, final float launchY, final float launchFacing, + final CUnit source, final CUnitAttackSettings settings, final AbilityTarget target, + final CAbilityProjectileListener projectileListener) { + final War3ID typeId = source.getTypeId(); + final int projectileSpeed = settings.getProjectileSpeed(); + final float projectileArc = settings.getProjectileArc(); + final String missileArt = settings.getProjectileArt(); + final boolean homing = settings.isProjectileHomingEnabled(); + final float projectileLaunchX = War3MapViewer.this.simulation.getUnitData() + .getProjectileLaunchX(typeId); + final float projectileLaunchY = War3MapViewer.this.simulation.getUnitData() + .getProjectileLaunchY(typeId); + final float projectileLaunchZ = War3MapViewer.this.simulation.getUnitData() + .getProjectileLaunchZ(typeId); + + final float facing = launchFacing; + final float sinFacing = (float) Math.sin(facing); + final float cosFacing = (float) Math.cos(facing); + final float x = launchX + (projectileLaunchY * cosFacing) + + (projectileLaunchX * sinFacing); + final float y = (launchY + (projectileLaunchY * sinFacing)) + - (projectileLaunchX * cosFacing); + + final float height = War3MapViewer.this.terrain.getGroundHeight(x, y) + + (settings.getZ() != null ? settings.getZ() : (source.getFlyHeight() + projectileLaunchZ)); + final CAbilityProjectile simulationAbilityProjectile = new CAbilityProjectile(x, y, + projectileSpeed, target, homing, source, projectileListener); + + final MdxModel model = loadModelMdx(missileArt); + final MdxComplexInstance modelInstance = (MdxComplexInstance) model.addInstance(); + + final RenderUnit renderPeer = getRenderPeer(source); + modelInstance.setTeamColor(renderPeer.playerIndex); + modelInstance.setScene(War3MapViewer.this.worldScene); + SequenceUtils.randomBirthSequence(modelInstance); + modelInstance.setLocation(x, y, height); + final RenderProjectile renderProjectile = new RenderProjectile( + simulationAbilityProjectile, modelInstance, height, projectileArc, + War3MapViewer.this); + if (settings.getImpactZ() != null) { + System.err.println("Setting impact Z to: " + settings.getImpactZ()); + renderProjectile.setImpactZ(War3MapViewer.this, settings.getImpactZ()); + } + if (settings.getArtDeathTime() != null) { + renderProjectile.setDeathTime(settings.getArtDeathTime()); + } + + War3MapViewer.this.projectiles.add(renderProjectile); + + return simulationAbilityProjectile; + } + @Override public CJassProjectile createJassProjectile(final CSimulation cSimulation, final float launchX, final float launchY, final float launchFacing, @@ -2939,9 +2950,14 @@ public void spawnDeathExplodeEffect(final CUnit source, final RenderUnit renderUnit = War3MapViewer.this.unitToRenderPeer.get(source); MdxComplexInstance modelInstance = null; if (explodesOnDeathBuffId != null) { - final EffectAttachmentUI effectAttachmentUI = getEffectAttachmentUI( - explodesOnDeathBuffId, CEffectType.EFFECT, 0); - final String modelPath = effectAttachmentUI.getModelPath(); + EffectAttachmentUI effectAttachmentUI = getEffectAttachmentUI(explodesOnDeathBuffId, + CEffectType.EFFECT, 0); + String modelPath = effectAttachmentUI.getModelPath(); + if (modelPath == null || modelPath.isEmpty()) { + effectAttachmentUI = getEffectAttachmentUI(explodesOnDeathBuffId, + CEffectType.SPECIAL, 0); + modelPath = effectAttachmentUI.getModelPath(); + } final MdxModel spawnedEffectModel = loadModelMdx(modelPath); if (spawnedEffectModel != null) { modelInstance = (MdxComplexInstance) spawnedEffectModel.addInstance(); @@ -3184,12 +3200,12 @@ public void changeUnitScale(final CUnit unit, final float scale, final boolean m renderPeer.selectionScale *= scale; Vector3 newScale = new Vector3(renderPeer.instance.localScale); newScale.scl(scale); - renderPeer.instance.setScale(new float[]{newScale.x,newScale.y,newScale.z}); + renderPeer.instance.setScale(new float[] { newScale.x, newScale.y, newScale.z }); } else { renderPeer.selectionScale = scale; - renderPeer.instance.setScale(new float[]{scale,scale,scale}); + renderPeer.instance.setScale(new float[] { scale, scale, scale }); } - + } @Override @@ -3270,13 +3286,11 @@ public TextTag spawnTextTag(final CUnit unit, final TextTagConfigType configType final Vector3 unitPosition; if (renderPeer != null) { unitPosition = new Vector3(renderPeer.location); - } - else if (unit != null) { + } else if (unit != null) { // try to fudge it and spawn in place of stale unit unitPosition = new Vector3(unit.getX(), unit.getY(), War3MapViewer.this.terrain.getGroundHeight(unit.getX(), unit.getY())); - } - else { + } else { unitPosition = new Vector3(0, 0, 0); } final TextTag textTag = new TextTag(unitPosition, new Vector2(0, 60f), message, @@ -3440,8 +3454,7 @@ public void changeUnitPlayerColor(CUnit unit, int previousColor, int newColor) { War3MapViewer.this.walkableObjectsTree = new Quadtree<>(War3MapViewer.this.terrain.getEntireMap()); if (War3MapViewer.this.doodadsAndDestructiblesLoaded) { loadDoodadsAndDestructibles(War3MapViewer.this.allObjectData, w3iFile); - } - else { + } else { throw new IllegalStateException( "transcription of JS has not loaded a map and has no JS async promises"); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderProjectile.java index 7e84516b8..372dc3d67 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderProjectile.java @@ -13,8 +13,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.War3MapViewer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class RenderProjectile implements RenderEffect { @@ -29,12 +27,13 @@ public class RenderProjectile implements RenderEffect { private final float arcPeakHeight; private float totalTravelDistance; - private final float targetHeight; + private float targetHeight; private float yaw; private float pitch; private boolean done = false; + private float deathTime; private float deathTimeElapsed; public RenderProjectile(final CProjectile simulationProjectile, final MdxComplexInstance modelInstance, @@ -65,6 +64,15 @@ public RenderProjectile(final CProjectile simulationProjectile, final MdxComplex this.targetHeight = (war3MapViewer.terrain.getGroundHeight(targetX, targetY) + flyHeight + impactZ); this.arcPeakHeight = arc * startingDistance; this.yaw = (float) StrictMath.atan2(dyToTarget, dxToTarget); + this.deathTime = war3MapViewer.simulation.getGameplayConstants().getBulletDeathTime(); + } + + public void setDeathTime(float time) { + this.deathTime = time; + } + + public void setImpactZ(final War3MapViewer war3MapViewer, float impactZ) { + this.targetHeight = (war3MapViewer.terrain.getGroundHeight(this.simulationProjectile.getTargetX(), this.simulationProjectile.getTargetY()) + impactZ); } @Override @@ -131,7 +139,7 @@ public boolean updateAnimations(final War3MapViewer war3MapViewer, final float d war3MapViewer.worldScene.instanceMoved(this.modelInstance, this.x, this.y); final boolean everythingDone = this.simulationProjectile.isDone() && (this.modelInstance.sequenceEnded - || (this.deathTimeElapsed >= war3MapViewer.simulation.getGameplayConstants().getBulletDeathTime())); + || (this.deathTimeElapsed >= this.deathTime)); if (everythingDone) { war3MapViewer.worldScene.removeInstance(this.modelInstance); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java index a580e3963..8be8188ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java @@ -622,7 +622,7 @@ public void assignSelectionPreviewHighlight(final SplatMover t) { @Override public boolean isSelectable(final CSimulation simulation, final int byPlayer) { - return this.simulationUnit.isVisible(simulation, byPlayer); // later needs locust + return this.simulationUnit.isVisible(simulation, byPlayer) && this.simulationUnit.isSelectable(simulation, byPlayer); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java index 532627d27..c25b41a70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java @@ -1,5 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.rendersim.commandbuttons; +import java.util.HashSet; +import java.util.Set; + import com.badlogic.gdx.graphics.Texture; import com.etheller.warsmash.parsers.fdf.GameUI; import com.etheller.warsmash.util.War3ID; @@ -66,6 +69,7 @@ public class CommandCardPopulatingAbilityVisitor implements CAbilityVisitor buffVisibleGroups; public CommandCardPopulatingAbilityVisitor reset(final CSimulation game, final GameUI gameUI, final CUnit unit, final CommandButtonListener commandButtonListener, final AbilityDataUI abilityDataUI, @@ -80,13 +84,15 @@ public CommandCardPopulatingAbilityVisitor reset(final CSimulation game, final G this.localPlayerIndex = localPlayerIndex; this.hasStop = false; this.hasCancel = false; + this.buffVisibleGroups = new HashSet<>(); this.previewCallback.setup(this.game.getUnitData(), this.game.getUpgradeData(), this.gameUI.getTemplates()); return this; } @Override public Void accept(final AbilityBuilderActiveAbility ability) { - if ((this.menuBaseOrderId == 0) && ability.isIconShowing()) { + if ((this.menuBaseOrderId == 0 || this.menuBaseOrderId == ability.getIconVisibleMenuId()) + && ability.isIconShowing()) { final AbilityUI ui = this.abilityDataUI.getUI(ability.getAlias()); final boolean autoCastOn = ability.isAutoCastOn(); if (ability.isSeparateOnAndOff()) { @@ -95,16 +101,15 @@ public Void accept(final AbilityBuilderActiveAbility ability) { addCommandButton(ability, ui.getOnIconUI(ability.getLevel() - 1), ability.getHandleId(), ability.getBaseOrderId(), autoCastOn ? ability.getAutoCastOffOrderId() : ability.getAutoCastOnOrderId(), autoCastOn, - false, ability.getUIGoldCost(), ability.getUILumberCost(), ability.getUIFoodCost(), - ability.getUIManaCost(), ability.getUsesRemaining()); - } - else { + ability.isMenuAbility(), ability.getUIGoldCost(), ability.getUILumberCost(), + ability.getUIFoodCost(), ability.getUIManaCost(), ability.getUsesRemaining()); + } else { addCommandButton(ability, ui.getOnIconUI(ability.getLevel() - 1), resolveUnknownIcon(onTt, false, ability.getLevel() - 1), ability.getHandleId(), ability.getBaseOrderId(), autoCastOn ? ability.getAutoCastOffOrderId() : ability.getAutoCastOnOrderId(), autoCastOn, - false, ability.getUIGoldCost(), ability.getUILumberCost(), ability.getUIFoodCost(), - ability.getUIManaCost(), ability.getUsesRemaining()); + ability.isMenuAbility(), ability.getUIGoldCost(), ability.getUILumberCost(), + ability.getUIFoodCost(), ability.getUIManaCost(), ability.getUsesRemaining()); } final War3ID offTt = ability.getOffTooltipOverride(); @@ -112,25 +117,22 @@ public Void accept(final AbilityBuilderActiveAbility ability) { addCommandButton(ability, ui.getOffIconUI(ability.getLevel() - 1), ability.getHandleId(), ability.getOffOrderId(), autoCastOn ? ability.getAutoCastOffOrderId() : ability.getAutoCastOnOrderId(), autoCastOn, - false, ability.getUIGoldCost(), ability.getUILumberCost(), ability.getUIFoodCost(), - ability.getUIManaCost(), -1); - } - else { + ability.isMenuAbility(), ability.getUIGoldCost(), ability.getUILumberCost(), + ability.getUIFoodCost(), ability.getUIManaCost(), -1); + } else { addCommandButton(ability, ui.getOffIconUI(ability.getLevel() - 1), resolveUnknownIcon(offTt, true, ability.getLevel() - 1), ability.getHandleId(), ability.getOffOrderId(), autoCastOn ? ability.getAutoCastOffOrderId() : ability.getAutoCastOnOrderId(), autoCastOn, - false, ability.getUIGoldCost(), ability.getUILumberCost(), ability.getUIFoodCost(), - ability.getUIManaCost(), -1); + ability.isMenuAbility(), ability.getUIGoldCost(), ability.getUILumberCost(), + ability.getUIFoodCost(), ability.getUIManaCost(), -1); } - } - else { + } else { final boolean active = ability.isToggleOn(); War3ID tt = null; if (active) { tt = ability.getOnTooltipOverride(); - } - else { + } else { tt = ability.getOffTooltipOverride(); } if ((tt == null) || (tt == ability.getAlias())) { @@ -138,17 +140,16 @@ public Void accept(final AbilityBuilderActiveAbility ability) { active ? ui.getOffIconUI(ability.getLevel() - 1) : ui.getOnIconUI(ability.getLevel() - 1), ability.getHandleId(), active ? ability.getOffOrderId() : ability.getBaseOrderId(), autoCastOn ? ability.getAutoCastOffOrderId() : ability.getAutoCastOnOrderId(), autoCastOn, - false, ability.getUIGoldCost(), ability.getUILumberCost(), ability.getUIFoodCost(), - ability.getUIManaCost(), active ? -1 : ability.getUsesRemaining()); - } - else { + ability.isMenuAbility(), ability.getUIGoldCost(), ability.getUILumberCost(), + ability.getUIFoodCost(), ability.getUIManaCost(), active ? -1 : ability.getUsesRemaining()); + } else { addCommandButton(ability, active ? ui.getOffIconUI(ability.getLevel() - 1) : ui.getOnIconUI(ability.getLevel() - 1), resolveUnknownIcon(tt, active, ability.getLevel() - 1), ability.getHandleId(), active ? ability.getOffOrderId() : ability.getBaseOrderId(), autoCastOn ? ability.getAutoCastOffOrderId() : ability.getAutoCastOnOrderId(), autoCastOn, - false, ability.getUIGoldCost(), ability.getUILumberCost(), ability.getUIFoodCost(), - ability.getUIManaCost(), active ? -1 : ability.getUsesRemaining()); + ability.isMenuAbility(), ability.getUIGoldCost(), ability.getUILumberCost(), + ability.getUIFoodCost(), ability.getUIManaCost(), active ? -1 : ability.getUsesRemaining()); } } } @@ -175,12 +176,10 @@ private IconUI resolveUnknownIcon(final War3ID id, final boolean active, final i icon = buff.getOnIconUI(); } } - } - else { + } else { if (active) { icon = aui.getOffIconUI(index); - } - else { + } else { icon = aui.getOnIconUI(index); } } @@ -240,8 +239,7 @@ public Void accept(final CAbilityGenericDoNothing ability) { if (abilityUI != null) { addCommandButton(ability, abilityUI.getOnIconUI(ability.getLevel() - 1), ability.getHandleId(), 0, 0, false, false); - } - else { + } else { addCommandButton(ability, this.abilityDataUI.getStopUI(), ability.getHandleId(), 0, 0, false, false); } @@ -329,8 +327,7 @@ public Void accept(final CAbilityColdArrows ability) { int autoCastId; if (autoCastActive) { autoCastId = OrderIds.coldarrows; - } - else { + } else { autoCastId = OrderIds.uncoldarrows; } final IconUI onIconUI = this.abilityDataUI.getUI(ability.getAlias()).getOnIconUI(ability.getLevel() - 1); @@ -406,8 +403,7 @@ private void handleBuildMenu(final AbstractCAbilityBuild ability, final IconUI b simulationUnitType.getFoodUsed(), 0, -1); } } - } - else if (this.menuBaseOrderId == 0) { + } else if (this.menuBaseOrderId == 0) { if (this.multiSelect) { return; } @@ -424,11 +420,15 @@ private void addBuffIcon(final CBuff buff, final IconUI iconUI) { this.commandButtonListener.timedLifeBar(buff.getLevel(), iconUI.getToolTip(), buff.getDurationRemaining(this.game, this.unit), buff.getDurationMax()); } - } - else { + } else { if (buff.isIconShowing()) { + String group = buff.getVisibilityGroup(); + if (group != null && this.buffVisibleGroups.contains(group)) { + return; + } this.commandButtonListener.buff(iconUI.getIcon(), buff.getLevel(), iconUI.getToolTip(), iconUI.getUberTip(), buff.isPositive(), buff.isLeveled()); + this.buffVisibleGroups.add(group); } } } @@ -481,8 +481,7 @@ private void addCommandButton(final CAbility ability, final Texture icon, final final CUnit selectedPlayerUnit = neutralBuildingData.getSelectedPlayerUnit(this.localPlayerIndex); if (selectedPlayerUnit != null) { controlShared = true; - } - else { + } else { requiresPatron = true; } } @@ -500,6 +499,8 @@ private void addCommandButton(final CAbility ability, final Texture icon, final final boolean active = (this.unit.getCurrentBehavior() != null) && (orderId == this.unit.getCurrentBehavior().getHighlightOrderId()); final boolean disabled = ((ability != null) && ability.isDisabled()) || this.previewCallback.isDisabled(); + final boolean clickDisabled = ((ability != null) && ability.isClickDisabled()) + || this.previewCallback.isDisabled(); final float cooldownRemaining = this.previewCallback.getCooldownRemaining(); final float cooldownMax = this.previewCallback.getCooldownMax(); if (disabled) { @@ -512,9 +513,11 @@ private void addCommandButton(final CAbility ability, final Texture icon, final if (this.previewCallback.isShowingRequirements()) { uberTip = this.previewCallback.getRequirementsText() + "|r" + uberTip; } - this.commandButtonListener.commandButton(buttonPosX, buttonPosY, disabled ? iconDisabled : icon, handleId, - disabled ? 0 : orderId, autoCastOrderId, active, autoCastActive, menuButton, toolTip, uberTip, - hotkey, goldCost, lumberCost, foodCost, manaCost, cooldownRemaining, cooldownMax, numberOverlay); + this.commandButtonListener.commandButton(buttonPosX, buttonPosY, + (disabled || clickDisabled) ? iconDisabled : icon, handleId, + (disabled || clickDisabled) ? 0 : orderId, autoCastOrderId, active, autoCastActive, menuButton, + toolTip, uberTip, hotkey, goldCost, lumberCost, foodCost, manaCost, cooldownRemaining, cooldownMax, + numberOverlay); } } @@ -574,8 +577,7 @@ public Void accept(final CAbilityQueue ability) { && (this.game.getPlayer(this.unit.getPlayerIndex()).getHeroTokens() > 0)) { goldCost = 0; lumberCost = 0; - } - else { + } else { goldCost = simulationUnitType.getGoldCost(); lumberCost = simulationUnitType.getLumberCost(); } @@ -638,8 +640,7 @@ public Void accept(final CAbilityUpgrade ability) { if (this.game.getGameplayConstants().isRelativeUpgradeCosts()) { relativeOffsetGold = existingUnitType.getGoldCost(); relativeOffsetLumber = existingUnitType.getLumberCost(); - } - else { + } else { relativeOffsetGold = 0; relativeOffsetLumber = 0; } @@ -674,8 +675,7 @@ public Void accept(final CAbilityHero ability) { unitType.getValue(), 0, false, false, 0, 0, 0, 0, nextLevel); } } - } - else { + } else { if (this.multiSelect) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java index ae2d0bd7e..44e5a2d11 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java @@ -42,6 +42,7 @@ public class CGameplayConstants { private final float frostAttackSpeedDecrease; private final float frostMoveSpeedDecrease; + private final boolean invulnerableSummonsTakeDispelDamage; private final boolean magicImmuneResistsDamage; private final boolean magicImmuneResistsLeech; private final boolean magicImmuneResistsThorns; @@ -223,6 +224,7 @@ public CGameplayConstants(final DataTable parsedDataTable) { this.frostAttackSpeedDecrease = miscData.getFieldFloatValue("FrostAttackSpeedDecrease"); this.frostMoveSpeedDecrease = miscData.getFieldFloatValue("FrostMoveSpeedDecrease"); + this.invulnerableSummonsTakeDispelDamage = miscData.getFieldValue("InvulnSummonDispelDamage") != 0; this.magicImmuneResistsDamage = miscData.getFieldValue("MagicImmunesResistDamage") != 0; this.magicImmuneResistsLeech = miscData.getFieldValue("MagicImmunesResistLeech") != 0; this.magicImmuneResistsThorns = miscData.getFieldValue("MagicImmunesResistThorns") != 0; @@ -424,6 +426,10 @@ public float getFrostMoveSpeedDecrease() { return frostMoveSpeedDecrease; } + public boolean isInvulnerableSummonsTakeDispelDamage() { + return invulnerableSummonsTakeDispelDamage; + } + public boolean isMagicImmuneResistsDamage() { return magicImmuneResistsDamage; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java index 16bd1adba..74f498d57 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java @@ -40,6 +40,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackInstant; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissile; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; @@ -180,8 +181,7 @@ public CSimulation(final War3MapConfig config, final int mapVersion, final DataT final CRaceManagerEntry raceEntry = WarsmashConstants.RACE_MANAGER .get(seededRandom.nextInt(WarsmashConstants.RACE_MANAGER.getEntryCount())); defaultRace = WarsmashConstants.RACE_MANAGER.getRace(raceEntry.getRaceId()); - } - else { + } else { for (int j = 0; j < WarsmashConstants.RACE_MANAGER.getEntryCount(); j++) { final CRaceManagerEntry entry = WarsmashConstants.RACE_MANAGER.get(j); final CRace race = WarsmashConstants.RACE_MANAGER.getRace(entry.getRaceId()); @@ -290,7 +290,8 @@ public void internalUnregisterTimer(final CTimer timer) { } public CUnit internalCreateUnit(final War3ID typeId, final int playerIndex, final float x, final float y, - final float facing, final BufferedImage buildingPathingPixelMap, int editorConfigHitPointPercent, int editorConfigManaAmount) { + final float facing, final BufferedImage buildingPathingPixelMap, int editorConfigHitPointPercent, + int editorConfigManaAmount) { final CUnit unit = this.unitData.create(this, playerIndex, typeId, x, y, facing, buildingPathingPixelMap, this.handleIdAllocator, editorConfigHitPointPercent, editorConfigManaAmount); this.newUnits.add(unit); @@ -323,7 +324,13 @@ public CItem createItem(final War3ID alias, final float unitX, final float unitY public CUnit createUnit(final War3ID typeId, final int playerIndex, final float x, final float y, final float facing) { + return this.createUnit(typeId, playerIndex, x, y, facing, false); + } + + public CUnit createUnit(final War3ID typeId, final int playerIndex, final float x, final float y, + final float facing, final boolean constructing) { final CUnit createdUnit = this.simulationRenderController.createUnit(this, typeId, playerIndex, x, y, facing); + createdUnit.setConstructing(constructing); if (createdUnit != null) { setupCreatedUnit(createdUnit); if (createdUnit.getCollisionRectangle() == null) { @@ -389,9 +396,9 @@ protected void onAbilityRemovedFromUnit(final CUnit unit, final CAbility ability public CAttackProjectile createProjectile(final CUnit source, final float launchX, final float launchY, final float launchFacing, final CUnitAttackMissile attack, final AbilityTarget target, final float damage, - final int bounceIndex, final CUnitAttackListener attackListener) { + final int bounceIndex, final CUnitAttackListener attackListener, final CUnitAttackSettings settings) { final CAttackProjectile projectile = this.simulationRenderController.createAttackProjectile(this, launchX, - launchY, launchFacing, source, attack, target, damage, bounceIndex, attackListener); + launchY, launchFacing, source, attack, target, damage, bounceIndex, attackListener, settings); this.newProjectiles.add(projectile); return projectile; } @@ -406,6 +413,16 @@ public CAbilityProjectile createProjectile(final CUnit source, final War3ID spel return projectile; } + public CAbilityProjectile createProjectile(final CUnit source, final CUnitAttackSettings settings, + final float launchX, final float launchY, final float launchFacing, final AbilityTarget target, + final CAbilityProjectileListener projectileListener) { + final CAbilityProjectile projectile = this.simulationRenderController.createProjectile(this, launchX, launchY, + launchFacing, source, settings, target, projectileListener); + this.newProjectiles.add(projectile); + projectileListener.onLaunch(this, projectile, target); + return projectile; + } + public CJassProjectile createProjectile(final CUnit source, final War3ID spellAlias, final float launchX, final float launchY, final float launchFacing, final float speed, final boolean homing, final AbilityTarget target) { @@ -548,14 +565,12 @@ public void update() { if (!this.falseTimeOfDay.tick()) { this.falseTimeOfDay = null; } - } - else { + } else { if (this.nextGameTime != null) { this.currentGameDayTimeElapsed = (this.nextGameTime / this.gameplayConstants.getGameDayHours()) * this.gameplayConstants.getGameDayLength(); this.nextGameTime = null; - } - else if (!this.timeOfDaySuspended) { + } else if (!this.timeOfDaySuspended) { this.currentGameDayTimeElapsed = (this.currentGameDayTimeElapsed + WarsmashConstants.SIMULATION_STEP_TIME) % this.gameplayConstants.getGameDayLength(); } @@ -1192,30 +1207,24 @@ public byte getFogStateFromSettings(byte mask) { if (this.fogMaskEnabled) { if (this.fogEnabled) { return CFogState.MASKED.getMask(); - } - else { + } else { return CFogState.MASKED.getMask(); } - } - else if (this.fogEnabled) { + } else if (this.fogEnabled) { return CFogState.FOGGED.getMask(); - } - else { + } else { return CFogState.VISIBLE.getMask(); } case FOGGED: if (this.fogMaskEnabled) { if (this.fogEnabled) { return CFogState.FOGGED.getMask(); - } - else { + } else { return CFogState.VISIBLE.getMask(); } - } - else if (this.fogEnabled) { + } else if (this.fogEnabled) { return CFogState.FOGGED.getMask(); - } - else { + } else { return CFogState.VISIBLE.getMask(); } case VISIBLE: diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index 29f1966ca..b1b21d870 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -55,7 +55,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericTimedBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPausedBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.CPausedTickingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetUnitVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -97,6 +97,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDefaultMagicImmuneDamageModListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDefaultSleepListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDefaultThornsListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackModifier; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.listeners.CUnitAbilityProjReactionListener; @@ -143,6 +146,9 @@ public class CUnit extends CWidget { private static RegionCheckerImpl regionCheckerImpl = new RegionCheckerImpl(); + private static CUnitPriorityLoopData attackModLoop = new CUnitPriorityLoopData(); + private static StateModBuff pauseBuff = new StateModBuff(StateModBuffType.PAUSED, 1); + private War3ID typeId; private float facing; // degrees private float mana; @@ -279,6 +285,7 @@ public class CUnit extends CWidget { private final List attackProjReactionListeners = new ArrayList<>(); private final List abilityProjReactionListeners = new ArrayList<>(); private final List abilityEffectReactionListeners = new ArrayList<>(); + private final List attackModifiers = new ArrayList<>(); private final List behaviorChangeListeners = new ArrayList<>(); @@ -296,8 +303,19 @@ public class CUnit extends CWidget { private final List detectorLevels = new ArrayList<>(1); private long detections = 0; + private long unselectablePlayers = 0; + private long untargetablePlayers = 0; + + private boolean unenumerable = false; + private MovementType movementOverride = null; + private boolean repairBlocked; + private boolean trainingBlocked; + private boolean constructionBlocked; + + private List uniqueFlags = null; + public CUnit(final int handleId, final int playerIndex, final float x, final float y, final float life, final War3ID typeId, final float facing, final float mana, final int maximumLife, final float lifeRegen, final int maximumMana, final int speed, final CUnitType unitType) { @@ -333,7 +351,7 @@ public CUnit(final int handleId, final int playerIndex, final float x, final flo computeAllDerivedFields(); } - private void beginBehavior(final CSimulation game, final CBehavior behavior) { + public void beginBehavior(final CSimulation game, final CBehavior behavior) { if (this.currentBehavior != behavior) { final int lastBehaviorHighlightOrderId = this.currentBehavior != null ? this.currentBehavior.getHighlightOrderId() @@ -492,6 +510,9 @@ public void removeNonStackingStatBuff(final CSimulation game, final NonStackingS .get(NonStackingStatBuffType.MELEEATK); try { buffKeyMap.get(buff.getStackingKey()).remove(buff); + if (buffKeyMap.get(buff.getStackingKey()).isEmpty()) { + buffKeyMap.remove(buff.getStackingKey()); + } } catch (final Exception e) { System.err.println(e.getLocalizedMessage()); System.err.println(e.getStackTrace().toString()); @@ -501,6 +522,9 @@ public void removeNonStackingStatBuff(final CSimulation game, final NonStackingS buffKeyMap = this.nonStackingBuffs.get(NonStackingStatBuffType.RNGDATK); try { buffKeyMap.get(buff.getStackingKey()).remove(buff); + if (buffKeyMap.get(buff.getStackingKey()).isEmpty()) { + buffKeyMap.remove(buff.getStackingKey()); + } } catch (final Exception e) { System.err.println(e.getLocalizedMessage()); System.err.println(e.getStackTrace().toString()); @@ -511,6 +535,9 @@ public void removeNonStackingStatBuff(final CSimulation game, final NonStackingS .get(NonStackingStatBuffType.MELEEATKPCT); try { buffKeyMap.get(buff.getStackingKey()).remove(buff); + if (buffKeyMap.get(buff.getStackingKey()).isEmpty()) { + buffKeyMap.remove(buff.getStackingKey()); + } } catch (final Exception e) { System.err.println(e.getLocalizedMessage()); System.err.println(e.getStackTrace().toString()); @@ -520,6 +547,9 @@ public void removeNonStackingStatBuff(final CSimulation game, final NonStackingS buffKeyMap = this.nonStackingBuffs.get(NonStackingStatBuffType.RNGDATKPCT); try { buffKeyMap.get(buff.getStackingKey()).remove(buff); + if (buffKeyMap.get(buff.getStackingKey()).isEmpty()) { + buffKeyMap.remove(buff.getStackingKey()); + } } catch (final Exception e) { System.err.println(e.getLocalizedMessage()); System.err.println(e.getStackTrace().toString()); @@ -529,6 +559,9 @@ public void removeNonStackingStatBuff(final CSimulation game, final NonStackingS final Map> buffKeyMap = this.nonStackingBuffs.get(buff.getBuffType()); try { buffKeyMap.get(buff.getStackingKey()).remove(buff); + if (buffKeyMap.get(buff.getStackingKey()).isEmpty()) { + buffKeyMap.remove(buff.getStackingKey()); + } } catch (final Exception e) { System.err.println(e.getLocalizedMessage()); System.err.println(e.getStackTrace().toString()); @@ -562,12 +595,18 @@ public void removeAllStateModBuffs(final StateModBuffType type) { public void computeUnitState(final CSimulation game, final StateModBuffType type) { switch (type) { + case ENABLE_ATTACK: + case DISABLE_ALL: + case DISABLE_MOVE: case DISABLE_ATTACK: case DISABLE_MELEE_ATTACK: case DISABLE_RANGED_ATTACK: case DISABLE_SPECIAL_ATTACK: case DISABLE_SPELLS: case ETHEREAL: + byte extraEnabledAttacks = 0; + boolean isDisableAll = false; + boolean isDisableMove = false; boolean isDisableAttack = false; boolean isDisableMeleeAttack = false; boolean isDisableRangedAttack = false; @@ -575,6 +614,21 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type boolean isDisableSpells = false; boolean isEthereal = false; for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.ENABLE_ATTACK) { + if (buff.getValue() != 0) { + extraEnabledAttacks |= buff.getValue(); + } + } + if (buff.getBuffType() == StateModBuffType.DISABLE_ALL) { + if (buff.getValue() != 0) { + isDisableAll = true; + } + } + if (buff.getBuffType() == StateModBuffType.DISABLE_MOVE) { + if (buff.getValue() != 0) { + isDisableMove = true; + } + } if (buff.getBuffType() == StateModBuffType.DISABLE_ATTACK) { if (buff.getValue() != 0) { isDisableAttack = true; @@ -606,26 +660,33 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type } } } + if (isDisableAll) { + isDisableMove = true; + isDisableAttack = true; + isDisableSpells = true; + } // CAbility attack = this.getFirstAbilityOfType(CAbilityAttack.class); // if (attack != null) { // attack.setDisabled(isDisableAttack, CAbilityDisableType.ATTACKDISABLED); // } for (final CAbility ability : this.abilities) { if (((isDisableAttack || isEthereal) && (ability.getAbilityCategory() == CAbilityCategory.ATTACK)) + || (isDisableMove && (ability.getAbilityCategory() == CAbilityCategory.MOVEMENT)) || (isDisableSpells && (ability.getAbilityCategory() == CAbilityCategory.SPELL) && ability.isMagic()) || (isEthereal && ability.isPhysical() && ((ability.getAbilityCategory() == CAbilityCategory.SPELL) || (ability.getAbilityCategory() == CAbilityCategory.CORE)))) { - ability.setDisabled(true, CAbilityDisableType.ATTACKDISABLED); + ability.setDisabled(true, CAbilityDisableType.DISABLED_EFFECT); } else { - ability.setDisabled(false, CAbilityDisableType.ATTACKDISABLED); + ability.setDisabled(false, CAbilityDisableType.DISABLED_EFFECT); } } final List newAttackList = new ArrayList(); for (int i = 0; i < this.unitSpecificAttacks.size(); i++) { final CUnitAttack attack = this.unitSpecificAttacks.get(i); - if (((getUnitType().getAttacksEnabled() & (i + 1)) != 0) && !isDisableAttack + if ((((getUnitType().getAttacksEnabled() & (1 << i)) != 0) || ((extraEnabledAttacks & (1 << i)) != 0)) + && !isDisableAttack && (!isDisableMeleeAttack || !attack.getWeaponType().equals(CWeaponType.NORMAL)) && (!isDisableRangedAttack || attack.getWeaponType().equals(CWeaponType.NORMAL)) && (!isDisableSpecialAttack || !((attack.getTargetsAllowed().size() == 1) @@ -636,15 +697,44 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type } setUnitSpecificCurrentAttacks(newAttackList); notifyAttacksChanged(); - checkDisabledAbilities(game, isDisableAttack); + switch (type) { + case ENABLE_ATTACK: + checkDisabledAbilities(game, isDisableAttack); + break; + case DISABLE_ALL: + checkDisabledAbilities(game, isDisableAll); + break; + case DISABLE_MOVE: + checkDisabledAbilities(game, isDisableMove); + break; + case DISABLE_ATTACK: + checkDisabledAbilities(game, isDisableAttack); + break; + case DISABLE_MELEE_ATTACK: + checkDisabledAbilities(game, isDisableMeleeAttack); + break; + case DISABLE_RANGED_ATTACK: + checkDisabledAbilities(game, isDisableRangedAttack); + break; + case DISABLE_SPECIAL_ATTACK: + checkDisabledAbilities(game, isDisableSpecialAttack); + break; + case DISABLE_SPELLS: + checkDisabledAbilities(game, isDisableSpells); + break; + case ETHEREAL: + checkDisabledAbilities(game, isEthereal); + break; + default: + break; + } if (isEthereal) { if (!this.damageTakenModificationListeners.contains(CUnitDefaultEtherealDamageModListener.INSTANCE)) { addDamageTakenModificationListener(CUnitDefaultEtherealDamageModListener.INSTANCE); } game.changeUnitVertexColor(this, RenderUnit.ETHEREAL); - } - else { + } else { if (this.damageTakenModificationListeners.contains(CUnitDefaultEtherealDamageModListener.INSTANCE)) { removeDamageTakenModificationListener(CUnitDefaultEtherealDamageModListener.INSTANCE); game.changeUnitVertexColor(this, RenderUnit.DEFAULT); @@ -732,16 +822,23 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type case STUN: boolean isSleeping = false; boolean isStun = false; + boolean updateAnim = false; for (final StateModBuff buff : this.stateModBuffs) { if (buff.getBuffType() == StateModBuffType.SLEEPING) { if (buff.getValue() != 0) { isSleeping = true; } + if (buff.getValue() == 1) { + updateAnim = true; + } } if (buff.getBuffType() == StateModBuffType.STUN) { if (buff.getValue() != 0) { isStun = true; } + if (buff.getValue() == 1) { + updateAnim = true; + } } } if (isSleeping || isStun) { @@ -751,7 +848,7 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type this.interruptedBehavior = this.currentBehavior; this.interruptedDefaultBehavior = this.defaultBehavior; } - this.currentBehavior = new CBehaviorStun(this); + this.currentBehavior = new CBehaviorStun(this, updateAnim); this.currentBehavior.begin(game); setDefaultBehavior(this.currentBehavior); this.stateNotifier.ordersChanged(); @@ -796,6 +893,18 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type this.moveDisabled = false; } } + break; + case PAUSED: + boolean isPaused = false; + for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.PAUSED) { + if (buff.getValue() != 0) { + isPaused = true; + } + } + } + this.paused = isPaused; + break; case DISABLE_UNIT_COLLISION: boolean isDisableCollision = false; @@ -810,8 +919,7 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type if (!this.noUnitCollision) { this.noUnitCollision = true; } - } - else { + } else { if (this.noUnitCollision) { this.noUnitCollision = false; } @@ -830,8 +938,7 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type if (!this.noBuildingCollision) { this.noBuildingCollision = true; } - } - else { + } else { if (this.noBuildingCollision) { this.noBuildingCollision = false; } @@ -883,6 +990,72 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type } this.detections = detections; break; + case UNSELECTABLE: + long unselectablePlayers = 0; + for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.UNSELECTABLE) { + if (buff.getValue() != 0) { + unselectablePlayers = (unselectablePlayers | buff.getValue()); + } + } + } + this.unselectablePlayers = unselectablePlayers; + break; + case UNTARGETABLE: + long untargetablePlayers = 0; + for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.UNTARGETABLE) { + if (buff.getValue() != 0) { + untargetablePlayers = (untargetablePlayers | buff.getValue()); + } + } + } + this.untargetablePlayers = untargetablePlayers; + break; + case UNENUMERABLE: + boolean isUnenumerable = false; + for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.UNENUMERABLE) { + if (buff.getValue() != 0) { + isUnenumerable = true; + } + } + } + this.unenumerable = isUnenumerable; + break; + case BLOCK_REPAIR: + boolean isRepairBlocked = false; + for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.BLOCK_REPAIR) { + if (buff.getValue() != 0) { + isRepairBlocked = true; + } + } + } + this.repairBlocked = isRepairBlocked; + break; + case BLOCK_TRAINING: + boolean isTrainingBlocked = false; + for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.BLOCK_TRAINING) { + if (buff.getValue() != 0) { + isTrainingBlocked = true; + } + } + } + this.trainingBlocked = isTrainingBlocked; + break; + case BLOCK_CONSTRUCTION: + boolean isConstructionBlocked = false; + for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.BLOCK_CONSTRUCTION) { + if (buff.getValue() != 0) { + isConstructionBlocked = true; + } + } + } + this.constructionBlocked = isConstructionBlocked; + break; default: break; } @@ -1650,7 +1823,7 @@ private void computeAllUnitStates(final CSimulation game) { computeUnitState(game, StateModBuffType.DETECTOR); computeUnitState(game, StateModBuffType.INVISIBLE); computeUnitState(game, StateModBuffType.INVULNERABLE); - computeUnitState(game, StateModBuffType.ETHEREAL); + computeUnitState(game, StateModBuffType.ENABLE_ATTACK); computeUnitState(game, StateModBuffType.DISABLE_AUTO_ATTACK); computeUnitState(game, StateModBuffType.DISABLE_AUTO_CAST); computeUnitState(game, StateModBuffType.DISABLE_ASSIST_ALLY); @@ -1659,7 +1832,14 @@ private void computeAllUnitStates(final CSimulation game) { computeUnitState(game, StateModBuffType.MAGIC_IMMUNE); computeUnitState(game, StateModBuffType.MORPH_IMMUNE); computeUnitState(game, StateModBuffType.RESISTANT); - computeUnitState(game, StateModBuffType.SNARED); + computeUnitState(game, StateModBuffType.STUN); + computeUnitState(game, StateModBuffType.PAUSED); + computeUnitState(game, StateModBuffType.UNSELECTABLE); + computeUnitState(game, StateModBuffType.UNTARGETABLE); + computeUnitState(game, StateModBuffType.UNENUMERABLE); + computeUnitState(game, StateModBuffType.BLOCK_REPAIR); + computeUnitState(game, StateModBuffType.BLOCK_TRAINING); + computeUnitState(game, StateModBuffType.BLOCK_CONSTRUCTION); } public void setManaRegenIntelligenceBonus(final float manaRegenIntelligenceBonus) { @@ -1757,16 +1937,16 @@ public void add(final CSimulation simulation, final CAbility ability) { } if (ability.isDisabled()) { this.disabledAbilities.add(ability); - } - else { + } else { ability.onAdd(simulation, this); } this.stateNotifier.abilitiesChanged(); } public void add(final CSimulation simulation, final CBuff ability) { - if (this.abilities.contains(ability) && (ability instanceof ABGenericTimedBuff)) { - ((ABGenericTimedBuff) ability).updateExpiration(simulation, this); + int index = this.abilities.indexOf(ability); + if (index >= 0 && (ability instanceof ABGenericTimedBuff)) { + ((ABGenericTimedBuff) this.abilities.get(index)).updateExpiration(simulation, this); } else { this.abilities.add(ability); simulation.onAbilityAddedToUnit(this, ability); @@ -1861,7 +2041,8 @@ public void setTypeId(final CSimulation game, final War3ID typeId, final boolean setTypeId(game, typeId, keepRatios, true); } - public void setTypeId(final CSimulation game, final War3ID typeId, final boolean keepRatios, final boolean updateArt) { + public void setTypeId(final CSimulation game, final War3ID typeId, final boolean keepRatios, + final boolean updateArt) { game.getWorldCollision().removeUnit(this); final CPlayer player = game.getPlayer(this.playerIndex); player.removeTechtreeUnlocked(game, this.typeId); @@ -1879,7 +2060,7 @@ public void setTypeId(final CSimulation game, final War3ID typeId, final boolean this.lifeRegen = this.unitType.getLifeRegen(); this.manaRegen = this.unitType.getManaRegen(); computeAllDerivedFields(); - + if (updateArt) { this.flyHeight = this.unitType.getDefaultFlyingHeight(); } @@ -1896,9 +2077,9 @@ public void setTypeId(final CSimulation game, final War3ID typeId, final boolean this.raisable = this.unitType.isRaise(); this.decays = this.unitType.isDecay(); final List sharedAbilities = new ArrayList(previousUnitType.getAbilityList()); - //sharedAbilities.addAll(previousUnitType.getHeroAbilityList()); + // sharedAbilities.addAll(previousUnitType.getHeroAbilityList()); final List newIds = new ArrayList(this.unitType.getAbilityList()); - //newIds.addAll(this.unitType.getHeroAbilityList()); + // newIds.addAll(this.unitType.getHeroAbilityList()); sharedAbilities.retainAll(newIds); // TODO Seems wasteful, but need to avoid messing up heros on transform final List persistedAbilities = new ArrayList<>(); final List removedAbilities = new ArrayList<>(); @@ -2074,14 +2255,14 @@ public boolean update(final CSimulation game) { setRallyPoint(this); } if (this.constructing) { - if (!this.constructingPaused) { + if (!(this.constructingPaused || this.constructionBlocked)) { this.constructionProgress += WarsmashConstants.SIMULATION_STEP_TIME; } final int buildTime; final boolean upgrading = isUpgrading(); if (!upgrading) { buildTime = this.unitType.getBuildTime(); - if (!this.constructingPaused) { + if (!(this.constructingPaused || this.constructionBlocked)) { final float healthGain = (WarsmashConstants.SIMULATION_STEP_TIME / buildTime) * (this.maximumLife * (1.0f - WarsmashConstants.BUILDING_CONSTRUCT_START_LIFE)); setLife(game, Math.min(this.life + healthGain, this.maximumLife)); @@ -2130,6 +2311,9 @@ public boolean update(final CSimulation game) { fireConstructFinishEvents(game); } else { game.unitUpgradeFinishEvent(this); + fireSimpleEvents(game, JassGameEventsWar3.EVENT_UNIT_UPGRADE_FINISH); + game.getPlayer(this.playerIndex).fireSimpleUnitEvents(this, + JassGameEventsWar3.EVENT_PLAYER_UNIT_UPGRADE_FINISH, game); } if (upgrading || true) { // TODO shouldnt need to play stand here, probably @@ -2138,12 +2322,22 @@ public boolean update(final CSimulation game) { } this.stateNotifier.ordersChanged(); } + for (int i = this.abilities.size() - 1; i >= 0; i--) { + // okay if it removes self from this during onTick() because of reverse + // iteration order + CAbility abil = this.abilities.get(i); + if (abil.getAbilityCategory() == CAbilityCategory.BUFF) { + abil.onTick(game, this); + } + } } else { final War3ID queuedRawcode = this.buildQueue[0]; if (queuedRawcode != null) { // queue step forward if (this.queuedUnitFoodPaid) { - this.constructionProgress += WarsmashConstants.SIMULATION_STEP_TIME; + if (!this.trainingBlocked) { + this.constructionProgress += WarsmashConstants.SIMULATION_STEP_TIME; + } } else { if (this.buildQueueTypes[0] == QueueItemType.UNIT) { final CPlayer player = game.getPlayer(this.playerIndex); @@ -2322,16 +2516,14 @@ public boolean update(final CSimulation game) { if (lifePlusRegen > this.maximumLife) { lifePlusRegen = this.maximumLife; } - this.life = lifePlusRegen; - this.stateNotifier.lifeChanged(); + setLife(game, lifePlusRegen); } else { float lifePlusRegen = (this.life + this.currentLifeRegenPerTick) - this.baseLifeRegenPerTick; if (lifePlusRegen > this.maximumLife) { lifePlusRegen = this.maximumLife; } - this.life = lifePlusRegen; - this.stateNotifier.lifeChanged(); + setLife(game, lifePlusRegen); } } if ((this.mana < this.maximumMana) || (this.currentManaRegenPerTick < 0)) { @@ -2361,8 +2553,7 @@ public boolean update(final CSimulation game) { } beginBehavior(game, this.currentBehavior.update(game)); - } - else { + } else { // check to auto acquire targets autoAcquireTargets(game, this.moveDisabled); } @@ -2414,8 +2605,7 @@ public boolean update(final CSimulation game) { if (lifePlusRegen > this.maximumLife) { lifePlusRegen = this.maximumLife; } - this.life = lifePlusRegen; - this.stateNotifier.lifeChanged(); + setLife(game, lifePlusRegen); } } if ((this.mana < this.maximumMana) @@ -2437,7 +2627,7 @@ public boolean update(final CSimulation game) { // okay if it removes self from this during onTick() because of reverse // iteration order if ((this.abilities.get(i) instanceof AbilityGenericSingleIconPassiveAbility) - || (this.abilities.get(i) instanceof ABTimedTickingPausedBuff)) { + || (this.abilities.get(i) instanceof CPausedTickingBuff)) { this.abilities.get(i).onTick(game, this); } } @@ -2472,7 +2662,8 @@ public boolean autoAcquireTargets(final CSimulation game, final boolean disableM } public boolean autoAcquireAutocastTargets(final CSimulation game, final boolean disableMove) { - if ((this.autocastAbility != null) && !this.autocastAbility.isDisabled() && this.autocastAbility.getAutocastType() != AutocastType.NOAUTOCASTBEHAVIOR) { + if ((this.autocastAbility != null) && !this.autocastAbility.isDisabled() + && this.autocastAbility.getAutocastType() != AutocastType.NOAUTOCASTBEHAVIOR) { if (this.autocastAbility.getAutocastType() == AutocastType.NOTARGET) { final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); @@ -2495,7 +2686,8 @@ public boolean autoAcquireAutocastTargets(final CSimulation game, final boolean game.getWorldCollision().enumUnitsInRect(tempRect, autocastTargetFinderEnum.reset(game, this, this.autocastAbility, disableMove)); if (autocastTargetFinderEnum.currentUnitTarget != null) { - this.order(game, this.autocastAbility.getBaseOrderId(), autocastTargetFinderEnum.currentUnitTarget, true); + this.order(game, this.autocastAbility.getBaseOrderId(), autocastTargetFinderEnum.currentUnitTarget, + true); return true; } } @@ -2612,7 +2804,8 @@ public boolean order(final CSimulation simulation, final int orderId, final Abil return this.order(simulation, orderId, target, false); } - public boolean order(final CSimulation simulation, final int orderId, final AbilityTarget target, final boolean autoOrder) { + public boolean order(final CSimulation simulation, final int orderId, final AbilityTarget target, + final boolean autoOrder) { if (orderId == OrderIds.stop) { order(simulation, new COrderNoTarget(0, orderId, false), false, autoOrder); return true; @@ -2626,7 +2819,8 @@ public boolean order(final CSimulation simulation, final int orderId, final Abil .getInstance().reset(); ability.checkCanTargetNoTarget(simulation, this, orderId, false, booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { - order(simulation, new COrderNoTarget(ability.getHandleId(), orderId, false, autoOrder), false, autoOrder); + order(simulation, new COrderNoTarget(ability.getHandleId(), orderId, false, autoOrder), false, + autoOrder); return true; } } else { @@ -2635,10 +2829,12 @@ public boolean order(final CSimulation simulation, final int orderId, final Abil public Boolean accept(final AbilityPointTarget target) { final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - ability.checkCanTarget(simulation, CUnit.this, orderId, false, target, booleanTargetReceiver); + ability.checkCanTarget(simulation, CUnit.this, orderId, false, target, + booleanTargetReceiver); final boolean pointTargetable = booleanTargetReceiver.isTargetable(); if (pointTargetable) { - order(simulation, new COrderTargetPoint(ability.getHandleId(), orderId, target, false, autoOrder), + order(simulation, + new COrderTargetPoint(ability.getHandleId(), orderId, target, false, autoOrder), false, autoOrder); } return pointTargetable; @@ -2647,7 +2843,8 @@ public Boolean accept(final AbilityPointTarget target) { public Boolean acceptWidget(final CWidget target) { final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - ability.checkCanTarget(simulation, CUnit.this, orderId, false, target, booleanTargetReceiver); + ability.checkCanTarget(simulation, CUnit.this, orderId, false, target, + booleanTargetReceiver); final boolean widgetTargetable = booleanTargetReceiver.isTargetable(); if (widgetTargetable) { order(simulation, new COrderTargetWidget(ability.getHandleId(), orderId, @@ -2970,9 +3167,66 @@ public boolean checkForAbilityEffectReaction(final CSimulation simulation, final return allow; } + public CUnitAttackSettings checkForAttackPreLaunchModification(final CSimulation simulation, + final AbilityTarget target, final CUnitAttack attack, final CUnitAttackSettings settings) { + if (!this.attackModifiers.isEmpty()) { + int maxPriority = 0; + int i = 0; + attackModLoop.reset(); + while (i <= maxPriority) { + attackModLoop.startLoop(i); + for (final CUnitAttackModifier modification : new ArrayList<>(this.attackModifiers)) { + int prio = modification.getPriority(simulation, this, target, attack); + if (prio > maxPriority) { + maxPriority = prio; + } + if (prio == i && !attackModLoop.skipCurrentLevel()) { + if (modification.checkPreLaunchApplication(simulation, this, target, attack)) { + modification.applyPreLaunchModification(simulation, this, target, attack, settings, + attackModLoop); + } + } + } + if (attackModLoop.end()) { + break; + } + i++; + } + } + return settings; + } + + public CUnitAttackSettings checkForAttackModification(final CSimulation simulation, final AbilityTarget target, + final CUnitAttack attack, final CUnitAttackSettings settings) { + if (!this.attackModifiers.isEmpty()) { + int maxPriority = 0; + int i = 0; + attackModLoop.reset(); + while (i <= maxPriority) { + attackModLoop.startLoop(i); + for (final CUnitAttackModifier modification : new ArrayList<>(this.attackModifiers)) { + int prio = modification.getPriority(simulation, this, target, attack); + if (prio > maxPriority) { + maxPriority = prio; + } + if (prio == i && !attackModLoop.skipCurrentLevel()) { + if (modification.checkApplication(simulation, this, target, attack)) { + modification.applyModification(simulation, this, target, attack, settings, attackModLoop); + } + } + } + if (attackModLoop.end()) { + break; + } + i++; + } + } + return settings; + } + public boolean isImmuneToDamage(final CSimulation simulation, final CDamageFlags flags, final CAttackType attackType, final CDamageType damageType) { - if (flags.isOnlyDamageSummons() && !this.isUnitType(CUnitTypeJass.SUMMONED)) { + if (flags != null && flags.isOnlyDamageSummons() && !this.isUnitType(CUnitTypeJass.SUMMONED)) { return true; } if (simulation.getGameplayConstants().isMagicImmuneResistsDamage()) { @@ -3012,7 +3266,10 @@ public float damage(final CSimulation simulation, final CUnit source, final CDam return 0; } float trueDamage = 0; - if (!this.invulnerable && !flags.isIgnoreInvulnerable()) { + if (!this.invulnerable || flags.isIgnoreInvulnerable() + || (flags != null && flags.isOnlyDamageSummons() + && simulation.getGameplayConstants().isInvulnerableSummonsTakeDispelDamage() + && this.isUnitType(CUnitTypeJass.SUMMONED))) { final CUnitAttackDamageTakenModificationListenerDamageModResult result = new CUnitAttackDamageTakenModificationListenerDamageModResult( damage, bonusDamage); @@ -3040,6 +3297,14 @@ public float damage(final CSimulation simulation, final CUnit source, final CDam trueDamage = listener.onDamage(simulation, source, this, flags, attackType, damageType, trueDamage); } + final List eventList = getEventList(JassGameEventsWar3.EVENT_UNIT_DAMAGED); + if (eventList != null) { + for (final CWidgetEvent event : eventList) { + event.fire(this, CommonTriggerExecutionScope.unitDamageTakenScope( + JassGameEventsWar3.EVENT_UNIT_DAMAGED, event.getTrigger(), this, source, trueDamage)); + } + } + final boolean wasAboveMax = this.life > this.maximumLife; this.life -= trueDamage; if ((result.computeFinalDamage() < 0) && !wasAboveMax && (this.life > this.maximumLife)) { @@ -3048,13 +3313,16 @@ public float damage(final CSimulation simulation, final CUnit source, final CDam // yet this.life = this.maximumLife; } + if (flags.isNonlethal() && this.life < 1) { + this.life = 1; + } this.stateNotifier.lifeChanged(); } for (final CUnitAttackDamageTakenListener listener : new ArrayList<>(this.damageTakenListeners)) { listener.onDamage(simulation, source, this, flags, damageType, damage, bonusDamage, trueDamage); } simulation.unitDamageEvent(this, weaponSoundType, this.unitType.getArmorType()); - if (!this.invulnerable && isDead()) { + if (isDead()) { if (!wasDead) { if (flags.isExplode()) { this.setExplodesOnDeath(true); @@ -3407,83 +3675,106 @@ public boolean canBeTargetedBy(final CSimulation simulation, final CUnit source, receiver.targetCheckFailed(CommandStringErrorKeys.THAT_UNIT_IS_IMMUNE_TO_MAGIC); return false; } - if (targeted && !isVisible(simulation, source.getPlayerIndex())) { + if (targeted && (!isVisible(simulation, source.getPlayerIndex()) + || (this.untargetablePlayers & (1 << source.getPlayerIndex())) != 0)) { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_UNIT_WITH_THIS_ACTION); return false; } + if (this.repairBlocked && targetsAllowed.contains(CTargetType.REPAIRABLE)) { + if (this.hasUniqueFlag("b_Frozen")) { + receiver.targetCheckFailed(CommandStringErrorKeys.TARGET_BUILDING_HAS_BEEN_FROZEN); + } else if (this.hasUniqueFlag("b_LFire")) { + receiver.targetCheckFailed(CommandStringErrorKeys.TARGET_BUILDING_HAS_LIQUID_FIRE); + } else { + receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_THIS_UNIT); + } + return false; + } if (targetsAllowed.containsAll(this.targetedAs) || (!targetsAllowed.contains(CTargetType.GROUND) && !targetsAllowed.contains(CTargetType.STRUCTURE) && !targetsAllowed.contains(CTargetType.AIR))) { final int sourcePlayerIndex = source.getPlayerIndex(); final CPlayer sourcePlayer = simulation.getPlayer(sourcePlayerIndex); if (!targetsAllowed.contains(CTargetType.ENEMIES) || !sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.PASSIVE) - || targetsAllowed.contains(CTargetType.FRIEND)) { + || targetsAllowed.contains(CTargetType.FRIEND) || targetsAllowed.contains(CTargetType.NEUTRAL)) { if (!targetsAllowed.contains(CTargetType.FRIEND) - || sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.PASSIVE) - || targetsAllowed.contains(CTargetType.ENEMIES)) { - if (!targetsAllowed.contains(CTargetType.MECHANICAL) - || this.classifications.contains(CUnitClassification.MECHANICAL)) { - if (!targetsAllowed.contains(CTargetType.ORGANIC) - || !this.classifications.contains(CUnitClassification.MECHANICAL)) { - if (!targetsAllowed.contains(CTargetType.ANCIENT) - || this.classifications.contains(CUnitClassification.ANCIENT)) { - if (!targetsAllowed.contains(CTargetType.NONANCIENT) - || !this.classifications.contains(CUnitClassification.ANCIENT)) { - final boolean invulnerable = isInvulnerable(); - if ((!invulnerable && (targetsAllowed.contains(CTargetType.VULNERABLE) - || !targetsAllowed.contains(CTargetType.INVULNERABLE))) - || (invulnerable && targetsAllowed.contains(CTargetType.INVULNERABLE))) { - if (!targetsAllowed.contains(CTargetType.HERO) || (getHeroData() != null)) { - if (!targetsAllowed.contains(CTargetType.NONHERO) - || (getHeroData() == null)) { - if (isDead()) { - if (isRaisable() && isDecays() && isBoneCorpse()) { - if (targetsAllowed.contains(CTargetType.DEAD)) { - return true; + || sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.SHARED_SPELLS) + || targetsAllowed.contains(CTargetType.ENEMIES) + || targetsAllowed.contains(CTargetType.NEUTRAL)) { + if (!targetsAllowed.contains(CTargetType.NEUTRAL) + || (sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.PASSIVE) + && !sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.SHARED_SPELLS)) + || (targetsAllowed.contains(CTargetType.ENEMIES) + && !sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.PASSIVE)) + || (targetsAllowed.contains(CTargetType.FRIEND) + && sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.SHARED_SPELLS))) { + if (!targetsAllowed.contains(CTargetType.MECHANICAL) + || this.classifications.contains(CUnitClassification.MECHANICAL)) { + if (!targetsAllowed.contains(CTargetType.ORGANIC) + || !this.classifications.contains(CUnitClassification.MECHANICAL)) { + if (!targetsAllowed.contains(CTargetType.ANCIENT) + || this.classifications.contains(CUnitClassification.ANCIENT)) { + if (!targetsAllowed.contains(CTargetType.NONANCIENT) + || !this.classifications.contains(CUnitClassification.ANCIENT)) { + final boolean invulnerable = isInvulnerable(); + if ((!invulnerable && (targetsAllowed.contains(CTargetType.VULNERABLE) + || !targetsAllowed.contains(CTargetType.INVULNERABLE))) + || (invulnerable + && targetsAllowed.contains(CTargetType.INVULNERABLE))) { + if (!targetsAllowed.contains(CTargetType.HERO) || (getHeroData() != null)) { + if (!targetsAllowed.contains(CTargetType.NONHERO) + || (getHeroData() == null)) { + if (isDead()) { + if (isRaisable() && isDecays() && isBoneCorpse()) { + if (targetsAllowed.contains(CTargetType.DEAD)) { + return true; + } else { + receiver.targetCheckFailed( + CommandStringErrorKeys.TARGET_MUST_BE_LIVING); + } } else { receiver.targetCheckFailed( - CommandStringErrorKeys.TARGET_MUST_BE_LIVING); + CommandStringErrorKeys.MUST_TARGET_A_UNIT_WITH_THIS_ACTION); } } else { - receiver.targetCheckFailed( - CommandStringErrorKeys.MUST_TARGET_A_UNIT_WITH_THIS_ACTION); + if (!targetsAllowed.contains(CTargetType.DEAD) + || targetsAllowed.contains(CTargetType.ALIVE)) { + return true; + } else { + receiver.targetCheckFailed( + CommandStringErrorKeys.MUST_TARGET_A_CORPSE); + } } } else { - if (!targetsAllowed.contains(CTargetType.DEAD) - || targetsAllowed.contains(CTargetType.ALIVE)) { - return true; - } else { - receiver.targetCheckFailed( - CommandStringErrorKeys.MUST_TARGET_A_CORPSE); - } + receiver.targetCheckFailed( + CommandStringErrorKeys.UNABLE_TO_TARGET_HEROES); } } else { - receiver.targetCheckFailed( - CommandStringErrorKeys.UNABLE_TO_TARGET_HEROES); + receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_HERO); } } else { - receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_HERO); + if (invulnerable) { + receiver.targetCheckFailed( + CommandStringErrorKeys.THAT_TARGET_IS_INVULNERABLE); + } else { + receiver.targetCheckFailed( + CommandStringErrorKeys.UNABLE_TO_TARGET_THIS_UNIT); + } } } else { - if (invulnerable) { - receiver.targetCheckFailed( - CommandStringErrorKeys.THAT_TARGET_IS_INVULNERABLE); - } else { - receiver.targetCheckFailed( - CommandStringErrorKeys.UNABLE_TO_TARGET_THIS_UNIT); - } + receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_ANCIENTS); } } else { - receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_ANCIENTS); + receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_AN_ANCIENT); } } else { - receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_AN_ANCIENT); + receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_ORGANIC_UNITS); } } else { - receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_ORGANIC_UNITS); + receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_ORGANIC_UNITS); } } else { - receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_ORGANIC_UNITS); + receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_NEUTRAL_UNIT); } } else { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_FRIENDLY_UNIT); @@ -3491,19 +3782,15 @@ public boolean canBeTargetedBy(final CSimulation simulation, final CUnit source, } else { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_AN_ENEMY_UNIT); } - } - else { + } else { if (this.targetedAs.contains(CTargetType.GROUND) && !targetsAllowed.contains(CTargetType.GROUND)) { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_GROUND_UNITS); - } - else if (this.targetedAs.contains(CTargetType.STRUCTURE) + } else if (this.targetedAs.contains(CTargetType.STRUCTURE) && !targetsAllowed.contains(CTargetType.STRUCTURE)) { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_BUILDINGS); - } - else if (this.targetedAs.contains(CTargetType.AIR) && !targetsAllowed.contains(CTargetType.AIR)) { + } else if (this.targetedAs.contains(CTargetType.AIR) && !targetsAllowed.contains(CTargetType.AIR)) { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_AIR_UNITS); - } - else if (this.targetedAs.contains(CTargetType.WARD) && !targetsAllowed.contains(CTargetType.WARD)) { + } else if (this.targetedAs.contains(CTargetType.WARD) && !targetsAllowed.contains(CTargetType.WARD)) { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_TARGET_WARDS); } else if (targetsAllowed.contains(CTargetType.GROUND)) { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_GROUND_UNIT); @@ -3543,8 +3830,7 @@ public MovementType getMovementType() { public void setNoCollisionMovementType(final boolean active) { if (active) { this.movementOverride = MovementType.FOOT_NO_COLLISION; - } - else { + } else { this.movementOverride = null; } } @@ -3710,6 +3996,23 @@ public boolean call(final CUnit unit) { } } break; + case FARTHESTVALID: + targetCheckReceiver.reset(); + this.ability.checkCanAutoTarget(this.game, this.source, this.ability.getBaseOrderId(), unit, + targetCheckReceiver); + if (targetCheckReceiver.isTargetable()) { + if (this.currentUnitTarget == null) { + this.currentUnitTarget = unit; + this.comparisonValue = this.source.distance(unit); + } else { + final double dist = this.source.distance(unit); + if (dist > this.comparisonValue) { + this.currentUnitTarget = unit; + this.comparisonValue = dist; + } + } + } + break; case NEARESTVALID: targetCheckReceiver.reset(); this.ability.checkCanAutoTarget(this.game, this.source, this.ability.getBaseOrderId(), unit, @@ -3930,7 +4233,12 @@ public void setHidden(final boolean hidden) { } public void setPaused(final boolean paused) { - this.paused = paused; + if (paused) { + this.addStateModBuff(pauseBuff); + } else { + this.removeStateModBuff(pauseBuff); + } + this.computeUnitState(null, StateModBuffType.PAUSED); } public boolean isPaused() { @@ -4253,12 +4561,13 @@ private UseAbilityOnTargetByIdVisitor reset(final CSimulation game, final CUnit public Void accept(final AbilityPointTarget target) { CAbility abilityToUse = null; for (final CAbility ability : this.trainedUnit.getAbilities()) { - ability.checkCanUse(this.game, this.trainedUnit, this.rallyOrderId, - false, BooleanAbilityActivationReceiver.INSTANCE); + ability.checkCanUse(this.game, this.trainedUnit, this.rallyOrderId, false, + BooleanAbilityActivationReceiver.INSTANCE); if (BooleanAbilityActivationReceiver.INSTANCE.isOk()) { final BooleanAbilityTargetCheckReceiver targetCheckReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - ability.checkCanTarget(this.game, this.trainedUnit, this.rallyOrderId, false, target, targetCheckReceiver); + ability.checkCanTarget(this.game, this.trainedUnit, this.rallyOrderId, false, target, + targetCheckReceiver); if (targetCheckReceiver.isTargetable()) { abilityToUse = ability; } @@ -4557,6 +4866,13 @@ public StateListenerUpdateType getUpdateType() { } } + public void cancelConstruction(final CSimulation game) { + this.setLife(game, 0); + this.fireSimpleEvents(game, JassGameEventsWar3.EVENT_UNIT_CONSTRUCT_CANCEL); + game.getPlayer(this.playerIndex).fireSimpleUnitEvents(this, + JassGameEventsWar3.EVENT_PLAYER_UNIT_CONSTRUCT_CANCEL, game); + } + public void cancelUpgrade(final CSimulation game) { final CPlayer player = game.getPlayer(this.playerIndex); player.setUnitFoodUsed(this, this.unitType.getFoodUsed()); @@ -4588,6 +4904,9 @@ public void cancelUpgrade(final CSimulation game) { this.constructing = false; this.constructionProgress = 0; this.unitAnimationListener.playAnimation(true, PrimaryTag.STAND, SequenceUtils.EMPTY, 0.0f, true); + this.fireSimpleEvents(game, JassGameEventsWar3.EVENT_UNIT_UPGRADE_CANCEL); + game.getPlayer(this.playerIndex).fireSimpleUnitEvents(this, JassGameEventsWar3.EVENT_PLAYER_UNIT_UPGRADE_CANCEL, + game); } public void beginUpgrade(final CSimulation game, final War3ID rawcode) { @@ -4616,6 +4935,9 @@ public void beginUpgrade(final CSimulation game, final War3ID rawcode) { game.unitUpgradingEvent(this, rawcode); this.unitAnimationListener.playAnimation(true, PrimaryTag.BIRTH, SequenceUtils.EMPTY, 0.0f, true); + this.fireSimpleEvents(game, JassGameEventsWar3.EVENT_UNIT_UPGRADE_START); + game.getPlayer(this.playerIndex).fireSimpleUnitEvents(this, JassGameEventsWar3.EVENT_PLAYER_UNIT_UPGRADE_START, + game); } public void setUnitState(final CSimulation game, final CUnitState whichUnitState, final float value) { @@ -4950,11 +5272,11 @@ public boolean removeUnitType(final CSimulation game, final CUnitTypeJass whichU } return false; } - + public Set getAppliedUpgrades() { return this.appliedUpgrades; } - + public int getLevelOfAppliedUpgrade(War3ID id) { CUnitAppliedUpgrade upgrade = getAppliedUpgrade(id); if (upgrade != null) { @@ -4962,7 +5284,7 @@ public int getLevelOfAppliedUpgrade(War3ID id) { } return 0; } - + private CUnitAppliedUpgrade getAppliedUpgrade(War3ID id) { for (CUnitAppliedUpgrade upgrade : this.appliedUpgrades) { if (upgrade.getType().getTypeId().equals(id)) { @@ -4971,11 +5293,12 @@ private CUnitAppliedUpgrade getAppliedUpgrade(War3ID id) { } return null; } - + public void applyUpgrade(CSimulation simulation, CUpgradeType upgradeType, int level) { CUnitAppliedUpgrade upgrade = getAppliedUpgrade(upgradeType.getTypeId()); if (upgrade != null) { if (upgrade.getLevel() == level) { + System.err.println("Unit already has upgrade? " + upgrade.getLevel() + " (target" + level + ")"); return; } unapplyUpgrade(simulation, upgradeType, upgrade); @@ -4984,13 +5307,14 @@ public void applyUpgrade(CSimulation simulation, CUpgradeType upgradeType, int l upgradeEffect.apply(simulation, this, level); } this.appliedUpgrades.add(new CUnitAppliedUpgrade(upgradeType, level)); + this.notifyUpgradesChanged(); } - + public void unapplyUpgrade(CSimulation simulation, CUpgradeType upgradeType) { CUnitAppliedUpgrade upgrade = getAppliedUpgrade(upgradeType.getTypeId()); unapplyUpgrade(simulation, upgradeType, upgrade); } - + public void unapplyUpgrade(CSimulation simulation, CUpgradeType upgradeType, CUnitAppliedUpgrade upgrade) { if (upgrade != null) { for (CUpgradeEffect upgradeEffect : upgradeType.getUpgradeEffects()) { @@ -5040,8 +5364,7 @@ public void fireSpellEvents(final CSimulation game, final JassGameEventsWar3 eve final AbilityTarget target) { if (target == null) { fireSpellEventsNoTarget(game, eventId, ability); - } - else { + } else { target.visit(new AbilityTargetVisitor() { @Override @@ -5158,10 +5481,23 @@ private JassGameEventsWar3 unitSpellEventToPlayerEvent(final JassGameEventsWar3 } } + public void fireSimpleEvents(final CSimulation game, JassGameEventsWar3 type) { + final List eventList = getEventList(type); + if (eventList != null) { + for (int i = eventList.size() - 1; i >= 0; i--) { + CWidgetEvent event = eventList.get(i); + event.fire(this, CommonTriggerExecutionScope.simpleUnitScope(type, event.getTrigger(), this, + game.getPlayer(this.playerIndex))); + } + } + game.getPlayer(this.playerIndex).fireSimpleUnitEvents(this, type, game); + } + public void firePickUpItemEvents(final CSimulation game, final CItem item) { final List eventList = getEventList(JassGameEventsWar3.EVENT_UNIT_PICKUP_ITEM); if (eventList != null) { - for (final CWidgetEvent event : eventList) { + for (int i = eventList.size() - 1; i >= 0; i--) { + CWidgetEvent event = eventList.get(i); event.fire(this, CommonTriggerExecutionScope.unitPickupItemScope( JassGameEventsWar3.EVENT_UNIT_PICKUP_ITEM, event.getTrigger(), this, item)); } @@ -5172,7 +5508,8 @@ public void firePickUpItemEvents(final CSimulation game, final CItem item) { public void fireOrderEvents(final CSimulation game, final COrderNoTarget order) { final List eventList = getEventList(JassGameEventsWar3.EVENT_UNIT_ISSUED_ORDER); if (eventList != null) { - for (final CWidgetEvent event : eventList) { + for (int i = eventList.size() - 1; i >= 0; i--) { + CWidgetEvent event = eventList.get(i); event.fire(this, CommonTriggerExecutionScope.unitOrderScope(JassGameEventsWar3.EVENT_UNIT_ISSUED_ORDER, event.getTrigger(), this, order.getOrderId())); } @@ -5184,7 +5521,8 @@ public void fireOrderEvents(final CSimulation game, final COrderTargetPoint orde final List eventList = getEventList(JassGameEventsWar3.EVENT_UNIT_ISSUED_POINT_ORDER); if (eventList != null) { final AbilityPointTarget target = order.getTarget(game); - for (final CWidgetEvent event : eventList) { + for (int i = eventList.size() - 1; i >= 0; i--) { + CWidgetEvent event = eventList.get(i); event.fire(this, CommonTriggerExecutionScope.unitOrderPointScope( JassGameEventsWar3.EVENT_UNIT_ISSUED_POINT_ORDER, event.getTrigger(), this, @@ -5198,7 +5536,8 @@ public void fireOrderEvents(final CSimulation game, final COrderTargetWidget ord final List eventList = getEventList(JassGameEventsWar3.EVENT_UNIT_ISSUED_TARGET_ORDER); if (eventList != null) { final CWidget target = order.getTarget(game); - for (final CWidgetEvent event : eventList) { + for (int i = eventList.size() - 1; i >= 0; i--) { + CWidgetEvent event = eventList.get(i); event.fire(this, CommonTriggerExecutionScope.unitOrderTargetScope( JassGameEventsWar3.EVENT_UNIT_ISSUED_TARGET_ORDER, event.getTrigger(), this, @@ -5212,7 +5551,8 @@ public void fireConstructFinishEvents(final CSimulation game) { final CUnit constructingUnit = this.worker; final List eventList = getEventList(JassGameEventsWar3.EVENT_UNIT_CONSTRUCT_FINISH); if (eventList != null) { - for (final CWidgetEvent event : eventList) { + for (int i = eventList.size() - 1; i >= 0; i--) { + CWidgetEvent event = eventList.get(i); event.fire(this, CommonTriggerExecutionScope.unitConstructFinishScope( JassGameEventsWar3.EVENT_UNIT_CONSTRUCT_FINISH, event.getTrigger(), this, constructingUnit)); } @@ -5223,7 +5563,8 @@ public void fireConstructFinishEvents(final CSimulation game) { public void fireTrainFinishEvents(final CSimulation game, final CUnit trainedUnit) { final List eventList = getEventList(JassGameEventsWar3.EVENT_UNIT_TRAIN_FINISH); if (eventList != null) { - for (final CWidgetEvent event : eventList) { + for (int i = eventList.size() - 1; i >= 0; i--) { + CWidgetEvent event = eventList.get(i); event.fire(this, CommonTriggerExecutionScope.unitTrainFinishScope( JassGameEventsWar3.EVENT_UNIT_TRAIN_FINISH, event.getTrigger(), this, trainedUnit)); } @@ -5234,7 +5575,8 @@ public void fireTrainFinishEvents(final CSimulation game, final CUnit trainedUni public void fireResearchFinishEvents(final CSimulation game, final War3ID researched) { final List eventList = getEventList(JassGameEventsWar3.EVENT_UNIT_RESEARCH_FINISH); if (eventList != null) { - for (final CWidgetEvent event : eventList) { + for (int i = eventList.size() - 1; i >= 0; i--) { + CWidgetEvent event = eventList.get(i); event.fire(this, CommonTriggerExecutionScope.unitResearchFinishScope( JassGameEventsWar3.EVENT_UNIT_RESEARCH_FINISH, event.getTrigger(), this, researched)); } @@ -5317,6 +5659,14 @@ public void notifyOrdersChanged() { this.stateNotifier.ordersChanged(); } + public void notifyAbilitiesChanged() { + this.stateNotifier.abilitiesChanged(); + } + + public void notifyUpgradesChanged() { + this.stateNotifier.upgradesChanged(); + } + public void setConstructionConsumesWorker(final boolean constructionConsumesWorker) { this.constructionConsumesWorker = constructionConsumesWorker; } @@ -5557,6 +5907,14 @@ public void removePostDamageListener(final CUnitAttackPostDamageListener listene this.postDamageListeners.remove(listener); } + public void addAttackModifier(final CUnitAttackModifier modifier) { + this.attackModifiers.add(0, modifier); + } + + public void removeAttackModifier(final CUnitAttackModifier modifier) { + this.attackModifiers.remove(modifier); + } + public void beginCooldown(final CSimulation game, final War3ID abilityId, final float cooldownDuration) { final int gameTurnTick = game.getGameTurnTick(); this.rawcodeToCooldownExpireTime.put(abilityId.getValue(), @@ -5623,7 +5981,10 @@ public void setFalseDeath(final boolean falseDeath) { this.falseDeath = falseDeath; } - public void setAutocastAbility(final CAutocastAbility autocastAbility) { + public void setAutocastAbility(final CSimulation simulation, final CAutocastAbility autocastAbility) { + if (this.autocastAbility != null && !this.autocastAbility.equals(autocastAbility)) { + this.autocastAbility.setAutoCastOn(simulation, this, false, false); + } this.autocastAbility = autocastAbility; } @@ -5641,6 +6002,34 @@ public boolean isVisible(final CSimulation simulation, final int toPlayerIndex) return toPlayer.getFogOfWar().isVisible(simulation, simulation.getPathingGrid(), getX(), getY()); } + public boolean hasUniqueFlag(String flag) { + if (this.uniqueFlags != null) { + return this.uniqueFlags.contains(flag); + } + return false; + } + + public void addUniqueFlag(String flag) { + if (this.uniqueFlags == null) { + this.uniqueFlags = new ArrayList<>(); + } + this.uniqueFlags.add(flag); + } + + public void removeUniqueFlag(String flag) { + if (this.uniqueFlags != null) { + this.uniqueFlags.remove(flag); + } + } + + public boolean isSelectable(final CSimulation simulation, final int toPlayerIndex) { + return ((this.unselectablePlayers & (1 << toPlayerIndex)) == 0); + } + + public boolean isUnenumerable() { + return this.unenumerable; + } + private final class CTimerUnitFade extends CTimer { private final StateModBuff stateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitStateListener.java index ce2de3735..7beb7a50e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitStateListener.java @@ -25,6 +25,8 @@ public interface CUnitStateListener { void hideStateChanged(); + void upgradesChanged(); + public static final class CUnitStateNotifier extends SubscriberSetNotifier implements CUnitStateListener { @Override @@ -103,5 +105,12 @@ public void hideStateChanged() { listener.hideStateChanged(); } } + + @Override + public void upgradesChanged() { + for (final CUnitStateListener listener : set) { + listener.upgradesChanged(); + } + } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWorldCollision.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWorldCollision.java index 932640706..9f849029e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWorldCollision.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWorldCollision.java @@ -161,7 +161,7 @@ public void enumUnitsInRect(final Rectangle rect, final CUnitEnumFunction callba // and so a recycled allocation did not work final Set intersectedUnits = new HashSet<>(); this.anyUnitEnumerableCollision.intersect(rect, (unit) -> { - if (unit.isHidden() || !intersectedUnits.add(unit)) { + if (unit.isHidden() || unit.isUnenumerable() || !intersectedUnits.add(unit)) { return false; } return callback.call(unit); @@ -172,7 +172,7 @@ public void enumCorpsesInRect(final Rectangle rect, final CUnitEnumFunction call // NOTE: allocation here seems quite wasteful, see note on enumUnitsInRect final Set intersectedUnits = new HashSet<>(); this.deadUnitCollision.intersect(rect, (unit) -> { - if (unit.isHidden() || !intersectedUnits.add(unit)) { + if (unit.isHidden() || unit.isUnenumerable() || !intersectedUnits.add(unit)) { return false; } return callback.call(unit); @@ -183,7 +183,7 @@ public void enumUnitsOrCorpsesInRect(final Rectangle rect, final CUnitEnumFuncti // NOTE: allocation here seems quite wasteful, see note on enumUnitsInRect final Set intersectedUnits = new HashSet<>(); final QuadtreeIntersector intersectorFxn = (unit) -> { - if (unit.isHidden() || !intersectedUnits.add(unit)) { + if (unit.isHidden() || unit.isUnenumerable() || !intersectedUnits.add(unit)) { return false; } return callback.call(unit); @@ -363,7 +363,7 @@ public AnyUnitExceptTwoIntersector reset(final CUnit firstUnit, final CUnit seco @Override public boolean onIntersect(final CUnit intersectingObject) { - if (intersectingObject.isHidden() + if (intersectingObject.isHidden() || intersectingObject.isUnenumerable() || MovementType.FOOT_NO_COLLISION.equals(intersectingObject.getMovementType()) || (this.forConstruction && intersectingObject.isNoBuildingCollision()) || (!this.forConstruction && intersectingObject.isNoUnitCollision())) { @@ -387,7 +387,7 @@ public EachUnitOnlyOnceIntersector reset(final CUnitEnumFunction consumerDelegat @Override public boolean onIntersect(final CUnit intersectingObject) { - if (intersectingObject.isHidden()) { + if (intersectingObject.isHidden() || intersectingObject.isUnenumerable()) { return false; } if (this.done) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java index 9ac80d37b..cab8fe5da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/AbstractCAbility.java @@ -65,6 +65,15 @@ public final void setDisabled(final boolean disabled, final CAbilityDisableType } onSetDisabled(disabled, wasDisabled, type); } + + @Override + public boolean isClickDisabled() { + return this.disabled != 0; + } + + @Override + public void setClickDisabled(final boolean disabled, final CAbilityDisableType type) { + } @Override public final boolean isIconShowing() { @@ -106,6 +115,28 @@ public CItem getItem() { // do nothing return null; } + + @Override + public boolean hasUniqueFlag(String flag) { + return false; + } + + public void addUniqueFlag(String flag) { + } + + public void removeUniqueFlag(String flag) { + } + + @Override + public T getUniqueValue(String key, Class cls) { + return null; + } + + public void addUniqueValue(Object item, String key) { + } + + public void removeUniqueValue(String key) { + } @Override public final void checkCanUse(final CSimulation game, final CUnit unit, final int orderId, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java index 26d8c40b5..04b8c3d3c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbility.java @@ -45,6 +45,7 @@ public interface CAbility extends CAbilityView, CExtensibleHandle { void setHero(boolean isHero); void setDisabled(boolean disabled, CAbilityDisableType type); + void setClickDisabled(boolean disabled, CAbilityDisableType type); void setIconShowing(boolean iconShowing); @@ -54,4 +55,12 @@ public interface CAbility extends CAbilityView, CExtensibleHandle { CItem getItem(); + boolean hasUniqueFlag(String flag); + void addUniqueFlag(String flag); + void removeUniqueFlag(String flag); + + T getUniqueValue(String key, Class cls); + void addUniqueValue(Object item, String key); + void removeUniqueValue(String key); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityDisableType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityDisableType.java index f17e2357d..03573f8b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityDisableType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityDisableType.java @@ -7,7 +7,7 @@ public enum CAbilityDisableType implements CHandle { CONSTRUCTION((byte) 2), TRANSFORMATION((byte) 4), TRIGGER((byte) 8), - ATTACKDISABLED((byte) 16), + DISABLED_EFFECT((byte) 16), PLAYER((byte) 32), ABILITYINTERNAL((byte) 64); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java index 049c5f17f..a60e5a1f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java @@ -34,6 +34,7 @@ void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder boolean isHero(); boolean isDisabled(); + boolean isClickDisabled(); boolean isIconShowing(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/AutocastType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/AutocastType.java index 6d831f55d..a6d498742 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/AutocastType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/AutocastType.java @@ -9,6 +9,7 @@ public enum AutocastType implements CHandle { ATTACKTARGETING, ATTACKINGALLY, ATTACKINGENEMY, + FARTHESTVALID, NEARESTVALID, NEARESTENEMY, NOTARGET, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/CAutocastAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/CAutocastAbility.java index 13c3ec636..24282f384 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/CAutocastAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/autocast/CAutocastAbility.java @@ -16,7 +16,7 @@ public interface CAutocastAbility { boolean isAutoCastOn(); - void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn); + void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn, final boolean notify); void checkCanAutoTarget(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java index 1fa1d47c2..09b6c67fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityBuildInProgress.java @@ -45,7 +45,7 @@ public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, fina caster.cancelUpgrade(game); } else { - caster.setLife(game, 0); + caster.cancelConstruction(game); } return false; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java index e6e23b2d5..3656b044a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityHumanRepair.java @@ -37,6 +37,7 @@ public CAbilityHumanRepair(final int handleId, final War3ID code, final War3ID a final float castRange) { super(handleId, code, alias); this.targetsAllowed = targetsAllowed; + this.targetsAllowed.add(CTargetType.REPAIRABLE); this.navalRangeBonus = navalRangeBonus; this.powerBuildCostRatio = powerBuildCostRatio; this.powerBuildTimeRatio = powerBuildTimeRatio; @@ -203,9 +204,11 @@ public AutocastType getAutocastType() { } @Override - public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn, final boolean notify) { this.autocasting = autoCastOn; - caster.setAutocastAbility(autoCastOn ? this : null); + if (notify) { + caster.setAutocastAbility(simulation, autoCastOn ? this : null); + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java index f315bd79e..48e25d591 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/build/CAbilityRepair.java @@ -34,6 +34,7 @@ public CAbilityRepair(final int handleId, final War3ID code, final War3ID alias, final float castRange) { super(handleId, code, alias); this.targetsAllowed = targetsAllowed; + this.targetsAllowed.add(CTargetType.REPAIRABLE); this.navalRangeBonus = navalRangeBonus; this.repairCostRatio = repairCostRatio; this.repairTimeRatio = repairTimeRatio; @@ -190,9 +191,11 @@ public AutocastType getAutocastType() { } @Override - public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn, final boolean notify) { this.autocasting = autoCastOn; - caster.setAutocastAbility(autoCastOn ? this : null); + if (notify) { + caster.setAutocastAbility(simulation, autoCastOn ? this : null); + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java index 5fedef3f5..37f887f30 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java @@ -59,5 +59,10 @@ public boolean isAura() { public boolean isHero() { return false; } + + @Override + public String getVisibilityGroup() { + return null; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericSingleIconActiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericSingleIconActiveAbility.java index 79700c3a2..d62c11c8a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericSingleIconActiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractGenericSingleIconActiveAbility.java @@ -23,11 +23,11 @@ public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, fina final int autoCastOffOrderId = getAutoCastOffOrderId(); if (orderId != 0) { if (orderId == autoCastOnOrderId) { - setAutoCastOn(game, caster, true); + setAutoCastOn(game, caster, true, true); return false; } else if (orderId == autoCastOffOrderId) { - setAutoCastOn(game, caster, false); + setAutoCastOn(game, caster, false, true); return false; } else { @@ -146,7 +146,7 @@ public int getAutoCastOffOrderId() { return 0; } - public void setAutoCastOn(final CSimulation simulation, final CUnit unit, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit unit, final boolean autoCastOn, final boolean notify) { } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java index 8c2785af1..1a75199fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java @@ -23,5 +23,7 @@ public interface CBuff extends CAliasedLevelingAbility { boolean isMagic(); boolean isAura(); + + String getVisibilityGroup(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/moonwell/CAbilityMoonWell.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/moonwell/CAbilityMoonWell.java index b8fce542c..83f44ecc2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/moonwell/CAbilityMoonWell.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/nightelf/moonwell/CAbilityMoonWell.java @@ -230,9 +230,11 @@ public boolean isAutoCastOn() { } @Override - public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn, final boolean notify) { this.autoCastActive = autoCastOn; - caster.setAutocastAbility(autoCastOn ? this : null); + if (notify) { + caster.setAutocastAbility(simulation, autoCastOn ? this : null); + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java index bf97fcfc7..ba55a1a8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/neutral/sappers/CAbilityKaboom.java @@ -110,9 +110,11 @@ private void explode(final CSimulation simulation, final CUnit caster) { } @Override - public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn, final boolean notify) { this.autoCastOn = autoCastOn; - caster.setAutocastAbility(autoCastOn ? this : null); + if (notify) { + caster.setAutocastAbility(simulation, autoCastOn ? this : null); + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffSlow.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffSlow.java index d03d077f8..fdb209152 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffSlow.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffSlow.java @@ -50,8 +50,8 @@ public boolean isTimedLifeBar() { } @Override - public boolean isMagic() { - return true; + public boolean isPositive() { + return false; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffStun.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffStun.java index a4b0958b5..afc5ec9c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffStun.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffStun.java @@ -35,5 +35,10 @@ protected void onBuffRemove(final CSimulation game, final CUnit unit) { public boolean isTimedLifeBar() { return false; } + + @Override + public boolean isPositive() { + return false; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/targeting/AbilityTargetStillAliveAndTargetableVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/targeting/AbilityTargetStillAliveAndTargetableVisitor.java index 87bc79d46..e51819d46 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/targeting/AbilityTargetStillAliveAndTargetableVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/targeting/AbilityTargetStillAliveAndTargetableVisitor.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; public final class AbilityTargetStillAliveAndTargetableVisitor implements AbilityTargetVisitor { private CSimulation simulation; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java index 0941536f4..3939a32b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java @@ -35,5 +35,15 @@ public interface AbilityBuilderAbility extends CLevelingAbility, Aliased { War3ID getOnTooltipOverride(); public int getAbilityIntField(String field); + public float getAbilityFloatField(String field); + public String getAbilityStringField(String field); + public boolean getAbilityBooleanField(String field); + + boolean hasUniqueFlag(String flag); + void addUniqueFlag(String flag); + void removeUniqueFlag(String flag); + + public int getIconVisibleMenuId(); + void setIconVisibleMenuId(int menu); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java index 53933b120..64af095b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java @@ -13,8 +13,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.CAutocastAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.GenericSingleIconActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; public interface AbilityBuilderActiveAbility extends AbilityBuilderAbility, CAutocastAbility, GenericSingleIconActiveAbility { @@ -26,6 +28,8 @@ public interface AbilityBuilderActiveAbility extends AbilityBuilderAbility, CAut public int getChargedManaCost(); public void setCastRange(float castRange); + + public EnumSet getTargetsAllowed(); public int getOffOrderId(); @@ -46,6 +50,8 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, final AbilityTargetCheckReceiver receiver); + public void internalBegin(CSimulation game, CUnit theCaster, int orderId, boolean b, AbilityTarget theTarget); + public void runOnOrderIssuedActions(CSimulation game, CUnit caster, int orderId); public void runBeginCastingActions(CSimulation game, CUnit caster, int orderId); @@ -65,5 +71,10 @@ public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, fin War3ID getOffTooltipOverride(); boolean isActive(); + + public void cleanupInputs(); + public void cleanupInputs(int castId); + + public boolean isMenuAbility(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java index f83ba8a6d..14de91b12 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java @@ -8,6 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -60,6 +62,20 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool return null; } } + + @Override + public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget noTarget) { + this.castId++; + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + CWidget target = autoTarget(game, caster); + if (target != null) { + this.runOnOrderIssuedActions(game, caster, orderId); + } else { + this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); + this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); + this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); + } + } public CWidget autoTarget(CSimulation game, CUnit caster) { CWidget target = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java index 28e7cdcce..2f4fe169e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java @@ -121,6 +121,8 @@ public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, fina @Override public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { if (this.isTargetedSpell() && !this.isPointTarget()) { + this.castId++; + this.behavior.setCastId(this.castId); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, target.visit(AbilityTargetVisitor.UNIT)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, target.visit(AbilityTargetVisitor.ITEM)); @@ -135,6 +137,8 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto @Override public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { if (this.isTargetedSpell() && this.isPointTarget()) { + this.castId++; + this.behavior.setCastId(this.castId); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, point); this.runOnOrderIssuedActions(game, caster, orderId); @@ -150,6 +154,8 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool if (castless) { return null; } else { + this.castId++; + this.behavior.setCastId(this.castId); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); this.runOnOrderIssuedActions(game, caster, orderId); return this.behavior.reset(); @@ -159,6 +165,29 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool } } + @Override + public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target) { + this.castId++; + if (this.isTargetedSpell()) { + if (this.isPointTarget()) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, target.visit(AbilityTargetVisitor.POINT)); + this.runOnOrderIssuedActions(game, caster, orderId); + } else { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, target.visit(AbilityTargetVisitor.UNIT)); + this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, target.visit(AbilityTargetVisitor.ITEM)); + this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, target.visit(AbilityTargetVisitor.DESTRUCTABLE)); + this.runOnOrderIssuedActions(game, caster, orderId); + } + } else { + if (!castless) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.runOnOrderIssuedActions(game, caster, orderId); + } + } + } + @Override protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java index 4206ee821..a76549c8b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; @@ -87,17 +88,24 @@ public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, fina @Override public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { - this.castId++; + this.internalBegin(game, caster, orderId, autoOrder, null); if (castless) { return null; } else { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); - this.runOnOrderIssuedActions(game, caster, orderId); this.behavior.setCastId(castId); return this.behavior.reset(); } } + @Override + public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target) { + this.castId++; + if (!castless) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.runOnOrderIssuedActions(game, caster, orderId); + } + } + @Override protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java index cfd13228c..b227ad4ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java @@ -15,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CPairingAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorSendOrder; @@ -179,6 +180,13 @@ private boolean offOrderId(final int orderId) { return ((this.toggleable && this.active) || this.separateOnAndOff) && orderId == this.getOffOrderId(); } + @Override + public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget noTarget) { + this.castId++; + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + //Just don't do this + } + // ---- // Non-Targeted @Override @@ -350,7 +358,7 @@ private boolean canPairWith(CSimulation game, CUnit caster, CUnit target) { } if (getPairAbilityCode(game, caster) != null) { for (CAbility ability : target.getAbilities()) { - if (ability.getCode().equals(this.getPairAbilityCode(game, caster))) { + if (this.getPairAbilityCode(game, caster).equals(ability.getCode())) { localStore.put(ABLocalStoreKeys.LASTPARTNERABILITY, ability); return true; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java index 64c283943..a7f8d62f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java @@ -8,6 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; @@ -44,12 +46,17 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto @Override public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { + this.internalBegin(game, caster, orderId, autoOrder, point); + this.behavior.setCastId(castId); + return this.behavior.reset(game, point); + } + + @Override + public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget theTarget) { this.castId++; this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, point); + localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, theTarget.visit(AbilityTargetVisitor.POINT)); this.runOnOrderIssuedActions(game, caster, orderId); - this.behavior.setCastId(castId); - return this.behavior.reset(game, point); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java index 6de3d3f31..2228c9197 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java @@ -8,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -35,15 +36,19 @@ public void onAdd(CSimulation game, CUnit unit) { @Override public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { - this.castId++; + this.internalBegin(game, caster, orderId, autoOrder, target); this.behavior.setCastId(castId); + return this.behavior.reset(game, target); + } + @Override + public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target) { + this.castId++; this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, target.visit(AbilityTargetVisitor.UNIT)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, target.visit(AbilityTargetVisitor.ITEM)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, target.visit(AbilityTargetVisitor.DESTRUCTABLE)); this.runOnOrderIssuedActions(game, caster, orderId); - return this.behavior.reset(game, target); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index 88fa7bfa4..a27837312 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -1,8 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; import java.util.EnumSet; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; + import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.util.WarsmashConstants; @@ -17,6 +20,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitTypeRequirement; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractGenericSingleIconNoSmartActiveAbility; @@ -27,6 +31,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -61,6 +66,8 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri protected boolean allowCastlessDeactivate = true; protected PrimaryTag castingPrimaryTag; protected EnumSet castingSecondaryTags; + + protected byte clickDisabled = 0; protected CItem item = null; @@ -83,6 +90,11 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri private boolean physical = false; private boolean magic = true; private boolean universal = false; + + protected Set uniqueFlags = null; + + private boolean isMenu = false; + private int visibleMenuId = 0; public CAbilityAbilityBuilderGenericActive(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, @@ -93,7 +105,11 @@ public CAbilityAbilityBuilderGenericActive(int handleId, War3ID code, War3ID ali this.localStore = localStore; localStore.put(ABLocalStoreKeys.ABILITY, this); - orderId = OrderIdUtils.getOrderId(config.getCastId()); + if (config.getCastId() != null) { + orderId = OrderIdUtils.getOrderId(config.getCastId()); + } else { + orderId = 0; + } if (config.getUncastId() != null) { unorderId = OrderIdUtils.getOrderId(config.getUncastId()); } @@ -129,6 +145,24 @@ public int getAbilityIntField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getFieldValue(field); } + + @Override + public float getAbilityFloatField(String field) { + GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + return editorData.getFieldFloatValue(field); + } + + @Override + public String getAbilityStringField(String field) { + GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + return editorData.getField(field); + } + + @Override + public boolean getAbilityBooleanField(String field) { + GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + return editorData.getFieldValue(field) != 0; + } @Override public void setLevel(CSimulation game, CUnit unit, int level) { @@ -158,6 +192,7 @@ public void onAdd(CSimulation game, CUnit unit) { public void onAddDisabled(CSimulation game, CUnit unit) { localStore.put(ABLocalStoreKeys.GAME, game); localStore.put(ABLocalStoreKeys.THISUNIT, unit); + addInitialUniqueFlags(game, unit); setSpellFields(game, unit); determineToggleableFields(game, unit); if (config.getOnAddDisabledAbility() != null) { @@ -175,6 +210,16 @@ public void onRemoveDisabled(CSimulation game, CUnit unit) { } } } + + private void addInitialUniqueFlags(CSimulation game, CUnit unit) { + if (this.config.getInitialUniqueFlags() != null && !this.config.getInitialUniqueFlags().isEmpty()) { + this.uniqueFlags = new HashSet<>(); + for (ABStringCallback flag : this.config.getInitialUniqueFlags()) { + this.uniqueFlags.add(flag.callback(game, unit, localStore, 0)); + } + } + } + private void determineToggleableFields(CSimulation game, CUnit unit) { if (config.getDisplayFields() != null && config.getDisplayFields().getSeparateOnAndOff() != null) { @@ -296,7 +341,21 @@ protected void setSpellFields(CSimulation game, CUnit unit) { if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getHideAreaCursor() != null) { this.hideAreaCursor = this.config.getDisplayFields().getHideAreaCursor().callback(game, unit, localStore, + castId); + } + if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getIsMenu() != null) { + this.isMenu = this.config.getDisplayFields().getIsMenu().callback(game, unit, localStore, this.getLevel()); + if (this.isMenu) { + if (this.config.getDisplayFields().getMenuId() != null) { + this.orderId = this.config.getDisplayFields().getMenuId().callback(game, unit, localStore, + castId); + } else { + if (this.orderId == 0) { + this.orderId = this.getHandleId(); + } + } + } } localStore.put(ABLocalStoreKeys.ISABILITYMAGIC, this.magic); localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, this.physical); @@ -381,6 +440,45 @@ public AbilityBuilderConfiguration getConfig() { public Map getLocalStore() { return this.localStore; } + + @Override + public boolean hasUniqueFlag(String flag) { + if (this.uniqueFlags != null) { + return this.uniqueFlags.contains(flag); + } + return false; + } + + public void addUniqueFlag(String flag) { + if (this.uniqueFlags == null) { + this.uniqueFlags = new HashSet<>(); + } + this.uniqueFlags.add(flag); + } + + public void removeUniqueFlag(String flag) { + if (this.uniqueFlags != null) { + this.uniqueFlags.remove(flag); + } + } + + @SuppressWarnings("unchecked") + @Override + public T getUniqueValue(String key, Class cls) { + Object o = this.localStore.get(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); + if (o != null && o.getClass() == cls) { + return (T)o; + } + return null; + } + + public void addUniqueValue(Object item, String key) { + this.localStore.put(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId()), item); + } + + public void removeUniqueValue(String key) { + this.localStore.remove(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); + } @Override public War3ID getOnTooltipOverride() { @@ -430,6 +528,10 @@ public float getCastTime() { public void setCastTime(float castTime) { this.castTime = castTime; } + + public EnumSet getTargetsAllowed() { + return targetsAllowed; + } @Override public boolean isSeparateOnAndOff() { @@ -445,6 +547,21 @@ public boolean isToggleOn() { public boolean isActive() { return this.active; } + + @Override + public boolean isClickDisabled() { + return this.clickDisabled != 0; + } + + @Override + public final void setClickDisabled(final boolean disabled, final CAbilityDisableType type) { + if (disabled) { + this.clickDisabled |= type.getMask(); + } + else { + this.clickDisabled &= ~type.getMask(); + } + } @Override public int getAutoCastOnOrderId() { @@ -462,10 +579,12 @@ public boolean isAutoCastOn() { } @Override - public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn) { + public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn, final boolean notify) { this.localStore.put(ABLocalStoreKeys.WASAUTOCASTON, this.autocasting); this.autocasting = autoCastOn; - caster.setAutocastAbility(autoCastOn ? this : null); + if (notify) { + caster.setAutocastAbility(simulation, autoCastOn ? this : null); + } this.localStore.put(ABLocalStoreKeys.ISAUTOCASTON, autoCastOn); if (this.config.getOnChangeAutoCast() != null) { for (ABAction action : this.config.getOnChangeAutoCast()) { @@ -1121,4 +1240,32 @@ public boolean isUniversal() { public CAbilityCategory getAbilityCategory() { return CAbilityCategory.SPELL; } + + @Override + public void cleanupInputs() { + this.cleanupInputs(castId); + } + + @Override + public void cleanupInputs(int theCastId) { + this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + theCastId); + this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + theCastId); + this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + theCastId); + this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + theCastId); + } + + @Override + public int getIconVisibleMenuId() { + return this.visibleMenuId; + } + + @Override + public void setIconVisibleMenuId(int menu) { + this.visibleMenuId = menu; + } + + @Override + public boolean isMenuAbility() { + return this.isMenu; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java index 35c621eea..4d641acee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java @@ -1,7 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.util.War3ID; @@ -14,6 +16,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractGenericNoIconAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; @@ -35,6 +38,10 @@ public class CAbilityAbilityBuilderNoIcon extends AbstractGenericNoIconAbility i protected float area = 0; protected float range = 0; protected float castTime = 0; + + protected Set uniqueFlags = null; + + private int visibleMenuId = 0; public CAbilityAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, Map localStore) { @@ -49,6 +56,15 @@ public CAbilityAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, Lis localStore.put(ABLocalStoreKeys.ISABILITYMAGIC, false); localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, false); } + + private void addInitialUniqueFlags(CSimulation game, CUnit unit) { + if (this.config.getInitialUniqueFlags() != null && !this.config.getInitialUniqueFlags().isEmpty()) { + this.uniqueFlags = new HashSet<>(); + for (ABStringCallback flag : this.config.getInitialUniqueFlags()) { + this.uniqueFlags.add(flag.callback(game, unit, localStore, 0)); + } + } + } protected void setSpellFields(CSimulation game, CUnit unit) { CAbilityTypeAbilityBuilderLevelData levelDataLevel = this.levelData.get(this.getLevel() - 1); @@ -79,6 +95,24 @@ public int getAbilityIntField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getFieldValue(field); } + + @Override + public float getAbilityFloatField(String field) { + GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + return editorData.getFieldFloatValue(field); + } + + @Override + public String getAbilityStringField(String field) { + GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + return editorData.getField(field); + } + + @Override + public boolean getAbilityBooleanField(String field) { + GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + return editorData.getFieldValue(field) != 0; + } @Override public List getLevelData() { @@ -163,6 +197,45 @@ public void setItemAbility(final CItem item, int slot) { public CItem getItem() { return this.item; } + + @Override + public boolean hasUniqueFlag(String flag) { + if (this.uniqueFlags != null) { + return this.uniqueFlags.contains(flag); + } + return false; + } + + public void addUniqueFlag(String flag) { + if (this.uniqueFlags == null) { + this.uniqueFlags = new HashSet<>(); + } + this.uniqueFlags.add(flag); + } + + public void removeUniqueFlag(String flag) { + if (this.uniqueFlags != null) { + this.uniqueFlags.remove(flag); + } + } + + @SuppressWarnings("unchecked") + @Override + public T getUniqueValue(String key, Class cls) { + Object o = this.localStore.get(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); + if (o != null && o.getClass() == cls) { + return (T)o; + } + return null; + } + + public void addUniqueValue(Object item, String key) { + this.localStore.put(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId()), item); + } + + public void removeUniqueValue(String key) { + this.localStore.remove(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); + } @Override public void setLevel(CSimulation game, CUnit unit, int level) { @@ -191,6 +264,7 @@ public void onAdd(CSimulation game, CUnit unit) { public void onAddDisabled(CSimulation game, CUnit unit) { localStore.put(ABLocalStoreKeys.GAME, game); localStore.put(ABLocalStoreKeys.THISUNIT, unit); + addInitialUniqueFlags(game, unit); setSpellFields(game, unit); if (config.getOnAddDisabledAbility() != null) { for (ABAction action : config.getOnAddDisabledAbility()) { @@ -262,6 +336,16 @@ public boolean isRequirementsMet(CSimulation game, CUnit unit) { } return requirementsMet; } + + @Override + public int getIconVisibleMenuId() { + return this.visibleMenuId; + } + + @Override + public void setIconVisibleMenuId(int menu) { + this.visibleMenuId = menu; + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java index ff1ce3304..c3e81811b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java @@ -1,7 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.util.War3ID; @@ -13,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; @@ -34,6 +37,10 @@ public class CAbilityAbilityBuilderPassive extends AbilityGenericSingleIconPassi private float castTime = 0; private War3ID onTooltipOverride = null; + + protected Set uniqueFlags = null; + + private int visibleMenuId = 0; public CAbilityAbilityBuilderPassive(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, @@ -49,6 +56,15 @@ public CAbilityAbilityBuilderPassive(int handleId, War3ID code, War3ID alias, localStore.put(ABLocalStoreKeys.ISABILITYMAGIC, false); localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, false); } + + private void addInitialUniqueFlags(CSimulation game, CUnit unit) { + if (this.config.getInitialUniqueFlags() != null && !this.config.getInitialUniqueFlags().isEmpty()) { + this.uniqueFlags = new HashSet<>(); + for (ABStringCallback flag : this.config.getInitialUniqueFlags()) { + this.uniqueFlags.add(flag.callback(game, unit, localStore, 0)); + } + } + } protected void setSpellFields(CSimulation game, CUnit unit) { if (this.levelData.size() > 0) { @@ -85,6 +101,24 @@ public int getAbilityIntField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getFieldValue(field); } + + @Override + public float getAbilityFloatField(String field) { + GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + return editorData.getFieldFloatValue(field); + } + + @Override + public String getAbilityStringField(String field) { + GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + return editorData.getField(field); + } + + @Override + public boolean getAbilityBooleanField(String field) { + GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + return editorData.getFieldValue(field) != 0; + } @Override public List getLevelData() { @@ -169,6 +203,45 @@ public void setItemAbility(final CItem item, int slot) { public CItem getItem() { return this.item; } + + @Override + public boolean hasUniqueFlag(String flag) { + if (this.uniqueFlags != null) { + return this.uniqueFlags.contains(flag); + } + return false; + } + + public void addUniqueFlag(String flag) { + if (this.uniqueFlags == null) { + this.uniqueFlags = new HashSet<>(); + } + this.uniqueFlags.add(flag); + } + + public void removeUniqueFlag(String flag) { + if (this.uniqueFlags != null) { + this.uniqueFlags.remove(flag); + } + } + + @SuppressWarnings("unchecked") + @Override + public T getUniqueValue(String key, Class cls) { + Object o = this.localStore.get(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); + if (o != null && o.getClass() == cls) { + return (T)o; + } + return null; + } + + public void addUniqueValue(Object item, String key) { + this.localStore.put(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId()), item); + } + + public void removeUniqueValue(String key) { + this.localStore.remove(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); + } @Override public War3ID getOnTooltipOverride() { @@ -204,6 +277,7 @@ public void onAdd(CSimulation game, CUnit unit) { public void onAddDisabled(CSimulation game, CUnit unit) { localStore.put(ABLocalStoreKeys.GAME, game); localStore.put(ABLocalStoreKeys.THISUNIT, unit); + addInitialUniqueFlags(game, unit); setSpellFields(game, unit); if (config.getOnAddDisabledAbility() != null) { for (ABAction action : config.getOnAddDisabledAbility()) { @@ -296,4 +370,14 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final super.innerCheckCanUse(game, unit, orderId, receiver); } + @Override + public int getIconVisibleMenuId() { + return this.visibleMenuId; + } + + @Override + public void setIconVisibleMenuId(int menu) { + this.visibleMenuId = menu; + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java index 264aa8822..7fea2b736 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java @@ -174,6 +174,11 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { } else { final int ticksSinceCast = game.getGameTurnTick() - this.castStartTick; if ((ticksSinceCast >= castPointTicks) || (ticksSinceCast >= backswingTicks)) { + if (!this.isWithinRange(game)) { + // Unit moved too far, out of range now + cleanupInputs(); + return this.unit.pollNextOrderBehavior(game); + } CBehavior beh = tryDoEffect(game, wasChanneling); if (beh != null) { return beh; @@ -194,10 +199,7 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { } private void cleanupInputs() { - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + castId); + this.ability.cleanupInputs(castId); } private CBehavior tryDoEffect(CSimulation game, boolean wasChanneling) { @@ -276,7 +278,11 @@ public int getHighlightOrderId() { @Override public boolean isWithinRange(CSimulation simulation) { - return this.unit.canReach(this.target, this.ability.getCastRange()); + float range = this.ability.getCastRange(); + if (this.castStartTick > 0) { + range += simulation.getGameplayConstants().getSpellCastRangeBuffer(); + } + return this.unit.canReach(this.target, range); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java index ad91a7cc8..f0b4fdfc0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -19,7 +19,7 @@ public class CBehaviorFinishTransformation implements CBehavior { private Map localStore; private OnTransformationActions actions; private CUnit unit; - private AbilityBuilderActiveAbility ability; + private AbilityBuilderAbility ability; private CUnitType baseTypeForDuration; private CUnitType newType; private boolean keepRatios; @@ -46,7 +46,7 @@ public class CBehaviorFinishTransformation implements CBehavior { private int castStartTick = 0; public CBehaviorFinishTransformation(Map localStore, final CUnit unit, - AbilityBuilderActiveAbility ability, CUnitType newType, final boolean keepRatios, + AbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, OnTransformationActions actions, boolean addAlternateTagAfter, final int visibleOrderId, boolean permanent, float duration, float transformationTime, float landingDelay, float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, boolean immediateLanding, boolean immediateTakeoff, War3ID buffId, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java index 24a8fe763..61386d5bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java @@ -13,21 +13,27 @@ public class ABActionAddAbility implements ABSingleAction { - private ABUnitCallback targetUnit; - private ABAbilityCallback abilityToAdd; + private ABUnitCallback unit; + private ABAbilityCallback ability; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - final CAbility ability = this.abilityToAdd.callback(game, caster, localStore, castId); - this.targetUnit.callback(game, caster, localStore, castId).add(game, ability); - localStore.put(ABLocalStoreKeys.LASTADDEDABILITY, ability); + final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theAbility != null) { + theUnit.add(game, theAbility); + localStore.put(ABLocalStoreKeys.LASTADDEDABILITY, theAbility); + } } @Override public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { return "AddUnitAbilityAU(" + jassTextGenerator.getTriggerLocalStore() + ", " - + this.targetUnit.generateJassEquivalent(jassTextGenerator) + ", " - + this.abilityToAdd.generateJassEquivalent(jassTextGenerator) + ")"; + + this.unit.generateJassEquivalent(jassTextGenerator) + ", " + + this.ability.generateJassEquivalent(jassTextGenerator) + ")"; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java index 9714922d5..8e22e6f39 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java @@ -6,25 +6,50 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.util.CBuffSlow; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuffSlow; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; public class ABActionAddSlowBuff implements ABSingleAction { private ABUnitCallback unit; + private ABIDCallback buffId; private ABFloatCallback duration; + private ABBooleanCallback showIcon; + private ABBooleanCallback leveled; + @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - final CAbility ability = new CBuffSlow(game.getHandleIdAllocator().createId(), War3ID.fromString("Bfro"), - this.duration.callback(game, caster, localStore, castId), - game.getGameplayConstants().getFrostAttackSpeedDecrease(), - game.getGameplayConstants().getFrostMoveSpeedDecrease()); + War3ID alias = null; + boolean isLeveled = false; + boolean isShowIcon = true; + if (buffId == null) { + alias = War3ID.fromString("Bfro"); + } else { + alias = buffId.callback(game, caster, localStore, castId); + } + if (leveled != null) { + isLeveled = leveled.callback(game, caster, localStore, castId); + } else { + isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + } + if (showIcon != null) { + isShowIcon = showIcon.callback(game, caster, localStore, castId); + } + + + final ABBuffSlow ability = new ABBuffSlow(game, game.getHandleIdAllocator().createId(), alias, + this.duration.callback(game, caster, localStore, castId), isLeveled); + + ability.setIconShowing(isShowIcon); + + this.unit.callback(game, caster, localStore, castId).add(game, ability); localStore.put(ABLocalStoreKeys.LASTADDEDBUFF, ability); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java index ac4040829..f31be5516 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java @@ -3,35 +3,56 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.util.CBuffStun; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuffStun; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; public class ABActionAddStunBuff implements ABSingleAction { - private ABUnitCallback target; + private ABUnitCallback unit; private ABIDCallback buffId; private ABFloatCallback duration; + private ABBooleanCallback showIcon; + private ABBooleanCallback leveled; + @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - final CAbility ability = new CBuffStun(game.getHandleIdAllocator().createId(), - this.buffId.callback(game, caster, localStore, castId), - this.duration.callback(game, caster, localStore, castId)); - this.target.callback(game, caster, localStore, castId).add(game, ability); + War3ID alias = null; + boolean isLeveled = false; + boolean isShowIcon = true; + if (buffId == null) { + alias = War3ID.fromString("BSTN"); + } else { + alias = buffId.callback(game, caster, localStore, castId); + } + if (leveled != null) { + isLeveled = leveled.callback(game, caster, localStore, castId); + } else { + isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + } + if (showIcon != null) { + isShowIcon = showIcon.callback(game, caster, localStore, castId); + } + final ABBuffStun ability = new ABBuffStun(game.getHandleIdAllocator().createId(), alias, + this.duration.callback(game, caster, localStore, castId), isLeveled); + ability.setIconShowing(isShowIcon); + + this.unit.callback(game, caster, localStore, castId).add(game, ability); localStore.put(ABLocalStoreKeys.LASTADDEDBUFF, ability); } @Override public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { - return "AddUnitAbility(" + this.target.generateJassEquivalent(jassTextGenerator) + ", CreateStunBuffAU(" + return "AddUnitAbility(" + this.unit.generateJassEquivalent(jassTextGenerator) + ", CreateStunBuffAU(" + jassTextGenerator.getTriggerLocalStore() + ", " + this.buffId.generateJassEquivalent(jassTextGenerator) + ", " + this.duration.generateJassEquivalent(jassTextGenerator) + "))"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java index f3e310539..d04cf0e89 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java @@ -3,29 +3,35 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; public class ABActionCreateAbilityFromId implements ABSingleAction { - private ABIDCallback abilityId; + private ABIDCallback id; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - final CAbility ability = game.getAbilityData() - .getAbilityType(this.abilityId.callback(game, caster, localStore, castId)) - .createAbility(game.getHandleIdAllocator().createId()); - localStore.put(ABLocalStoreKeys.LASTCREATEDABILITY, ability); + War3ID theId = this.id.callback(game, caster, localStore, castId); + CAbilityType type = game.getAbilityData().getAbilityType(theId); + if (type != null) { + final CAbility ability = type.createAbility(game.getHandleIdAllocator().createId()); + localStore.put(ABLocalStoreKeys.LASTCREATEDABILITY, ability); + } else { + System.err.println("Failed to find an ability type definition for ability " + theId.asStringValue()); + } } @Override public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { return "CreateAbilityFromIdAU(" + jassTextGenerator.getTriggerLocalStore() + ", " - + this.abilityId.generateJassEquivalent(jassTextGenerator) + ")"; + + this.id.generateJassEquivalent(jassTextGenerator) + ")"; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateLightningEffect.java index 2c82a53cb..c8cc3eef3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateLightningEffect.java @@ -2,6 +2,7 @@ import java.util.Map; +import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -26,14 +27,21 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + War3ID theId = null; + if (id == null) { + theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + } else { + theId = id.callback(game, caster, localStore, castId); + } if (index == null) { SimulationRenderComponent ret = game.createPersistentSpellEffectOnUnit( - (target.callback(game, caster, localStore, castId)), this.id.callback(game, caster, localStore, castId), - this.effectType); + (target.callback(game, caster, localStore, castId)), theId, this.effectType); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } else { SimulationRenderComponent ret = game.createPersistentSpellEffectOnUnit( - (target.callback(game, caster, localStore, castId)), this.id.callback(game, caster, localStore, castId), - this.effectType, this.index.callback(game, caster, localStore, castId)); + (target.callback(game, caster, localStore, castId)), + this.id.callback(game, caster, localStore, castId), this.effectType, + this.index.callback(game, caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectAtLocation.java index 7c053b276..6d5cf6582 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectAtLocation.java @@ -3,12 +3,14 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -27,8 +29,14 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + War3ID theId = null; + if (id == null) { + theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + } else { + theId = id.callback(game, caster, localStore, castId); + } game.createTemporarySpellEffectOnUnit((this.target.callback(game, caster, localStore, castId)), - this.id.callback(game, caster, localStore, castId), this.effectType); + theId, this.effectType); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java new file mode 100644 index 000000000..c8467c208 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionDeleteStoredKey implements ABAction { + + private ABStringCallback key; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + localStore.remove(key.callback(game, caster, localStore, castId)); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java index d4cbf2b6b..f8808b150 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java @@ -5,25 +5,32 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; public class ABActionRemoveAbility implements ABSingleAction { - private ABUnitCallback targetUnit; - private ABAbilityCallback abilityToRemove; + private ABUnitCallback unit; + private ABAbilityCallback ability; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - (this.targetUnit.callback(game, caster, localStore, castId)).remove(game, - this.abilityToRemove.callback(game, caster, localStore, castId)); + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + if (theAbility != null) { + theUnit.remove(game, theAbility); + } } @Override public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { - return "RemoveUnitAbility(" + this.targetUnit.generateJassEquivalent(jassTextGenerator) + ", " - + this.abilityToRemove.generateJassEquivalent(jassTextGenerator) + ")"; + return "RemoveUnitAbility(" + this.unit.generateJassEquivalent(jassTextGenerator) + ", " + + this.ability.generateJassEquivalent(jassTextGenerator) + ")"; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java new file mode 100644 index 000000000..2a7ee065b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java @@ -0,0 +1,32 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionAbilityAddUniqueFlag implements ABSingleAction { + + private ABAbilityCallback ability; + private ABStringCallback flag; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + if (theAbility instanceof AbilityBuilderAbility) { + ((AbilityBuilderAbility)theAbility).addUniqueFlag(flag.callback(game, caster, localStore, castId)); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "JASSTODO"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java new file mode 100644 index 000000000..bc88ab4d5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java @@ -0,0 +1,58 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; + +public class ABActionAbilityAttemptToApplyEffect implements ABSingleAction { + + private ABAbilityCallback ability; + private ABUnitCallback source; + private ABUnitCallback target; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnit theCaster = caster; + if (source != null) { + theCaster = source.callback(game, theCaster, localStore, castId); + } + CUnit theTarget = target.callback(game, theCaster, localStore, castId); + final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + if (theAbility instanceof AbilityBuilderActiveAbility) { + AbilityBuilderActiveAbility active = ((AbilityBuilderActiveAbility)theAbility); + int orderId = active.getBaseOrderId(); + final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; + active.checkCanUse(game, theCaster, orderId, false, activationReceiver); + if (activationReceiver.isOk()) { + final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver + .getInstance().reset(); + active.checkCanTarget(game, theCaster, orderId, false, theTarget, booleanTargetReceiver); + if (booleanTargetReceiver.isTargetable()) { + if (theCaster.chargeMana(active.getChargedManaCost())) { + active.internalBegin(game, theCaster, orderId, false, theTarget); + active.startCooldown(game, theCaster); + active.runEndCastingActions(game, theCaster, orderId); + active.cleanupInputs(); + } + } + } + + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "JASSTODO"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java new file mode 100644 index 000000000..04e52789e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java @@ -0,0 +1,32 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionAbilityRemoveUniqueFlag implements ABSingleAction { + + private ABAbilityCallback ability; + private ABStringCallback flag; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + if (theAbility instanceof AbilityBuilderAbility) { + ((AbilityBuilderAbility)theAbility).removeUniqueFlag(flag.callback(game, caster, localStore, castId)); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "JASSTODO"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java new file mode 100644 index 000000000..621bc707a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java @@ -0,0 +1,31 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABActionAbilityRemoveUniqueValue implements ABAction { + + private ABAbilityCallback ability; + private ABStringCallback key; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CAbility theAbility = null; + if (ability != null) { + theAbility = ability.callback(game, caster, localStore, castId); + } else { + theAbility = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + } + theAbility.removeUniqueValue(key.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java index 5cacdfe6b..bcfd33975 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java @@ -5,8 +5,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; public class ABActionAbilitySetShowIcon implements ABSingleAction { @@ -17,7 +20,16 @@ public class ABActionAbilitySetShowIcon implements ABSingleAction { @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - ability.callback(game, caster, localStore, castId).setIconShowing(show.callback(game, caster, localStore, castId)); + if (this.ability != null) { + final CAbility abil = ability.callback(game, caster, localStore, castId); + if (abil != null) { + abil.setIconShowing(show.callback(game, caster, localStore, castId)); + } + } + else { + final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + abil.setIconShowing(show.callback(game, caster, localStore, castId)); + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java new file mode 100644 index 000000000..bae2ce22b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java @@ -0,0 +1,33 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABActionAbilityStoreUniqueValue implements ABAction { + + private ABAbilityCallback ability; + private ABStringCallback key; + private ABCallback valueToStore; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CAbility theAbility = null; + if (ability != null) { + theAbility = ability.callback(game, caster, localStore, castId); + } else { + theAbility = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + } + theAbility.addUniqueValue(valueToStore.callback(game, caster, localStore, castId), key.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java index 33d941ab7..77a675ec8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java @@ -8,6 +8,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -21,11 +23,16 @@ public class ABActionAddTargetAllowed implements ABSingleAction { @SuppressWarnings("unchecked") public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - final List levelData = (List) localStore - .get(ABLocalStoreKeys.LEVELDATA); - final EnumSet targetsAllowed = levelData - .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getTargetsAllowed(); - targetsAllowed.add(this.targetType); + AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null && ability instanceof AbilityBuilderActiveAbility) { + ((AbilityBuilderActiveAbility)ability).getTargetsAllowed().add(this.targetType); + } else { + final List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + final EnumSet targetsAllowed = levelData + .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getTargetsAllowed(); + targetsAllowed.add(this.targetType); + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java new file mode 100644 index 000000000..a19e0cc22 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionClickDisableAbility implements ABSingleAction { + + private ABAbilityCallback ability; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if (this.ability != null) { + final CAbility abil = ability.callback(game, caster, localStore, castId); + if (abil != null) { + abil.setClickDisabled(true, CAbilityDisableType.ABILITYINTERNAL); + } + } + else { + final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + abil.setClickDisabled(true, CAbilityDisableType.ABILITYINTERNAL); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + if (this.ability != null) { + return "TODOJASS"; + } + else { + return "TODOJASS"; + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java new file mode 100644 index 000000000..50bb4fcfd --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionClickEnableAbility implements ABSingleAction { + + private ABAbilityCallback ability; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if (this.ability != null) { + final CAbility abil = ability.callback(game, caster, localStore, castId); + if (abil != null) { + abil.setClickDisabled(false, CAbilityDisableType.ABILITYINTERNAL); + } + } + else { + final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + abil.setClickDisabled(false, CAbilityDisableType.ABILITYINTERNAL); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + if (this.ability != null) { + return "TODOJASS"; + } + else { + return "TODOJASS"; + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java index aec3e72bd..8765042b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java @@ -3,33 +3,24 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; public class ABActionDisableAbility implements ABSingleAction { - private ABIDCallback alias; - private ABUnitCallback unit; + private ABAbilityCallback ability; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnit theUnit = caster; - if (this.unit != null) { - theUnit = this.unit.callback(game, caster, localStore, castId); - } - if (this.alias != null) { - final War3ID aliasId = this.alias.callback(game, caster, localStore, castId); - final AbilityBuilderAbility abil = theUnit - .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); + if (this.ability != null) { + final CAbility abil = ability.callback(game, caster, localStore, castId); if (abil != null) { abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } @@ -42,14 +33,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnit theUnit = caster; + if (this.unit != null) { + theUnit = this.unit.callback(game, caster, localStore, castId); + } + if (this.alias != null) { + final War3ID aliasId = this.alias.callback(game, caster, localStore, castId); + final AbilityBuilderAbility abil = theUnit + .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); + if (abil != null) { + abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); + } + } + else { + final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + String unitExpression; + if (this.unit != null) { + unitExpression = this.unit.generateJassEquivalent(jassTextGenerator); + } + else { + unitExpression = jassTextGenerator.getCaster(); + } + if (this.alias != null) { + return "TODOJASS"; + } + else { + return "TODOJASS"; + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java index ffc5e129c..f75b2cd60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java @@ -3,33 +3,24 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; public class ABActionEnableAbility implements ABSingleAction { - private ABIDCallback alias; - private ABUnitCallback unit; + private ABAbilityCallback ability; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnit theUnit = caster; - if (this.unit != null) { - theUnit = this.unit.callback(game, caster, localStore, castId); - } - if (this.alias != null) { - final War3ID aliasId = this.alias.callback(game, caster, localStore, castId); - final AbilityBuilderAbility abil = theUnit - .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); + if (this.ability != null) { + final CAbility abil = ability.callback(game, caster, localStore, castId); if (abil != null) { abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } @@ -42,14 +33,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnit theUnit = caster; + if (this.unit != null) { + theUnit = this.unit.callback(game, caster, localStore, castId); + } + if (this.alias != null) { + final War3ID aliasId = this.alias.callback(game, caster, localStore, castId); + final AbilityBuilderAbility abil = theUnit + .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); + if (abil != null) { + abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); + } + } + else { + final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + String unitExpression; + if (this.unit != null) { + unitExpression = this.unit.generateJassEquivalent(jassTextGenerator); + } + else { + unitExpression = jassTextGenerator.getCaster(); + } + if (this.alias != null) { + return "TODOJASS"; + } + else { + return "TODOJASS"; + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java index c44eba1ed..2cdc67e99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java @@ -8,6 +8,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -21,11 +23,16 @@ public class ABActionRemoveTargetAllowed implements ABSingleAction { @SuppressWarnings("unchecked") public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - final List levelData = (List) localStore - .get(ABLocalStoreKeys.LEVELDATA); - final EnumSet targetsAllowed = levelData - .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getTargetsAllowed(); - targetsAllowed.remove(this.targetType); + AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null && ability instanceof AbilityBuilderActiveAbility) { + ((AbilityBuilderActiveAbility)ability).getTargetsAllowed().remove(this.targetType); + } else { + final List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + final EnumSet targetsAllowed = levelData + .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getTargetsAllowed(); + targetsAllowed.remove(this.targetType); + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionAddAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionAddAttackModifier.java new file mode 100644 index 000000000..493b78c7b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionAddAttackModifier.java @@ -0,0 +1,22 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionAddAttackModifier implements ABAction { + + private ABUnitCallback unit; + private ABAttackModifierCallback modifier; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + CUnit target = unit.callback(game, caster, localStore, castId); + + target.addAttackModifier(modifier.callback(game, caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java new file mode 100644 index 000000000..dce779e88 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java @@ -0,0 +1,37 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; + +public class ABActionCreateAttackModifier implements ABAction { + + private ABIntegerCallback priority; + private ABCondition preLaunchCondition; + private List preLaunchModification; + private ABCondition condition; + private List modification; + + private ABBooleanCallback useCastId; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + boolean isUseCastId = true; + if (useCastId != null) { + isUseCastId = useCastId.callback(game, caster, localStore, castId); + } + ABAttackModifier modifier = new ABAttackModifier(localStore, castId, priority, preLaunchCondition, + preLaunchModification, condition, modification, isUseCastId); + + localStore.put(ABLocalStoreKeys.LASTCREATEDAMod, modifier); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java new file mode 100644 index 000000000..b261de849 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java @@ -0,0 +1,72 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorAttackListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; + +public class ABActionFireModifiedAttack implements ABAction { + + private ABUnitCallback unit; + private ABUnitCallback target; + private ABAttackModifierCallback modifier; + + private ABBooleanCallback showMissOnFailure; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + CUnit theTarget = target.callback(game, caster, localStore, castId); + + for (final CUnitAttack attack : theUnit.getCurrentAttacks()) { + if (theUnit.canReach(theTarget, attack.getRange() + attack.getRangeMotionBuffer()) + && theTarget.canBeTargetedBy(game, theUnit, attack.getTargetsAllowed()) + && (theUnit.getUnitType().getMinimumAttackRange() == 0 + || theUnit.distance(theTarget) >= theUnit.getUnitType().getMinimumAttackRange())) { + if (!theTarget.isImmuneToDamage(game, null, attack.getAttackType(), + attack.getWeaponType().getDamageType())) { + ABAttackModifier mod = null; + if (modifier != null) { + mod = modifier.callback(game, caster, localStore, castId); + } + CUnitAttackSettings settings = attack.initialSettings(); + if (mod != null) { + if (mod.checkPreLaunchApplication(game, theUnit, theTarget, attack)) { + mod.applyPreLaunchModification(game, theUnit, theTarget, attack, settings, null); + } + if (mod.checkApplication(game, theUnit, theTarget, attack)) { + mod.applyModification(game, theUnit, theTarget, attack, settings, null); + } + } + if (settings.getPreDamageListeners() == null) { + settings.setEmptyPreDamageListeners(); + } + + attack.launch(game, theUnit, theTarget, attack.roll(game.getSeededRandom()), + CBehaviorAttackListener.DO_NOTHING); + return; + } + } + } + boolean show = false; + if (showMissOnFailure != null) { + show = showMissOnFailure.callback(game, caster, localStore, castId); + } + if (show) { + game.spawnTextTag(theUnit, theUnit.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, "miss"); + } + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java new file mode 100644 index 000000000..31223b5da --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java @@ -0,0 +1,22 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionRemoveAttackModifier implements ABAction { + + private ABUnitCallback unit; + private ABAttackModifierCallback modifier; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + CUnit target = unit.callback(game, caster, localStore, castId); + + target.removeAttackModifier(modifier.callback(game, caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java new file mode 100644 index 000000000..eb620b9ac --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java @@ -0,0 +1,63 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorAttackListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; + +public class ABActionStartModifiedAttack implements ABAction { + + private ABUnitCallback unit; + private ABUnitCallback target; + private ABAttackModifierCallback modifier; + + private ABBooleanCallback disableMove; + + private ABBooleanCallback stopOnFailure; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + CUnit theTarget = target.callback(game, caster, localStore, castId); + + boolean isDisableMove = false; + if (disableMove != null) { + isDisableMove = disableMove.callback(game, caster, localStore, castId); + } + + for (final CUnitAttack attack : theUnit.getCurrentAttacks()) { + if (theUnit.canReach(theTarget, theUnit.getAcquisitionRange()) + && theTarget.canBeTargetedBy(game, theUnit, attack.getTargetsAllowed()) + && (theUnit.distance(theTarget) >= theUnit.getUnitType().getMinimumAttackRange())) { + if (!theTarget.isImmuneToDamage(game, null, attack.getAttackType(), + attack.getWeaponType().getDamageType())) { + theUnit.beginBehavior(game, + theUnit.getAttackBehavior().reset(game, OrderIds.attack, attack, theTarget, isDisableMove, + CBehaviorAttackListener.DO_NOTHING, + modifier.callback(game, caster, localStore, castId))); + return; + } + } + } + boolean stop = true; + if (stopOnFailure != null) { + stop = stopOnFailure.callback(game, caster, localStore, castId); + } + if (stop) { + theUnit.performDefaultBehavior(game); + game.spawnTextTag(theUnit, theUnit.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, "miss"); + } + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java new file mode 100644 index 000000000..475748d8d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java @@ -0,0 +1,23 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierAddAnimationTag implements ABAction { + + private ABStringCallback tag; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + settings.addAnimationName(SecondaryTag.valueOf(tag.callback(game, caster, localStore, castId))); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java new file mode 100644 index 000000000..267b05d55 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java @@ -0,0 +1,22 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierAddPostDamageListener implements ABAction { + + private ABAttackPostDamageListenerCallback listener; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + settings.addPostDamageListener(listener.callback(game, caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java new file mode 100644 index 000000000..5bcd4a16f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java @@ -0,0 +1,22 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierAddPreDamageListener implements ABAction { + + private ABAttackPreDamageListenerCallback listener; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + settings.addPreDamageListener(listener.callback(game, caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java new file mode 100644 index 000000000..1dc11ba76 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java @@ -0,0 +1,30 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierApplyAllArtFields implements ABAction { + + private ABBooleanCallback applyArtIfMissing; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + String art = abil.getAbilityStringField("Missileart"); + if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(game, caster, localStore, castId))) { + settings.setProjectileArt(art); + } + settings.setProjectileSpeed(abil.getAbilityIntField("Missilespeed")); + settings.setProjectileArc(abil.getAbilityFloatField("Missilearc")); + settings.setProjectileHomingEnabled(abil.getAbilityBooleanField("MissileHoming")); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java new file mode 100644 index 000000000..333207d13 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java @@ -0,0 +1,27 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierApplyArt implements ABAction { + + private ABBooleanCallback applyArtIfMissing; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + String art = abil.getAbilityStringField("Missileart"); + if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(game, caster, localStore, castId))) { + settings.setProjectileArt(art); + } + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java new file mode 100644 index 000000000..2d473a82e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java @@ -0,0 +1,28 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierApplyArtAndSpeed implements ABAction { + + private ABBooleanCallback applyArtIfMissing; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + String art = abil.getAbilityStringField("Missileart"); + if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(game, caster, localStore, castId))) { + settings.setProjectileArt(art); + } + settings.setProjectileSpeed(abil.getAbilityIntField("Missilespeed")); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java new file mode 100644 index 000000000..5f8018336 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierApplyDefaultSpeed implements ABAction { + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + if (settings.getProjectileSpeed() == 0) { + settings.setProjectileSpeed(900); + } + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java new file mode 100644 index 000000000..c5ec1f4bd --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java @@ -0,0 +1,20 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; + +public class ABActionAttackModifierPreventOtherModifications implements ABAction { + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore.get(ABLocalStoreKeys.ATTACKMODLOOP + castId); + if (loop != null) + loop.preventAllOtherModifications(); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java new file mode 100644 index 000000000..f05a87d2d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java @@ -0,0 +1,20 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; + +public class ABActionAttackModifierPreventOtherSamePriorityModifications implements ABAction { + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore.get(ABLocalStoreKeys.ATTACKMODLOOP + castId); + if (loop != null) + loop.preventOtherModificationsWithSamePriority(); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java new file mode 100644 index 000000000..66702084a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java @@ -0,0 +1,23 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierRemoveAnimationTag implements ABAction { + + private ABStringCallback tag; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + settings.removeAnimationName(SecondaryTag.valueOf(tag.callback(game, caster, localStore, castId))); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java new file mode 100644 index 000000000..9a42574a0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java @@ -0,0 +1,22 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierRemovePostDamageListener implements ABAction { + + private ABAttackPostDamageListenerCallback listener; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + settings.removePostDamageListener(listener.callback(game, caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java new file mode 100644 index 000000000..36546d532 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java @@ -0,0 +1,22 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierRemovePreDamageListener implements ABAction { + + private ABAttackPreDamageListenerCallback listener; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + settings.removePreDamageListener(listener.callback(game, caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java new file mode 100644 index 000000000..49744cc27 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java @@ -0,0 +1,24 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierSetAttackArc implements ABAction { + + private ABFloatCallback arc; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + if (arc != null) { + settings.setProjectileArc(arc.callback(game, caster, localStore, castId)); + } + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java new file mode 100644 index 000000000..2574137a9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java @@ -0,0 +1,24 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierSetAttackDeathTime implements ABAction { + + private ABFloatCallback deathTime; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + if (deathTime != null) { + settings.setArtDeathTime(deathTime.callback(game, caster, localStore, castId)); + } + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java new file mode 100644 index 000000000..0016e969a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java @@ -0,0 +1,23 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierSetAttackHoming implements ABAction { + + private ABBooleanCallback homing; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + if (homing != null) { + settings.setProjectileHomingEnabled(homing.callback(game, caster, localStore, castId)); } + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java new file mode 100644 index 000000000..406762fa3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java @@ -0,0 +1,24 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierSetAttackImpactZ implements ABAction { + + private ABFloatCallback impactZ; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + if (impactZ != null) { + settings.setImpactZ(impactZ.callback(game, caster, localStore, castId)); + } + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java new file mode 100644 index 000000000..cef09dbcc --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java @@ -0,0 +1,24 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierSetAttackStartZ implements ABAction { + + private ABFloatCallback z; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + if (z != null) { + settings.setZ(z.callback(game, caster, localStore, castId)); + } + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java new file mode 100644 index 000000000..51a1b250e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java @@ -0,0 +1,41 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABActionAttackModifierSetSplashFields implements ABAction { + + private ABIntegerCallback areaOfEffectFullDamage; + private ABIntegerCallback areaOfEffectMediumDamage; + private ABIntegerCallback areaOfEffectSmallDamage; + private ABFloatCallback damageFactorMedium; + private ABFloatCallback damageFactorSmall; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + if (areaOfEffectFullDamage != null) { + settings.setAreaOfEffectFullDamage(areaOfEffectFullDamage.callback(game, caster, localStore, castId)); + } + if (areaOfEffectMediumDamage != null) { + settings.setAreaOfEffectMediumDamage(areaOfEffectMediumDamage.callback(game, caster, localStore, castId)); + } + if (areaOfEffectSmallDamage != null) { + settings.setAreaOfEffectSmallDamage(areaOfEffectSmallDamage.callback(game, caster, localStore, castId)); + } + if (damageFactorMedium != null) { + settings.setDamageFactorMedium(damageFactorMedium.callback(game, caster, localStore, castId)); + } + if (damageFactorSmall != null) { + settings.setDamageFactorSmall(damageFactorSmall.callback(game, caster, localStore, castId)); + } + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java new file mode 100644 index 000000000..525b530fa --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; + +public class ABCallbackGetModifiedAttackAttackType extends ABAttackTypeCallback { + + @Override + public CAttackType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getAttackType(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java new file mode 100644 index 000000000..fde0bf1cb --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; + +public class ABCallbackGetModifiedAttackDamageType extends ABDamageTypeCallback { + + @Override + public CDamageType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().getDamageType(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java new file mode 100644 index 000000000..d576844b3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; + +public class ABCallbackGetModifiedAttackWeaponType extends ABWeaponTypeCallback { + + @Override + public CWeaponType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java index dac7dd21c..732288ca9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java @@ -20,8 +20,10 @@ public class ABActionAddBuff implements ABSingleAction { public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { final CBuff ability = this.buff.callback(game, caster, localStore, castId); - this.target.callback(game, caster, localStore, castId).add(game, ability); - localStore.put(ABLocalStoreKeys.LASTADDEDBUFF, ability); + if (ability != null) { + this.target.callback(game, caster, localStore, castId).add(game, ability); + localStore.put(ABLocalStoreKeys.LASTADDEDBUFF, ability); + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java new file mode 100644 index 000000000..f687033c3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java @@ -0,0 +1,32 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionBuffAddUniqueFlag implements ABSingleAction { + + private ABBuffCallback buff; + private ABStringCallback flag; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final CBuff theBuff = this.buff.callback(game, caster, localStore, castId); + if (theBuff instanceof ABBuff) { + ((ABBuff)theBuff).addUniqueFlag(flag.callback(game, caster, localStore, castId)); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "JASSTODO"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java new file mode 100644 index 000000000..5d3dda308 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java @@ -0,0 +1,32 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionBuffRemoveUniqueFlag implements ABSingleAction { + + private ABBuffCallback buff; + private ABStringCallback flag; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final CBuff theBuff = this.buff.callback(game, caster, localStore, castId); + if (theBuff instanceof ABBuff) { + ((ABBuff)theBuff).removeUniqueFlag(flag.callback(game, caster, localStore, castId)); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "JASSTODO"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java new file mode 100644 index 000000000..edaae4104 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionBuffRemoveUniqueValue implements ABAction { + + private ABBuffCallback buff; + private ABStringCallback key; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CBuff theAbility = buff.callback(game, caster, localStore, castId); + theAbility.removeUniqueValue(key.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java new file mode 100644 index 000000000..796c21409 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; + +public class ABActionBuffStoreUniqueValue implements ABAction { + + private ABBuffCallback buff; + private ABStringCallback key; + private ABCallback valueToStore; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CBuff theAbility = buff.callback(game, caster, localStore, castId); + theAbility.addUniqueValue(valueToStore.callback(game, caster, localStore, castId), key.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java index 9f995ad44..dc403eca2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -8,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -28,6 +29,10 @@ public class ABActionCreatePassiveBuff implements ABSingleAction { private ABBooleanCallback leveled; private ABBooleanCallback positive; + private ABStringCallback visibilityGroup; + + private List uniqueFlags; + @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { @@ -63,6 +68,14 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - final CBuff ability = new ABTargetingBuff(game.getHandleIdAllocator().createId(), + final ABTargetingBuff ability = new ABTargetingBuff(game.getHandleIdAllocator().createId(), this.buffId.callback(game, caster, localStore, castId)); + if (uniqueFlags != null) { + for (ABStringCallback flag : uniqueFlags) { + ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + } + } localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java index 08fe5f331..ff1478e48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +import java.util.List; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -8,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedArtBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -24,6 +26,11 @@ public class ABActionCreateTimedArtBuff implements ABSingleAction { private ABBooleanCallback positive; private ABBooleanCallback dispellable; + private ABBooleanCallback stacks; + private ABStringCallback visibilityGroup; + + private List uniqueFlags; + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { boolean isLeveled = false; @@ -43,23 +50,33 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; + private Map uniqueValues; + @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { @@ -66,35 +74,48 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java new file mode 100644 index 000000000..97ae4de1c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java @@ -0,0 +1,123 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedPausedExpirationBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; + +public class ABActionCreateTimedPausedExpirationBuff implements ABAction { + + private ABIDCallback buffId; + private ABFloatCallback duration; + private ABBooleanCallback showTimedLifeBar; + private List onAddActions; + private List onRemoveActions; + private List onExpireActions; + private ABBooleanCallback showIcon; + private CEffectType artType; + private ABBooleanCallback hideArt; + + private ABBooleanCallback leveled; + private ABBooleanCallback positive; + private ABBooleanCallback dispellable; + private ABBooleanCallback magic; + private ABBooleanCallback physical; + + private ABBooleanCallback stacks; + private ABStringCallback visibilityGroup; + + private List uniqueFlags; + private Map uniqueValues; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + boolean showTimedLife = false; + if (this.showTimedLifeBar != null) { + showTimedLife = this.showTimedLifeBar.callback(game, caster, localStore, castId); + } + boolean isLeveled = false; + if (leveled != null) { + isLeveled = leveled.callback(game, caster, localStore, castId); + } else { + isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + } + boolean isPositive = true; + if (positive != null) { + isPositive = positive.callback(game, caster, localStore, castId); + } + boolean isDispellable = true; + if (dispellable != null) { + isDispellable = dispellable.callback(game, caster, localStore, castId); + } else { + isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); + } + + boolean isMagic = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); + boolean isPhysical = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); + if (magic != null) { + isMagic = magic.callback(game, caster, localStore, castId); + } + if (physical != null) { + isPhysical = physical.callback(game, caster, localStore, castId); + } + + ABTimedBuff ability; + if (showIcon != null) { + ability = new ABTimedPausedExpirationBuff(game.getHandleIdAllocator().createId(), + buffId.callback(game, caster, localStore, castId), + duration.callback(game, caster, localStore, castId), showTimedLife, localStore, onAddActions, + onRemoveActions, onExpireActions, showIcon.callback(game, caster, localStore, castId), castId, + isLeveled, isPositive, isDispellable); + + } else { + ability = new ABTimedPausedExpirationBuff(game.getHandleIdAllocator().createId(), + buffId.callback(game, caster, localStore, castId), + duration.callback(game, caster, localStore, castId), showTimedLife, localStore, onAddActions, + onRemoveActions, onExpireActions, castId, isLeveled, isPositive, isDispellable); + } + if (artType != null) { + ability.setArtType(artType); + } + if ((this.hideArt != null) && this.hideArt.callback(game, caster, localStore, castId)) { + ability.setArtType(null); + } + ability.setMagic(isMagic); + ability.setPhysical(isPhysical); + boolean isStacks = false; + if (stacks != null) { + isStacks = stacks.callback(game, caster, localStore, castId); + } + ability.setStacks(isStacks); + if (visibilityGroup != null) { + ability.setVisibilityGroup(visibilityGroup.callback(game, caster, localStore, castId)); + } + + localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); + if (uniqueFlags != null) { + for (ABStringCallback flag : uniqueFlags) { + ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + } + } + if (uniqueValues != null) { + for (String key : uniqueValues.keySet()) { + ability.addUniqueValue(uniqueValues.get(key).callback(game, caster, localStore, castId), + key); + } + } + if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { + localStore.put(ABLocalStoreKeys.BUFFCASTINGUNIT, caster); + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java index 7b99f34d8..99cd8c27c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java @@ -1,13 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +import java.util.List; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTargetingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -17,12 +19,26 @@ public class ABActionCreateTimedTargetingBuff implements ABSingleAction { private ABIDCallback buffId; private ABFloatCallback duration; + private ABBooleanCallback stacks; + + private List uniqueFlags; + @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - final CBuff ability = new ABTimedTargetingBuff(game.getHandleIdAllocator().createId(), + final ABTimedTargetingBuff ability = new ABTimedTargetingBuff(game.getHandleIdAllocator().createId(), this.buffId.callback(game, caster, localStore, castId), this.duration.callback(game, caster, localStore, castId)); + if (uniqueFlags != null) { + for (ABStringCallback flag : uniqueFlags) { + ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + } + } + boolean isStacks = false; + if (stacks != null) { + isStacks = stacks.callback(game, caster, localStore, castId); + } + ability.setStacks(isStacks); localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java index 99a526b8d..4652511f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java @@ -9,8 +9,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -33,6 +35,12 @@ public class ABActionCreateTimedTickingBuff implements ABSingleAction { private ABBooleanCallback magic; private ABBooleanCallback physical; + private ABBooleanCallback stacks; + private ABStringCallback visibilityGroup; + + private List uniqueFlags; + private Map uniqueValues; + @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { @@ -66,30 +74,44 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; + private Map uniqueValues; + @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { @@ -66,29 +74,44 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; + @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { @@ -66,9 +72,9 @@ public void runAction(final CSimulation game, final CUnit caster, final Map actions; + + private JassGameEventsWar3 eventType; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + + final ABWidgetEvent event = new ABWidgetEvent(game, caster, localStore, castId, + this.widget.callback(game, caster, localStore, castId), this.eventType, this.condition, this.actions); + + localStore.put(ABLocalStoreKeys.LASTCREATEDWIDEVENT, event); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java new file mode 100644 index 000000000..a73d7739e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java @@ -0,0 +1,27 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks.ABWidgetEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; + +public class ABActionRegisterWidgetEvent implements ABSingleAction { + + private ABWidgetEventCallback event; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + ABWidgetEvent theEvent = event.callback(game, caster, localStore, castId); + theEvent.getWidget().addEvent(theEvent); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "RegisterABWidgetEvent(" + this.event.generateJassEquivalent(jassTextGenerator) + ")"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java new file mode 100644 index 000000000..9907b9a70 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java @@ -0,0 +1,27 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks.ABWidgetEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; + +public class ABActionUnregisterWidgetEvent implements ABSingleAction { + + private ABWidgetEventCallback event; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + ABWidgetEvent theEvent = event.callback(game, caster, localStore, castId); + theEvent.remove(); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "UnregisterABWidgetEvent(" + this.event.generateJassEquivalent(jassTextGenerator) + ")"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java index fa3c8b375..70b02488d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java @@ -92,7 +92,6 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - float theSpeed = 0; - boolean isHoming = true; final CUnit theSource = this.source.callback(game, caster, localStore, castId); AbilityTarget sourceLocation = theSource; final GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); - final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); if (this.sourceLoc != null) { sourceLocation = this.sourceLoc.callback(game, caster, localStore, castId); } - if (this.speed != null) { - theSpeed = this.speed.callback(game, caster, localStore, castId); - } - else { - theSpeed = editorData.getFieldAsFloat(AbilityFields.PROJECTILE_SPEED, 0); - } - if (this.homing != null) { - isHoming = this.homing.callback(game, caster, localStore, castId); - } - else { - isHoming = editorData.getFieldAsBoolean(AbilityFields.PROJECTILE_HOMING_ENABLED, 0); - } final CUnit theTarget = this.target.callback(game, caster, localStore, castId); final CAbilityProjectileListener listener = new ABProjectileListener(this.onLaunch, this.onHit, caster, localStore, castId); - final CProjectile proj = game.createProjectile(theSource, this.id.callback(game, caster, localStore, castId), - sourceLocation.getX(), sourceLocation.getY(), (float) theSource.angleTo(theTarget), theSpeed, isHoming, - theTarget, listener); + CProjectile proj = null; + if (id != null) { + float theSpeed = 0; + boolean isHoming = true; + if (this.speed != null) { + theSpeed = this.speed.callback(game, caster, localStore, castId); + } + else { + theSpeed = editorData.getFieldAsFloat(AbilityFields.PROJECTILE_SPEED, 0); + } + if (this.homing != null) { + isHoming = this.homing.callback(game, caster, localStore, castId); + } + else { + isHoming = editorData.getFieldAsBoolean(AbilityFields.PROJECTILE_HOMING_ENABLED, 0); + } + proj = game.createProjectile(theSource, this.id.callback(game, caster, localStore, castId), + sourceLocation.getX(), sourceLocation.getY(), (float) theSource.angleTo(theTarget), theSpeed, isHoming, + theTarget, listener); + } else if (settings != null) { + proj = game.createProjectile(theSource, this.settings.callback(game, caster, localStore, castId), + sourceLocation.getX(), sourceLocation.getY(), (float) theSource.angleTo(theTarget), + theTarget, listener); + } localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java index 8ed0f2a4b..67e335523 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java @@ -108,7 +108,6 @@ public void runAction(final CSimulation game, final CUnit caster, final Map iterationActions; + private ABCondition condition; + + private ABIntegerCallback sort; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, @@ -31,20 +37,34 @@ public void runAction(final CSimulation game, final CUnit caster, final Map foundUnits = new ArrayList<>(); recycleRect.set(target.getX() - rangeVal, target.getY() - rangeVal, rangeVal * 2, rangeVal * 2); game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (enumUnit.canReach(target, rangeVal)) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - for (final ABAction iterationAction : ABActionIterateUnitsInRangeOfLocation.this.iterationActions) { - iterationAction.runAction(game, caster, localStore, castId); + localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); + if (condition == null || condition.callback(game, caster, localStore, castId)) { + foundUnits.add(enumUnit); } } return false; } }); + if (sort != null) { + ABUnitComparator comp = new ABUnitComparator(game, caster, localStore, castId, sort); + foundUnits.sort(comp); + } + + for (CUnit unit : foundUnits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT+castId, unit); + for (ABAction iterationAction : iterationActions) { + iterationAction.runAction(game, caster, localStore, castId); + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); } @Override @@ -58,6 +78,37 @@ public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) + "GetFilterUnit()" + ") // filter unit used intentionally as enum"; } }); + if (this.condition != null) { + modifiedActionList.add(0, new JassTextGeneratorStmt() { + @Override + public void generateJassEquivalent(int indent, final JassTextGenerator jassTextGenerator) { + final StringBuilder sb = new StringBuilder(); + JassTextGenerator.Util.indent(indent, sb); + sb.append("SetLocalStoreUnitHandle(" + jassTextGenerator.getTriggerLocalStore() + + ", AB_LOCAL_STORE_KEY_MATCHINGUNIT + I2S(" + jassTextGenerator.getCastId() + "), " + + "GetFilterUnit()" + ")"); + jassTextGenerator.println(sb.toString()); + + sb.setLength(0); + JassTextGenerator.Util.indent(indent, sb); + sb.append("if not "); + sb.append(ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.this.condition + .generateJassEquivalent(jassTextGenerator)); + sb.append(" then"); + jassTextGenerator.println(sb.toString()); + + sb.setLength(0); + JassTextGenerator.Util.indent(indent + 1, sb); + sb.append("return false"); + jassTextGenerator.println(sb.toString()); + + sb.setLength(0); + JassTextGenerator.Util.indent(indent, sb); + sb.append("endif"); + jassTextGenerator.println(sb.toString()); + } + }); + } modifiedActionList.add(new JassTextGeneratorStmt() { @Override public void generateJassEquivalent(int indent, JassTextGenerator jassTextGenerator) { @@ -88,5 +139,11 @@ public void generateJassEquivalent(int indent, JassTextGenerator jassTextGenerat sb.append("call FlushChildLocalStore(" + jassTextGenerator.getTriggerLocalStore() + ", AB_LOCAL_STORE_KEY_ENUMUNIT + I2S(" + jassTextGenerator.getCastId() + "))"); jassTextGenerator.println(sb.toString()); + + sb.setLength(0); + JassTextGenerator.Util.indent(indent, sb); + sb.append("call FlushChildLocalStore(" + jassTextGenerator.getTriggerLocalStore() + + ", AB_LOCAL_STORE_KEY_MATCHINGUNIT + I2S(" + jassTextGenerator.getCastId() + "))"); + jassTextGenerator.println(sb.toString()); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java index 3df21066e..f72d91de4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java @@ -12,14 +12,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; -public class ABActionIterateUnitsInRangeOfUnit implements ABAction { +public class ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort implements ABAction { private static final Rectangle recycleRect = new Rectangle(); private List iterationActions; + private ABCondition condition; + + private ABIntegerCallback sort; private ABUnitCallback originUnit; private ABFloatCallback range; @@ -30,21 +36,35 @@ public void runAction(final CSimulation game, final CUnit caster, final Map foundUnits = new ArrayList<>(); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - for (final ABAction iterationAction : ABActionIterateUnitsInRangeOfUnit.this.iterationActions) { - iterationAction.runAction(game, caster, localStore, castId); + localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); + if (condition == null || condition.callback(game, caster, localStore, castId)) { + foundUnits.add(enumUnit); } } return false; } }); + if (sort != null) { + ABUnitComparator comp = new ABUnitComparator(game, caster, localStore, castId, sort); + foundUnits.sort(comp); + } + + for (CUnit unit : foundUnits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT+castId, unit); + for (ABAction iterationAction : iterationActions) { + iterationAction.runAction(game, caster, localStore, castId); + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); } @Override @@ -58,6 +78,37 @@ public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) + "GetFilterUnit()" + ") // filter unit used intentionally as enum"; } }); + if (this.condition != null) { + modifiedActionList.add(0, new JassTextGeneratorStmt() { + @Override + public void generateJassEquivalent(int indent, final JassTextGenerator jassTextGenerator) { + final StringBuilder sb = new StringBuilder(); + JassTextGenerator.Util.indent(indent, sb); + sb.append("SetLocalStoreUnitHandle(" + jassTextGenerator.getTriggerLocalStore() + + ", AB_LOCAL_STORE_KEY_MATCHINGUNIT + I2S(" + jassTextGenerator.getCastId() + "), " + + "GetFilterUnit()" + ")"); + jassTextGenerator.println(sb.toString()); + + sb.setLength(0); + JassTextGenerator.Util.indent(indent, sb); + sb.append("if not "); + sb.append(ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.this.condition + .generateJassEquivalent(jassTextGenerator)); + sb.append(" then"); + jassTextGenerator.println(sb.toString()); + + sb.setLength(0); + JassTextGenerator.Util.indent(indent + 1, sb); + sb.append("return false"); + jassTextGenerator.println(sb.toString()); + + sb.setLength(0); + JassTextGenerator.Util.indent(indent, sb); + sb.append("endif"); + jassTextGenerator.println(sb.toString()); + } + }); + } modifiedActionList.add(new JassTextGeneratorStmt() { @Override public void generateJassEquivalent(int indent, JassTextGenerator jassTextGenerator) { @@ -88,5 +139,11 @@ public void generateJassEquivalent(int indent, JassTextGenerator jassTextGenerat sb.append("call FlushChildLocalStore(" + jassTextGenerator.getTriggerLocalStore() + ", AB_LOCAL_STORE_KEY_ENUMUNIT + I2S(" + jassTextGenerator.getCastId() + "))"); jassTextGenerator.println(sb.toString()); + + sb.setLength(0); + JassTextGenerator.Util.indent(indent, sb); + sb.append("call FlushChildLocalStore(" + jassTextGenerator.getTriggerLocalStore() + + ", AB_LOCAL_STORE_KEY_MATCHINGUNIT + I2S(" + jassTextGenerator.getCastId() + "))"); + jassTextGenerator.println(sb.toString()); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java new file mode 100644 index 000000000..3899fd5bf --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java @@ -0,0 +1,39 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorNextBehaviorVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CRangedBehavior; + +public class ABActionChangeAttackActionToMovement implements ABAction { + + private ABUnitCallback unit; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit targetUnit = caster; + if (unit != null) { + targetUnit = this.unit.callback(game, caster, localStore, castId); + } + if (targetUnit.getCurrentBehavior().getBehaviorCategory() == CBehaviorCategory.ATTACK) { + targetUnit.beginBehavior(game, + targetUnit.getMoveBehavior().reset(targetUnit.getMoveBehavior().getHighlightOrderId(), + targetUnit.getCurrentBehavior().visit(BehaviorTargetVisitor.INSTANCE))); + } else + if (targetUnit.getCurrentBehavior().getBehaviorCategory() == CBehaviorCategory.MOVEMENT) { + CRangedBehavior next = targetUnit.getCurrentBehavior().visit(BehaviorNextBehaviorVisitor.INSTANCE); + if (next != null && next.getBehaviorCategory() == CBehaviorCategory.ATTACK) { + targetUnit.beginBehavior(game, + targetUnit.getMoveBehavior().reset(targetUnit.getMoveBehavior().getHighlightOrderId(), + next.visit(BehaviorTargetVisitor.INSTANCE))); + } + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java index 949faad72..61a573004 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java @@ -5,34 +5,45 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitClassification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionCreateUnit implements ABSingleAction { private ABIDCallback id; - private ABIntegerCallback playerIndex; + private ABPlayerCallback owner; private ABLocationCallback loc; private ABFloatCallback facing; + + private ABBooleanCallback addSummonedTag; @Override public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { - int thePlayerId = caster.getPlayerIndex(); + CPlayer thePlayer = null; float theFacing = 0; - if (this.playerIndex != null) { - thePlayerId = this.playerIndex.callback(game, caster, localStore, castId); + if (this.owner != null) { + thePlayer = this.owner.callback(game, caster, localStore, castId); + } else { + thePlayer = game.getPlayer(caster.getPlayerIndex()); } if (this.facing != null) { theFacing = this.facing.callback(game, caster, localStore, castId); } final AbilityPointTarget location = this.loc.callback(game, caster, localStore, castId); - final CUnit createdUnit = game.createUnitSimple(this.id.callback(game, caster, localStore, castId), thePlayerId, + final CUnit createdUnit = game.createUnitSimple(this.id.callback(game, caster, localStore, castId), thePlayer.getId(), location.getX(), location.getY(), theFacing); + + if (addSummonedTag == null || addSummonedTag.callback(game, caster, localStore, castId)) { + createdUnit.addClassification(CUnitClassification.SUMMONED); + } localStore.put(ABLocalStoreKeys.LASTCREATEDUNIT, createdUnit); } @@ -40,11 +51,11 @@ public void runAction(CSimulation game, CUnit caster, Map localS @Override public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String playerIndexExpression; - if (this.playerIndex != null) { - playerIndexExpression = this.playerIndex.generateJassEquivalent(jassTextGenerator); + if (this.owner != null) { + playerIndexExpression = this.owner.generateJassEquivalent(jassTextGenerator); } else { - playerIndexExpression = "GetOwningPlayer(" + jassTextGenerator.getCaster() + ")"; + playerIndexExpression = "TODOJASS(" + jassTextGenerator.getCaster() + ")"; } String facingExpression = "bj_UNIT_FACING"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java new file mode 100644 index 000000000..a28e1c895 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java @@ -0,0 +1,118 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CWeaponSoundTypeJass; + +public class ABActionDamageArea implements ABAction { + + private ABUnitCallback source; + private ABLocationCallback target; + private ABFloatCallback radius; + private ABFloatCallback damage; + private ABBooleanCallback validTarget; + + private ABBooleanCallback isAttack; + private ABBooleanCallback isRanged; + private ABAttackTypeCallback attackType; + private ABDamageTypeCallback damageType; + + private ABBooleanCallback ignoreLTEZero; + private ABBooleanCallback damageInvulnerable; + private ABBooleanCallback explodeOnDeath; + private ABBooleanCallback onlyDamageSummons; + private ABBooleanCallback nonlethal; + + private List extraActions; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + CAttackType theAttackType = CAttackType.SPELLS; + CDamageType theDamageType = CDamageType.MAGIC; + final CDamageFlags flags = new CGenericDamageFlags(false, true); + + float theDamage = damage.callback(game, caster, localStore, castId); + + if (isAttack != null) { + flags.setAttack(isAttack.callback(game, caster, localStore, castId)); + } + if (isRanged != null) { + flags.setRanged(isRanged.callback(game, caster, localStore, castId)); + } + if (damageInvulnerable != null) { + flags.setIgnoreInvulnerable(damageInvulnerable.callback(game, caster, localStore, castId)); + } + if (explodeOnDeath != null) { + flags.setExplode(explodeOnDeath.callback(game, caster, localStore, castId)); + } + if (onlyDamageSummons != null) { + flags.setOnlyDamageSummons(onlyDamageSummons.callback(game, caster, localStore, castId)); + } + if (nonlethal != null) { + flags.setNonlethal(nonlethal.callback(game, caster, localStore, castId)); + } + if (this.attackType != null) { + theAttackType = this.attackType.callback(game, caster, localStore, castId); + } + if (this.damageType != null) { + theDamageType = this.damageType.callback(game, caster, localStore, castId); + } + if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId)) { + AbilityPointTarget loc = target.callback(game, caster, localStore, castId); + float pfullRad = 0; + CUnit theSource = caster; + if (this.radius != null) { + pfullRad = this.radius.callback(game, caster, localStore, castId); + } + if (this.source != null) { + theSource = this.source.callback(game, caster, localStore, castId); + } + + final float fullRad = pfullRad; + final CAttackType ftheAttackType = theAttackType; + final CDamageType ftheDamageType = theDamageType; + final CUnit ftheSource = theSource; + final float baseDamage = damage.callback(game, caster, localStore, castId); + + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, + new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (enumUnit.canReach(loc, fullRad)) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; + } + }); + + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java new file mode 100644 index 000000000..abf21f3c6 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java @@ -0,0 +1,158 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CWeaponSoundTypeJass; + +public class ABActionDamageAttackSplash implements ABAction { + + private ABUnitCallback source; + private ABLocationCallback target; + private ABFloatCallback damage; + private ABFloatCallback fullDamageRadius; + private ABFloatCallback mediumDamageRadius; + private ABFloatCallback smallDamageRadius; + private ABFloatCallback damageFactorMedium; + private ABFloatCallback damageFactorSmall; + private ABBooleanCallback validTarget; + + private ABBooleanCallback isAttack; + private ABBooleanCallback isRanged; + private ABAttackTypeCallback attackType; + private ABDamageTypeCallback damageType; + + private ABBooleanCallback ignoreLTEZero; + private ABBooleanCallback damageInvulnerable; + private ABBooleanCallback explodeOnDeath; + private ABBooleanCallback onlyDamageSummons; + private ABBooleanCallback nonlethal; + + private List extraActions; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + CAttackType theAttackType = CAttackType.SPELLS; + CDamageType theDamageType = CDamageType.MAGIC; + final CDamageFlags flags = new CGenericDamageFlags(false, true); + + float theDamage = damage.callback(game, caster, localStore, castId); + + if (isAttack != null) { + flags.setAttack(isAttack.callback(game, caster, localStore, castId)); + } + if (isRanged != null) { + flags.setRanged(isRanged.callback(game, caster, localStore, castId)); + } + if (damageInvulnerable != null) { + flags.setIgnoreInvulnerable(damageInvulnerable.callback(game, caster, localStore, castId)); + } + if (explodeOnDeath != null) { + flags.setExplode(explodeOnDeath.callback(game, caster, localStore, castId)); + } + if (onlyDamageSummons != null) { + flags.setOnlyDamageSummons(onlyDamageSummons.callback(game, caster, localStore, castId)); + } + if (nonlethal != null) { + flags.setNonlethal(nonlethal.callback(game, caster, localStore, castId)); + } + if (this.attackType != null) { + theAttackType = this.attackType.callback(game, caster, localStore, castId); + } + if (this.damageType != null) { + theDamageType = this.damageType.callback(game, caster, localStore, castId); + } + if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId)) { + AbilityPointTarget loc = target.callback(game, caster, localStore, castId); + float pfullRad = 0; + float pmedRad = 0; + float psmallRad = 0; + float pmedDam = 0; + float psmallDam = 0; + CUnit theSource = caster; + if (this.fullDamageRadius != null) { + pfullRad = this.fullDamageRadius.callback(game, caster, localStore, castId); + } + if (this.mediumDamageRadius != null) { + pmedRad = this.mediumDamageRadius.callback(game, caster, localStore, castId); + } + if (this.smallDamageRadius != null) { + psmallRad = this.smallDamageRadius.callback(game, caster, localStore, castId); + } + if (this.damageFactorMedium != null) { + pmedDam = this.damageFactorMedium.callback(game, caster, localStore, castId); + } + if (this.damageFactorSmall != null) { + psmallDam = this.damageFactorSmall.callback(game, caster, localStore, castId); + } + if (this.source != null) { + theSource = this.source.callback(game, caster, localStore, castId); + } + + final float fullRad = pfullRad; + final float medRad = pmedRad; + final float smallRad = psmallRad; + final float medDam = pmedDam; + final float smallDam = psmallDam; + final CAttackType ftheAttackType = theAttackType; + final CDamageType ftheDamageType = theDamageType; + final CUnit ftheSource = theSource; + final float baseDamage = damage.callback(game, caster, localStore, castId); + + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + Math.max(Math.max(pfullRad, pmedRad), psmallRad), new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (enumUnit.canReach(loc, fullRad)) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } else if (enumUnit.canReach(loc, medRad)) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * medDam); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } else if (enumUnit.canReach(loc, smallRad)) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * smallDam); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; + } + }); + + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java new file mode 100644 index 000000000..63a8b9c1a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java @@ -0,0 +1,138 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CWeaponSoundTypeJass; + +public class ABActionDamageBurst implements ABAction { + + private ABUnitCallback source; + private ABLocationCallback target; + private ABFloatCallback fullDamageRadius; + private ABFloatCallback partialDamageRadius; + private ABFloatCallback damage; + private ABFloatCallback partialDamage; + private ABBooleanCallback validTarget; + + private ABBooleanCallback isAttack; + private ABBooleanCallback isRanged; + private ABAttackTypeCallback attackType; + private ABDamageTypeCallback damageType; + + private ABBooleanCallback ignoreLTEZero; + private ABBooleanCallback damageInvulnerable; + private ABBooleanCallback explodeOnDeath; + private ABBooleanCallback onlyDamageSummons; + private ABBooleanCallback nonlethal; + + private List extraActions; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + CAttackType theAttackType = CAttackType.SPELLS; + CDamageType theDamageType = CDamageType.MAGIC; + final CDamageFlags flags = new CGenericDamageFlags(false, true); + + float theDamage = damage.callback(game, caster, localStore, castId); + + if (isAttack != null) { + flags.setAttack(isAttack.callback(game, caster, localStore, castId)); + } + if (isRanged != null) { + flags.setRanged(isRanged.callback(game, caster, localStore, castId)); + } + if (damageInvulnerable != null) { + flags.setIgnoreInvulnerable(damageInvulnerable.callback(game, caster, localStore, castId)); + } + if (explodeOnDeath != null) { + flags.setExplode(explodeOnDeath.callback(game, caster, localStore, castId)); + } + if (onlyDamageSummons != null) { + flags.setOnlyDamageSummons(onlyDamageSummons.callback(game, caster, localStore, castId)); + } + if (nonlethal != null) { + flags.setNonlethal(nonlethal.callback(game, caster, localStore, castId)); + } + if (this.attackType != null) { + theAttackType = this.attackType.callback(game, caster, localStore, castId); + } + if (this.damageType != null) { + theDamageType = this.damageType.callback(game, caster, localStore, castId); + } + if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId)) { + AbilityPointTarget loc = target.callback(game, caster, localStore, castId); + float pfullRad = 0; + float parRad = 0; + float parDam = 0; + CUnit theSource = caster; + if (this.fullDamageRadius != null) { + pfullRad = this.fullDamageRadius.callback(game, caster, localStore, castId); + } + if (this.partialDamageRadius != null) { + parRad = this.partialDamageRadius.callback(game, caster, localStore, castId); + } + if (this.partialDamage != null) { + parDam = this.partialDamage.callback(game, caster, localStore, castId); + } + if (this.source != null) { + theSource = this.source.callback(game, caster, localStore, castId); + } + + final float fullRad = pfullRad; + final float partialRad = parRad; + final float partialDam = parDam; + final CAttackType ftheAttackType = theAttackType; + final CDamageType ftheDamageType = theDamageType; + final CUnit ftheSource = theSource; + final float baseDamage = damage.callback(game, caster, localStore, castId); + + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, partialRad), + new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (enumUnit.canReach(loc, fullRad)) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } else if (enumUnit.canReach(loc, partialRad)) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), partialDam); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; + } + }); + + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java new file mode 100644 index 000000000..96b58c2cc --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java @@ -0,0 +1,158 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CWeaponSoundTypeJass; + +public class ABActionDamageSplash implements ABAction { + + private ABUnitCallback source; + private ABLocationCallback target; + private ABFloatCallback fullDamage; + private ABFloatCallback fullDamageRadius; + private ABFloatCallback mediumDamage; + private ABFloatCallback mediumDamageRadius; + private ABFloatCallback smallDamage; + private ABFloatCallback smallDamageRadius; + private ABBooleanCallback validTarget; + + private ABBooleanCallback isAttack; + private ABBooleanCallback isRanged; + private ABAttackTypeCallback attackType; + private ABDamageTypeCallback damageType; + + private ABBooleanCallback ignoreLTEZero; + private ABBooleanCallback damageInvulnerable; + private ABBooleanCallback explodeOnDeath; + private ABBooleanCallback onlyDamageSummons; + private ABBooleanCallback nonlethal; + + private List extraActions; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + CAttackType theAttackType = CAttackType.SPELLS; + CDamageType theDamageType = CDamageType.MAGIC; + final CDamageFlags flags = new CGenericDamageFlags(false, true); + + float theDamage = fullDamage.callback(game, caster, localStore, castId); + + if (isAttack != null) { + flags.setAttack(isAttack.callback(game, caster, localStore, castId)); + } + if (isRanged != null) { + flags.setRanged(isRanged.callback(game, caster, localStore, castId)); + } + if (damageInvulnerable != null) { + flags.setIgnoreInvulnerable(damageInvulnerable.callback(game, caster, localStore, castId)); + } + if (explodeOnDeath != null) { + flags.setExplode(explodeOnDeath.callback(game, caster, localStore, castId)); + } + if (onlyDamageSummons != null) { + flags.setOnlyDamageSummons(onlyDamageSummons.callback(game, caster, localStore, castId)); + } + if (nonlethal != null) { + flags.setNonlethal(nonlethal.callback(game, caster, localStore, castId)); + } + if (this.attackType != null) { + theAttackType = this.attackType.callback(game, caster, localStore, castId); + } + if (this.damageType != null) { + theDamageType = this.damageType.callback(game, caster, localStore, castId); + } + if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId)) { + AbilityPointTarget loc = target.callback(game, caster, localStore, castId); + float pfullRad = 0; + float pmedRad = 0; + float psmallRad = 0; + float pmedDam = 0; + float psmallDam = 0; + CUnit theSource = caster; + if (this.fullDamageRadius != null) { + pfullRad = this.fullDamageRadius.callback(game, caster, localStore, castId); + } + if (this.mediumDamageRadius != null) { + pmedRad = this.mediumDamageRadius.callback(game, caster, localStore, castId); + } + if (this.smallDamageRadius != null) { + psmallRad = this.smallDamageRadius.callback(game, caster, localStore, castId); + } + if (this.mediumDamage != null) { + pmedDam = this.mediumDamage.callback(game, caster, localStore, castId); + } + if (this.smallDamage != null) { + psmallDam = this.smallDamage.callback(game, caster, localStore, castId); + } + if (this.source != null) { + theSource = this.source.callback(game, caster, localStore, castId); + } + + final float fullRad = pfullRad; + final float medRad = pmedRad; + final float smallRad = psmallRad; + final float medDam = pmedDam; + final float smallDam = psmallDam; + final CAttackType ftheAttackType = theAttackType; + final CDamageType ftheDamageType = theDamageType; + final CUnit ftheSource = theSource; + final float baseDamage = fullDamage.callback(game, caster, localStore, castId); + + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + Math.max(Math.max(pfullRad, pmedRad), psmallRad), new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (enumUnit.canReach(loc, fullRad)) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } else if (enumUnit.canReach(loc, medRad)) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), medDam); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } else if (enumUnit.canReach(loc, smallRad)) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), smallDam); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; + } + }); + + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java index df9d24568..3bdccf5ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java @@ -31,6 +31,7 @@ public class ABActionDamageTarget implements ABSingleAction { private ABBooleanCallback damageInvulnerable; private ABBooleanCallback explodeOnDeath; private ABBooleanCallback onlyDamageSummons; + private ABBooleanCallback nonlethal; @Override public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { @@ -55,13 +56,16 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (onlyDamageSummons != null) { flags.setOnlyDamageSummons(onlyDamageSummons.callback(game, caster, localStore, castId)); } + if (nonlethal != null) { + flags.setNonlethal(nonlethal.callback(game, caster, localStore, castId)); + } if (this.attackType != null) { theAttackType = this.attackType.callback(game, caster, localStore, castId); } if (this.damageType != null) { theDamageType = this.damageType.callback(game, caster, localStore, castId); } - if (ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId) || theDamage > 0) { + if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId)) { target.callback(game, caster, localStore, castId).damage(game, source.callback(game, caster, localStore, castId), flags, theAttackType, theDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damage.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java new file mode 100644 index 000000000..d45a8a6bd --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; + +public class ABActionForceBeginCreatedBehavior implements ABAction { + + private ABUnitCallback unit; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit targetUnit = caster; + if (unit != null) { + targetUnit = this.unit.callback(game, caster, localStore, castId); + } + CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + if (newBehavior != null) { + System.err.println("Forcing start of new behavior"); + localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); + targetUnit.beginBehavior(game, newBehavior); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java index 9626d313e..e89d82363 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java @@ -12,7 +12,7 @@ public class ABActionSubtractMp implements ABSingleAction { - private ABUnitCallback target; + private ABUnitCallback unit; private ABFloatCallback amount; private ABBooleanCallback isPercent; @@ -22,7 +22,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (this.isPercent != null) { percent = this.isPercent.callback(game, caster, localStore, castId); } - final CUnit targetUnit = this.target.callback(game, caster, localStore, castId); + final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); if (percent) { targetUnit.setMana(Math.max(Math.min( targetUnit.getMana() @@ -42,7 +42,7 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { if (this.isPercent != null) { percentExpression = this.isPercent.generateJassEquivalent(jassTextGenerator); } - return "AddMpAU(" + this.target.generateJassEquivalent(jassTextGenerator) + ", -(" + return "AddMpAU(" + this.unit.generateJassEquivalent(jassTextGenerator) + ", -(" + this.amount.generateJassEquivalent(jassTextGenerator) + "), " + percentExpression + ")"; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java index 911178e83..fd8489a6c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java @@ -7,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorFinishTransformation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -63,7 +64,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (this.requiresPayment != null) { charge = this.requiresPayment.callback(game, caster, localStore, castId); } - AbilityBuilderActiveAbility abil = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); + AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (baseId == null || altId == null) { localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); @@ -162,11 +163,17 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (instantTransformAtDurationEnd != null) { instant = instantTransformAtDurationEnd.callback(game, caster, localStore, castId); } + + int orderId = -1; + if (abil instanceof AbilityBuilderActiveAbility) { + AbilityBuilderActiveAbility activeabil = (AbilityBuilderActiveAbility) abil; + orderId = addAlternateTagAfter ? activeabil.getBaseOrderId() : activeabil.getOffOrderId(); + } localStore.put(ABLocalStoreKeys.TRANSFORMINGTOALT + castId, addAlternateTagAfter); localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, new CBehaviorFinishTransformation(localStore, u1, abil, targetType, isKeepRatios, actions, - addAlternateTagAfter, addAlternateTagAfter ? abil.getBaseOrderId() : abil.getOffOrderId(), perm, + addAlternateTagAfter, orderId, perm, dur, transTime, landTime, atlAdDelay, altAdTime, imLand, imTakeOff, theBuffId, game.getUnitData().getUnitType(baseId), instant)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java index f16430351..9ff980f46 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -55,7 +55,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS } War3ID baseId = baseUnitId.callback(game, caster, localStore, castId); War3ID altId = alternateUnitId.callback(game, caster, localStore, castId); - AbilityBuilderActiveAbility abil = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); + AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (baseId == null || altId == null) { localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java index dcb7765b6..d67155a8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -40,7 +40,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS } War3ID baseId = baseUnitId.callback(game, caster, localStore, castId); War3ID altId = alternateUnitId.callback(game, caster, localStore, castId); - AbilityBuilderActiveAbility abil = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); + AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (baseId == null || altId == null) { return; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java index 5e602a24a..c1e8e8299 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java @@ -11,11 +11,11 @@ public class ABActionAddAttackPostDamageListener implements ABAction { - private ABUnitCallback targetUnit; + private ABUnitCallback unit; private ABAttackPostDamageListenerCallback listener; public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + CUnit target = unit.callback(game, caster, localStore, castId); target.addPostDamageListener(listener.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java new file mode 100644 index 000000000..9954dd178 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java @@ -0,0 +1,24 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABUnitStateListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABActionAddUnitStateListener implements ABAction { + + private ABUnitCallback unit; + private ABUnitStateListenerCallback listener; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + CUnit target = unit.callback(game, caster, localStore, castId); + + localStore.put(ABLocalStoreKeys.LASTSTATELISTENERADDEDUNIT, target); + target.addStateListener(listener.callback(game, caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java index 7202aa48f..5cd8b96c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java @@ -7,12 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public class ABActionCreateAttackPostDamageListener implements ABAction { + private ABIntegerCallback priority; private List actions; private ABBooleanCallback useCastId; @@ -21,7 +23,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map onLifeChanged; + private List onManaChanged; + private List onOrdersChanged; + private List onQueueChanged; + private List onRallyPointChanged; + private List onWaypointsChanged; + private List onHeroStatsChanged; + private List onInventoryChanged; + private List onAttacksChanged; + private List onAbilitiesChanged; + private List onUpgradesChanged; + private List onHideStateChanged; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + ABUnitStateListener modifier = new ABUnitStateListener(game, caster, localStore, castId, onLifeChanged, + onManaChanged, onOrdersChanged, onQueueChanged, onRallyPointChanged, onWaypointsChanged, + onHeroStatsChanged, onInventoryChanged, onAttacksChanged, onAbilitiesChanged, onUpgradesChanged, + onHideStateChanged); + + localStore.put(ABLocalStoreKeys.LASTCREATEDUSL, modifier); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java index 7c51ddcb8..166aabf4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java @@ -11,11 +11,11 @@ public class ABActionRemoveAttackPostDamageListener implements ABAction { - private ABUnitCallback targetUnit; + private ABUnitCallback unit; private ABAttackPostDamageListenerCallback listener; public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + CUnit target = unit.callback(game, caster, localStore, castId); target.removePostDamageListener(listener.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java new file mode 100644 index 000000000..b0a3bbab3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java @@ -0,0 +1,22 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABUnitStateListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionRemoveUnitStateListener implements ABAction { + + private ABUnitCallback unit; + private ABUnitStateListenerCallback listener; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + CUnit target = unit.callback(game, caster, localStore, castId); + + target.removeStateListener(listener.callback(game, caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java index ac8f0e041..89ebe5fd5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java @@ -19,6 +19,5 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + CUnitAttackPreDamageListenerDamageModResult result = (CUnitAttackPreDamageListenerDamageModResult) localStore + .get(ABLocalStoreKeys.PREDAMAGERESULT+castId); + result.lock(); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java new file mode 100644 index 000000000..4aa5f4ccb --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABCallbackGetAttackBaseDamage extends ABFloatCallback { + + @Override + public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); + return settings.getBaseDamage(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java new file mode 100644 index 000000000..9c9800565 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABCallbackGetAttackMaximumSplashRadius extends ABIntegerCallback { + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); + return Math.max(settings.getAreaOfEffectFullDamage(), Math.max(settings.getAreaOfEffectMediumDamage(), settings.getAreaOfEffectSmallDamage())); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java new file mode 100644 index 000000000..ae8700ab9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; + +public class ABCallbackGetAttackType extends ABAttackTypeCallback { + + @Override + public CAttackType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getAttackType(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java new file mode 100644 index 000000000..aa7c3daed --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; + +public class ABCallbackGetDamageType extends ABDamageTypeCallback { + + @Override + public CDamageType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().getDamageType(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java new file mode 100644 index 000000000..3466fa3dc --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; + +public class ABCallbackGetWeaponType extends ABWeaponTypeCallback { + + @Override + public CWeaponType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java new file mode 100644 index 000000000..2a900b6a4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java @@ -0,0 +1,27 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileLine; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; + +public class ABConditionIsAttackArtillery extends ABCondition { + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnitAttack attack = (CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId); + if (attack instanceof CUnitAttackMissileSplash) { + return ((CUnitAttackMissileSplash)attack).isArtillery(); + } + if (attack instanceof CUnitAttackMissileLine) { + return ((CUnitAttackMissileLine)attack).isArtillery(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java new file mode 100644 index 000000000..889bbd811 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABConditionIsAttackHoming extends ABCondition { + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); + return settings.isProjectileHomingEnabled(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java new file mode 100644 index 000000000..142da4466 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java @@ -0,0 +1,53 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; + +import java.util.EnumSet; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; + +public class ABConditionIsUnitValidSplashDamageTarget extends ABCondition { + + private ABUnitCallback caster; + private ABUnitCallback unit; + private ABBooleanCallback targetedEffect; + + @Override + public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + CUnit theCaster = casterUnit; + + EnumSet targetsAllowed = null; + + CUnitAttack atk = (CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId); + if (atk instanceof CUnitAttackMissileSplash) { + targetsAllowed = ((CUnitAttackMissileSplash)atk).getAreaOfEffectTargets(); + } else { + return false; + } + + if (targetsAllowed.isEmpty()) { + return true; + } + final CUnit theUnit = this.unit.callback(game, casterUnit, localStore, castId); + boolean te = false; + if (this.caster != null) { + theCaster = this.caster.callback(game, casterUnit, localStore, castId); + } + if (this.targetedEffect != null) { + te = this.targetedEffect.callback(game, theCaster, localStore, castId); + } + + return theUnit.canBeTargetedBy(game, theCaster, te, targetsAllowed, + BooleanAbilityTargetCheckReceiver.getInstance().reset()); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java new file mode 100644 index 000000000..465041509 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java @@ -0,0 +1,25 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.ABLongCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; + +public class ABActionUpdateStateModBuff implements ABAction { + + private ABStateModBuffCallback buff; + private ABLongCallback value; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final StateModBuff buffObj = this.buff.callback(game, caster, localStore, castId); + buffObj.setValue(this.value.callback(game, caster, localStore, castId)); + } + +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java new file mode 100644 index 000000000..dcbdac34a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CProjectileVisionFogModifier; + +public class ABActionCreateProjectileVisionModifier implements ABAction { + + private ABProjectileCallback projectile; + private ABPlayerCallback player; + private ABFloatCallback radius; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + final CProjectileVisionFogModifier vision = new CProjectileVisionFogModifier( + this.projectile.callback(game, caster, localStore, castId), radius.callback(game, caster, localStore, castId)); + if (this.player != null) { + this.player.callback(game, caster, localStore, castId).addFogModifer(game, vision, false); + } + localStore.put(ABLocalStoreKeys.LASTCREATEDVISIONMODIFIER, vision); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java new file mode 100644 index 000000000..2901fda5b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java @@ -0,0 +1,27 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; + +public class ABCallbackGetAbilityById extends ABAbilityCallback { + + private ABIDCallback id; + private ABUnitCallback unit; + + @Override + public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (this.unit != null) { + theUnit = this.unit.callback(game, caster, localStore, castId); + } + return theUnit.getAbility(GetABAbilityByRawcodeVisitor.getInstance() + .reset(this.id.callback(game, caster, localStore, castId))); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java new file mode 100644 index 000000000..3a93896c8 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; + +public abstract class ABAttackModifierCallback implements ABCallback { + + abstract public ABAttackModifier callback(final CSimulation game, final CUnit caster, + final Map localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java new file mode 100644 index 000000000..7bd0eaf84 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; + +public class ABCallbackGetLastCreatedAttackModifier extends ABAttackModifierCallback { + + @Override + public ABAttackModifier callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (ABAttackModifier) localStore.get(ABLocalStoreKeys.LASTCREATEDAMod); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java new file mode 100644 index 000000000..5f33a8428 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; + +public class ABCallbackGetStoredAttackModifierByKey extends ABAttackModifierCallback { + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public ABAttackModifier callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + return (ABAttackModifier) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + } else { + return (ABAttackModifier) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java new file mode 100644 index 000000000..4f2724f54 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public abstract class ABAttackSettingsCallback implements ABCallback { + + abstract public CUnitAttackSettings callback(final CSimulation game, final CUnit caster, + final Map localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java new file mode 100644 index 000000000..240067fae --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABCallbackGetCurrentAttackSettings extends ABAttackSettingsCallback { + + @Override + public CUnitAttackSettings callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + System.err.println("Getting: " + localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId)); + return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java new file mode 100644 index 000000000..2a855ab61 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABCallbackGetLastCreatedAttackSettings extends ABAttackSettingsCallback { + + @Override + public CUnitAttackSettings callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.LASTCREATEDASettings); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java new file mode 100644 index 000000000..5cf7611a0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABCallbackGetStoredAttackSettingsByKey extends ABAttackSettingsCallback { + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public CUnitAttackSettings callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + } else { + return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java new file mode 100644 index 000000000..b39e5a241 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; + +public class ABCallbackGetAbilityUniqueValueBoolean extends ABBooleanCallback { + + private ABAbilityCallback ability; + private ABStringCallback key; + + private ABBooleanCallback allowNull; + + @Override + public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = key.callback(game, caster, localStore, castId); + final CAbility theAbility = ability.callback(game, caster, localStore, castId); + Boolean theVal = theAbility.getUniqueValue(keyS, Boolean.class); + if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + return theVal; + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java new file mode 100644 index 000000000..e5de02a4b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; + +public class ABCallbackGetBuffUniqueValueBoolean extends ABBooleanCallback { + + private ABBuffCallback buff; + private ABStringCallback key; + + private ABBooleanCallback allowNull; + + @Override + public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = key.callback(game, caster, localStore, castId); + final CBuff theBuff = buff.callback(game, caster, localStore, castId); + Boolean theVal = theBuff.getUniqueValue(keyS, Boolean.class); + if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + return theVal; + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java new file mode 100644 index 000000000..2f580f422 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java @@ -0,0 +1,34 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; + +public class ABCallbackGetBuffById extends ABBuffCallback { + + private ABUnitCallback unit; + private ABIDCallback id; + + @Override + public CBuff callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = unit.callback(game, caster, localStore, castId); + War3ID theId = id.callback(game, caster, localStore, castId); + if (theUnit != null) { + for (CAbility ability : theUnit.getAbilities()) { + if (ability instanceof CBuff) { + if (((CBuff)ability).getAlias() == theId) { + return (CBuff)ability; + } + } + } + } + return null; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackThisBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackThisBuff.java new file mode 100644 index 000000000..ff233f8c8 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackThisBuff.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackThisBuff extends ABBuffCallback { + + @Override + public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return (CBuff) localStore.get(ABLocalStoreKeys.BUFF); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ENUMBUFF", JassTextGeneratorType.BuffHandle); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java new file mode 100644 index 000000000..f9b245a5c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetAttackedDestructable extends ABDestructableCallback { + + @Override + public CDestructable callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); + return tar.visit(AbilityTargetVisitor.DESTRUCTABLE); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java new file mode 100644 index 000000000..ac4bf7da3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; + +public class ABCallbackGetDefenseTypeFromString extends ABDefenseTypeCallback { + + private ABStringCallback id; + + @Override + public CDefenseType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return CDefenseType.valueOf(this.id.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java new file mode 100644 index 000000000..86500fb9e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; + +public class ABCallbackGetStoredAttackTypeByKey extends ABAttackTypeCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public CAttackType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (CAttackType) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (CAttackType) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java new file mode 100644 index 000000000..dbb8959ad --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; + +public class ABCallbackGetStoredDamageTypeByKey extends ABDamageTypeCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public CDamageType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (CDamageType) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (CDamageType) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java new file mode 100644 index 000000000..c195f8a75 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; + +public class ABCallbackGetStoredDefenseTypeByKey extends ABDefenseTypeCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public CDefenseType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (CDefenseType) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (CDefenseType) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java new file mode 100644 index 000000000..ce62adcb8 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; + +public class ABCallbackGetStoredWeaponTypeByKey extends ABWeaponTypeCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public CWeaponType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (CWeaponType) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (CWeaponType) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java new file mode 100644 index 000000000..a9b2dd8f1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; + +public class ABCallbackGetUnitDefenseType extends ABDefenseTypeCallback { + + private ABUnitCallback unit; + + @Override + public CDefenseType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return unit.callback(game, caster, localStore, castId).getDefenseType(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java new file mode 100644 index 000000000..9fcd5093f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java @@ -0,0 +1,32 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABCallbackRawString; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; + +public class ABCallbackGetWeaponTypeFromString extends ABWeaponTypeCallback { + + private ABStringCallback id; + + @Override + public CWeaponType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return CWeaponType.valueOf(this.id.callback(game, caster, localStore, castId)); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + if (this.id instanceof ABCallbackRawString) { + // if possible, convert it directly, no shenanigans + final String value = ((ABCallbackRawString) this.id).getValue(); + return "WEAPON_TYPE_" + value; + } + return "String2WeaponType(" + this.id.generateJassEquivalent(jassTextGenerator) + ")"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java new file mode 100644 index 000000000..639e7fd01 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; + +public class ABCallbackRawWeaponType extends ABWeaponTypeCallback { + + private CWeaponType type; + + @Override + public CWeaponType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return type; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java new file mode 100644 index 000000000..2713e39d0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java @@ -0,0 +1,13 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; + +public abstract class ABDefenseTypeCallback implements ABCallback { + + abstract public CDefenseType callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java new file mode 100644 index 000000000..31daf69c1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java @@ -0,0 +1,13 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; + +public abstract class ABWeaponTypeCallback implements ABCallback { + + abstract public CWeaponType callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java new file mode 100644 index 000000000..b8b4dacb1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; + +public class ABCallbackArgumentWidgetEvent extends ABWidgetEventCallback { + + private ABStringCallback name; + + @Override + public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABWidgetEventCallback) { + return ((ABWidgetEventCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseWidgetEventCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java new file mode 100644 index 000000000..69c43fd72 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; + +public class ABCallbackGetLastCreatedWidgetEvent extends ABWidgetEventCallback { + + @Override + public ABWidgetEvent callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (ABWidgetEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDWIDEVENT); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java new file mode 100644 index 000000000..279ae4824 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; + +public class ABCallbackGetStoredWidgetEventByKey extends ABWidgetEventCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public ABWidgetEvent callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + return (ABWidgetEvent) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + } else { + return (ABWidgetEvent) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java new file mode 100644 index 000000000..4f5fa7cd4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; + +public class ABCallbackInlineConditionWidgetEvent extends ABWidgetEventCallback { + + private ABCondition condition; + private ABWidgetEventCallback pass; + private ABWidgetEventCallback fail; + + @Override + public ABWidgetEvent callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java new file mode 100644 index 000000000..01bcb30ef --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseWidgetEvent extends ABWidgetEventCallback { + + private ABStringCallback name; + + @Override + public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABWidgetEventCallback) { + return ((ABWidgetEventCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseWidgetEventCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseWidgetEventCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java new file mode 100644 index 000000000..94de1d7a8 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java @@ -0,0 +1,50 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseWidgetEventWithArguments extends ABWidgetEventCallback { + + private ABStringCallback name; + private Map arguments; + + @Override + public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABWidgetEventCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABWidgetEventCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseWidgetEventCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseWidgetEventCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java new file mode 100644 index 000000000..f8326bb3e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; + +public abstract class ABWidgetEventCallback implements ABCallback { + + abstract public ABWidgetEvent callback(final CSimulation game, final CUnit caster, + final Map localStore, final int castId); + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java index 59e20d4a7..72d5622ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -15,9 +16,14 @@ public class ABCallbackGetAbilityCastTime extends ABFloatCallback { @Override public Float callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - final List levelData = (List) localStore - .get(ABLocalStoreKeys.LEVELDATA); - return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getCastTime(); + AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null) { + return ability.getCastTime(); + } else { + final List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getCastTime(); + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java new file mode 100644 index 000000000..6f6dbd625 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java @@ -0,0 +1,31 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; + +public class ABCallbackGetAbilityUniqueValueFloat extends ABFloatCallback { + + private ABAbilityCallback ability; + private ABStringCallback key; + + private ABBooleanCallback allowNull; + + @Override + public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = key.callback(game, caster, localStore, castId); + final CAbility theAbility = ability.callback(game, caster, localStore, castId); + Float theVal = theAbility.getUniqueValue(keyS, Float.class); + if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + return theVal; + } + return 0.0f; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java new file mode 100644 index 000000000..9dbfd69b8 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java @@ -0,0 +1,31 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; + +public class ABCallbackGetBuffUniqueValueFloat extends ABFloatCallback { + + private ABBuffCallback buff; + private ABStringCallback key; + + private ABBooleanCallback allowNull; + + @Override + public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = key.callback(game, caster, localStore, castId); + final CBuff theBuff = buff.callback(game, caster, localStore, castId); + Float theVal = theBuff.getUniqueValue(keyS, Float.class); + if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + return theVal; + } + return 0.0f; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java new file mode 100644 index 000000000..05246212c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; + +public class ABCallbackGetDistanceBetweenUnits extends ABFloatCallback { + + private ABUnitCallback origin; + private ABUnitCallback target; + + @Override + public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit o = origin.callback(game, caster, localStore, castId); + CUnit t = target.callback(game, caster, localStore, castId); + + return (float) o.distance(t); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java index f71cfa3fe..b111d4aae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java @@ -13,7 +13,7 @@ public class ABCallbackGetUnitCurrentHp extends ABFloatCallback { @Override public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return this.unit.callback(game, caster, localStore, castId).getLife(); + return unit == null ? caster.getLife() : this.unit.callback(game, caster, localStore, castId).getLife(); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java index 07a9bb2d3..5e064310e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java @@ -12,7 +12,7 @@ public class ABCallbackGetUnitCurrentMana extends ABFloatCallback { @Override public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return unit.callback(game, caster, localStore, castId).getMana(); + return unit == null ? caster.getMana() : unit.callback(game, caster, localStore, castId).getMana(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java new file mode 100644 index 000000000..713112a1b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java @@ -0,0 +1,33 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; + +public class ABCallbackGetAbilityUniqueValueId extends ABIDCallback { + + private ABAbilityCallback ability; + private ABStringCallback key; + + private ABBooleanCallback allowNull; + + @Override + public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = key.callback(game, caster, localStore, castId); + final CAbility theAbility = ability.callback(game, caster, localStore, castId); + War3ID theVal = theAbility.getUniqueValue(keyS, War3ID.class); + System.err.println("Get Unique ID Val: " + (theVal != null ? theVal.asStringValue() : null)); + if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + return theVal; + } + return War3ID.NONE; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java index f0def5514..71af72b91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java @@ -5,17 +5,22 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; public class ABCallbackGetAbilityCastTimeAsInteger extends ABIntegerCallback { - @SuppressWarnings("unchecked") @Override public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); - return (int) levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL))-1).getCastTime(); + AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null) { + return (int) ability.getCastTime(); + } else { + List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); + return (int) levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL))-1).getCastTime(); + } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java new file mode 100644 index 000000000..5610ce678 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java @@ -0,0 +1,31 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; + +public class ABCallbackGetAbilityUniqueValueInteger extends ABIntegerCallback { + + private ABAbilityCallback ability; + private ABStringCallback key; + + private ABBooleanCallback allowNull; + + @Override + public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = key.callback(game, caster, localStore, castId); + final CAbility theAbility = ability.callback(game, caster, localStore, castId); + Integer theVal = theAbility.getUniqueValue(keyS, Integer.class); + if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + return theVal; + } + return 0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java new file mode 100644 index 000000000..2e253121d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java @@ -0,0 +1,31 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; + +public class ABCallbackGetBuffUniqueValueInteger extends ABIntegerCallback { + + private ABBuffCallback buff; + private ABStringCallback key; + + private ABBooleanCallback allowNull; + + @Override + public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = key.callback(game, caster, localStore, castId); + final CBuff theBuff = buff.callback(game, caster, localStore, castId); + Integer theVal = theBuff.getUniqueValue(keyS, Integer.class); + if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + return theVal; + } + return 0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java new file mode 100644 index 000000000..7f8e73f0e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetItemSlot extends ABIntegerCallback { + + private ABItemCallback item; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); + if (slot != null) { + return slot; + } + + CItem theItem; + if (item != null) { + theItem = item.callback(game, caster, localStore, castId); + } else { + theItem = (CItem)localStore.get(ABLocalStoreKeys.ITEM); + } + + if (theItem == null || theItem.getContainedInventory() == null) { + return null; + } + return theItem.getContainedInventory().getSlot(theItem); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java new file mode 100644 index 000000000..3291d67b2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; + +public class ABCallbackGetUnitMaximumHp extends ABIntegerCallback { + + private ABUnitCallback unit; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return unit == null ? caster.getMaximumLife() + : this.unit.callback(game, caster, localStore, castId).getMaximumLife(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java new file mode 100644 index 000000000..307cb9133 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; + +public class ABCallbackGetUnitMaximumMp extends ABIntegerCallback { + + private ABUnitCallback unit; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return unit == null ? caster.getMaximumMana() + : unit.callback(game, caster, localStore, castId).getMaximumMana(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java new file mode 100644 index 000000000..7e1d984f6 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABCallbackIntegerZeroIfNull extends ABIntegerCallback { + + private ABIntegerCallback value; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + Integer v = value.callback(game, caster, localStore, castId); + return v == null ? 0 : v; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java index b10dce23e..07d8a118c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java @@ -4,8 +4,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; public class ABCallbackIterator extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java new file mode 100644 index 000000000..abed304ca --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; + +public class ABCallbackTruncateFloatToInteger extends ABIntegerCallback { + + private ABFloatCallback value; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return value.callback(game, caster, localStore, castId).intValue(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java new file mode 100644 index 000000000..71a8f544d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetAttackedItem extends ABItemCallback { + + @Override + public CItem callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); + return tar.visit(AbilityTargetVisitor.ITEM); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java new file mode 100644 index 000000000..b3b9f65e9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetLastCreatedItem extends ABItemCallback { + + @Override + public CItem callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (CItem) localStore.get(ABLocalStoreKeys.LASTCREATEDITEM); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java new file mode 100644 index 000000000..8b1ce878d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetStoredItemByKey extends ABItemCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public CItem callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + return (CItem) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + } else { + return (CItem) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java new file mode 100644 index 000000000..3a334c3bf --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; + +public class ABCallbackGetLastCreatedUnitStateListener extends ABUnitStateListenerCallback { + + @Override + public ABUnitStateListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (ABUnitStateListener) localStore.get(ABLocalStoreKeys.LASTCREATEDUSL); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java new file mode 100644 index 000000000..80dc40b81 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; + +public class ABCallbackGetStoredUnitStateListenerByKey extends ABUnitStateListenerCallback { + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public ABUnitStateListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + return (ABUnitStateListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + } else { + return (ABUnitStateListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java new file mode 100644 index 000000000..dabb930bc --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; + +public abstract class ABUnitStateListenerCallback implements ABCallback { + + abstract public ABUnitStateListener callback(final CSimulation game, final CUnit caster, + final Map localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java index d77bed263..99dcf9792 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; public class ABCallbackCreateLocationFromOffset extends ABLocationCallback { @@ -13,6 +14,8 @@ public class ABCallbackCreateLocationFromOffset extends ABLocationCallback { private ABLocationCallback origin; private ABFloatCallback dist; private ABFloatCallback angle; + + private ABBooleanCallback angleInDegrees; @Override public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, @@ -20,7 +23,10 @@ public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.ATTACKIMPACTLOCATION+castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java new file mode 100644 index 000000000..d1720ffb5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetAttackTargetLocation extends ABLocationCallback { + + @Override + public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); + if (tar.visit(AbilityTargetVisitor.POINT) != null) { + return tar.visit(AbilityTargetVisitor.POINT); + } + return new AbilityPointTarget(tar.getX(), tar.getY()); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java new file mode 100644 index 000000000..e790c2ad7 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetGroundAttackedLocation extends ABLocationCallback { + + @Override + public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); + return tar.visit(AbilityTargetVisitor.POINT); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java new file mode 100644 index 000000000..58a1463ce --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java @@ -0,0 +1,37 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; + +public class ABCallbackGetAbilityDataAsLong extends ABLongCallback { + + private DataFieldLetter dataField; + + @SuppressWarnings("unchecked") + @Override + public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + final List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); + + final String data = levelData.get(level - 1).getData().get(this.dataField.getIndex()); + if ("-".equals(data)) { + return 0l; + } + return Long.parseLong(data); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "GetAbilityDataAsLongAU(" + jassTextGenerator.getTriggerLocalStore() + ", DATA_FIELD_LETTER_" + + this.dataField.name() + ")"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java new file mode 100644 index 000000000..1e1ed3365 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java @@ -0,0 +1,31 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; + +public class ABCallbackGetAbilityUniqueValueLong extends ABLongCallback { + + private ABAbilityCallback ability; + private ABStringCallback key; + + private ABBooleanCallback allowNull; + + @Override + public Long callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = key.callback(game, caster, localStore, castId); + final CAbility theAbility = ability.callback(game, caster, localStore, castId); + Long theVal = theAbility.getUniqueValue(keyS, Long.class); + if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + return theVal; + } + return 0l; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java new file mode 100644 index 000000000..4bc1d3fe2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java @@ -0,0 +1,31 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; + +public class ABCallbackGetBuffUniqueValueLong extends ABLongCallback { + + private ABBuffCallback buff; + private ABStringCallback key; + + private ABBooleanCallback allowNull; + + @Override + public Long callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = key.callback(game, caster, localStore, castId); + final CBuff theBuff = buff.callback(game, caster, localStore, castId); + Long theVal = theBuff.getUniqueValue(keyS, Long.class); + if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + return theVal; + } + return 0l; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java new file mode 100644 index 000000000..667a7b475 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.util.WarsmashConstants; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABCallbackPlayerMaskAllPlayers extends ABLongCallback { + + @Override + public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + long dat = 0; + for (int i = 0; i < WarsmashConstants.MAX_PLAYERS; i++) { + dat |= 1 << i; + } + + return dat; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java new file mode 100644 index 000000000..cf1bff6ad --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; + +public class ABCallbackPlayerMaskExcludePlayers extends ABLongCallback { + + List players; + + @Override + public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + long dat = 0; + for (ABPlayerCallback player : players) { + dat |= 1 << player.callback(game, caster, localStore, castId).getId(); + } + + return ~dat; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java new file mode 100644 index 000000000..977581769 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; + +public class ABCallbackPlayerMaskIncludePlayers extends ABLongCallback { + + List players; + + @Override + public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + long dat = 0; + for (ABPlayerCallback player : players) { + dat |= 1 << player.callback(game, caster, localStore, castId).getId(); + } + + return dat; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java new file mode 100644 index 000000000..5522cd3e9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; + +public class ABCallbackGetAbilityHandleAsString extends ABStringCallback { + + private ABAbilityCallback ability; + + @Override + public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return "" + ability.callback(game, caster, localStore, castId).getHandleId(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java new file mode 100644 index 000000000..bab645583 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; + +public class ABCallbackGetAbilityUniqueValueString extends ABStringCallback { + + private ABAbilityCallback ability; + private ABStringCallback key; + + private ABBooleanCallback allowNull; + + @Override + public String callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = key.callback(game, caster, localStore, castId); + final CAbility theAbility = ability.callback(game, caster, localStore, castId); + String theVal = theAbility.getUniqueValue(keyS, String.class); + if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + return theVal; + } + return ""; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java new file mode 100644 index 000000000..67c9f8490 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; + +public class ABCallbackGetBuffHandleAsString extends ABStringCallback { + + private ABBuffCallback buff; + + @Override + public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return "" + buff.callback(game, caster, localStore, castId).getHandleId(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java new file mode 100644 index 000000000..84b9b192d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; + +public class ABCallbackGetBuffUniqueValueString extends ABStringCallback { + + private ABBuffCallback buff; + private ABStringCallback key; + + private ABBooleanCallback allowNull; + + @Override + public String callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = key.callback(game, caster, localStore, castId); + final CBuff theBuff = buff.callback(game, caster, localStore, castId); + String theVal = theBuff.getUniqueValue(keyS, String.class); + if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + return theVal; + } + return ""; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java new file mode 100644 index 000000000..d67937a4a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; + +public class ABCallbackIdToString extends ABStringCallback { + + private ABIDCallback value; + + @Override + public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return value.callback(game, caster, localStore, castId).asStringValue(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java index 2957ad0e9..243a3df56 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java @@ -4,13 +4,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; public class ABCallbackGetAttackedUnit extends ABUnitCallback { @Override public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.ATTACKEDUNIT+castId); + AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); + return tar.visit(AbilityTargetVisitor.UNIT); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java new file mode 100644 index 000000000..62a789998 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetCompUnit1 extends ABUnitCallback { + + @Override + public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.COMPUNIT1); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr( + "AB_LOCAL_STORE_KEY_COMPUNIT1 + I2S(" + jassTextGenerator.getCastId() + ")", + JassTextGeneratorType.UnitHandle); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java new file mode 100644 index 000000000..0a7bf61c1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetCompUnit2 extends ABUnitCallback { + + @Override + public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.COMPUNIT2); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr( + "AB_LOCAL_STORE_KEY_COMPUNIT2 + I2S(" + jassTextGenerator.getCastId() + ")", + JassTextGeneratorType.UnitHandle); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java new file mode 100644 index 000000000..3b20099bc --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; + +public class ABCallbackDestructableToWidget extends ABWidgetCallback { + + private ABDestructableCallback destructable; + + @Override + public CWidget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return destructable.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java new file mode 100644 index 000000000..852cb4caf --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; + +public class ABCallbackItemToWidget extends ABWidgetCallback { + + private ABItemCallback item; + + @Override + public CWidget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return item.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java index eb92c98e7..47785b8ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java @@ -6,6 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -22,11 +24,17 @@ public class ABConditionIsDestructableValidTarget extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theCaster = casterUnit; - - List levelData = (List) localStore - .get(ABLocalStoreKeys.LEVELDATA); - EnumSet targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL))-1) - .getTargetsAllowed(); + + EnumSet targetsAllowed = null; + AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null && ability instanceof AbilityBuilderActiveAbility) { + targetsAllowed = ((AbilityBuilderActiveAbility)ability).getTargetsAllowed(); + } else { + List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL))-1) + .getTargetsAllowed(); + } if (targetsAllowed.isEmpty()) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java index 541ad1038..3296e1caa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -19,7 +19,10 @@ public class ABConditionIsUnitPassAllAbilityTargetChecks extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theCaster = casterUnit; - + CUnit theTarget = target.callback(game, casterUnit, localStore, castId); + if (theTarget == null) { + return false; + } if (caster != null) { theCaster = caster.callback(game, casterUnit, localStore, castId); } @@ -29,7 +32,7 @@ public Boolean callback(CSimulation game, CUnit casterUnit, Map .getInstance().reset(); abil.checkCanTarget(game, theCaster, abil.getBaseOrderId(), - false, target.callback(game, casterUnit, localStore, castId), booleanTargetReceiver); + false, theTarget, booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java index 827d577dc..5f4fba60a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java @@ -8,6 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -27,14 +29,24 @@ public class ABConditionIsUnitValidTarget extends ABCondition { public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theCaster = casterUnit; - final List levelData = (List) localStore - .get(ABLocalStoreKeys.LEVELDATA); - final EnumSet targetsAllowed = levelData - .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getTargetsAllowed(); + EnumSet targetsAllowed = null; + AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null && ability instanceof AbilityBuilderActiveAbility) { + targetsAllowed = ((AbilityBuilderActiveAbility)ability).getTargetsAllowed(); + } else { + List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL))-1) + .getTargetsAllowed(); + } + if (targetsAllowed.isEmpty()) { return true; } final CUnit theUnit = this.target.callback(game, casterUnit, localStore, castId); + if (theUnit == null) { + return false; + } boolean te = false; if (this.caster != null) { theCaster = this.caster.callback(game, casterUnit, localStore, castId); @@ -42,9 +54,6 @@ public Boolean callback(CSimulation game, CUnit casterUnit, Map if (this.targetedEffect != null) { te = this.targetedEffect.callback(game, theCaster, localStore, castId); } -// for (CTargetType tar : targetsAllowed) { -// System.err.println("Matches " + tar + "? " + theUnit.canBeTargetedBy(game, theCaster, EnumSet.of(tar))); -// } return theUnit.canBeTargetedBy(game, theCaster, te, targetsAllowed, BooleanAbilityTargetCheckReceiver.getInstance().reset()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java index 2aa454253..34af796fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java @@ -7,6 +7,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -24,10 +27,16 @@ public class ABConditionIsValidTarget extends ABCondition { public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theCaster = casterUnit; - final List levelData = (List) localStore - .get(ABLocalStoreKeys.LEVELDATA); - final EnumSet targetsAllowed = levelData - .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getTargetsAllowed(); + EnumSet targetsAllowed = null; + AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null && ability instanceof AbilityBuilderActiveAbility) { + targetsAllowed = ((AbilityBuilderActiveAbility) ability).getTargetsAllowed(); + } else { + List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1) + .getTargetsAllowed(); + } if (targetsAllowed.isEmpty()) { return true; @@ -36,13 +45,12 @@ public Boolean callback(CSimulation game, CUnit casterUnit, Map theCaster = this.caster.callback(game, casterUnit, localStore, castId); } -// CWidget theTarget = target.callback(game, theCaster, localStore, castId); -// for (CTargetType tar : targetsAllowed) { -// System.err.println("Matches " + tar + "? " + theTarget.canBeTargetedBy(game, theCaster, EnumSet.of(tar))); -// } + CWidget widget = this.target.callback(game, casterUnit, localStore, castId); + if (widget == null) { + return false; + } - return this.target.callback(game, casterUnit, localStore, castId).canBeTargetedBy(game, theCaster, - targetsAllowed); + return widget.canBeTargetedBy(game, theCaster, targetsAllowed); } @Override @@ -50,8 +58,7 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String casterExpr; if (this.caster == null) { casterExpr = jassTextGenerator.getCaster(); - } - else { + } else { casterExpr = this.caster.generateJassEquivalent(jassTextGenerator); } return "IsValidTargetAU(" + this.target.generateJassEquivalent(jassTextGenerator) + ", " + casterExpr + ", " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java new file mode 100644 index 000000000..c3e275ae2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionDoesAbilityHaveUniqueFlag extends ABCondition { + + ABAbilityCallback ability; + ABStringCallback flag; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CAbility theAbility = ability.callback(game, caster, localStore, castId); + return theAbility.hasUniqueFlag(flag.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastOn.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastOn.java new file mode 100644 index 000000000..3e4b35125 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastOn.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABConditionIsAutoCastOn extends ABCondition { + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (Boolean) localStore.get(ABLocalStoreKeys.ISAUTOCASTON); + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ISAUTOCASTON", JassTextGeneratorType.Boolean); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java new file mode 100644 index 000000000..b236e9915 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABConditionIsDisabled extends ABCondition { + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + return ability.isDisabled(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastOn.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastOn.java new file mode 100644 index 000000000..bf0a95a13 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastOn.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABConditionWasAutoCastOn extends ABCondition { + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (Boolean) localStore.get(ABLocalStoreKeys.WASAUTOCASTON); + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_WASAUTOCASTON", JassTextGeneratorType.Boolean); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java new file mode 100644 index 000000000..a885a8e3c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; + +public class ABConditionIsAttackProjectile extends ABCondition { + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().isProjectile(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java new file mode 100644 index 000000000..3d88d8fd1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; + +public class ABConditionIsAttackRanged extends ABCondition { + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().isRanged(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java new file mode 100644 index 000000000..3e1ada5af --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionDoesBuffHaveUniqueFlag extends ABCondition { + + ABBuffCallback buff; + ABStringCallback flag; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CBuff theBuff = buff.callback(game, caster, localStore, castId); + return theBuff.hasUniqueFlag(flag.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java new file mode 100644 index 000000000..9e72fa77e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java @@ -0,0 +1,28 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDefenseTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; + +public class ABConditionIsDefenseTypeEqual extends ABCondition { + + private ABDefenseTypeCallback defenseType1; + private ABDefenseTypeCallback defenseType2; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CDefenseType lD = defenseType1.callback(game, caster, localStore, castId); + CDefenseType rD = defenseType2.callback(game, caster, localStore, castId); + if (lD == null) { + if (rD == null) { + return true; + } + return false; + } + return lD.equals(rD); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java new file mode 100644 index 000000000..3e2a22c9c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java @@ -0,0 +1,28 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDefenseTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; + +public class ABConditionIsDefenseTypeInList extends ABCondition { + + private ABDefenseTypeCallback defenseType; + private List list; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, int castId) { + CDefenseType theType = defenseType.callback(game, caster, localStore, castId); + for (ABDefenseTypeCallback lType : list) { + if (theType == lType.callback(game, caster, localStore, castId)) { + return true; + } + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java new file mode 100644 index 000000000..18e91ef5c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java @@ -0,0 +1,28 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; + +public class ABConditionIsWeaponTypeEqual extends ABCondition { + + private ABWeaponTypeCallback weaponType1; + private ABWeaponTypeCallback weaponType2; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CWeaponType lD = weaponType1.callback(game, caster, localStore, castId); + CWeaponType rD = weaponType2.callback(game, caster, localStore, castId); + if (lD == null) { + if (rD == null) { + return true; + } + return false; + } + return lD.equals(rD); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java index 18cc82f2c..b4c96f77c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java @@ -16,7 +16,10 @@ public class ABConditionDoesUnitHaveBuff extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CUnit theUnit = unit.callback(game, caster, localStore, castId); + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } if (theUnit != null) { for (CAbility ability : theUnit.getAbilities()) { if (ability instanceof CBuff) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java index 3964e4409..7e47fd8d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java @@ -12,7 +12,10 @@ public class ABConditionIsUnitBuilding extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CUnit theUnit = unit.callback(game, caster, localStore, castId); + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } if (theUnit != null) { return theUnit.isBuilding(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java new file mode 100644 index 000000000..9e7cf4873 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsUnitConstructing extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isConstructing(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java new file mode 100644 index 000000000..0a6c830f4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsUnitConstructingOrUpgrading extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isConstructingOrUpgrading(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java index 2486c6fef..1695ddb48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java @@ -12,7 +12,10 @@ public class ABConditionIsUnitDead extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CUnit theUnit = unit.callback(game, caster, localStore, castId); + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } if (theUnit != null) { return theUnit.isDead(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java new file mode 100644 index 000000000..005c9bc40 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsUnitHero extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isHero(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java new file mode 100644 index 000000000..6232ab7ed --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; + +public class ABConditionIsUnitHeroDuration extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = unit.callback(game, caster, localStore, castId); + if (theUnit != null && (theUnit.isHero() || theUnit.isUnitType(CUnitTypeJass.RESISTANT))) { + return true; + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java new file mode 100644 index 000000000..336e5ac55 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsUnitHidden extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isHidden(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java index ed080e7a4..71431095c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java @@ -12,7 +12,10 @@ public class ABConditionIsUnitMagicImmune extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CUnit theUnit = unit.callback(game, caster, localStore, castId); + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } if (theUnit != null) { return theUnit.isMagicImmune(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java index 61151d751..49b849972 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java @@ -14,7 +14,10 @@ public class ABConditionIsUnitMaxHp extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CUnit theUnit = unit.callback(game, caster, localStore, castId); + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } if (theUnit != null) { return theUnit.getLife() >= theUnit.getMaximumLife(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java index 240f8d9c8..de608eb27 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java @@ -14,7 +14,10 @@ public class ABConditionIsUnitMaxMp extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CUnit theUnit = unit.callback(game, caster, localStore, castId); + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } if (theUnit != null) { return theUnit.getMana() >= theUnit.getMaximumMana(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java new file mode 100644 index 000000000..f374dd90d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; + +public class ABConditionIsUnitSummoned extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isUnitType(CUnitTypeJass.SUMMONED); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java index 255bfeddc..91aa7e293 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java @@ -12,7 +12,10 @@ public class ABConditionIsUnitTraining extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CUnit theUnit = unit.callback(game, caster, localStore, castId); + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } if (theUnit != null) { return theUnit.isBuildQueueActive(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java index 39e72f7ac..189ad629e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java @@ -14,7 +14,10 @@ public class ABConditionIsUnitType extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CUnit theUnit = unit.callback(game, caster, localStore, castId); + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } if (theUnit != null) { return theUnit.getTypeId().equals(unitType.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java new file mode 100644 index 000000000..73a41921b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsUnitUpgrading extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isUpgrading(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java new file mode 100644 index 000000000..0fd6b02e4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java @@ -0,0 +1,65 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; + +public class ABConditionSuccessfullyChargeResources extends ABCondition { + + private ABUnitCallback unit; + private ABPlayerCallback player; + + private ABIntegerCallback mana; + private ABIntegerCallback gold; + private ABIntegerCallback lumber; + private ABIntegerCallback food; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + CPlayer thePlayer = game.getPlayer(theUnit.getPlayerIndex()); + if (player != null) { + thePlayer = player.callback(game, caster, localStore, castId); + } + + int manaCost = 0; + int goldCost = 0; + int lumberCost = 0; + int foodCost = 0; + if (mana != null) { + manaCost = mana.callback(game, caster, localStore, castId); + } + if (gold != null) { + goldCost = gold.callback(game, caster, localStore, castId); + } + if (lumber != null) { + lumberCost = lumber.callback(game, caster, localStore, castId); + } + if (food != null) { + foodCost = food.callback(game, caster, localStore, castId); + } + + if ((manaCost > 0 && manaCost > theUnit.getMana()) || (goldCost > 0 && goldCost > thePlayer.getGold()) + || (lumberCost > 0 && lumberCost > thePlayer.getLumber()) + || (foodCost > 0 && foodCost > (thePlayer.getFoodCap() - thePlayer.getFoodUsed()))) { + return false; + } + + if (manaCost > 0) + theUnit.chargeMana(manaCost); + theUnit.notifyAbilitiesChanged(); + if (goldCost > 0 || lumberCost > 0) + thePlayer.charge(goldCost, lumberCost); + if (foodCost > 0) + thePlayer.setFoodUsed(thePlayer.getFoodUsed() + foodCost); + return true; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java new file mode 100644 index 000000000..86ca0265d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java @@ -0,0 +1,27 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionUnitHasResearch extends ABCondition { + + private ABUnitCallback unit; + private ABIDCallback researchId; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.getLevelOfAppliedUpgrade(researchId.callback(game, caster, localStore, castId)) > 0; + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java index 531f54e82..9d42dc766 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java @@ -1,5 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +import java.util.ArrayList; +import java.util.List; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -20,8 +22,12 @@ public abstract class ABBuff extends AbstractCBuff { protected static int PHYSICAL = 0b100000; protected static int MAGIC = 0b1000000; protected static int AURA = 0b10000000; + protected static int STACKS = 0b100000000; protected int flags = DISPELLABLE; + + protected List uniqueFlags = null; + private String visibilityGroup = null; public ABBuff(int handleId, War3ID code, War3ID alias) { super(handleId, code, alias); @@ -76,6 +82,41 @@ public T visit(final CAbilityVisitor visitor) { return visitor.accept(this); } + @Override + public boolean hasUniqueFlag(String flag) { + if (this.uniqueFlags != null) { + return this.uniqueFlags.contains(flag); + } + return false; + } + + public void addUniqueFlag(String flag) { + if (this.uniqueFlags == null) { + this.uniqueFlags = new ArrayList<>(); + } + this.uniqueFlags.add(flag); + } + + public void removeUniqueFlag(String flag) { + if (this.uniqueFlags != null) { + this.uniqueFlags.remove(flag); + } + } + + @Override + public T getUniqueValue(String key, Class cls) { + return null; + } + + public void setVisibilityGroup(String visibilityGroup) { + this.visibilityGroup = visibilityGroup; + } + + @Override + public String getVisibilityGroup() { + return this.visibilityGroup; + } + public void setTimedLifeBar(boolean timedLife) { this.flags = timedLife ? this.flags | TIMEDLIFE : this.flags & ~TIMEDLIFE; } @@ -147,4 +188,12 @@ public void setAura(boolean aura) { public boolean isAura() { return ((this.flags & AURA) != 0); } + + public void setStacks(boolean stacks) { + this.flags = stacks ? this.flags | STACKS : this.flags & ~STACKS; + } + + public boolean isStacks() { + return ((this.flags & STACKS) != 0); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java new file mode 100644 index 000000000..07d8bb805 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java @@ -0,0 +1,100 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABBuffSlow extends ABGenericTimedBuff { + private static NonStackingStatBuff STANDARD_ATTACK_DEBUFF; + private static NonStackingStatBuff STANDARD_MOVE_DEBUFF; + + private NonStackingStatBuff attackSpeedDebuff; + private NonStackingStatBuff moveSpeedDebuff; + + private NonStackingFx fx; + private SimulationRenderComponent sfx; + private SimulationRenderComponent lsfx; + + public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias, final float duration, + boolean leveled) { + super(handleId, alias, duration, false, leveled, false, false); + if (STANDARD_ATTACK_DEBUFF == null) { + STANDARD_ATTACK_DEBUFF = new NonStackingStatBuff(NonStackingStatBuffType.ATKSPD, "genericSlow", + -1 * game.getGameplayConstants().getFrostAttackSpeedDecrease()); + } + if (STANDARD_MOVE_DEBUFF == null) { + STANDARD_MOVE_DEBUFF = new NonStackingStatBuff(NonStackingStatBuffType.MVSPDPCT, "genericSlow", + -1 * game.getGameplayConstants().getFrostMoveSpeedDecrease()); + } + this.attackSpeedDebuff = STANDARD_ATTACK_DEBUFF; + this.moveSpeedDebuff = STANDARD_MOVE_DEBUFF; + } + + public ABBuffSlow(final int handleId, final War3ID alias, final float duration, + final float attackSpeedReductionPercent, final float moveSpeedReductionPercent, boolean leveled) { + super(handleId, alias, duration, false, leveled, false, false); + this.attackSpeedDebuff = new NonStackingStatBuff(NonStackingStatBuffType.ATKSPD, "genericSlow", + -1 * attackSpeedReductionPercent); + this.moveSpeedDebuff = new NonStackingStatBuff(NonStackingStatBuffType.MVSPDPCT, "genericSlow", + -1 * moveSpeedReductionPercent); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ABBuffSlow other = (ABBuffSlow) obj; + return this.attackSpeedDebuff.getValue() == other.attackSpeedDebuff.getValue() + && this.moveSpeedDebuff.getValue() == other.moveSpeedDebuff.getValue(); + } + + @Override + protected void onBuffAdd(final CSimulation game, final CUnit unit) { + unit.addNonStackingStatBuff(game, attackSpeedDebuff); + unit.addNonStackingStatBuff(game, moveSpeedDebuff); + if (this.fx != null) { + unit.removeNonStackingFx(game, this.fx); + } + if (this.getAlias() != null) { + this.fx = unit.addNonStackingFx(game, getAlias().asStringValue(), getAlias(), CEffectType.TARGET); + this.sfx = game.unitSoundEffectEvent(unit, getAlias()); + this.lsfx = game.unitLoopSoundEffectEvent(unit, getAlias()); + } + + float[] color = game.getUnitVertexColor(unit); + color[0] *= 0.6; + color[1] *= 0.6; + game.changeUnitVertexColor(unit, color[0], color[1], color[2]); + } + + @Override + protected void onBuffRemove(final CSimulation game, final CUnit unit) { + unit.removeNonStackingStatBuff(game, attackSpeedDebuff); + unit.removeNonStackingStatBuff(game, moveSpeedDebuff); + if (this.fx != null) { + unit.removeNonStackingFx(game, this.fx); + } + if (this.sfx != null) { + this.sfx.remove(); + } + if (this.lsfx != null) { + this.lsfx.remove(); + } + game.changeUnitVertexColor(unit, 1, 1, 1); + } + + @Override + protected void onBuffExpire(CSimulation game, CUnit unit) { + // Do Nothing + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java new file mode 100644 index 000000000..b0d9991b1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java @@ -0,0 +1,68 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuffType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABBuffStun extends ABGenericTimedBuff { + private static StateModBuff stunBuff = new StateModBuff(StateModBuffType.STUN, 1); + + private NonStackingFx fx; + private SimulationRenderComponent sfx; + private SimulationRenderComponent lsfx; + + public ABBuffStun(final int handleId, final War3ID alias, final float duration, final boolean leveled) { + super(handleId, alias, duration, false, leveled, false, false); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + return true; + } + + @Override + protected void onBuffAdd(final CSimulation game, final CUnit unit) { + unit.addStateModBuff(stunBuff); + unit.computeUnitState(game, stunBuff.getBuffType()); + if (this.fx != null) { + unit.removeNonStackingFx(game, this.fx); + } + if (this.getAlias() != null) { + this.fx = unit.addNonStackingFx(game, getAlias().asStringValue(), getAlias(), CEffectType.TARGET); + this.sfx = game.unitSoundEffectEvent(unit, getAlias()); + this.lsfx = game.unitLoopSoundEffectEvent(unit, getAlias()); + } + } + + @Override + protected void onBuffRemove(final CSimulation game, final CUnit unit) { + unit.removeStateModBuff(stunBuff); + unit.computeUnitState(game, stunBuff.getBuffType()); + if (this.fx != null) { + unit.removeNonStackingFx(game, this.fx); + } + if (this.sfx != null) { + this.sfx.remove(); + } + if (this.lsfx != null) { + this.lsfx.remove(); + } + } + + @Override + protected void onBuffExpire(CSimulation game, CUnit unit) { + // Do Nothing + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java index 49b702233..37889aa54 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java @@ -19,6 +19,18 @@ public ABGenericTimedBuff(int handleId, War3ID alias, float duration, boolean sh this.setPositive(positive); this.setDispellable(dispellable); } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ABGenericTimedBuff other = (ABGenericTimedBuff) obj; + return this.getAlias() == other.getAlias() && this.getLevel() == other.getLevel() && !this.isStacks(); + } @Override public void onAdd(CSimulation game, CUnit unit) { @@ -36,6 +48,11 @@ public void onAdd(CSimulation game, CUnit unit) { @Override public void onRemove(CSimulation game, CUnit unit) { this.onBuffRemove(game, unit); + this.cleanUpUniqueValues(); + } + + protected void cleanUpUniqueValues() { + // Do nothing } protected abstract void onBuffRemove(CSimulation game, CUnit unit); @@ -68,7 +85,6 @@ public void onDeath(final CSimulation game, final CUnit cUnit) { } public void updateExpiration(final CSimulation game, final CUnit unit) { - final int durationTicks = (int) (this.duration / WarsmashConstants.SIMULATION_STEP_TIME); - expireTick = game.getGameTurnTick() + durationTicks; + this.currentTick = 0; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java index 051a683ad..d55ab3080 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java @@ -1,7 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -48,6 +50,34 @@ public ABTimedBuff(int handleId, War3ID alias, float duration, boolean showTimed this.setLevel(null, null, (int) localStore.getOrDefault(ABLocalStoreKeys.CURRENTLEVEL, 1)); } + + @SuppressWarnings("unchecked") + @Override + public T getUniqueValue(String key, Class cls) { + Object o = this.localStore.get(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); + if (o != null && o.getClass() == cls) { + return (T)o; + } + return null; + } + + public void addUniqueValue(Object item, String key) { + this.localStore.put(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId()), item); + } + + public void removeUniqueValue(String key) { + this.localStore.remove(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); + } + + public void cleanUpUniqueValues() { + final Set keySet = new HashSet<>(localStore.keySet()); + String search = ABLocalStoreKeys.combineUniqueValueKey("", this.getHandleId()); + for (final String key : keySet) { + if (key.contains(search)) { + localStore.remove(key); + } + } + } public void setArtType(CEffectType artType) { this.artType = artType; @@ -66,9 +96,11 @@ protected void onBuffAdd(CSimulation game, CUnit unit) { this.lsfx = game.unitLoopSoundEffectEvent(unit, getAlias()); } if (onAddActions != null) { + localStore.put(ABLocalStoreKeys.BUFF, this); for (ABAction action : onAddActions) { action.runAction(game, unit, localStore, castId); } + localStore.remove(ABLocalStoreKeys.BUFF); } } @@ -84,18 +116,22 @@ protected void onBuffRemove(CSimulation game, CUnit unit) { this.lsfx.remove(); } if (onRemoveActions != null) { + localStore.put(ABLocalStoreKeys.BUFF, this); for (ABAction action : onRemoveActions) { action.runAction(game, unit, localStore, castId); } + localStore.remove(ABLocalStoreKeys.BUFF); } } @Override protected void onBuffExpire(CSimulation game, CUnit unit) { if (onExpireActions != null) { + localStore.put(ABLocalStoreKeys.BUFF, this); for (ABAction action : onExpireActions) { action.runAction(game, unit, localStore, castId); } + localStore.remove(ABLocalStoreKeys.BUFF); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java new file mode 100644 index 000000000..1a2232e6c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; + +import java.util.List; +import java.util.Map; +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABTimedPausedExpirationBuff extends ABTimedBuff implements CPausedTickingBuff { + + public ABTimedPausedExpirationBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + Map localStore, List onAddActions, List onRemoveActions, + List onExpireActions, boolean showIcon, final int castId, final boolean leveled, + final boolean positive, final boolean dispellable) { + super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + showIcon, castId, leveled, positive, dispellable); + } + + public ABTimedPausedExpirationBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + Map localStore, List onAddActions, List onRemoveActions, + List onExpireActions, final int castId, final boolean leveled, final boolean positive, + final boolean dispellable) { + super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + castId, leveled, positive, dispellable); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java index 74c6c9b30..1c6eb6144 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java @@ -7,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; public class ABTimedTickingBuff extends ABTimedBuff { @@ -33,9 +34,11 @@ public ABTimedTickingBuff(int handleId, War3ID alias, float duration, boolean sh @Override public void onTick(CSimulation game, CUnit unit) { if (onTickActions != null) { + localStore.put(ABLocalStoreKeys.BUFF, this); for (ABAction action : onTickActions) { action.runAction(game, unit, localStore, castId); } + localStore.remove(ABLocalStoreKeys.BUFF); } super.onTick(game, unit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java index c75019361..1b49d1b51 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java @@ -7,8 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABTimedTickingPausedBuff extends ABTimedBuff { +public class ABTimedTickingPausedBuff extends ABTimedBuff implements CPausedTickingBuff { private List onTickActions; @@ -33,9 +34,11 @@ public ABTimedTickingPausedBuff(int handleId, War3ID alias, float duration, bool @Override public void onTick(CSimulation game, CUnit unit) { if (onTickActions != null) { + localStore.put(ABLocalStoreKeys.BUFF, this); for (ABAction action : onTickActions) { action.runAction(game, unit, localStore, castId); } + localStore.remove(ABLocalStoreKeys.BUFF); } if (!unit.isPaused()) { super.onTick(game, unit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java index f21d1a21f..447aa552b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorFinishTransformation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.COrderStartTransformation; @@ -17,7 +18,7 @@ public class ABTimedTransformationBuff extends ABGenericTimedBuff { private Map localStore; private OnTransformationActions actions; - private AbilityBuilderActiveAbility abil; + private AbilityBuilderAbility abil; private CUnitType targetType; private boolean keepRatios; private boolean addAlternateTagAfter; @@ -32,10 +33,10 @@ public class ABTimedTransformationBuff extends ABGenericTimedBuff { private boolean instantTransformation; public ABTimedTransformationBuff(int handleId, Map localStore, OnTransformationActions actions, - War3ID alias, float duration, AbilityBuilderActiveAbility ability, CUnitType newType, - final boolean keepRatios, boolean addAlternateTagAfter, boolean permanent, float transformationDuration, - float transformationTime, float landingDelay, float altitudeAdjustmentDelay, - float altitudeAdjustmentDuration, boolean immediateLanding, boolean immediateTakeoff) { + War3ID alias, float duration, AbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, + boolean addAlternateTagAfter, boolean permanent, float transformationDuration, float transformationTime, + float landingDelay, float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, + boolean immediateLanding, boolean immediateTakeoff) { super(handleId, alias, duration, true, false, true, false); this.setIconShowing(false); this.localStore = localStore; @@ -56,7 +57,7 @@ public ABTimedTransformationBuff(int handleId, Map localStore, O } public ABTimedTransformationBuff(int handleId, Map localStore, OnTransformationActions actions, - War3ID alias, float duration, AbilityBuilderActiveAbility ability, CUnitType newType, + War3ID alias, float duration, AbilityBuilderAbility ability, CUnitType newType, boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { super(handleId, alias, duration, true, false, true, false); this.setIconShowing(false); @@ -89,8 +90,15 @@ public void onDeath(CSimulation game, CUnit unit) { @Override protected void onBuffExpire(CSimulation game, CUnit unit) { - if (abil.isToggleOn()) { - abil.deactivate(game, unit); + int visibleOrderId = -1; + int transformId = -1; + if (abil instanceof AbilityBuilderActiveAbility) { + AbilityBuilderActiveAbility actabil = (AbilityBuilderActiveAbility) abil; + if (actabil.isToggleOn()) { + actabil.deactivate(game, unit); + } + visibleOrderId = addAlternateTagAfter ? actabil.getBaseOrderId() : actabil.getOffOrderId(); + transformId = actabil.getBaseOrderId(); } if (instantTransformation) { if (dur > 0) { @@ -103,11 +111,11 @@ protected void onBuffExpire(CSimulation game, CUnit unit) { } } else { unit.order(game, - new COrderStartTransformation(new CBehaviorFinishTransformation(localStore, unit, abil, targetType, - keepRatios, actions, addAlternateTagAfter, - addAlternateTagAfter ? abil.getBaseOrderId() : abil.getOffOrderId(), perm, dur, transTime, - landTime, atlAdDelay, altAdTime, imLand, imTakeOff, this.getAlias(), targetType, - instantTransformation), abil.getBaseOrderId()), + new COrderStartTransformation( + new CBehaviorFinishTransformation(localStore, unit, abil, targetType, keepRatios, actions, + addAlternateTagAfter, visibleOrderId, perm, dur, transTime, landTime, atlAdDelay, + altAdTime, imLand, imTakeOff, this.getAlias(), targetType, instantTransformation), + transformId), false); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/CPausedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/CPausedTickingBuff.java new file mode 100644 index 000000000..5cbdcdf35 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/CPausedTickingBuff.java @@ -0,0 +1,8 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public interface CPausedTickingBuff { + public void onTick(CSimulation game, CUnit unit); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index 33f5d34c5..148f9cd58 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -12,6 +12,7 @@ public class ABLocalStoreKeys { public static final String GAME = "_game"; public static final String THISUNIT = "_thisUnit"; public static final String ABILITY = "_ability"; + public static final String BUFF = "_buff"; public static final String ITEM = "_item"; public static final String ITEMSLOT = "_itemSlot"; public static final String ITERATORCOUNT = "_i"; @@ -51,6 +52,11 @@ public class ABLocalStoreKeys { public static final String LASTCREATEDUNIT = "_lastCreatedUnit"; public static final String LASTADDEDUNIT = "_lastAddedUnit"; public static final String LASTREMOVEDDUNIT = "_lastRemovedUnit"; + public static final String COMPUNIT1 = "_compUnit1"; + public static final String COMPUNIT2 = "_compUnit2"; + + // Item Names + public static final Object LASTCREATEDITEM = "_lastCreatedItem"; // Ability Names public static final String LASTCREATEDABILITY = "_lastCreatedAbility"; @@ -68,7 +74,8 @@ public class ABLocalStoreKeys { //Generic Targeting public static final String ATTACKINGUNIT = "_attackingUnit#"; - public static final String ATTACKEDUNIT = "_attackedUnit#"; + public static final String ATTACKTARGET = "_attackTarget#"; + public static final String ATTACKIMPACTLOCATION = "_attackImpactLocation#"; public static final String ABILITYTARGETEDUNIT = "_abilityTargetedUnit#"; public static final String ABILITYTARGETEDDESTRUCTABLE = "_abilityTargetedDestructable#"; public static final String ABILITYTARGETEDITEM = "_abilityTargetedItem#"; @@ -98,6 +105,7 @@ public class ABLocalStoreKeys { //Events public static final String LASTCREATEDTODEVENT = "_lastCreatedToDEvent"; + public static final String LASTCREATEDWIDEVENT = "_lastCreatedWidEvent"; // Dest Names @@ -140,6 +148,7 @@ public class ABLocalStoreKeys { // AttackPostDamageListener Names public static final String LASTCREATEDAPoDL = "_lastCreatedAPoDL"; + public static final String LISTENERLOOP = "_listenerLoop#"; // AttackPreDamageListener Names public static final String LASTCREATEDAPrDL = "_lastCreatedAPrDL"; @@ -184,6 +193,19 @@ public class ABLocalStoreKeys { public static final String WASAUTOCASTON = "_wasAutocastOn"; public static final String ISAUTOCASTON = "_isAutocastOn"; + // Attack Modifier Names + public static final String LASTCREATEDAMod = "_lastCreatedAMod"; + public static final String ATTACKSETTINGS = "_attackSettings#"; + public static final String ATTACKMODLOOP = "_attackModLoop#"; + public static final String THEATTACK = "_theAttack#"; + + // Attack Settings + public static final String LASTCREATEDASettings = "_lastCreatedASettings"; + + //Unit State Listener + public static final String LASTCREATEDUSL = "_lastCreatedUSL"; + public static final String LASTSTATELISTENERADDEDUNIT = "_lastStateListenerAddedUnit"; + public static String combineKey(String key, int castId) { return key + castId; } @@ -207,4 +229,8 @@ public static String combineSubroutineInstanceKey(String key, int castId) { public static String combineArgumentKey(String key) { return "_$" + key; } + + public static String combineUniqueValueKey(String key, int handleId) { + return "_*" + handleId +"#" + key; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index 9642b5285..d93ccbf83 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -3,9 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.floatingtext.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.gamestate.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.item.*; @@ -28,16 +31,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ABCallbackNull; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.*; @@ -56,6 +63,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game.*; @@ -81,6 +89,7 @@ private static void registerAbilityCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetReactionAbility.class, "getReactionAbility") .registerSubtype(ABCallbackGetLastCreatedAbility.class, "getLastCreatedAbility") .registerSubtype(ABCallbackGetThisAbility.class, "getThisAbility") + .registerSubtype(ABCallbackGetAbilityById.class, "getAbilityById") .registerSubtype(ABCallbackArgumentAbility.class, "argumentAbility") .registerSubtype(ABCallbackReuseAbility.class, "reuseAbility") @@ -88,6 +97,24 @@ private static void registerAbilityCallbacks(RuntimeTypeAdapterFactory callbackT } + private static void registerAttackModifierCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { + callbackTypeFactory + .registerSubtype(ABCallbackGetLastCreatedAttackModifier.class, + "getLastCreatedAttackModifier") + .registerSubtype(ABCallbackGetStoredAttackModifierByKey.class, + "getStoredAttackModifierByKey"); + } + + private static void registerAttackSettingsCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { + callbackTypeFactory + .registerSubtype(ABCallbackGetLastCreatedAttackSettings.class, + "getLastCreatedAttackSettings") + .registerSubtype(ABCallbackGetStoredAttackSettingsByKey.class, + "getStoredAttackSettingsByKey") + .registerSubtype(ABCallbackGetCurrentAttackSettings.class, + "getCurrentAttackSettings"); + } + private static void registerAbilityEffectReactionListenerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory .registerSubtype(ABCallbackGetLastCreatedAbilityEffectReactionListener.class, @@ -142,6 +169,8 @@ private static void registerBooleanCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackInlineConditionBoolean.class, "inlineConditionBoolean") .registerSubtype(ABCallbackGetAbilityDataAsBoolean.class, "getAbilityDataAsBoolean") .registerSubtype(ABCallbackGetParentAbilityDataAsBoolean.class, "getParentAbilityDataAsBoolean") + .registerSubtype(ABCallbackGetAbilityUniqueValueBoolean.class, "getAbilityUniqueValueBoolean") + .registerSubtype(ABCallbackGetBuffUniqueValueBoolean.class, "getBuffUniqueValueBoolean") .registerSubtype(ABCallbackIntegerToBoolean.class, "i2b") @@ -154,9 +183,12 @@ private static void registerBooleanCallbacks(RuntimeTypeAdapterFactory callbackT private static void registerBuffCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetStoredBuffByKey.class, "getStoredBuffByKey") .registerSubtype(ABCallbackInlineConditionBuff.class, "inlineConditionBuff") + .registerSubtype(ABCallbackThisBuff.class, "thisBuff") .registerSubtype(ABCallbackGetLastCreatedBuff.class, "getLastCreatedBuff") .registerSubtype(ABCallbackEnumBuff.class, "enumBuff") + .registerSubtype(ABCallbackGetBuffById.class, "getBuffById") + .registerSubtype(ABCallbackArgumentBuff.class, "argumentBuff") .registerSubtype(ABCallbackReuseBuff.class, "reuseBuff") .registerSubtype(ABCallbackReuseBuffWithArguments.class, "reuseBuffWithArguments"); @@ -189,6 +221,7 @@ private static void registerDestructableCallbacks(RuntimeTypeAdapterFactory call .registerSubtype(ABCallbackGetStoredDestructableByKey.class, "getStoredDestructableByKey") .registerSubtype(ABCallbackInlineConditionDestructable.class, "inlineConditionDestructable") .registerSubtype(ABCallbackGetEnumDestructable.class, "getEnumDestructable") + .registerSubtype(ABCallbackGetAttackedDestructable.class, "getAttackedDestructable") .registerSubtype(ABCallbackGetProjectileHitDestructable.class, "getProjectileHitDestructable") .registerSubtype(ABCallbackArgumentDestructable.class, "argumentDestructable") @@ -242,6 +275,9 @@ private static void registerFloatCallbacks(RuntimeTypeAdapterFactory callbackTyp .registerSubtype(ABCallbackInlineConditionFloat.class, "inlineConditionFloat") .registerSubtype(ABCallbackGetAbilityDataAsFloat.class, "getAbilityDataAsFloat") .registerSubtype(ABCallbackGetParentAbilityDataAsFloat.class, "getParentAbilityDataAsFloat") + .registerSubtype(ABCallbackGetAbilityUniqueValueFloat.class, "getAbilityUniqueValueFloat") + .registerSubtype(ABCallbackGetBuffUniqueValueFloat.class, "getBuffUniqueValueFloat") + .registerSubtype(ABCallbackRandomFloat.class, "randomFloat") .registerSubtype(ABCallbackRandomBoundedFloat.class, "randomBoundedFloat") .registerSubtype(ABCallbackGetUnitLocationX.class, "getUnitLocationX") @@ -257,9 +293,11 @@ private static void registerFloatCallbacks(RuntimeTypeAdapterFactory callbackTyp .registerSubtype(ABCallbackGetAngleBetweenLocations.class, "getAngleBetweenLocations") .registerSubtype(ABCallbackGetDistanceBetweenLocations.class, "getDistanceBetweenLocations") + .registerSubtype(ABCallbackGetDistanceBetweenUnits.class, "getDistanceBetweenUnits") .registerSubtype(ABCallbackTicksForDuration.class, "ticksForDuration") .registerSubtype(ABCallbackGetTotalDamageDealt.class, "getTotalDamageDealt") + .registerSubtype(ABCallbackGetAttackBaseDamage.class, "getAttackBaseDamage") .registerSubtype(ABCallbackGetReactionAttackProjectileDamage.class, "getReactionAttackProjectileDamage") .registerSubtype(ABCallbackArgumentFloat.class, "argumentFloat") @@ -302,6 +340,7 @@ private static void registerFxCallbacks(RuntimeTypeAdapterFactory callbackTypeFa private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetStoredIDByKey.class, "getStoredIDByKey") .registerSubtype(ABCallbackInlineConditionID.class, "inlineConditionID") + .registerSubtype(ABCallbackGetAbilityUniqueValueId.class, "getAbilityUniqueValueId") .registerSubtype(ABCallbackGetAbilityDataAsID.class, "getAbilityDataAsID") .registerSubtype(ABCallbackGetAbilityUnitId.class, "getAbilityUnitId") .registerSubtype(ABCallbackGetWar3IDFromString.class, "getWar3IDFromString") @@ -324,6 +363,9 @@ private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFa private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackRawInteger.class, "rawInteger") .registerSubtype(ABCallbackGetStoredIntegerByKey.class, "getStoredIntegerByKey") + .registerSubtype(ABCallbackGetAbilityUniqueValueInteger.class, "getAbilityUniqueValueInteger") + .registerSubtype(ABCallbackGetBuffUniqueValueInteger.class, "getBuffUniqueValueInteger") + .registerSubtype(ABCallbackInlineConditionInteger.class, "inlineConditionInteger") .registerSubtype(ABCallbackIterator.class, "iterator") @@ -331,6 +373,9 @@ private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetAbilityManaCost.class, "getAbilityManaCost") .registerSubtype(ABCallbackGetAbilityCastTimeAsInteger.class, "getAbilityCastTimeAsInteger") .registerSubtype(ABCallbackGetAbilityTargetAttachmentPoints.class, "getAbilityTargetAttachmentPoints") + + .registerSubtype(ABCallbackGetUnitMaximumHp.class, "getUnitMaximumHp") + .registerSubtype(ABCallbackGetUnitMaximumMp.class, "getUnitMaximumMp") .registerSubtype(ABCallbackCountUnitsInRangeOfUnit.class, "countUnitsInRangeOfUnit") .registerSubtype(ABCallbackCountUnitsInRangeOfLocation.class, "countUnitsInRangeOfLocation") @@ -341,6 +386,8 @@ private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetUnitTypeGoldCost.class, "getUnitTypeGoldCost") .registerSubtype(ABCallbackGetUnitTypeLumberCost.class, "getUnitTypeLumberCost") .registerSubtype(ABCallbackGetUnitTypeFoodCost.class, "getUnitTypeFoodCost") + + .registerSubtype(ABCallbackGetAttackMaximumSplashRadius.class, "getAttackMaximumSplashRadius") .registerSubtype(ABCallbackAddInteger.class, "i+") .registerSubtype(ABCallbackSubtractInteger.class, "i-") @@ -351,14 +398,19 @@ private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackMinInteger.class, "iMin") .registerSubtype(ABCallbackMaxInteger.class, "iMax") + .registerSubtype(ABCallbackTruncateFloatToInteger.class, "f2i") + .registerSubtype(ABCallbackIntegerIf.class, "iIf") .registerSubtype(ABCallbackIntegerZeroIfFalse.class, "i0IfFalse") + .registerSubtype(ABCallbackIntegerZeroIfNull.class, "i0IfNull") .registerSubtype(ABCallbackGetUnitGroupSize.class, "getUnitGroupSize") .registerSubtype(ABCallbackGetUnitQueueSize.class, "getUnitQueueSize") .registerSubtype(ABCallbackGetPlayerId.class, "getPlayerId") + .registerSubtype(ABCallbackGetItemSlot.class, "getItemSlot") + .registerSubtype(ABCallbackPlayerToStateModValue.class, "playerToStateModValue") .registerSubtype(ABCallbackDetectionDropdownConversion.class, "detectionDropdownConversion") @@ -367,6 +419,17 @@ private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackReuseIntegerWithArguments.class, "reuseIntegerWithArguments"); } + private static void registerItemCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { + callbackTypeFactory + .registerSubtype(ABCallbackArgumentItem.class, "argumentItem") + .registerSubtype(ABCallbackInlineConditionItem.class, "inlineConditionItem") + .registerSubtype(ABCallbackReuseItem.class, "reuseItem") + .registerSubtype(ABCallbackReuseItemWithArguments.class, "reuseItemWithArguments") + .registerSubtype(ABCallbackGetStoredItemByKey.class, "getStoredItemByKey") + .registerSubtype(ABCallbackGetLastCreatedItem.class, "getLastCreatedItem") + .registerSubtype(ABCallbackGetAttackedItem.class, "getAttackedItem"); + } + private static void registerLightningCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetLastCreatedLightningEffect.class, "getLastCreatedLightningEffect") .registerSubtype(ABCallbackGetStoredLightningByKey.class, "getStoredLightningByKey"); @@ -378,6 +441,9 @@ private static void registerLocationCallbacks(RuntimeTypeAdapterFactory callback .registerSubtype(ABCallbackGetStoredLocationByKey.class, "getStoredLocationByKey") .registerSubtype(ABCallbackInlineConditionLocation.class, "inlineConditionLocation") .registerSubtype(ABCallbackGetTargetedLocation.class, "getTargetedLocation") + .registerSubtype(ABCallbackGetGroundAttackedLocation.class, "getGroundAttackedLocation") + .registerSubtype(ABCallbackGetAttackTargetLocation.class, "getAttackTargetLocation") + .registerSubtype(ABCallbackGetAttackImpactLocation.class, "getAttackImpactLocation") .registerSubtype(ABCallbackCreateLocationFromTarget.class, "createLocationFromTarget") .registerSubtype(ABCallbackGetProjectileCurrentLocation.class, "getProjectileCurrentLocation") .registerSubtype(ABCallbackGetUnitLocation.class, "getUnitLocation") @@ -389,8 +455,11 @@ private static void registerLocationCallbacks(RuntimeTypeAdapterFactory callback private static void registerLongCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackRawLong.class, "rawLong") + .registerSubtype(ABCallbackGetAbilityDataAsLong.class, "getAbilityDataAsLong") .registerSubtype(ABCallbackGetStoredLongByKey.class, "getStoredLongByKey") .registerSubtype(ABCallbackInlineConditionLong.class, "inlineConditionLong") + .registerSubtype(ABCallbackGetAbilityUniqueValueLong.class, "getAbilityUniqueValueLong") + .registerSubtype(ABCallbackGetBuffUniqueValueLong.class, "getBuffUniqueValueLong") .registerSubtype(ABCallbackAddLong.class, "l+") .registerSubtype(ABCallbackSubtractLong.class, "l-") @@ -404,6 +473,10 @@ private static void registerLongCallbacks(RuntimeTypeAdapterFactory callbackType .registerSubtype(ABCallbackCreateDetectorData.class, "createDetectorData") .registerSubtype(ABCallbackCreateDetectedData.class, "createDetectedData") + .registerSubtype(ABCallbackPlayerMaskIncludePlayers.class, "playerMaskIncludePlayers") + .registerSubtype(ABCallbackPlayerMaskExcludePlayers.class, "playerMaskExcludePlayers") + .registerSubtype(ABCallbackPlayerMaskAllPlayers.class, "playerMaskAllPlayers") + .registerSubtype(ABCallbackArgumentLong.class, "argumentLong") .registerSubtype(ABCallbackReuseLong.class, "reuseLong") .registerSubtype(ABCallbackReuseLongWithArguments.class, "reuseLongWithArguments"); @@ -476,10 +549,15 @@ private static void registerStringCallbacks(RuntimeTypeAdapterFactory callbackTy .registerSubtype(ABCallbackGetStoredStringByKey.class, "getStoredStringByKey") .registerSubtype(ABCallbackInlineConditionString.class, "inlineConditionString") .registerSubtype(ABCallbackGetAbilityDataAsString.class, "getAbilityDataAsString") + .registerSubtype(ABCallbackGetAbilityUniqueValueString.class, "getAbilityUniqueValueString") + .registerSubtype(ABCallbackGetBuffUniqueValueString.class, "getBuffUniqueValueString") + .registerSubtype(ABCallbackCatStrings.class, "catStrings") .registerSubtype(ABCallbackGetAliasAsString.class, "getAliasAsString") .registerSubtype(ABCallbackGetCodeAsString.class, "getCodeAsString") .registerSubtype(ABCallbackGetUnitHandleAsString.class, "getUnitHandleAsString") + .registerSubtype(ABCallbackGetAbilityHandleAsString.class, "getAbilityHandleAsString") + .registerSubtype(ABCallbackGetBuffHandleAsString.class, "getBuffHandleAsString") .registerSubtype(ABCallbackGetAllowStackingKey.class, "getAllowStackingKey") @@ -488,6 +566,7 @@ private static void registerStringCallbacks(RuntimeTypeAdapterFactory callbackTy .registerSubtype(ABCallbackFloatToString.class, "f2s") .registerSubtype(ABCallbackIntegerToString.class, "i2s") .registerSubtype(ABCallbackLongToString.class, "l2s") + .registerSubtype(ABCallbackIdToString.class, "id2s") .registerSubtype(ABCallbackArgumentString.class, "argumentString") .registerSubtype(ABCallbackReuseString.class, "reuseString") @@ -535,6 +614,8 @@ private static void registerUnitCallbacks(RuntimeTypeAdapterFactory unitCallback .registerSubtype(ABCallbackGetBuffedUnit.class, "getBuffedUnit") .registerSubtype(ABCallbackGetListenerUnit.class, "getListenerUnit") .registerSubtype(ABCallbackGetEnumUnit.class, "getEnumUnit") + .registerSubtype(ABCallbackGetCompUnit1.class, "getCompUnit1") + .registerSubtype(ABCallbackGetCompUnit2.class, "getCompUnit2") .registerSubtype(ABCallbackGetMatchingUnit.class, "getMatchingUnit") .registerSubtype(ABCallbackGetAttackedUnit.class, "getAttackedUnit") .registerSubtype(ABCallbackGetAttackingUnit.class, "getAttackingUnit") @@ -583,6 +664,14 @@ private static void registerUnitQueueCallbacks(RuntimeTypeAdapterFactory unitGro .registerSubtype(ABCallbackReuseUnitQueueWithArguments.class, "reuseUnitQueueWithArguments"); } + private static void registerUnitStateListenerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { + callbackTypeFactory + .registerSubtype(ABCallbackGetLastCreatedUnitStateListener.class, + "getLastCreatedUnitStateListener") + .registerSubtype(ABCallbackGetStoredUnitStateListenerByKey.class, + "getStoredUnitStateListenerByKey"); + } + private static void registerVisionModifierCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory .registerSubtype(ABCallbackGetStoredVisionModifierByKey.class, "getStoredVisionModifierByKey") @@ -598,7 +687,9 @@ private static void registerVisionModifierCallbacks(RuntimeTypeAdapterFactory ca private static void registerWidgetCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory .registerSubtype(ABCallbackGetProjectileHitWidget.class, "getProjectileHitWidget") - .registerSubtype(ABCallbackUnitToWidget.class, "unitToWidget") + .registerSubtype(ABCallbackUnitToWidget.class, "u2w") + .registerSubtype(ABCallbackItemToWidget.class, "i2w") + .registerSubtype(ABCallbackDestructableToWidget.class, "d2w") .registerSubtype(ABCallbackGetStoredWidgetByKey.class, "getStoredWidgetByKey") .registerSubtype(ABCallbackInlineConditionWidget.class, "inlineConditionWidget") @@ -608,6 +699,16 @@ private static void registerWidgetCallbacks(RuntimeTypeAdapterFactory callbackTy ; } + private static void registerWidgetEventCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { + callbackTypeFactory.registerSubtype(ABCallbackGetLastCreatedWidgetEvent.class, "getLastCreatedWidgetEvent") + .registerSubtype(ABCallbackGetStoredWidgetEventByKey.class, "getStoredWidgetEventByKey") + .registerSubtype(ABCallbackInlineConditionWidgetEvent.class, "inlineConditionWidgetEvent") + + .registerSubtype(ABCallbackArgumentWidgetEvent.class, "argumentWidgetEvent") + .registerSubtype(ABCallbackReuseWidgetEvent.class, "reuseWidgetEvent") + .registerSubtype(ABCallbackReuseWidgetEventWithArguments.class, "reuseWidgetEventWithArguments"); + } + private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFactory) { conditionTypeFactory.registerSubtype(ABConditionAnd.class, "and").registerSubtype(ABConditionOr.class, "or") .registerSubtype(ABConditionNot.class, "not").registerSubtype(ABConditionBool.class, "bool") @@ -638,6 +739,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsValidTarget.class, "isValidTarget") .registerSubtype(ABConditionIsUnitValidTarget.class, "isUnitValidTarget") + .registerSubtype(ABConditionIsUnitValidSplashDamageTarget.class, "isUnitValidSplashDamageTarget") .registerSubtype(ABConditionIsPassAllAbilityTargetChecks.class, "isPassAllAbilityTargetChecks") .registerSubtype(ABConditionIsUnitPassAllAbilityTargetChecks.class, "isUnitPassAllAbilityTargetChecks") .registerSubtype(ABConditionIsDestructableValidTarget.class, "isDestructableValidTarget") @@ -650,9 +752,16 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsUnitEqual.class, "isUnitEqual") .registerSubtype(ABConditionIsAttackTypeEqual.class, "isAttackTypeEqual") .registerSubtype(ABConditionIsDamageTypeEqual.class, "isDamageTypeEqual") + .registerSubtype(ABConditionIsWeaponTypeEqual.class, "isWeaponTypeEqual") .registerSubtype(ABConditionIsIdEqual.class, "isIdEqual") + .registerSubtype(ABConditionIsDefenseTypeEqual.class, "isDefenseTypeEqual") + .registerSubtype(ABConditionIsDefenseTypeInList.class, "isDefenseTypeInList") .registerSubtype(ABConditionIsOnCooldown.class, "isOnCooldown") + .registerSubtype(ABConditionIsDisabled.class, "isDisabled") + .registerSubtype(ABConditionIsAutoCastOn.class, "isAutoCastOn") + .registerSubtype(ABConditionWasAutoCastOn.class, "wasAutoCastOn") + .registerSubtype(ABConditionDoesAbilityHaveUniqueFlag.class, "doesAbilityHaveUniqueFlag") .registerSubtype(ABConditionIsFlexAbilityTargeted.class, "isFlexAbilityTargeted") .registerSubtype(ABConditionIsFlexAbilityNonTargeted.class, "isFlexAbilityNonTargeted") .registerSubtype(ABConditionIsFlexAbilityPointTarget.class, "isFlexAbilityPointTarget") @@ -666,11 +775,19 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsUnitMaxHp.class, "isUnitMaxHp") .registerSubtype(ABConditionIsUnitMaxMp.class, "isUnitMaxMp") .registerSubtype(ABConditionIsUnitBuilding.class, "isUnitBuilding") + .registerSubtype(ABConditionIsUnitHero.class, "isUnitHero") + .registerSubtype(ABConditionIsUnitSummoned.class, "isUnitSummoned") .registerSubtype(ABConditionIsUnitEnemy.class, "isUnitEnemy") .registerSubtype(ABConditionIsUnitDead.class, "isUnitDead") + .registerSubtype(ABConditionIsUnitHidden.class, "isUnitHidden") + .registerSubtype(ABConditionUnitHasResearch.class, "unitHasResearch") .registerSubtype(ABConditionIsUnitTraining.class, "isUnitTraining") + .registerSubtype(ABConditionIsUnitConstructing.class, "isUnitConstructing") + .registerSubtype(ABConditionIsUnitUpgrading.class, "isUnitUpgrading") + .registerSubtype(ABConditionIsUnitConstructingOrUpgrading.class, "isUnitConstructingOrUpgrading") .registerSubtype(ABConditionIsUnitMagicImmune.class, "isUnitMagicImmune") .registerSubtype(ABConditionIsUnitShareSpells.class, "isUnitShareSpells") + .registerSubtype(ABConditionIsUnitHeroDuration.class, "isUnitHeroDuration") .registerSubtype(ABConditionIsItemAbility.class, "isItemAbility") .registerSubtype(ABConditionItemHasCharges.class, "itemHasCharges") @@ -688,9 +805,14 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionWasCastingInterrupted.class, "wasCastingInterrupted") .registerSubtype(ABConditionIsTriggeringDamageAnAttack.class, "isTriggeringDamageAnAttack") .registerSubtype(ABConditionIsTriggeringDamageRanged.class, "isTriggeringDamageRanged") + .registerSubtype(ABConditionIsAttackRanged.class, "isAttackRanged") + .registerSubtype(ABConditionIsAttackProjectile.class, "isAttackProjectile") + .registerSubtype(ABConditionIsAttackHoming.class, "isAttackHoming") + .registerSubtype(ABConditionIsAttackArtillery.class, "isAttackArtillery") .registerSubtype(ABConditionIsProjectileReflected.class, "isProjectileReflected") - + + .registerSubtype(ABConditionDoesBuffHaveUniqueFlag.class, "doesBuffHaveUniqueFlag") .registerSubtype(ABConditionIsBuffMagic.class, "isBuffMagic") @@ -701,7 +823,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsNewBehaviorCategoryInList.class, "isNewBehaviorCategoryInList") - + .registerSubtype(ABConditionSuccessfullyChargeResources.class, "successfullyChargeResources") ; } @@ -710,10 +832,10 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionWhile.class, "while") .registerSubtype(ABActionFor.class, "for") .registerSubtype(ABActionBreak.class, "break") - .registerSubtype(ABActionIterateUnitsInRangeOfUnit.class, "iterateUnitsInRangeOfUnit") .registerSubtype(ABActionIterateUnitsInRangeOfUnitMatchingCondition.class, "iterateUnitsInRangeOfUnitMatchingCondition") - .registerSubtype(ABActionIterateUnitsInRangeOfLocation.class, "iterateUnitsInRangeOfLocation") .registerSubtype(ABActionIterateUnitsInRangeOfLocationMatchingCondition.class, "iterateUnitsInRangeOfLocationMatchingCondition") + .registerSubtype(ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.class, "iterateUnitsInRangeOfUnitMatchingConditionWithSort") + .registerSubtype(ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.class, "iterateUnitsInRangeOfLocationMatchingConditionWithSort") .registerSubtype(ABActionIterateUnitsInRect.class, "iterateUnitsInRect") .registerSubtype(ABActionPeriodicExecute.class, "periodicExecute") .registerSubtype(ABActionCleanUpCastInstance.class, "cleanUpCastInstance") @@ -750,6 +872,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionAddNewAbility.class, "addNewAbility") .registerSubtype(ABActionRemoveAbility.class, "removeAbility") .registerSubtype(ABActionStoreValueLocally.class, "storeValueLocally") + .registerSubtype(ABActionDeleteStoredKey.class, "deleteStoredKey") .registerSubtype(ABActionRemoveSpellEffect.class, "removeSpellEffect") .registerSubtype(ABActionCreateAbilityFromId.class, "createAbilityFromId") .registerSubtype(ABActionAddDefenseBonus.class, "addDefenseBonus") @@ -768,7 +891,12 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionClearUnitQueue.class, "clearUnitQueue") .registerSubtype(ABActionCreateUnit.class, "createUnit") - .registerSubtype(ABActionDamageTarget.class, "damageTarget").registerSubtype(ABActionHeal.class, "heal") + .registerSubtype(ABActionDamageTarget.class, "damageTarget") + .registerSubtype(ABActionDamageArea.class, "damageArea") + .registerSubtype(ABActionDamageBurst.class, "damageBurst") + .registerSubtype(ABActionDamageSplash.class, "damageSplash") + .registerSubtype(ABActionDamageAttackSplash.class, "damageAttackSplash") + .registerSubtype(ABActionHeal.class, "heal") .registerSubtype(ABActionSetHp.class, "setHp").registerSubtype(ABActionResurrect.class, "resurrect") .registerSubtype(ABActionSetMp.class, "setMp") .registerSubtype(ABActionAddMp.class, "addMp") @@ -790,10 +918,13 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionSendUnitBackToWork.class, "sendUnitBackToWork") .registerSubtype(ABActionStartTrainingUnit.class, "startTrainingUnit") .registerSubtype(ABActionStartSacrificingUnit.class, "startSacrificingUnit") + .registerSubtype(ABActionForceBeginCreatedBehavior.class, "forceBeginCreatedBehavior") + .registerSubtype(ABActionChangeAttackActionToMovement.class, "changeAttackActionToMovement") + .registerSubtype(ABActionStartModifiedAttack.class, "startModifiedAttack") + .registerSubtype(ABActionFireModifiedAttack.class, "fireModifiedAttack") .registerSubtype(ABActionSetUnitFlyHeight.class, "setUnitFlyHeight") .registerSubtype(ABActionSetUnitMovementTypeNoCollision.class, "setUnitMovementTypeNoCollision") - .registerSubtype(ABActionPlayAnimation.class, "playAnimation") .registerSubtype(ABActionAddSecondaryAnimationTag.class, "addSecondaryAnimationTag") @@ -815,11 +946,16 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionDeactivateToggledAbility.class, "deactivateToggledAbility") .registerSubtype(ABActionEnableAbility.class, "enableAbility") .registerSubtype(ABActionDisableAbility.class, "disableAbility") + .registerSubtype(ABActionEnableAbilityById.class, "enableAbilityById") + .registerSubtype(ABActionDisableAbilityById.class, "disableAbilityById") + .registerSubtype(ABActionClickEnableAbility.class, "clickEnableAbility") + .registerSubtype(ABActionClickDisableAbility.class, "clickDisableAbility") .registerSubtype(ABActionBeginChanneling.class, "beginChanneling") .registerSubtype(ABActionFinishChanneling.class, "finishChanneling") .registerSubtype(ABActionSetAbilityCastRange.class, "setAbilityCastRange") .registerSubtype(ABActionAddTargetAllowed.class, "addTargetAllowed") .registerSubtype(ABActionRemoveTargetAllowed.class, "removeTargetAllowed") + .registerSubtype(ABActionAbilityAttemptToApplyEffect.class, "abilityAttemptToApplyEffect") .registerSubtype(ABActionCreateTimer.class, "createTimer") @@ -837,14 +973,21 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionCreateTimedBuff.class, "createTimedBuff") .registerSubtype(ABActionCreateTimedTargetingBuff.class, "createTimedTargetingBuff") .registerSubtype(ABActionCreateTimedArtBuff.class, "createTimedArtBuff") + .registerSubtype(ABActionCreateTimedPausedExpirationBuff.class, "createTimedPausedExpirationBuff") .registerSubtype(ABActionCreateTimedTickingBuff.class, "createTimedTickingBuff") .registerSubtype(ABActionCreateTimedTickingPausedBuff.class, "createTimedTickingPausedBuff") .registerSubtype(ABActionCreateTimedTickingPostDeathBuff.class, "createTimedTickingPostDeathBuff") .registerSubtype(ABActionCreateTimedLifeBuff.class, "createTimedLifeBuff") + .registerSubtype(ABActionBuffAddUniqueFlag.class, "buffAddUniqueFlag") + .registerSubtype(ABActionBuffRemoveUniqueFlag.class, "buffRemoveUniqueFlag") + .registerSubtype(ABActionBuffStoreUniqueValue.class, "buffStoreUniqueValue") + .registerSubtype(ABActionBuffRemoveUniqueValue.class, "buffRemoveUniqueValue") + .registerSubtype(ABActionCreateStateModBuff.class, "createStateModBuff") .registerSubtype(ABActionAddStateModBuff.class, "addStateModBuff") .registerSubtype(ABActionRemoveStateModBuff.class, "removeStateModBuff") + .registerSubtype(ABActionUpdateStateModBuff.class, "updateStateModBuff") .registerSubtype(ABActionSetUnitFadeTimer.class, "setUnitFadeTimer") .registerSubtype(ABActionCreateNonStackingStatBuff.class, "createNonStackingStatBuff") @@ -853,6 +996,9 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionUpdateNonStackingStatBuff.class, "updateNonStackingStatBuff") .registerSubtype(ABActionRecomputeStatBuffsOnUnit.class, "recomputeStatBuffsOnUnit") + .registerSubtype(ABActionCreateAttackModifier.class, "createAttackModifier") + .registerSubtype(ABActionAddAttackModifier.class, "addAttackModifier") + .registerSubtype(ABActionRemoveAttackModifier.class, "removeAttackModifier") .registerSubtype(ABActionCreateAttackPostDamageListener.class, "createAttackPostDamageListener") .registerSubtype(ABActionAddAttackPostDamageListener.class, "addAttackPostDamageListener") .registerSubtype(ABActionRemoveAttackPostDamageListener.class, "removeAttackPostDamageListener") @@ -897,6 +1043,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) "multiplyDamageTakenMultiplier") .registerSubtype(ABActionPreDamageListenerAddDamageMultiplier.class, "addDamageDealtMultiplier") .registerSubtype(ABActionPreDamageListenerAddBonusDamage.class, "addBonusDamageDealt") + .registerSubtype(ABActionPreDamageListenerLockDamageModifications.class, "lockDamageModifications") .registerSubtype(ABActionPreDamageListenerSetMiss.class, "preDamageListenerSetMiss") .registerSubtype(ABActionSetPreDamageStacking.class, "setStacking") .registerSubtype(ABActionDeathReplacementSetReviving.class, "setReviving") @@ -905,6 +1052,29 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionSubtractTotalDamageDealt.class, "subtractTotalDamageDealt") .registerSubtype(ABActionReactionPreventHit.class, "reactionPreventHit") + .registerSubtype(ABActionCreateUnitStateListener.class, "createUnitStateListener") + .registerSubtype(ABActionAddUnitStateListener.class, "addUnitStateListener") + .registerSubtype(ABActionRemoveUnitStateListener.class, "removeUnitStateListener") + + .registerSubtype(ABActionAttackModifierPreventOtherSamePriorityModifications.class, "attackModifierPreventOtherSamePriorityModifications") + .registerSubtype(ABActionAttackModifierPreventOtherModifications.class, "attackModifierPreventOtherModifications") + .registerSubtype(ABActionAttackModifierApplyArt.class, "attackModifierApplyArt") + .registerSubtype(ABActionAttackModifierApplyArtAndSpeed.class, "attackModifierApplyArtAndSpeed") + .registerSubtype(ABActionAttackModifierApplyAllArtFields.class, "attackModifierApplyAllArtFields") + .registerSubtype(ABActionAttackModifierApplyDefaultSpeed.class, "attackModifierApplyDefaultSpeed") + .registerSubtype(ABActionAttackModifierSetAttackArc.class, "attackModifierSetAttackArc") + .registerSubtype(ABActionAttackModifierSetAttackHoming.class, "attackModifierSetAttackHoming") + .registerSubtype(ABActionAttackModifierSetSplashFields.class, "attackModifierSetSplashFields") + .registerSubtype(ABActionAttackModifierSetAttackStartZ.class, "attackModifierSetAttackStartZ") + .registerSubtype(ABActionAttackModifierSetAttackImpactZ.class, "attackModifierSetAttackImpactZ") + .registerSubtype(ABActionAttackModifierSetAttackDeathTime.class, "attackModifierSetAttackDeathTime") + .registerSubtype(ABActionAttackModifierAddPreDamageListener.class, "attackModifierAddPreDamageListener") + .registerSubtype(ABActionAttackModifierRemovePreDamageListener.class, "attackModifierRemovePreDamageListener") + .registerSubtype(ABActionAttackModifierAddPostDamageListener.class, "attackModifierAddPostDamageListener") + .registerSubtype(ABActionAttackModifierRemovePostDamageListener.class, "attackModifierRemovePostDamageListener") + .registerSubtype(ABActionAttackModifierAddAnimationTag.class, "attackModifierAddAnimationTag") + .registerSubtype(ABActionAttackModifierRemoveAnimationTag.class, "attackModifierRemoveAnimationTag") + .registerSubtype(ABActionAddDestructableBuff.class, "addDestructableBuff") .registerSubtype(ABActionCreateDestructableBuff.class, "createDestructableBuff") .registerSubtype(ABActionRemoveDestructableBuff.class, "removeDestructableBuff") @@ -929,16 +1099,25 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionCreateUnitVisionModifier.class, "createUnitVisionModifier") .registerSubtype(ABActionCreateLocationVisionModifier.class, "createLocationVisionModifier") + .registerSubtype(ABActionCreateProjectileVisionModifier.class, "createProjectileVisionModifier") .registerSubtype(ABActionRemoveVisionModifier.class, "removeVisionModifier") .registerSubtype(ABActionAbilitySetShowIcon.class, "abilitySetShowIcon") + .registerSubtype(ABActionAbilityAddUniqueFlag.class, "abilityAddUniqueFlag") + .registerSubtype(ABActionAbilityRemoveUniqueFlag.class, "abilityRemoveUniqueFlag") + .registerSubtype(ABActionAbilityStoreUniqueValue.class, "abilityStoreUniqueValue") + .registerSubtype(ABActionAbilityRemoveUniqueValue.class, "abilityRemoveUniqueValue") .registerSubtype(ABActionCreateTimeOfDayEvent.class, "createTimeOfDayEvent") .registerSubtype(ABActionRegisterTimeOfDayEvent.class, "registerTimeOfDayEvent") .registerSubtype(ABActionRegisterUniqueTimeOfDayEvent.class, "registerUniqueTimeOfDayEvent") .registerSubtype(ABActionUnregisterTimeOfDayEvent.class, "unregisterTimeOfDayEvent") + + .registerSubtype(ABActionCreateWidgetEvent.class, "createWidgetEvent") + .registerSubtype(ABActionRegisterWidgetEvent.class, "registerWidgetEvent") + .registerSubtype(ABActionUnregisterWidgetEvent.class, "unregisterWidgetEvent") @@ -963,6 +1142,8 @@ public static Gson create() { final RuntimeTypeAdapterFactory callbackTypeFactory = RuntimeTypeAdapterFactory.of(ABCallback.class, "type"); registerAbilityCallbacks(callbackTypeFactory); + registerAttackModifierCallbacks(callbackTypeFactory); + registerAttackSettingsCallbacks(callbackTypeFactory); registerAbilityEffectReactionListenerCallbacks(callbackTypeFactory); registerAbilityProjReactionListenerCallbacks(callbackTypeFactory); registerAttackProjReactionListenerCallbacks(callbackTypeFactory); @@ -984,6 +1165,7 @@ public static Gson create() { registerFxCallbacks(callbackTypeFactory); registerIdCallbacks(callbackTypeFactory); registerIntegerCallbacks(callbackTypeFactory); + registerItemCallbacks(callbackTypeFactory); registerLightningCallbacks(callbackTypeFactory); registerLocationCallbacks(callbackTypeFactory); registerLongCallbacks(callbackTypeFactory); @@ -999,8 +1181,10 @@ public static Gson create() { registerUnitCallbacks(callbackTypeFactory); registerUnitGroupCallbacks(callbackTypeFactory); registerUnitQueueCallbacks(callbackTypeFactory); + registerUnitStateListenerCallbacks(callbackTypeFactory); registerVisionModifierCallbacks(callbackTypeFactory); registerWidgetCallbacks(callbackTypeFactory); + registerWidgetEventCallbacks(callbackTypeFactory); callbackTypeFactory.registerSubtype(ABCallbackNull.class, "null"); gsonBuilder.registerTypeAdapterFactory(callbackTypeFactory); @@ -1008,6 +1192,18 @@ public static Gson create() { .of(ABAbilityCallback.class, "type"); registerAbilityCallbacks(abilityCallbackTypeFactory); gsonBuilder.registerTypeAdapterFactory(abilityCallbackTypeFactory); + + + + final RuntimeTypeAdapterFactory attackModifierCallbackTypeFactory = RuntimeTypeAdapterFactory + .of(ABAttackModifierCallback.class, "type"); + registerAttackModifierCallbacks(attackModifierCallbackTypeFactory); + gsonBuilder.registerTypeAdapterFactory(attackModifierCallbackTypeFactory); + + final RuntimeTypeAdapterFactory attackSettingsCallbackTypeFactory = RuntimeTypeAdapterFactory + .of(ABAttackSettingsCallback.class, "type"); + registerAttackSettingsCallbacks(attackSettingsCallbackTypeFactory); + gsonBuilder.registerTypeAdapterFactory(attackSettingsCallbackTypeFactory); final RuntimeTypeAdapterFactory abilityEffectReactionListenerCallbackTypeFactory = RuntimeTypeAdapterFactory .of(ABAbilityEffectReactionListenerCallback.class, "type"); @@ -1105,6 +1301,11 @@ public static Gson create() { .of(ABIntegerCallback.class, "type"); registerIntegerCallbacks(integerCallbackTypeFactory); gsonBuilder.registerTypeAdapterFactory(integerCallbackTypeFactory); + + final RuntimeTypeAdapterFactory itemCallbackTypeFactory = RuntimeTypeAdapterFactory + .of(ABItemCallback.class, "type"); + registerItemCallbacks(itemCallbackTypeFactory); + gsonBuilder.registerTypeAdapterFactory(itemCallbackTypeFactory); final RuntimeTypeAdapterFactory lightningCallbackTypeFactory = RuntimeTypeAdapterFactory .of(ABLightningCallback.class, "type"); @@ -1182,6 +1383,11 @@ public static Gson create() { registerUnitQueueCallbacks(unitQueueCallbackTypeFactory); gsonBuilder.registerTypeAdapterFactory(unitQueueCallbackTypeFactory); + final RuntimeTypeAdapterFactory unitStateListenerCallbackTypeFactory = RuntimeTypeAdapterFactory + .of(ABUnitStateListenerCallback.class, "type"); + registerUnitStateListenerCallbacks(unitStateListenerCallbackTypeFactory); + gsonBuilder.registerTypeAdapterFactory(unitStateListenerCallbackTypeFactory); + final RuntimeTypeAdapterFactory visionModifierCallbackTypeFactory = RuntimeTypeAdapterFactory .of(ABVisionModifierCallback.class, "type"); registerVisionModifierCallbacks(visionModifierCallbackTypeFactory); @@ -1193,6 +1399,11 @@ public static Gson create() { registerWidgetCallbacks(widgetCallbackTypeFactory); gsonBuilder.registerTypeAdapterFactory(widgetCallbackTypeFactory); + final RuntimeTypeAdapterFactory widgetEventCallbackTypeFactory = RuntimeTypeAdapterFactory + .of(ABWidgetEventCallback.class, "type"); + registerWidgetEventCallbacks(widgetEventCallbackTypeFactory); + gsonBuilder.registerTypeAdapterFactory(widgetEventCallbackTypeFactory); + final RuntimeTypeAdapterFactory conditionTypeFactory = RuntimeTypeAdapterFactory .of(ABCondition.class, "type"); registerConditions(conditionTypeFactory); @@ -1209,15 +1420,39 @@ public static Gson create() { final RuntimeTypeAdapterFactory atTypeFactory = RuntimeTypeAdapterFactory .of(ABAttackTypeCallback.class, "type"); atTypeFactory.registerSubtype(ABCallbackGetAttackTypeFromString.class, "getAttackTypeFromString") + .registerSubtype(ABCallbackGetStoredAttackTypeByKey.class, "getStoredAttackTypeByKey") + .registerSubtype(ABCallbackGetAttackType.class, "getAttackType") .registerSubtype(ABCallbackGetTriggeringAttackType.class, "getTriggeringAttackType") + .registerSubtype(ABCallbackGetModifiedAttackAttackType.class, "getModifiedAttackAttackType") .registerSubtype(ABCallbackGetReactionAttackProjectileAttackType.class, "getReactionAttackProjectileAttackType"); gsonBuilder.registerTypeAdapterFactory(atTypeFactory); + callbackTypeFactory.registerSubtype(ABCallbackGetAttackType.class, "getAttackType"); final RuntimeTypeAdapterFactory dtTypeFactory = RuntimeTypeAdapterFactory .of(ABDamageTypeCallback.class, "type"); dtTypeFactory.registerSubtype(ABCallbackGetDamageTypeFromString.class, "getDamageTypeFromString") - .registerSubtype(ABCallbackGetTriggeringDamageType.class, "getTriggeringDamageType"); + .registerSubtype(ABCallbackGetStoredDamageTypeByKey.class, "getStoredDamageTypeByKey") + .registerSubtype(ABCallbackGetDamageType.class, "getDamageType") + .registerSubtype(ABCallbackGetTriggeringDamageType.class, "getTriggeringDamageType") + .registerSubtype(ABCallbackGetModifiedAttackDamageType.class, "getModifiedAttackDamageType"); gsonBuilder.registerTypeAdapterFactory(dtTypeFactory); + callbackTypeFactory.registerSubtype(ABCallbackGetDamageType.class, "getDamageType"); + + final RuntimeTypeAdapterFactory defTypeFactory = RuntimeTypeAdapterFactory + .of(ABDefenseTypeCallback.class, "type"); + defTypeFactory.registerSubtype(ABCallbackGetDefenseTypeFromString.class, "getDefenseTypeFromString") + .registerSubtype(ABCallbackGetStoredDefenseTypeByKey.class, "getStoredDefenseTypeByKey") + .registerSubtype(ABCallbackGetUnitDefenseType.class, "getUnitDefenseType"); + gsonBuilder.registerTypeAdapterFactory(defTypeFactory); + + final RuntimeTypeAdapterFactory wtTypeFactory = RuntimeTypeAdapterFactory + .of(ABWeaponTypeCallback.class, "type"); + wtTypeFactory.registerSubtype(ABCallbackGetWeaponTypeFromString.class, "getWeaponTypeFromString") + .registerSubtype(ABCallbackGetStoredWeaponTypeByKey.class, "getStoredWeaponTypeByKey") + .registerSubtype(ABCallbackGetWeaponType.class, "getWeaponType") + .registerSubtype(ABCallbackRawWeaponType.class, "rawWeaponType") + .registerSubtype(ABCallbackGetModifiedAttackWeaponType.class, "getModifiedAttackWeaponType"); + gsonBuilder.registerTypeAdapterFactory(wtTypeFactory); final RuntimeTypeAdapterFactory pdlpTypeFactory = RuntimeTypeAdapterFactory .of(ABAttackPreDamageListenerPriorityCallback.class, "type"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java index 219531d77..f6203704b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java @@ -13,7 +13,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetInstantTransformationBuffVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTransformationBuff; @@ -203,7 +202,7 @@ public static void instantTransformation(final CSimulation game, final Map localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, - final AbilityBuilderActiveAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, + final AbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, final float transformationTime, final float duration, final boolean permanent, final boolean takingOff, final boolean landing, final boolean immediateTakeoff, final boolean immediateLanding, final float altitudeAdjustmentDelay, final float landingDelay, final float altitudeAdjustmentDuration) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java new file mode 100644 index 000000000..173d270f8 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java @@ -0,0 +1,38 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs; + +import java.util.Comparator; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABUnitComparator implements Comparator { + + private CSimulation game; + private CUnit caster; + private Map localStore; + private int castId; + private ABIntegerCallback comparison; + + public ABUnitComparator(final CSimulation game, final CUnit caster, final Map localStore, + final int castId, ABIntegerCallback comparison) { + this.game = game; + this.caster = caster; + this.localStore = localStore; + this.castId = castId; + this.comparison = comparison; + } + + @Override + public int compare(CUnit o1, CUnit o2) { + this.localStore.put(ABLocalStoreKeys.COMPUNIT1, o1); + this.localStore.put(ABLocalStoreKeys.COMPUNIT2, o2); + int v = comparison.callback(game, caster, localStore, castId); + this.localStore.remove(ABLocalStoreKeys.COMPUNIT1); + this.localStore.remove(ABLocalStoreKeys.COMPUNIT2); + return v; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java index 5f9866fe8..f86ff5dac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java @@ -32,7 +32,7 @@ public boolean onAttack(CSimulation simulation, CUnit attacker, CUnit target, bo CDamageType damageType) { boolean evade = false; localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); - localStore.put(ABLocalStoreKeys.ATTACKEDUNIT+triggerId, target); + localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, isAttack); localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, isRanged); localStore.put(ABLocalStoreKeys.DAMAGETYPE+triggerId, damageType); @@ -42,7 +42,7 @@ public boolean onAttack(CSimulation simulation, CUnit attacker, CUnit target, bo } } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKEDUNIT+triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISATTACK+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISRANGED+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGETYPE+triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java new file mode 100644 index 000000000..e934d62ec --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java @@ -0,0 +1,138 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackModifier; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class ABAttackModifier implements CUnitAttackModifier { + private ABIntegerCallback priority; + private ABCondition preLaunchCondition; + private List preLaunchModification; + private ABCondition condition; + private List modification; + + private Map localStore; + private int castId = Integer.MAX_VALUE; + private boolean useCastId; + + public ABAttackModifier(Map localStore, int castId, ABIntegerCallback priority, + ABCondition preLaunchCondition, List preLaunchModification, ABCondition condition, + List modification, boolean useCastId) { + this.localStore = localStore; + this.priority = priority; + this.preLaunchCondition = preLaunchCondition; + this.condition = condition; + this.preLaunchModification = preLaunchModification; + this.modification = modification; + this.useCastId = useCastId; + if (useCastId) { + this.castId = castId; + } + } + + @Override + public int getPriority(CSimulation simulation, CUnit source, AbilityTarget target, CUnitAttack attack) { + if (!this.useCastId) { + this.castId--; + } + localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.castId, source); + localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.castId, target); + localStore.put(ABLocalStoreKeys.THEATTACK + this.castId, attack); + int prio = this.priority.callback(simulation, source, this.localStore, this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.castId); + localStore.remove(ABLocalStoreKeys.THEATTACK + this.castId); + return prio; + } + + @Override + public boolean checkPreLaunchApplication(CSimulation simulation, CUnit source, AbilityTarget target, + CUnitAttack attack) { + if (!this.useCastId) { + this.castId--; + } + boolean ret = true; + if (this.preLaunchCondition != null) { + localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.castId, source); + localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.castId, target); + localStore.put(ABLocalStoreKeys.THEATTACK + this.castId, attack); + ret = this.preLaunchCondition.callback(simulation, source, this.localStore, this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.castId); + localStore.remove(ABLocalStoreKeys.THEATTACK + this.castId); + } + return ret; + } + + @Override + public void applyPreLaunchModification(CSimulation simulation, CUnit source, AbilityTarget target, + CUnitAttack attack, CUnitAttackSettings settings, CUnitPriorityLoopData loop) { + if (this.preLaunchModification != null) { + localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.castId, source); + localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.castId, target); + localStore.put(ABLocalStoreKeys.THEATTACK + this.castId, attack); + + localStore.put(ABLocalStoreKeys.ATTACKSETTINGS + this.castId, settings); + localStore.put(ABLocalStoreKeys.ATTACKMODLOOP + this.castId, loop); + for (ABAction action : this.preLaunchModification) { + action.runAction(simulation, source, this.localStore, this.castId); + } + localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.castId); + localStore.remove(ABLocalStoreKeys.THEATTACK + this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKSETTINGS + this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKMODLOOP + this.castId); + } + } + + @Override + public boolean checkApplication(CSimulation simulation, CUnit source, AbilityTarget target, CUnitAttack attack) { + if (!this.useCastId) { + this.castId--; + } + boolean ret = true; + if (this.condition != null) { + localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.castId, source); + localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.castId, target); + localStore.put(ABLocalStoreKeys.THEATTACK + this.castId, attack); + ret = this.condition.callback(simulation, source, this.localStore, this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.castId); + localStore.remove(ABLocalStoreKeys.THEATTACK + this.castId); + } + return ret; + } + + @Override + public void applyModification(CSimulation simulation, CUnit source, AbilityTarget target, CUnitAttack attack, + CUnitAttackSettings settings, CUnitPriorityLoopData loop) { + if (this.modification != null) { + localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.castId, source); + localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.castId, target); + localStore.put(ABLocalStoreKeys.THEATTACK + this.castId, attack); + + localStore.put(ABLocalStoreKeys.ATTACKSETTINGS + this.castId, settings); + localStore.put(ABLocalStoreKeys.ATTACKMODLOOP + this.castId, loop); + for (ABAction action : this.modification) { + action.runAction(simulation, source, this.localStore, this.castId); + } + localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.castId); + localStore.remove(ABLocalStoreKeys.THEATTACK + this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKSETTINGS + this.castId); + localStore.remove(ABLocalStoreKeys.ATTACKMODLOOP + this.castId); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java index 14201f393..6a4a70154 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java @@ -6,20 +6,25 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPostDamageListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public class ABAttackPostDamageListener implements CUnitAttackPostDamageListener { private Map localStore; + private ABIntegerCallback priority; private List actions; private int triggerId = 0; private boolean useCastId; - public ABAttackPostDamageListener(Map localStore, List actions, int castId, boolean useCastId) { + public ABAttackPostDamageListener(Map localStore, ABIntegerCallback priority, List actions, int castId, boolean useCastId) { this.localStore = localStore; + this.priority = priority; this.actions = actions; this.useCastId = useCastId; if (useCastId) { @@ -28,21 +33,37 @@ public ABAttackPostDamageListener(Map localStore, List } @Override - public void onHit(CSimulation simulation, CUnit attacker, AbilityTarget target, float damage) { + public void onHit(CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack attack, float damage, CUnitPriorityLoopData loop) { localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); - localStore.put(ABLocalStoreKeys.ATTACKEDUNIT+triggerId, target); + localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); localStore.put(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId, damage); + localStore.put(ABLocalStoreKeys.THEATTACK + this.triggerId, attack); + localStore.put(ABLocalStoreKeys.LISTENERLOOP + this.triggerId, loop); if (actions != null) { for (ABAction action : actions) { action.runAction(simulation, attacker, localStore, triggerId); } } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKEDUNIT+triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); localStore.remove(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId); + localStore.remove(ABLocalStoreKeys.THEATTACK + this.triggerId); + localStore.remove(ABLocalStoreKeys.LISTENERLOOP + this.triggerId); if (!this.useCastId) { this.triggerId++; } } + @Override + public int getPriority(CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack attack) { + localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.triggerId, attacker); + localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.triggerId, target); + localStore.put(ABLocalStoreKeys.THEATTACK + this.triggerId, attack); + int prio = this.priority.callback(simulation, attacker, this.localStore, this.triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.triggerId); + localStore.remove(ABLocalStoreKeys.THEATTACK + this.triggerId); + return prio; + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java index fc243dc66..dc70a3cc4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java @@ -5,25 +5,26 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackEffectListenerStacking; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABAttackPreDamageListener implements CUnitAttackPreDamageListener { private Map localStore; private List actions; - + private int triggerId = 0; private boolean useCastId; - - public ABAttackPreDamageListener(Map localStore, List actions, int castId, boolean useCastId) { + + public ABAttackPreDamageListener(Map localStore, List actions, int castId, + boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; @@ -31,35 +32,35 @@ public ABAttackPreDamageListener(Map localStore, List this.triggerId = castId; } } - + @Override public CUnitAttackEffectListenerStacking onAttack(CSimulation simulation, CUnit attacker, AbilityTarget target, - CWeaponType weaponType, CAttackType attackType, CDamageType damageType, + AbilityPointTarget attackImpactLocation, CUnitAttack attack, CUnitAttackSettings settings, CUnitAttackPreDamageListenerDamageModResult damageResult) { - localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); - localStore.put(ABLocalStoreKeys.ATTACKEDUNIT+triggerId, target); - localStore.put(ABLocalStoreKeys.WEAPONTYPE+triggerId, weaponType); - localStore.put(ABLocalStoreKeys.ATTACKTYPE+triggerId, attackType); - localStore.put(ABLocalStoreKeys.DAMAGETYPE+triggerId, damageType); - localStore.put(ABLocalStoreKeys.BASEDAMAGEDEALT+triggerId, damageResult.getBaseDamage()); - localStore.put(ABLocalStoreKeys.BONUSDAMAGEDEALT+triggerId, damageResult.getBonusDamage()); - localStore.put(ABLocalStoreKeys.PREDAMAGERESULT+triggerId, damageResult); + localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + triggerId, attacker); + localStore.put(ABLocalStoreKeys.ATTACKTARGET + triggerId, target); + localStore.put(ABLocalStoreKeys.ATTACKIMPACTLOCATION + triggerId, attackImpactLocation); + localStore.put(ABLocalStoreKeys.THEATTACK + triggerId, attack); + localStore.put(ABLocalStoreKeys.ATTACKSETTINGS + triggerId, settings); + localStore.put(ABLocalStoreKeys.BASEDAMAGEDEALT + triggerId, damageResult.getBaseDamage()); + localStore.put(ABLocalStoreKeys.BONUSDAMAGEDEALT + triggerId, damageResult.getBonusDamage()); + localStore.put(ABLocalStoreKeys.PREDAMAGERESULT + triggerId, damageResult); CUnitAttackEffectListenerStacking stacking = new CUnitAttackEffectListenerStacking(); - localStore.put(ABLocalStoreKeys.PREDAMAGESTACKING+triggerId, stacking); + localStore.put(ABLocalStoreKeys.PREDAMAGESTACKING + triggerId, stacking); if (actions != null) { for (ABAction action : actions) { action.runAction(simulation, attacker, localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKEDUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.WEAPONTYPE+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKTYPE+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGETYPE+triggerId); - localStore.remove(ABLocalStoreKeys.BASEDAMAGEDEALT+triggerId); - localStore.remove(ABLocalStoreKeys.BONUSDAMAGEDEALT+triggerId); - localStore.remove(ABLocalStoreKeys.PREDAMAGERESULT+triggerId); - localStore.remove(ABLocalStoreKeys.PREDAMAGESTACKING+triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET + triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKIMPACTLOCATION + triggerId); + localStore.remove(ABLocalStoreKeys.THEATTACK + triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKSETTINGS + triggerId); + localStore.remove(ABLocalStoreKeys.BASEDAMAGEDEALT + triggerId); + localStore.remove(ABLocalStoreKeys.BONUSDAMAGEDEALT + triggerId); + localStore.remove(ABLocalStoreKeys.PREDAMAGERESULT + triggerId); + localStore.remove(ABLocalStoreKeys.PREDAMAGESTACKING + triggerId); if (!this.useCastId) { this.triggerId++; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java index 7feee21a8..ab29993eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java @@ -34,7 +34,7 @@ public boolean onHit(final CSimulation simulation, CUnit source, CUnit target, C } localStore.put(ABLocalStoreKeys.REACTIONALLOWHIT+triggerId, true); localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, source); - localStore.put(ABLocalStoreKeys.ATTACKEDUNIT+triggerId, target); + localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); localStore.put(ABLocalStoreKeys.ATTACKPROJ+triggerId, projectile); if (actions != null) { for (ABAction action : actions) { @@ -42,7 +42,7 @@ public boolean onHit(final CSimulation simulation, CUnit source, CUnit target, C } } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKEDUNIT+triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); localStore.remove(ABLocalStoreKeys.ATTACKPROJ+triggerId); return (boolean) localStore.remove(ABLocalStoreKeys.REACTIONALLOWHIT+triggerId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java index b05402454..f462002d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java @@ -32,7 +32,7 @@ public ABDamageTakenListener(Map localStore, List acti public void onDamage(CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CDamageType damageType, float damage, float bonusDamage, float trueDamage) { localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); - localStore.put(ABLocalStoreKeys.ATTACKEDUNIT+triggerId, target); + localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, flags.isAttack()); localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, flags.isRanged()); localStore.put(ABLocalStoreKeys.DAMAGETYPE+triggerId, damageType); @@ -45,7 +45,7 @@ public void onDamage(CSimulation simulation, CUnit attacker, CUnit target, final } } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKEDUNIT+triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISATTACK+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISRANGED+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGETYPE+triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java index 37beb2b3b..55de3458a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java @@ -35,7 +35,7 @@ public CUnitAttackDamageTakenModificationListenerDamageModResult onDamage(CSimul CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, CUnitAttackDamageTakenModificationListenerDamageModResult previousDamage) { localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); - localStore.put(ABLocalStoreKeys.ATTACKEDUNIT+triggerId, target); + localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, flags.isAttack()); localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, flags.isRanged()); localStore.put(ABLocalStoreKeys.ATTACKTYPE+triggerId, attackType); @@ -49,7 +49,7 @@ public CUnitAttackDamageTakenModificationListenerDamageModResult onDamage(CSimul } } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKEDUNIT+triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISATTACK+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISRANGED+triggerId); localStore.remove(ABLocalStoreKeys.ATTACKTYPE+triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABFinalDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABFinalDamageTakenModificationListener.java index 5bd327b2a..b4babf27a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABFinalDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABFinalDamageTakenModificationListener.java @@ -34,7 +34,7 @@ public float onDamage(CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, float previousDamage) { localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); - localStore.put(ABLocalStoreKeys.ATTACKEDUNIT+triggerId, target); + localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, flags.isAttack()); localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, flags.isRanged()); localStore.put(ABLocalStoreKeys.ATTACKTYPE+triggerId, attackType); @@ -48,7 +48,7 @@ public float onDamage(CSimulation simulation, CUnit attacker, } float finalDamage = (float) localStore.get(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId); localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKEDUNIT+triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISATTACK+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISRANGED+triggerId); localStore.remove(ABLocalStoreKeys.ATTACKTYPE+triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java new file mode 100644 index 000000000..b8330082c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java @@ -0,0 +1,210 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitStateListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABUnitStateListener implements CUnitStateListener { + private CSimulation game; + private CUnit caster; + private Map localStore; + private int castId; + + private List onLifeChanged = null; + private List onManaChanged = null; + private List onOrdersChanged = null; + private List onQueueChanged = null; + private List onRallyPointChanged = null; + private List onWaypointsChanged = null; + private List onHeroStatsChanged = null; + private List onInventoryChanged = null; + private List onAttacksChanged = null; + private List onAbilitiesChanged = null; + private List onUpgradesChanged = null; + private List onHideStateChanged = null; + + public ABUnitStateListener(CSimulation game, CUnit caster, Map localStore, int castId, + List onLifeChanged, List onManaChanged, List onOrdersChanged, + List onQueueChanged, List onRallyPointChanged, List onWaypointsChanged, + List onHeroStatsChanged, List onInventoryChanged, List onAttacksChanged, + List onAbilitiesChanged, List onUpgradesChanged, List onHideStateChanged) { + super(); + this.game = game; + this.caster = caster; + this.localStore = localStore; + this.castId = castId; + this.onLifeChanged = onLifeChanged; + this.onManaChanged = onManaChanged; + this.onOrdersChanged = onOrdersChanged; + this.onQueueChanged = onQueueChanged; + this.onRallyPointChanged = onRallyPointChanged; + this.onWaypointsChanged = onWaypointsChanged; + this.onHeroStatsChanged = onHeroStatsChanged; + this.onInventoryChanged = onInventoryChanged; + this.onAttacksChanged = onAttacksChanged; + this.onAbilitiesChanged = onAbilitiesChanged; + this.onUpgradesChanged = onUpgradesChanged; + this.onHideStateChanged = onHideStateChanged; + } + + public void setOnLifeChanged(List onLifeChanged) { + this.onLifeChanged = onLifeChanged; + } + + public void setOnManaChanged(List onManaChanged) { + this.onManaChanged = onManaChanged; + } + + public void setOnOrdersChanged(List onOrdersChanged) { + this.onOrdersChanged = onOrdersChanged; + } + + public void setOnQueueChanged(List onQueueChanged) { + this.onQueueChanged = onQueueChanged; + } + + public void setOnRallyPointChanged(List onRallyPointChanged) { + this.onRallyPointChanged = onRallyPointChanged; + } + + public void setOnWaypointsChanged(List onWaypointsChanged) { + this.onWaypointsChanged = onWaypointsChanged; + } + + public void setOnHeroStatsChanged(List onHeroStatsChanged) { + this.onHeroStatsChanged = onHeroStatsChanged; + } + + public void setOnInventoryChanged(List onInventoryChanged) { + this.onInventoryChanged = onInventoryChanged; + } + + public void setOnAttacksChanged(List onAttacksChanged) { + this.onAttacksChanged = onAttacksChanged; + } + + public void setOnAbilitiesChanged(List onAbilitiesChanged) { + this.onAbilitiesChanged = onAbilitiesChanged; + } + + public void setOnUpgradesChanged(List onUpgradesChanged) { + this.onUpgradesChanged = onUpgradesChanged; + } + + public void setOnHideStateChanged(List onHideStateChanged) { + this.onHideStateChanged = onHideStateChanged; + } + + @Override + public void lifeChanged() { + if (onLifeChanged != null) { + for (ABAction action : onLifeChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + + @Override + public void manaChanged() { + if (onManaChanged != null) { + for (ABAction action : onManaChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + + @Override + public void ordersChanged() { + if (onOrdersChanged != null) { + for (ABAction action : onOrdersChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + + @Override + public void queueChanged() { + if (onQueueChanged != null) { + for (ABAction action : onQueueChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + + @Override + public void rallyPointChanged() { + if (onRallyPointChanged != null) { + for (ABAction action : onRallyPointChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + + @Override + public void waypointsChanged() { + if (onWaypointsChanged != null) { + for (ABAction action : onWaypointsChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + + @Override + public void heroStatsChanged() { + if (onHeroStatsChanged != null) { + for (ABAction action : onHeroStatsChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + + @Override + public void inventoryChanged() { + if (onInventoryChanged != null) { + for (ABAction action : onInventoryChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + + @Override + public void attacksChanged() { + if (onAttacksChanged != null) { + for (ABAction action : onAttacksChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + + @Override + public void abilitiesChanged() { + if (onAbilitiesChanged != null) { + for (ABAction action : onAbilitiesChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + + @Override + public void upgradesChanged() { + if (onUpgradesChanged != null) { + for (ABAction action : onUpgradesChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + + @Override + public void hideStateChanged() { + if (onHideStateChanged != null) { + for (ABAction action : onHideStateChanged) { + action.runAction(game, caster, localStore, castId); + } + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java index 9fb13ef72..731a4eb9f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java @@ -4,6 +4,7 @@ import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -50,6 +51,8 @@ public class AbilityBuilderConfiguration { private Map> reuseActions; private Map reuseCallbacks; + private List initialUniqueFlags; + public AbilityBuilderConfiguration(AbilityBuilderParser parser, AbilityBuilderDupe dupe) { this.id = dupe.getId(); this.castId = dupe.getCastId(); @@ -87,6 +90,8 @@ public AbilityBuilderConfiguration(AbilityBuilderParser parser, AbilityBuilderDu this.setReuseActions(parser.getReuseActions()); this.setReuseCallbacks(parser.getReuseCallbacks()); + + this.setInitialUniqueFlags(parser.getInitialUniqueFlags()); } public CAbilityTypeDefinitionAbilityBuilder createDefinition() { @@ -365,4 +370,12 @@ public void setReuseCallbacks(Map reuseCallbacks) { this.reuseCallbacks = reuseCallbacks; } + public List getInitialUniqueFlags() { + return this.initialUniqueFlags; + } + + public void setInitialUniqueFlags( List initialUniqueFlags) { + this.initialUniqueFlags = initialUniqueFlags; + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java index 60a5ff27f..f94279238 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java @@ -5,6 +5,7 @@ import java.util.Map; import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -46,6 +47,8 @@ public class AbilityBuilderParser { private Map> reuseActions; private Map reuseCallbacks; + + private List initialUniqueFlags; //Template only private AbilityBuilderParserTemplateFields templateFields; @@ -138,6 +141,9 @@ public void updateFromParent(AbilityBuilderParser parent) { this.onChannelTick = parent.onChannelTick; if (this.onEndChannel == null) this.onEndChannel = parent.onEndChannel; + + if (this.initialUniqueFlags == null) + this.initialUniqueFlags = parent.initialUniqueFlags; } public List getIds() { @@ -437,4 +443,12 @@ public MeleeRangeTargetOverride getMeleeRangeTargetOverride() { public void setMeleeRangeTargetOverride(MeleeRangeTargetOverride meleeRangeTargetOverride) { this.templateFields.setMeleeRangeTargetOverride(meleeRangeTargetOverride); } + + public List getInitialUniqueFlags() { + return this.initialUniqueFlags; + } + + public void setInitialUniqueFlags( List initialUniqueFlags) { + this.initialUniqueFlags = initialUniqueFlags; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserUtil.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserUtil.java index a71a3fe79..9acfca137 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserUtil.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserUtil.java @@ -10,9 +10,12 @@ public class AbilityBuilderParserUtil { public static void loadAbilityBuilderFiles(final AbilityBuilderFileListener listener) { + loadAbilityBuilderFiles(listener, "abilityBehaviors"); + } + public static void loadAbilityBuilderFiles(final AbilityBuilderFileListener listener, String folder) { final Gson gson = AbilityBuilderGsonBuilder.create(); try { - final File abilityBehaviorsDir = new File("abilityBehaviors"); + final File abilityBehaviorsDir = new File(folder); final File[] abilityBehaviorFiles = abilityBehaviorsDir.listFiles(); if (abilityBehaviorFiles != null) { for (final File abilityBehaviorFile : abilityBehaviorFiles) { @@ -49,6 +52,9 @@ public static void loadAbilityBuilderFile(final Gson gson, final File abilityBeh catch (final IllegalArgumentException e) { System.err.println("Failed to load Ability Builder config file: " + abilityBehaviorFile.getName()); e.printStackTrace(); + } catch (FileNotFoundException e) { + System.err.println("Failed to find Ability Builder config file: " + abilityBehaviorFile.getName()); + e.printStackTrace(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java index 280a53f9a..a1cbd793f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java @@ -21,6 +21,9 @@ public class AbilityBuilderSpecialDisplayFields { private ABBooleanCallback separateOnAndOff; private ABIDCallback alternateUnitId; + private ABBooleanCallback isMenu; + private ABIntegerCallback menuId; + public void updateFromParent(AbilityBuilderSpecialDisplayFields parent) { if (this.showOnAndOffIcons == null) this.showOnAndOffIcons = parent.showOnAndOffIcons; @@ -116,4 +119,17 @@ public void setAlternateUnitId(ABIDCallback alternateUnitId) { this.alternateUnitId = alternateUnitId; } + public ABBooleanCallback getIsMenu() { + return this.isMenu; + } + public void setIsMenu(ABBooleanCallback isMenu) { + this.isMenu = isMenu; + } + public ABIntegerCallback getMenuId() { + return this.menuId; + } + public void setMenuId(ABIntegerCallback menuId) { + this.menuId = menuId; + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java index 2f3a5b750..c7dc68619 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java @@ -26,6 +26,11 @@ public CAbility accept(CBehaviorAbilityBuilderBase target) { public CAbility accept(CBehaviorAbilityBuilderNoTarget target) { return target.getAbility(); } + + @Override + public CAbility accept(CBehaviorMove target) { + return null; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java new file mode 100644 index 000000000..9ac7d7b3b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; + +public class BehaviorNextBehaviorVisitor implements CBehaviorVisitor { + public static final BehaviorNextBehaviorVisitor INSTANCE = new BehaviorNextBehaviorVisitor(); + + @Override + public CRangedBehavior accept(CBehavior target) { + return null; + } + + @Override + public CRangedBehavior accept(CBehaviorMove target) { + return target.getRangedBehavior(); + } + + @Override + public CRangedBehavior accept(CRangedBehavior target) { + return null; + } + + @Override + public CRangedBehavior accept(CBehaviorAbilityBuilderBase target) { + return null; + } + + @Override + public CRangedBehavior accept(CBehaviorAbilityBuilderNoTarget target) { + return null; + } + + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java index 857e4ef59..cc9bd8cd3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java @@ -33,6 +33,11 @@ public CUnit accept(CBehaviorAbilityBuilderBase target) { public CUnit accept(CBehaviorAbilityBuilderNoTarget target) { return null; } + + @Override + public CUnit accept(CBehaviorMove target) { + return null; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java index 80356a229..edd712d8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java @@ -26,6 +26,11 @@ public AbilityTarget accept(CBehaviorAbilityBuilderBase target) { public AbilityTarget accept(CBehaviorAbilityBuilderNoTarget target) { return null; } + + @Override + public AbilityTarget accept(CBehaviorMove target) { + return null; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorAttack.java index 2d804168c..ddda0a51d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorAttack.java @@ -5,11 +5,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetStillAliveAndTargetableVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackModifier; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class CBehaviorAttack extends CAbstractRangedBehavior { @@ -26,6 +26,8 @@ public CBehaviorAttack(final CUnit unit) { private int backSwingTime; private int thisOrderCooldownEndTime; private CBehaviorAttackListener attackListener; + private CUnitAttackModifier forcedModifier; + private CUnitAttackSettings settings; public CBehavior reset(final CSimulation game, final int highlightOrderId, final CUnitAttack unitAttack, final AbilityTarget target, final boolean disableMove, final CBehaviorAttackListener attackListener) { @@ -40,6 +42,12 @@ public CBehavior reset(final CSimulation game, final int highlightOrderId, final return super.innerReset(game, target); } + public CBehavior reset(final CSimulation game, final int highlightOrderId, final CUnitAttack unitAttack, + final AbilityTarget target, final boolean disableMove, final CBehaviorAttackListener attackListener, CUnitAttackModifier forcedModifier) { + this.forcedModifier = forcedModifier; + return this.reset(game, highlightOrderId, unitAttack, target, disableMove, attackListener); + } + @Override public int getHighlightOrderId() { return this.highlightOrderId; @@ -83,13 +91,22 @@ public CBehavior update(final CSimulation simulation, final boolean withinFacing if (this.damagePointLaunchTime != 0) { if (currentTurnTick >= this.damagePointLaunchTime) { final int damage = this.unitAttack.roll(simulation.getSeededRandom()); + this.settings.setBaseDamage(damage); AbilityTarget target = this.target; - if (this.unitAttack.getWeaponType() == CWeaponType.ARTILLERY) { - // NOTE: adding this fixed a bunch of special cases in my code, but - // maybe we should re-use the point objects and not "new" here for - // better performance (maybe in a refactor in the future). - target = new AbilityPointTarget(target.getX(), target.getY()); + if (this.forcedModifier != null && this.forcedModifier.checkApplication(simulation, this.unit, target, this.unitAttack)) { + this.forcedModifier.applyModification(simulation, this.unit, target, this.unitAttack, this.settings, null); + } else { + this.settings = this.unit.checkForAttackModification(simulation, target, unitAttack, this.settings); } + this.forcedModifier = null; + +// if (this.unitAttack.getWeaponType() == CWeaponType.ARTILLERY || this.unitAttack.getWeaponType() == CWeaponType.ALINE) { +// // NOTE: adding this fixed a bunch of special cases in my code, but +// // maybe we should re-use the point objects and not "new" here for +// // better performance (maybe in a refactor in the future). +// target = new AbilityPointTarget(target.getX(), target.getY()); +// } + this.unitAttack.launch(simulation, this.unit, target, damage, this.attackListener); this.damagePointLaunchTime = 0; } @@ -105,8 +122,14 @@ else if (currentTurnTick >= cooldownEndTime) { this.thisOrderCooldownEndTime = currentTurnTick + a1CooldownSteps; this.damagePointLaunchTime = currentTurnTick + a1DamagePointSteps; this.backSwingTime = currentTurnTick + a1DamagePointSteps + a1BackswingSteps; + this.settings = this.unitAttack.initialSettings(); + if (this.forcedModifier != null && this.forcedModifier.checkPreLaunchApplication(simulation, this.unit, target, this.unitAttack)) { + this.forcedModifier.applyPreLaunchModification(simulation, this.unit, target, this.unitAttack, this.settings, null); + } else { + this.settings = this.unit.checkForAttackPreLaunchModification(simulation, target, unitAttack, this.settings); + } this.unit.getUnitAnimationListener().playAnimationWithDuration(true, PrimaryTag.ATTACK, - SequenceUtils.EMPTY, animationBackswingPoint + animationDamagePoint, true); + this.settings.getAnimationNames(), animationBackswingPoint + animationDamagePoint, true); this.unit.getUnitAnimationListener().queueAnimation(PrimaryTag.STAND, SequenceUtils.READY, false); } else if (currentTurnTick >= this.thisOrderCooldownEndTime) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorCategory.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorCategory.java index 745b0c247..fce86f5e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorCategory.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorCategory.java @@ -6,7 +6,8 @@ public enum CBehaviorCategory implements CHandle { IDLE, MOVEMENT, ATTACK, - SPELL; + SPELL, + BUILD; @Override public int getHandleId() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java index c5b21ecba..aaa1d3232 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java @@ -407,6 +407,10 @@ public CUnit getUnit() { return this.unit; } + public CRangedBehavior getRangedBehavior() { + return this.rangedBehavior; + } + public void pathFound(final List waypoints, final CSimulation simulation) { this.pathfindingActive = false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorStun.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorStun.java index 6e8267cd1..b2b5fcea7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorStun.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorStun.java @@ -9,9 +9,11 @@ public class CBehaviorStun implements CBehavior { private final CUnit unit; + private boolean updateAnims; - public CBehaviorStun(final CUnit unit) { + public CBehaviorStun(final CUnit unit, final boolean updateAnims) { this.unit = unit; + this.updateAnims = updateAnims; } @Override @@ -26,8 +28,9 @@ public CBehavior update(final CSimulation game) { @Override public void begin(final CSimulation game) { - this.unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.STAND, SequenceUtils.EMPTY, 1.0f, - true); + if (this.updateAnims) + this.unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.STAND, SequenceUtils.EMPTY, 1.0f, + true); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java index 29dea9cdd..5be8f9192 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java @@ -11,4 +11,6 @@ public interface CBehaviorVisitor { T accept(CBehaviorAbilityBuilderBase target); T accept(CBehaviorAbilityBuilderNoTarget target); + T accept(CBehaviorMove target); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanBuild.java index 1a6a311ed..3cb884fb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanBuild.java @@ -67,7 +67,7 @@ protected CBehavior update(final CSimulation simulation, final boolean withinFac final int playerIndex = this.unit.getPlayerIndex(); if (!buildLocationObstructed) { final CUnit constructedStructure = simulation.createUnit(this.orderId, playerIndex, this.target.getX(), - this.target.getY(), simulation.getGameplayConstants().getBuildingAngle()); + this.target.getY(), simulation.getGameplayConstants().getBuildingAngle(), true); if (canBeBuiltOnThem) { CAbilityGoldMinable abilityGoldMine = null; if (this.buildOnBuildingIntersector.getUnitToBuildOn() != null) { @@ -91,7 +91,6 @@ protected CBehavior update(final CSimulation simulation, final boolean withinFac } } } - constructedStructure.setConstructing(true); constructedStructure.setConstructingPaused(true); constructedStructure.setLife(simulation, constructedStructure.getMaximumLife() * WarsmashConstants.BUILDING_CONSTRUCT_START_LIFE); @@ -187,7 +186,7 @@ public boolean interruptable() { @Override public CBehaviorCategory getBehaviorCategory() { - return CBehaviorCategory.SPELL; + return CBehaviorCategory.BUILD; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanRepair.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanRepair.java index 6c7354aae..45977a28a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanRepair.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorHumanRepair.java @@ -224,6 +224,6 @@ public boolean interruptable() { @Override public CBehaviorCategory getBehaviorCategory() { - return CBehaviorCategory.SPELL; + return CBehaviorCategory.BUILD; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorOrcBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorOrcBuild.java index f0cf5a12e..389b5ec1f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorOrcBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorOrcBuild.java @@ -69,7 +69,7 @@ protected CBehavior update(final CSimulation simulation, final boolean withinFac final int playerIndex = this.unit.getPlayerIndex(); if (!buildLocationObstructed) { final CUnit constructedStructure = simulation.createUnit(this.orderId, playerIndex, this.target.getX() - , this.target.getY(), simulation.getGameplayConstants().getBuildingAngle()); + , this.target.getY(), simulation.getGameplayConstants().getBuildingAngle(), true); if (canBeBuiltOnThem) { CAbilityGoldMinable abilityGoldMine = null; if (this.buildOnBuildingIntersector.getUnitToBuildOn() != null) { @@ -91,7 +91,6 @@ protected CBehavior update(final CSimulation simulation, final boolean withinFac } } } - constructedStructure.setConstructing(true); constructedStructure.setWorker(this.unit, true); final CAbilityBuildInProgress abilityBuildInProgress = new CAbilityBuildInProgress(simulation.getHandleIdAllocator().createId()); @@ -174,6 +173,6 @@ public boolean interruptable() { @Override public CBehaviorCategory getBehaviorCategory() { - return CBehaviorCategory.SPELL; + return CBehaviorCategory.BUILD; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorRepair.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorRepair.java index b6054e3ad..e9e58d910 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorRepair.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorRepair.java @@ -152,6 +152,6 @@ public boolean interruptable() { @Override public CBehaviorCategory getBehaviorCategory() { - return CBehaviorCategory.SPELL; + return CBehaviorCategory.BUILD; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorUndeadBuild.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorUndeadBuild.java index 49cfdae17..a2eaea0fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorUndeadBuild.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/CBehaviorUndeadBuild.java @@ -79,7 +79,7 @@ else if (!this.unitCreated) { final int playerIndex = this.unit.getPlayerIndex(); if (!buildLocationObstructed) { final CUnit constructedStructure = simulation.createUnit(this.orderId, playerIndex, this.target.getX(), - this.target.getY(), simulation.getGameplayConstants().getBuildingAngle()); + this.target.getY(), simulation.getGameplayConstants().getBuildingAngle(), true); if (canBeBuiltOnThem) { CAbilityGoldMinable abilityGoldMine = null; if (this.buildOnBuildingIntersector.getUnitToBuildOn() != null) { @@ -103,7 +103,6 @@ else if (!this.unitCreated) { } } } - constructedStructure.setConstructing(true); constructedStructure.setWorker(this.unit, false); constructedStructure.setLife(simulation, constructedStructure.getMaximumLife() * WarsmashConstants.BUILDING_CONSTRUCT_START_LIFE); @@ -186,6 +185,6 @@ public boolean interruptable() { @Override public CBehaviorCategory getBehaviorCategory() { - return CBehaviorCategory.SPELL; + return CBehaviorCategory.BUILD; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java index 244038f9d..4ebc373cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java @@ -6,6 +6,7 @@ public abstract class CBaseDamageFlags implements CDamageFlags { private static int IGNOREINVUL = 0b100; private static int EXPLODE = 0b1000; private static int SUMMON = 0b10000; + private static int NONLETHAL = 0b100000; private int flags = 0; @@ -61,4 +62,14 @@ public boolean isOnlyDamageSummons() { public void setOnlyDamageSummons(boolean summon) { this.flags = summon ? this.flags | SUMMON : this.flags & ~SUMMON; } + + @Override + public boolean isNonlethal() { + return (this.flags & NONLETHAL) != 0; + } + + @Override + public void setNonlethal(boolean nonlethal) { + this.flags = nonlethal ? this.flags | NONLETHAL : this.flags & ~NONLETHAL; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java index 516dfb1da..dac9b6763 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java @@ -22,4 +22,8 @@ public interface CDamageFlags { void setOnlyDamageSummons(boolean callback); + boolean isNonlethal(); + + void setNonlethal(boolean callback); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CTargetType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CTargetType.java index cf96eee01..2029880f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CTargetType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CTargetType.java @@ -39,7 +39,8 @@ public enum CTargetType implements CHandle { DECORATION, // BELOW: internal values: NON_MAGIC_IMMUNE, - NON_ETHEREAL + NON_ETHEREAL, + REPAIRABLE ; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CWeaponType.java index f3fd8c76f..04ccb7eed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CWeaponType.java @@ -4,21 +4,24 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public enum CWeaponType implements CHandle { - NONE(CDamageType.UNKNOWN, false), - NORMAL(CDamageType.NORMAL, false), - INSTANT(CDamageType.NORMAL, true), - ARTILLERY(CDamageType.NORMAL, true), - ALINE(CDamageType.NORMAL, true), - MISSILE(CDamageType.NORMAL, true), - MSPLASH(CDamageType.NORMAL, true), - MBOUNCE(CDamageType.NORMAL, true), - MLINE(CDamageType.NORMAL, true); + NONE(CDamageType.UNKNOWN, false, false), + NORMAL(CDamageType.NORMAL, false, false), + INSTANT(CDamageType.NORMAL, true, false), + ARTILLERY(CDamageType.NORMAL, true, true), + ALINE(CDamageType.NORMAL, true, true), + MISSILE(CDamageType.NORMAL, true, true), + MSPLASH(CDamageType.NORMAL, true, true), + MBOUNCE(CDamageType.NORMAL, true, true), + MLINE(CDamageType.NORMAL, true, true); private CDamageType damageType; private boolean ranged; + private boolean projectile; - CWeaponType(final CDamageType damageType, final boolean ranged) { + CWeaponType(final CDamageType damageType, final boolean ranged, final boolean projectile) { this.damageType = damageType; + this.ranged = ranged; + this.projectile = projectile; } public CDamageType getDamageType() { @@ -29,8 +32,8 @@ public boolean isRanged() { return this.ranged; } - public void setRanged(final boolean ranged) { - this.ranged = ranged; + public boolean isProjectile() { + return this.projectile; } public static CWeaponType parseWeaponType(final String weaponTypeString) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java index 4ab9a3ebe..6fdde05f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java @@ -8,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; @@ -17,7 +18,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerPriority; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackReplacementEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; @@ -35,6 +37,7 @@ * these attacks as best as possible. */ public abstract class CUnitAttack { + private static CUnitPriorityLoopData postListenerLoop = new CUnitPriorityLoopData(); private float animationBackswingPointBase; private float animationBackswingPoint; private float animationDamagePoint; @@ -64,8 +67,8 @@ public abstract class CUnitAttack { private Map> nonStackingFlatBuffs = new HashMap<>(); private Map> nonStackingPctBuffs = new HashMap<>(); - - protected CUnitAttackReplacementEffect attackReplacement = null; + + protected CUnitAttackSettings attackModifier = null; // calculate private int totalBaseDamage; @@ -136,8 +139,7 @@ public void computeDerivedFields() { for (final NonStackingStatBuff buff : this.nonStackingFlatBuffs.get(key)) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -149,12 +151,10 @@ public void computeDerivedFields() { for (final NonStackingStatBuff buff : this.nonStackingPctBuffs.get(key)) { if (buffForKey == null) { buffForKey = buff.getValue(); - } - else { + } else { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); - } - else { + } else { buffForKey = Math.max(buffForKey, buff.getValue()); } } @@ -184,7 +184,8 @@ public void computeDerivedFields() { + totalNSAtkBuff + totalNSAtkPctBuff; float totalAttackSpeedBonus = this.agiAttackSpeedBonus + this.attackSpeedBonus + this.attackSpeedModifier; float totalAttackSpeedPercent = 1.0f + Math.max(Math.min(totalAttackSpeedBonus, 4), -0.9f); - // TODO there might be a gameplay constants value for this instead of 0.0001, didn't look + // TODO there might be a gameplay constants value for this instead of 0.0001, + // didn't look if (totalAttackSpeedPercent <= 0.0001f) { totalAttackSpeedPercent = 0.0001f; } @@ -424,37 +425,42 @@ public int roll(final Random seededRandom) { } public CUnitAttackPreDamageListenerDamageModResult runPreDamageListeners(final CSimulation simulation, - final CUnit attacker, final AbilityTarget target, final float damage) { + final CUnit attacker, final AbilityTarget target, final AbilityPointTarget attackImpactLocation, + final float damage, final CUnitAttackSettings settings) { final CUnitAttackPreDamageListenerDamageModResult result = new CUnitAttackPreDamageListenerDamageModResult( damage); CUnitAttackEffectListenerStacking allowContinue = new CUnitAttackEffectListenerStacking(); for (final CUnitAttackPreDamageListenerPriority priority : CUnitAttackPreDamageListenerPriority.values()) { if (allowContinue.isAllowStacking()) { - if (priority == CUnitAttackPreDamageListenerPriority.ATTACKREPLACEMENT && this.attackReplacement != null && this.attackReplacement.getPreDamageListeners() != null) { - for (CUnitAttackPreDamageListener listener : this.attackReplacement.getPreDamageListeners()) { + if (priority == CUnitAttackPreDamageListenerPriority.ATTACKREPLACEMENT && settings != null + && settings.getPreDamageListeners() != null) { + for (CUnitAttackPreDamageListener listener : settings.getPreDamageListeners()) { if (allowContinue.isAllowSamePriorityStacking()) { - allowContinue = listener.onAttack(simulation, attacker, target, weaponType, attackType, weaponType.getDamageType(), result); + allowContinue = listener.onAttack(simulation, attacker, target, attackImpactLocation, this, + settings, result); } } } else { for (CUnitAttackPreDamageListener listener : attacker.getPreDamageListenersForPriority(priority)) { if (allowContinue.isAllowSamePriorityStacking()) { - allowContinue = listener.onAttack(simulation, attacker, target, weaponType, attackType, weaponType.getDamageType(), result); + allowContinue = listener.onAttack(simulation, attacker, target, attackImpactLocation, this, + settings, result); } } } } + allowContinue.setAllowSamePriorityStacking(true); } if (result.isMiss()) { - if (this.weaponType == CWeaponType.ARTILLERY) { + if (this.weaponType == CWeaponType.ARTILLERY || this.weaponType == CWeaponType.ALINE) { result.setDamageMultiplier(simulation.getGameplayConstants().getMissDamageReduction()); - } - else if (this.weaponType == CWeaponType.MSPLASH) { + result.setBonusDamage(result.getBonusDamage() * simulation.getGameplayConstants().getMissDamageReduction()); + } else if (this.weaponType == CWeaponType.MSPLASH) { result.setDamageMultiplier(simulation.getGameplayConstants().getMissDamageReduction()); + result.setBonusDamage(result.getBonusDamage() * simulation.getGameplayConstants().getMissDamageReduction()); simulation.spawnTextTag(attacker, attacker.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, "miss"); - } - else { + } else { result.setBaseDamage(0); result.setBonusDamage(0); result.setDamageMultiplier(0); @@ -468,8 +474,7 @@ else if (this.weaponType == CWeaponType.MSPLASH) { if (!result.isMiss() && (result.getDamageMultiplier() != 1) && (result.getDamageMultiplier() != 0)) { simulation.spawnTextTag(attacker, attacker.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, Math.round(result.computeFinalDamage())); - } - else if (result.getBonusDamage() != 0) { + } else if (result.getBonusDamage() != 0) { simulation.spawnTextTag(attacker, attacker.getPlayerIndex(), TextTagConfigType.BASH, Math.round(result.getBonusDamage())); } @@ -477,10 +482,44 @@ else if (result.getBonusDamage() != 0) { } public void runPostDamageListeners(final CSimulation simulation, final CUnit attacker, final AbilityTarget target, - final float actualDamage) { - for (final CUnitAttackPostDamageListener listener : attacker.getPostDamageListeners()) { - listener.onHit(simulation, attacker, target, actualDamage); - + final float actualDamage, final CUnitAttackSettings settings) { + int maxPriority = 0; + int i = 0; + postListenerLoop.reset(); + while (i <= maxPriority) { + postListenerLoop.startLoop(i); + + if (settings.getPostDamageListeners() != null) { + for (int j = settings.getPostDamageListeners().size() - 1; j >= 0; j--) { + CUnitAttackPostDamageListener listener = settings.getPostDamageListeners().get(j); + int prio = listener.getPriority(simulation, attacker, target, this); + if (prio > maxPriority) { + maxPriority = prio; + } + if (prio == i && !postListenerLoop.skipCurrentLevel()) { + listener.onHit(simulation, attacker, target, this, actualDamage, postListenerLoop); + } + } + } + for (int j = attacker.getPostDamageListeners().size() - 1; j >= 0; j--) { + CUnitAttackPostDamageListener listener = attacker.getPostDamageListeners().get(j); + int prio = listener.getPriority(simulation, attacker, target, this); + if (prio > maxPriority) { + maxPriority = prio; + } + if (prio == i && !postListenerLoop.skipCurrentLevel()) { + listener.onHit(simulation, attacker, target, this, actualDamage, postListenerLoop); + } + } + if (postListenerLoop.end()) { + break; + } + i++; } } + + public CUnitAttackSettings initialSettings() { + this.attackModifier = new CUnitAttackSettings(); + return this.attackModifier; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java index 9d4bd8150..c1c4e8441 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java @@ -5,13 +5,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectileInstant; public class CUnitAttackInstant extends CUnitAttack { @@ -52,7 +55,8 @@ public void launch(final CSimulation simulation, final CUnit unit, final Ability CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { simulation.createInstantAttackEffect(unit, this, widget); - CAttackProjectileInstant proj = new CAttackProjectileInstant(widget.getX(), widget.getY(), widget, unit, damage, this, attackListener); + CAttackProjectileInstant proj = new CAttackProjectileInstant(widget.getX(), widget.getY(), widget, unit, + damage, this, attackListener, this.attackModifier); int i = 0; while (!proj.update(simulation) && i < 100) { i++; @@ -63,13 +67,18 @@ public void launch(final CSimulation simulation, final CUnit unit, final Ability } public void doDamage(final CSimulation cSimulation, final CUnit source, final AbilityTarget target, - final float damage, final float x, final float y, - final CUnitAttackListener attackListener) { + final float damage, final float x, final float y, final CUnitAttackListener attackListener, + final CUnitAttackSettings settings) { final CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { - CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(cSimulation, source, target, damage); - float damageDealt = widget.damage(cSimulation, source, ATTACK_FLAGS, getAttackType(), getWeaponType().getDamageType(), getWeaponSound(), modDamage.computeFinalDamage(), modDamage.getBonusDamage()); - runPostDamageListeners(cSimulation, source, target, damageDealt); + CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(cSimulation, source, target, + target.visit(AbilityTargetVisitor.POINT) != null ? target.visit(AbilityTargetVisitor.POINT) + : new AbilityPointTarget(x, y), + damage, settings); + float damageDealt = widget.damage(cSimulation, source, ATTACK_FLAGS, getAttackType(), + getWeaponType().getDamageType(), getWeaponSound(), modDamage.computeFinalDamage(), + modDamage.getBonusDamage()); + runPostDamageListeners(cSimulation, source, target, damageDealt, settings); attackListener.onHit(target, damage); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java index db55eb533..8922e6e55 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java @@ -5,7 +5,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; @@ -13,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class CUnitAttackMissile extends CUnitAttack { private static CAttackDamageFlags ATTACK_FLAGS = new CAttackDamageFlags(true); @@ -20,7 +23,7 @@ public class CUnitAttackMissile extends CUnitAttack { private String projectileArt; private boolean projectileHomingEnabled; private int projectileSpeed; - + protected CDamageFlags damageFlags; public CUnitAttackMissile(final float animationBackswingPoint, final float animationDamagePoint, @@ -37,6 +40,7 @@ public CUnitAttackMissile(final float animationBackswingPoint, final float anima this.projectileHomingEnabled = projectileHomingEnabled; this.projectileSpeed = projectileSpeed; this.damageFlags = ATTACK_FLAGS; + initialSettings(); } @Override @@ -48,30 +52,18 @@ public CUnitAttack copy() { } public float getProjectileArc() { - if (this.attackReplacement != null) { - return this.attackReplacement.getProjectileArc(); - } return this.projectileArc; } public String getProjectileArt() { - if (this.attackReplacement != null) { - return this.attackReplacement.getProjectileArt(); - } return this.projectileArt; } public boolean isProjectileHomingEnabled() { - if (this.attackReplacement != null) { - return this.attackReplacement.isProjectileHomingEnabled(); - } return this.projectileHomingEnabled; } public int getProjectileSpeed() { - if (this.attackReplacement != null) { - return this.attackReplacement.getProjectileSpeed(); - } return this.projectileSpeed; } @@ -96,18 +88,29 @@ public void launch(final CSimulation simulation, final CUnit unit, final Ability final CUnitAttackListener attackListener) { attackListener.onLaunch(); simulation.createProjectile(unit, unit.getX(), unit.getY(), (float) Math.toRadians(unit.getFacing()), this, - target, damage, 0, attackListener); + target, damage, 0, attackListener, this.attackModifier); } public void doDamage(final CSimulation cSimulation, final CUnit source, final AbilityTarget target, final float damage, final float x, final float y, final int bounceIndex, - final CUnitAttackListener attackListener) { + final CUnitAttackListener attackListener, final CUnitAttackSettings settings) { final CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { - CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(cSimulation, source, target, damage); - float damageDealt = widget.damage(cSimulation, source, damageFlags, getAttackType(), getWeaponType().getDamageType(), getWeaponSound(), modDamage.computeFinalDamage(), modDamage.getBonusDamage()); - runPostDamageListeners(cSimulation, source, target, damageDealt); + CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(cSimulation, source, target, + target.visit(AbilityTargetVisitor.POINT) != null ? target.visit(AbilityTargetVisitor.POINT) + : new AbilityPointTarget(x, y), + damage, settings); + float damageDealt = widget.damage(cSimulation, source, damageFlags, getAttackType(), + getWeaponType().getDamageType(), getWeaponSound(), modDamage.computeFinalDamage(), + modDamage.getBonusDamage()); + runPostDamageListeners(cSimulation, source, target, damageDealt, settings); attackListener.onHit(target, damage); } } + + public CUnitAttackSettings initialSettings() { + this.attackModifier = new CUnitAttackSettings(this.projectileArc, this.projectileArt, + this.projectileHomingEnabled, this.projectileSpeed); + return this.attackModifier; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileBounce.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileBounce.java index 03fe33cd7..a41e06e93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileBounce.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileBounce.java @@ -12,7 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class CUnitAttackMissileBounce extends CUnitAttackMissile { private float damageLossFactor; @@ -35,6 +35,7 @@ public CUnitAttackMissileBounce(final float animationBackswingPoint, final float this.maximumNumberOfTargets = maximumNumberOfTargets; this.areaOfEffectFullDamage = areaOfEffectFullDamage; this.areaOfEffectTargets = areaOfEffectTargets; + initialSettings(); } @Override @@ -66,14 +67,14 @@ public void setMaximumNumberOfTargets(final int maximumNumberOfTargets) { @Override public void doDamage(final CSimulation cSimulation, final CUnit source, final AbilityTarget target, final float damage, final float x, final float y, final int bounceIndex, - final CUnitAttackListener attackListener) { - super.doDamage(cSimulation, source, target, damage, x, y, bounceIndex, attackListener); + final CUnitAttackListener attackListener, final CUnitAttackSettings settings) { + super.doDamage(cSimulation, source, target, damage, x, y, bounceIndex, attackListener, settings); final CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { final int nextBounceIndex = bounceIndex + 1; if (nextBounceIndex != this.maximumNumberOfTargets) { BounceMissileConsumer.INSTANCE.nextBounce(cSimulation, source, widget, this, x, y, damage, - nextBounceIndex, attackListener); + nextBounceIndex, attackListener, settings); } } } @@ -91,10 +92,11 @@ private static final class BounceMissileConsumer implements CUnitEnumFunction { private int bounceIndex; private CUnitAttackListener attackListener; private boolean launched = false; + private CUnitAttackSettings settings; public void nextBounce(final CSimulation simulation, final CUnit source, final CWidget target, final CUnitAttackMissileBounce attack, final float x, final float y, final float damage, - final int bounceIndex, final CUnitAttackListener attackListener) { + final int bounceIndex, final CUnitAttackListener attackListener, CUnitAttackSettings settings) { this.simulation = simulation; this.source = source; this.target = target; @@ -105,6 +107,7 @@ public void nextBounce(final CSimulation simulation, final CUnit source, final C this.bounceIndex = bounceIndex; this.attackListener = attackListener; this.launched = false; + this.settings = settings; final float doubleMaxArea = attack.areaOfEffectFullDamage + (this.simulation.getGameplayConstants().getCloseEnoughRange() * 2); final float maxArea = doubleMaxArea / 2; @@ -126,7 +129,7 @@ public boolean call(final CUnit enumUnit) { final float dy = enumUnit.getY() - this.y; final float angle = (float) Math.atan2(dy, dx); this.simulation.createProjectile(this.source, this.x, this.y, angle, this.attack, enumUnit, - this.damage * (1.0f - this.attack.damageLossFactor), this.bounceIndex, this.attackListener); + this.damage * (1.0f - this.attack.damageLossFactor), this.bounceIndex, this.attackListener, this.settings); this.launched = true; return true; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileLine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileLine.java index 9a3799824..43ee5bce7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileLine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileLine.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class CUnitAttackMissileLine extends CUnitAttackMissile { private float damageSpillDistance; @@ -21,7 +22,7 @@ public CUnitAttackMissileLine(final float animationBackswingPoint, final float a final float damageSpillRadius, final boolean isArtillery) { super(animationBackswingPoint, animationDamagePoint, attackType, cooldownTime, damageBase, damageDice, damageSidesPerDie, damageUpgradeAmount, range, rangeMotionBuffer, showUI, targetsAllowed, weaponSound, - weaponType, projectileArc, projectileArt, projectileHomingEnabled, projectileSpeed); + weaponType, projectileArc, projectileArt, isArtillery ? false : projectileHomingEnabled, projectileSpeed); this.damageSpillDistance = damageSpillDistance; this.damageSpillRadius = damageSpillRadius; this.artillery = isArtillery; @@ -29,6 +30,7 @@ public CUnitAttackMissileLine(final float animationBackswingPoint, final float a this.damageFlags = new CAttackDamageFlags(true); this.damageFlags.setExplode(true); } + initialSettings(); } @Override @@ -56,4 +58,17 @@ public void setDamageSpillRadius(final float damageSpillRadius) { this.damageSpillRadius = damageSpillRadius; } + public Boolean isArtillery() { + return this.artillery; + } + + public CUnitAttackSettings initialSettings() { + this.attackModifier = super.initialSettings(); + if (this.artillery) { + this.attackModifier.setImpactZ(0f); + this.attackModifier.setApplyEffectsOnMiss(true); + } + return this.attackModifier; + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java index 85725c5ef..fd7c5f329 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java @@ -9,13 +9,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class CUnitAttackMissileSplash extends CUnitAttackMissile { private int areaOfEffectFullDamage; @@ -37,7 +40,8 @@ public CUnitAttackMissileSplash(final float animationBackswingPoint, final float final float damageFactorSmall, final boolean isArtillery) { super(animationBackswingPoint, animationDamagePoint, attackType, cooldownTime, damageBase, damageDice, damageSidesPerDie, damageUpgradeAmount, range, rangeMotionBuffer, showUI, targetsAllowed, weaponSound, - weaponType, projectileArc, projectileArt, projectileHomingEnabled, projectileSpeed); + weaponType, projectileArc, projectileArt, isArtillery ? false : projectileHomingEnabled, + projectileSpeed); this.areaOfEffectFullDamage = areaOfEffectFullDamage; this.areaOfEffectMediumDamage = areaOfEffectMediumDamage; this.areaOfEffectSmallDamage = areaOfEffectSmallDamage; @@ -49,6 +53,7 @@ public CUnitAttackMissileSplash(final float animationBackswingPoint, final float this.damageFlags = new CAttackDamageFlags(true); this.damageFlags.setExplode(true); } + initialSettings(); } @Override @@ -89,6 +94,10 @@ public float getDamageFactorMedium() { public float getDamageFactorSmall() { return this.damageFactorSmall; } + + public boolean isArtillery() { + return this.artillery; + } public void setAreaOfEffectFullDamage(final int areaOfEffectFullDamage) { this.areaOfEffectFullDamage = areaOfEffectFullDamage; @@ -117,9 +126,10 @@ public void setDamageFactorSmall(final float damageFactorSmall) { @Override public void doDamage(final CSimulation cSimulation, final CUnit source, final AbilityTarget target, final float damage, final float x, final float y, final int bounceIndex, - final CUnitAttackListener attackListener) { - SplashDamageConsumer.INSTANCE.doDamage(cSimulation, source, target, this, x, y, damage, attackListener); - if (!SplashDamageConsumer.INSTANCE.hitTarget) { + final CUnitAttackListener attackListener, final CUnitAttackSettings settings) { + SplashDamageConsumer.INSTANCE.doDamage(cSimulation, source, target, this, x, y, damage, attackListener, + settings); + if (!SplashDamageConsumer.INSTANCE.hitTarget && this.isProjectileHomingEnabled()) { final CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { SplashDamageConsumer.INSTANCE.damageTarget(widget); @@ -131,6 +141,7 @@ private static final class SplashDamageConsumer implements CUnitEnumFunction, CD private static final SplashDamageConsumer INSTANCE = new SplashDamageConsumer(); private final Rectangle rect = new Rectangle(); private CUnitAttackMissileSplash attack; + private CUnitAttackSettings settings; private CSimulation simulation; private CUnit source; private AbilityTarget target; @@ -143,20 +154,28 @@ private static final class SplashDamageConsumer implements CUnitEnumFunction, CD public void doDamage(final CSimulation simulation, final CUnit source, final AbilityTarget target, final CUnitAttackMissileSplash attack, final float x, final float y, final float damage, - final CUnitAttackListener attackListener) { + final CUnitAttackListener attackListener, final CUnitAttackSettings settings) { this.simulation = simulation; this.source = source; this.target = target; this.attack = attack; + this.settings = settings; this.x = x; this.y = y; this.damage = damage; this.attackListener = attackListener; this.hitTarget = false; - final float doubleMaxArea = Math.max(Math.max(attack.areaOfEffectFullDamage, attack.areaOfEffectMediumDamage), attack.areaOfEffectSmallDamage) * 2; + final float doubleMaxArea = Math.max( + Math.max(settings.getAreaOfEffectFullDamage(), settings.getAreaOfEffectMediumDamage()), + settings.getAreaOfEffectSmallDamage()) * 2; final float maxArea = doubleMaxArea / 2; this.rect.set(x - maxArea, y - maxArea, doubleMaxArea, doubleMaxArea); - CUnitAttackPreDamageListenerDamageModResult result = this.attack.runPreDamageListeners(simulation, this.source, this.target, this.damage); + CUnitAttackPreDamageListenerDamageModResult result = this.attack.runPreDamageListeners(simulation, + this.source, this.target, + this.target.visit(AbilityTargetVisitor.POINT) != null + ? this.target.visit(AbilityTargetVisitor.POINT) + : new AbilityPointTarget(x, y), + this.damage, settings); this.damage = result.computeFinalDamage(); this.bonusDamage = result.getBonusDamage(); simulation.getWorldCollision().enumUnitsInRect(this.rect, this); @@ -165,11 +184,12 @@ public void doDamage(final CSimulation simulation, final CUnit source, final Abi @Override public boolean call(final CUnit enumUnit) { - if (enumUnit != this.source && enumUnit.canBeTargetedBy(this.simulation, this.source, this.attack.areaOfEffectTargets)) { + if (enumUnit != this.source + && enumUnit.canBeTargetedBy(this.simulation, this.source, this.attack.areaOfEffectTargets)) { float damageDealt = damageTarget(enumUnit); if (enumUnit == this.target) { this.hitTarget = true; - this.attack.runPostDamageListeners(simulation, this.source, target, damageDealt); + this.attack.runPostDamageListeners(simulation, this.source, target, damageDealt, settings); } } return false; @@ -181,7 +201,7 @@ public boolean call(final CDestructable enumDestructable) { float damageDealt = damageTarget(enumDestructable); if (enumDestructable == this.target) { this.hitTarget = true; - this.attack.runPostDamageListeners(simulation, this.source, target, damageDealt); + this.attack.runPostDamageListeners(simulation, this.source, target, damageDealt, settings); } } return false; @@ -190,22 +210,38 @@ public boolean call(final CDestructable enumDestructable) { public float damageTarget(final CWidget enumUnit) { float damageDealt = this.damage; final double distance = enumUnit.distance(this.x, this.y); - if (distance <= (this.attack.areaOfEffectFullDamage)) { - damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, this.attack.getAttackType(), - this.attack.getWeaponType().getDamageType(), this.attack.getWeaponSound(), this.damage, this.bonusDamage); + if (distance <= (this.settings.getAreaOfEffectFullDamage())) { + damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, + this.attack.getAttackType(), this.attack.getWeaponType().getDamageType(), + this.attack.getWeaponSound(), this.damage, this.bonusDamage); this.attackListener.onHit(enumUnit, this.damage + this.bonusDamage); - } else if (distance <= (this.attack.areaOfEffectMediumDamage)) { - damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, this.attack.getAttackType(), - this.attack.getWeaponType().getDamageType(), this.attack.getWeaponSound(), - this.damage * this.attack.damageFactorMedium, this.bonusDamage * this.attack.damageFactorMedium); + } else if (distance <= (this.settings.getAreaOfEffectMediumDamage())) { + damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, + this.attack.getAttackType(), this.attack.getWeaponType().getDamageType(), + this.attack.getWeaponSound(), this.damage * this.settings.getDamageFactorMedium(), + this.bonusDamage * this.settings.getDamageFactorMedium()); this.attackListener.onHit(enumUnit, this.damage + this.bonusDamage); - } else if (distance <= (this.attack.areaOfEffectSmallDamage)) { - damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, this.attack.getAttackType(), - this.attack.getWeaponType().getDamageType(), this.attack.getWeaponSound(), - this.damage * this.attack.damageFactorSmall, this.bonusDamage * this.attack.damageFactorSmall); + } else if (distance <= (this.settings.getAreaOfEffectSmallDamage())) { + damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, + this.attack.getAttackType(), this.attack.getWeaponType().getDamageType(), + this.attack.getWeaponSound(), this.damage * this.settings.getDamageFactorSmall(), + this.bonusDamage * this.settings.getDamageFactorSmall()); this.attackListener.onHit(enumUnit, this.damage + this.bonusDamage); } return damageDealt; } } + + @Override + public CUnitAttackSettings initialSettings() { + this.attackModifier = new CUnitAttackSettings(this.getProjectileArc(), this.getProjectileArt(), + this.isProjectileHomingEnabled(), this.getProjectileSpeed(), this.areaOfEffectFullDamage, + this.areaOfEffectMediumDamage, this.areaOfEffectSmallDamage, this.damageFactorMedium, + this.damageFactorSmall); + this.attackModifier.setApplyEffectsOnMiss(true); + if (this.artillery) { + this.attackModifier.setImpactZ(0f); + } + return this.attackModifier; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java index ad1bc1f0e..0591b322b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java @@ -5,7 +5,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; @@ -39,10 +41,14 @@ public void launch(final CSimulation simulation, final CUnit unit, final Ability attackListener.onLaunch(); final CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { - CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(simulation, unit, target, damage); - float damageDealt = widget.damage(simulation, unit, ATTACK_FLAGS, getAttackType(), getWeaponType().getDamageType(), - modDamage.isMiss() ? null : getWeaponSound(), modDamage.computeFinalDamage(), modDamage.getBonusDamage()); - runPostDamageListeners(simulation, unit, target, damageDealt); + CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(simulation, unit, target, + target.visit(AbilityTargetVisitor.POINT) != null ? target.visit(AbilityTargetVisitor.POINT) + : new AbilityPointTarget(target.getX(), target.getY()), + damage, this.attackModifier); + float damageDealt = widget.damage(simulation, unit, ATTACK_FLAGS, getAttackType(), + getWeaponType().getDamageType(), modDamage.isMiss() ? null : getWeaponSound(), + modDamage.computeFinalDamage(), modDamage.getBonusDamage()); + runPostDamageListeners(simulation, unit, target, damageDealt, this.attackModifier); attackListener.onHit(target, damage); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPostDamageListener.java index 1c0147a55..9d75c780b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPostDamageListener.java @@ -3,7 +3,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public interface CUnitAttackPostDamageListener { - public void onHit(final CSimulation simulation, CUnit attacker, AbilityTarget target, float damage); + public void onHit(final CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack cUnitAttack, float damage, CUnitPriorityLoopData postListenerLoop); + + public int getPriority(CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack cUnitAttack); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListener.java index 1642642ee..7040b4e37 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListener.java @@ -2,11 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public interface CUnitAttackPreDamageListener { - public CUnitAttackEffectListenerStacking onAttack(final CSimulation simulation, CUnit attacker, AbilityTarget target, CWeaponType weaponType, CAttackType attackType, CDamageType damageType, CUnitAttackPreDamageListenerDamageModResult damageResult); + public CUnitAttackEffectListenerStacking onAttack(final CSimulation simulation, CUnit attacker, + AbilityTarget target, AbilityPointTarget attackImpactLocation, CUnitAttack attack, + CUnitAttackSettings settings, CUnitAttackPreDamageListenerDamageModResult damageResult); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultAccuracyCheckListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultAccuracyCheckListener.java index 18e663e18..a2cf2a5ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultAccuracyCheckListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultAccuracyCheckListener.java @@ -4,34 +4,39 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; + +public class CUnitDefaultAccuracyCheckListener implements CUnitAttackPreDamageListener { -public class CUnitDefaultAccuracyCheckListener implements CUnitAttackPreDamageListener{ - public CUnitDefaultAccuracyCheckListener() { super(); } @Override - public CUnitAttackEffectListenerStacking onAttack(CSimulation simulation, CUnit attacker, AbilityTarget target, CWeaponType weaponType, CAttackType attackType, CDamageType damageType, + public CUnitAttackEffectListenerStacking onAttack(CSimulation simulation, CUnit attacker, AbilityTarget target, + AbilityPointTarget attackImpactLocation, CUnitAttack attack, CUnitAttackSettings settings, CUnitAttackPreDamageListenerDamageModResult damageResult) { boolean miss = false; if (target instanceof CUnit) { - if (simulation.getTerrainHeight(attacker.getX(), attacker.getY()) < simulation.getTerrainHeight(target.getX(), target.getY())) { + if (simulation.getTerrainHeight(attacker.getX(), attacker.getY()) < simulation + .getTerrainHeight(target.getX(), target.getY())) { Random random = simulation.getSeededRandom(); if (random.nextFloat(1f) < simulation.getGameplayConstants().getChanceToMiss()) { miss = true; } } - miss = miss || ((CUnit) target).checkForMiss(simulation, attacker, true, miss, null, null, damageResult.getBaseDamage(), damageResult.getBonusDamage()); - + miss = miss || ((CUnit) target).checkForMiss(simulation, attacker, true, miss, null, null, + damageResult.getBaseDamage(), damageResult.getBonusDamage()); + } if (miss) { damageResult.setMiss(true); - return new CUnitAttackEffectListenerStacking(false, true); + if (!settings.isApplyEffectsOnMiss()) { + return new CUnitAttackEffectListenerStacking(false, true); + } } return new CUnitAttackEffectListenerStacking(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultLifestealListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultLifestealListener.java index 21a8a24f9..5f0964b58 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultLifestealListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultLifestealListener.java @@ -4,6 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; @@ -15,7 +17,8 @@ public CUnitDefaultLifestealListener(float amount) { this.amount = amount; } - public void onHit(final CSimulation simulation, CUnit attacker, AbilityTarget target, float damage) { + @Override + public void onHit(final CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack cUnitAttack, float damage, CUnitPriorityLoopData postListenerLoop) { CUnit tarU = target.visit(AbilityTargetVisitor.UNIT); if (tarU != null && !tarU.isBuilding() && !tarU.isUnitType(CUnitTypeJass.MECHANICAL) && !simulation.getPlayer(attacker.getPlayerIndex()).hasAlliance(tarU.getPlayerIndex(), @@ -25,6 +28,11 @@ public void onHit(final CSimulation simulation, CUnit attacker, AbilityTarget ta attacker.heal(simulation, damage * this.amount); } } + + @Override + public int getPriority(CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack cUnitAttack) { + return 0; + } public float getAmount() { return amount; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackModifier.java new file mode 100644 index 000000000..9668bd4f9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackModifier.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; + +public interface CUnitAttackModifier { + + public int getPriority(CSimulation simulation, CUnit source, AbilityTarget target, CUnitAttack attack); + + public boolean checkPreLaunchApplication(CSimulation simulation, CUnit source, AbilityTarget target, CUnitAttack attack); + + public void applyPreLaunchModification(CSimulation simulation, CUnit unit, AbilityTarget target, + CUnitAttack unitAttack, CUnitAttackSettings settings, CUnitPriorityLoopData loop); + + public boolean checkApplication(CSimulation simulation, CUnit source, AbilityTarget target, CUnitAttack attack); + + public void applyModification(CSimulation simulation, CUnit source, AbilityTarget target, CUnitAttack attack, + CUnitAttackSettings settings, CUnitPriorityLoopData loop); + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackReplacementEffect.java deleted file mode 100644 index f9ca8125d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackReplacementEffect.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListener; - -public class CUnitAttackReplacementEffect { - - public List getPreDamageListeners() { - return null; - } - - public float getProjectileArc() { - // TODO Auto-generated method stub - return 0; - } - - public boolean isProjectileHomingEnabled() { - // TODO Auto-generated method stub - return false; - } - - public int getProjectileSpeed() { - // TODO Auto-generated method stub - return 0; - } - - public String getProjectileArt() { - // TODO Auto-generated method stub - return null; - } - - public boolean chargeResources(CUnit unit) { - - return false; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackReplacementPriority.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackReplacementPriority.java deleted file mode 100644 index 54f15f953..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackReplacementPriority.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement; - -public enum CUnitAttackReplacementPriority { - AUTOCAST(0), - HIGHPRI(1), - INVENTORY(2), - LOWPRIORITY(3), - NOPRIORITY(4); - - private int priority; - - CUnitAttackReplacementPriority(int priority) { - this.priority = priority; - } - public int getPriority() { - return priority; - } - public void setPriority(int priority) { - this.priority = priority; - } - - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackSettings.java new file mode 100644 index 000000000..cc9379032 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitAttackSettings.java @@ -0,0 +1,228 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement; + +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; +import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPostDamageListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListener; + +public class CUnitAttackSettings { + + private int areaOfEffectFullDamage; + private int areaOfEffectMediumDamage; + private int areaOfEffectSmallDamage; + private float damageFactorMedium; + private float damageFactorSmall; + private int projectileSpeed = 0; + private String projectileArt = ""; + private float projectileArc = 0; + private boolean isHomingEnabled = false; + private boolean isApplyEffectsOnMiss = false; + private Float z = null; + private Float impactZ = null; + private Float deathTime = null; + + private EnumSet animationNames = null; + + private List listeners = null; + private List postDamageListeners = null; + private float baseDamage; // This is a hack, as Barrage needs the damage early + + public CUnitAttackSettings(float projectileArc, String projectileArt, boolean projectileHomingEnabled, int projectileSpeed) { + this.projectileSpeed = projectileSpeed; + this.projectileArt = projectileArt; + this.projectileArc = projectileArc; + this.isHomingEnabled = projectileHomingEnabled; + } + + public CUnitAttackSettings() { + } + + public CUnitAttackSettings(float projectileArc, String projectileArt, boolean projectileHomingEnabled, + int projectileSpeed, int areaOfEffectFullDamage, int areaOfEffectMediumDamage, + int areaOfEffectSmallDamage, float damageFactorMedium, float damageFactorSmall) { + this.projectileSpeed = projectileSpeed; + this.projectileArt = projectileArt; + this.projectileArc = projectileArc; + this.isHomingEnabled = projectileHomingEnabled; + this.areaOfEffectFullDamage = areaOfEffectFullDamage; + this.areaOfEffectMediumDamage = areaOfEffectMediumDamage; + this.areaOfEffectSmallDamage = areaOfEffectSmallDamage; + this.damageFactorMedium = damageFactorMedium; + this.damageFactorSmall = damageFactorSmall; + } + + public List getPreDamageListeners() { + return listeners; + } + + public void addPreDamageListener(CUnitAttackPreDamageListener listener) { + if (this.listeners == null) { + this.listeners = new ArrayList<>(); + } + this.listeners.add(listener); + } + + public void removePreDamageListener(CUnitAttackPreDamageListener listener) { + if (this.listeners != null) { + this.listeners.remove(listener); + } + } + + public void setEmptyPreDamageListeners() { + this.listeners = new ArrayList<>(); + } + + public List getPostDamageListeners() { + return postDamageListeners; + } + + public void addPostDamageListener(CUnitAttackPostDamageListener listener) { + if (this.postDamageListeners == null) { + this.postDamageListeners = new ArrayList<>(); + } + this.postDamageListeners.add(0, listener); + } + + public void removePostDamageListener(CUnitAttackPostDamageListener listener) { + if (this.postDamageListeners != null) { + this.postDamageListeners.remove(listener); + } + } + + public float getProjectileArc() { + return projectileArc; + } + + public void setProjectileArc(float projectileArc) { + this.projectileArc = projectileArc ; + } + + public boolean isProjectileHomingEnabled() { + return isHomingEnabled; + } + + public void setProjectileHomingEnabled(boolean isHomingEnabled) { + this.isHomingEnabled = isHomingEnabled ; + } + + public boolean isApplyEffectsOnMiss() { + return isApplyEffectsOnMiss; + } + + public void setApplyEffectsOnMiss(boolean isApplyEffectsOnMiss) { + this.isApplyEffectsOnMiss = isApplyEffectsOnMiss; + } + + public int getProjectileSpeed() { + return projectileSpeed; + } + + public void setProjectileSpeed(int projectileSpeed) { + this.projectileSpeed = projectileSpeed ; + } + + public String getProjectileArt() { + return projectileArt; + } + + public void setProjectileArt(String projectileArt) { + this.projectileArt = projectileArt ; + } + + public int getAreaOfEffectFullDamage() { + return areaOfEffectFullDamage; + } + + public void setAreaOfEffectFullDamage(int areaOfEffectFullDamage) { + this.areaOfEffectFullDamage = areaOfEffectFullDamage; + } + + public int getAreaOfEffectMediumDamage() { + return areaOfEffectMediumDamage; + } + + public void setAreaOfEffectMediumDamage(int areaOfEffectMediumDamage) { + this.areaOfEffectMediumDamage = areaOfEffectMediumDamage; + } + + public int getAreaOfEffectSmallDamage() { + return areaOfEffectSmallDamage; + } + + public void setAreaOfEffectSmallDamage(int areaOfEffectSmallDamage) { + this.areaOfEffectSmallDamage = areaOfEffectSmallDamage; + } + + public float getDamageFactorMedium() { + return damageFactorMedium; + } + + public void setDamageFactorMedium(float damageFactorMedium) { + this.damageFactorMedium = damageFactorMedium; + } + + public float getDamageFactorSmall() { + return damageFactorSmall; + } + + public void setDamageFactorSmall(float damageFactorSmall) { + this.damageFactorSmall = damageFactorSmall; + } + + public EnumSet getAnimationNames() { + if (this.animationNames == null) { + return SequenceUtils.EMPTY; + } + return animationNames; + } + + public void addAnimationName(SecondaryTag animationName) { + if (this.animationNames == null) { + this.animationNames = EnumSet.of(animationName); + } else { + this.animationNames.add(animationName); + } + } + + public void removeAnimationName(SecondaryTag animationName) { + if (this.animationNames != null) { + this.animationNames.remove(animationName); + } + } + + public Float getZ() { + return this.z; + } + + public void setZ(Float z) { + this.z = z; + } + + public Float getImpactZ() { + return this.impactZ; + } + + public void setImpactZ(Float impactZ) { + this.impactZ = impactZ; + } + + public Float getArtDeathTime() { + return this.deathTime; + } + + public void setArtDeathTime(Float deathTime) { + this.deathTime = deathTime; + } + + public void setBaseDamage(int damage) { + this.baseDamage = damage; + } + + public float getBaseDamage() { + return this.baseDamage; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitPriorityLoopData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitPriorityLoopData.java new file mode 100644 index 000000000..baa67aca3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/replacement/CUnitPriorityLoopData.java @@ -0,0 +1,33 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement; + +public class CUnitPriorityLoopData { + private boolean endLoop = false; + private boolean endLevel = false; + + public void startLoop(int i) { + this.endLevel = false; + } + + public void preventOtherModificationsWithSamePriority() { + this.endLevel = true; + } + + public void preventAllOtherModifications() { + this.endLevel = true; + this.endLoop = true; + } + + public boolean skipCurrentLevel() { + return this.endLevel; + } + + public boolean end() { + return this.endLoop; + } + + public void reset() { + this.endLevel = false; + this.endLoop = false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CAttackProjectileInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CAttackProjectileInstant.java index 14f71ea43..9a4d37881 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CAttackProjectileInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CAttackProjectileInstant.java @@ -7,15 +7,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackInstant; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class CAttackProjectileInstant extends CAttackProjectile { CUnitAttackInstant attack; + private CUnitAttackSettings settings; public CAttackProjectileInstant(final float x, final float y, final AbilityTarget target, final CUnit source, final float damage, final CUnitAttackInstant unitAttack, - final CUnitAttackListener attackListener) { + final CUnitAttackListener attackListener, final CUnitAttackSettings settings) { super(x, y, Float.MAX_VALUE, target, source, damage, true, attackListener); this.attack = unitAttack; + this.settings = settings; } @Override public boolean update(final CSimulation game) { @@ -37,7 +40,7 @@ protected void onHitTarget(CSimulation game) { CUnit tarU = getTarget().visit(AbilityTargetVisitor.UNIT); if (tarU == null || tarU.checkForAttackProjReaction(game, getSource(), this)) { this.attack.doDamage(game, getSource(), getTarget(), this.damage, getX(), getY(), - this.attackListener); + this.attackListener, settings); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CAttackProjectileMissile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CAttackProjectileMissile.java index 09a063b7e..4d308e9b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CAttackProjectileMissile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CAttackProjectileMissile.java @@ -7,17 +7,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissile; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class CAttackProjectileMissile extends CAttackProjectile { protected final CUnitAttackMissile unitAttack; protected final int bounceIndex; + private CUnitAttackSettings settings; public CAttackProjectileMissile(final float x, final float y, final float speed, final AbilityTarget target, final CUnit source, final float damage, final CUnitAttackMissile unitAttack, final int bounceIndex, - final CUnitAttackListener attackListener) { - super(x, y, speed, target, source, damage, unitAttack.isProjectileHomingEnabled(), attackListener); + final CUnitAttackListener attackListener, final CUnitAttackSettings settings) { + super(x, y, speed, target, source, damage, settings.isProjectileHomingEnabled(), attackListener); this.unitAttack = unitAttack; this.bounceIndex = bounceIndex; + this.settings = settings; } @Override @@ -25,7 +28,7 @@ protected void onHitTarget(CSimulation game) { CUnit tarU = getTarget().visit(AbilityTargetVisitor.UNIT); if (tarU == null || tarU.checkForAttackProjReaction(game, getSource(), this)) { this.unitAttack.doDamage(game, getSource(), getTarget(), this.damage, getX(), getY(), this.bounceIndex, - this.attackListener); + this.attackListener, this.settings); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CProjectile.java index 73f7054a1..6f4043c05 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CProjectile.java @@ -22,7 +22,7 @@ public CProjectile(final float x, final float y, final float speed, final Abilit final boolean homingEnabled, final CUnit source) { this.x = x; this.y = y; - this.speed = speed; + this.speed = speed != 0 ? speed : 9999999; this.target = target; this.homingEnabled = homingEnabled; this.source = source; @@ -115,6 +115,9 @@ public final float getTargetY() { return this.initialTargetY; } } + public boolean isHomingEnabled() { + return this.homingEnabled; + } public boolean isReflected() { return this.reflected; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java index 2f9342496..2d55d6a14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java @@ -1,8 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.data; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -11,6 +8,7 @@ import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.units.ObjectData; import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityGenericDoNothing; @@ -89,16 +87,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.CAbilityTypeDefinitionStandDown; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.CAbilityTypeDefinitionWispHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.jass.CAbilityTypeJassDefinition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.AbilityBuilderGsonBuilder; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderDupe; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderFile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParser; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParserUtil; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.definitions.impl.CAbilityTypeDefinitionAbilityTemplateBuilder; -import com.google.gson.Gson; -import com.google.gson.JsonParseException; public class CAbilityData { @@ -227,7 +221,7 @@ private void registerCodes() { this.codeToAbilityTypeDefinition.put(War3ID.fromString("ANsw"), new CAbilityTypeDefinitionSpellBase((handleId, alias) -> new CAbilitySummonHawk(handleId, alias))); - this.codeToAbilityTypeDefinition.put(War3ID.fromString("AHca"), new CAbilityTypeDefinitionColdArrows()); +// this.codeToAbilityTypeDefinition.put(War3ID.fromString("AHca"), new CAbilityTypeDefinitionColdArrows()); this.codeToAbilityTypeDefinition.put(War3ID.fromString("Agld"), new CAbilityTypeDefinitionGoldMine()); this.codeToAbilityTypeDefinition.put(War3ID.fromString("Agl2"), new CAbilityTypeDefinitionGoldMineOverlayed()); this.codeToAbilityTypeDefinition.put(War3ID.fromString("Abgm"), new CAbilityTypeDefinitionBlightedGoldMine()); @@ -289,57 +283,36 @@ private void registerCodes() { System.err.println("Starting to load ability builder"); System.err.println("========================================================================"); - Gson gson = AbilityBuilderGsonBuilder.create(); - AbilityBuilderFile behaviors = null; try { - List inheritingAbilities = new ArrayList<>(); - Map previousAbilityParsers = new HashMap<>(); + final List inheritingAbilities = new ArrayList<>(); + final Map previousAbilityParsers = new HashMap<>(); - File abilityBehaviorsDir = new File("abilityBehaviors"); - File[] abilityBehaviorFiles = abilityBehaviorsDir.listFiles(); - if (abilityBehaviorFiles != null) { - for (File abilityBehaviorFile : abilityBehaviorFiles) { - if (abilityBehaviorFile == null || abilityBehaviorFile.isDirectory()) { - continue; + AbilityBuilderParserUtil.loadAbilityBuilderFiles(behavior -> { + if (behavior.getType().equals(AbilityBuilderType.INHERIT)) { + inheritingAbilities.add(behavior); + } else if (behavior.getType().equals(AbilityBuilderType.TEMPLATE)) { + for (AbilityBuilderDupe dupe : behavior.getIds()) { + previousAbilityParsers.put(dupe.getId(), behavior); + this.codeToAbilityTypeDefinition.put(War3ID.fromString(dupe.getId()), + new CAbilityTypeDefinitionAbilityTemplateBuilder(behavior)); } - try { - behaviors = gson.fromJson(new FileReader(abilityBehaviorFile), AbilityBuilderFile.class); - for (AbilityBuilderParser behavior : behaviors.getAbilityList()) { - if (behavior.getType().equals(AbilityBuilderType.INHERIT)) { - inheritingAbilities.add(behavior); - } else if (behavior.getType().equals(AbilityBuilderType.TEMPLATE)) { - for (AbilityBuilderDupe dupe : behavior.getIds()) { - previousAbilityParsers.put(dupe.getId(), behavior); - this.codeToAbilityTypeDefinition.put(War3ID.fromString(dupe.getId()), - new CAbilityTypeDefinitionAbilityTemplateBuilder(behavior)); - } - } else { - for (AbilityBuilderDupe dupe : behavior.getIds()) { - previousAbilityParsers.put(dupe.getId(), behavior); - AbilityBuilderConfiguration config = new AbilityBuilderConfiguration(behavior, dupe); - this.codeToAbilityTypeDefinition.put(War3ID.fromString(config.getId()), - config.createDefinition()); - } - } - } - } catch (JsonParseException e) { - System.err.println("Failed to load Ability Builder config file: " + abilityBehaviorFile.getName()); - e.printStackTrace(); - } catch (IllegalArgumentException e) { - System.err.println("Failed to load Ability Builder config file: " + abilityBehaviorFile.getName()); - e.printStackTrace(); - } catch (FileNotFoundException e) { - System.err.println("Failed to find Ability Builder config file: " + abilityBehaviorFile.getName()); - e.printStackTrace(); + } else { + for (AbilityBuilderDupe dupe : behavior.getIds()) { + previousAbilityParsers.put(dupe.getId(), behavior); + AbilityBuilderConfiguration config = new AbilityBuilderConfiguration(behavior, dupe); + this.codeToAbilityTypeDefinition.put(War3ID.fromString(config.getId()), + config.createDefinition()); } } - } + }); + int prevIter = 1; - while (inheritingAbilities.size() > 0) { - List iter = inheritingAbilities; - inheritingAbilities = new ArrayList<>(); + List loopInheritingAbilities = inheritingAbilities; + while (loopInheritingAbilities.size() > 0) { + List iter = loopInheritingAbilities; + loopInheritingAbilities = new ArrayList<>(); if (prevIter == 0) { for (AbilityBuilderParser parser : iter) { @@ -365,30 +338,78 @@ private void registerCodes() { prevIter++; } } else { - inheritingAbilities.add(parser); + loopInheritingAbilities.add(parser); + } + } + } + + if (WarsmashConstants.ABILITY_COMPATIBILITY != null && WarsmashConstants.ABILITY_COMPATIBILITY.size() > 0) { + final List inheritingCompatAbilities = new ArrayList<>(); + boolean all = WarsmashConstants.ABILITY_COMPATIBILITY.contains("all"); + + AbilityBuilderParserUtil.loadAbilityBuilderFiles(behavior -> { + if (behavior.getType().equals(AbilityBuilderType.INHERIT)) { + inheritingCompatAbilities.add(behavior); + } else if (behavior.getType().equals(AbilityBuilderType.TEMPLATE)) { + for (AbilityBuilderDupe dupe : behavior.getIds()) { + if (all || WarsmashConstants.ABILITY_COMPATIBILITY.contains(dupe.getId())) { + previousAbilityParsers.put(dupe.getId(), behavior); + this.codeToAbilityTypeDefinition.put(War3ID.fromString(dupe.getId()), + new CAbilityTypeDefinitionAbilityTemplateBuilder(behavior)); + } + } + } else { + for (AbilityBuilderDupe dupe : behavior.getIds()) { + if (all || WarsmashConstants.ABILITY_COMPATIBILITY.contains(dupe.getId())) { + previousAbilityParsers.put(dupe.getId(), behavior); + AbilityBuilderConfiguration config = new AbilityBuilderConfiguration(behavior, dupe); + this.codeToAbilityTypeDefinition.put(War3ID.fromString(config.getId()), + config.createDefinition()); + } + } + } + }, "abilityBehaviors_compatibility"); + + prevIter = 1; + List loopInheritingCompatAbilities = inheritingCompatAbilities; + while (loopInheritingCompatAbilities.size() > 0) { + List iter = loopInheritingCompatAbilities; + loopInheritingCompatAbilities = new ArrayList<>(); + + if (prevIter == 0) { + for (AbilityBuilderParser parser : iter) { + System.err.println("Couldn't parse INHERIT ability due to no parent ability definition: " + parser.getIds().get(0).getId()); + } + break; + } + prevIter = 0; + + for (AbilityBuilderParser parser : iter) { + if (parser.getParentId() == null) { + System.err.println("Couldn't parse INHERIT ability due to missing parent ID: " + parser.getIds().get(0).getId()); + continue; + } + AbilityBuilderParser parent = previousAbilityParsers.get(parser.getParentId()); + if (parent != null) { + parser.updateFromParent(parent); + for (AbilityBuilderDupe dupe : parser.getIds()) { + if (all || WarsmashConstants.ABILITY_COMPATIBILITY.contains(dupe.getId())) { + previousAbilityParsers.put(dupe.getId(), parser); + AbilityBuilderConfiguration config = new AbilityBuilderConfiguration(parser, dupe); + this.codeToAbilityTypeDefinition.put(War3ID.fromString(config.getId()), + config.createDefinition()); + prevIter++; + } + } + } else { + loopInheritingCompatAbilities.add(parser); + } } } } } catch (Exception e) { e.printStackTrace(); } -// if (true) { -// AbilityBuilderParserUtil.loadAbilityBuilderFiles(behavior -> { -// if (behavior.getType().equals(AbilityBuilderType.TEMPLATE)) { -// for (final AbilityBuilderDupe dupe : behavior.getIds()) { -// this.codeToAbilityTypeDefinition.put(War3ID.fromString(dupe.getId()), -// new CAbilityTypeDefinitionAbilityTemplateBuilder(behavior)); -// } -// } -// else { -// for (final AbilityBuilderDupe dupe : behavior.getIds()) { -// final AbilityBuilderConfiguration config = new AbilityBuilderConfiguration(behavior, dupe); -// this.codeToAbilityTypeDefinition.put(War3ID.fromString(config.getId()), -// config.createDefinition()); -// } -// } -// }); -// } System.err.println("========================================================================"); System.err.println("registered abilities"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java index a40fe5cae..95cb7a642 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java @@ -371,12 +371,12 @@ public void addDefaultAbilitiesToUnit(final CSimulation simulation, final Handle } if (ability.equals(unitTypeInstance.getDefaultAutocastAbility()) && (createAbility instanceof CAutocastAbility)) { - ((CAutocastAbility) createAbility).setAutoCastOn(simulation, unit, true); + ((CAutocastAbility) createAbility).setAutoCastOn(simulation, unit, true, true); } } else { if (ability.equals(unitTypeInstance.getDefaultAutocastAbility()) && (existingAbility instanceof CAutocastAbility)) { - ((CAutocastAbility) existingAbility).setAutoCastOn(simulation, unit, true); + ((CAutocastAbility) existingAbility).setAutoCastOn(simulation, unit, true, true); } } } @@ -501,12 +501,12 @@ public void addMissingDefaultAbilitiesToUnit(final CSimulation simulation, } if (ability.equals(unitTypeInstance.getDefaultAutocastAbility()) && (createAbility instanceof CAutocastAbility)) { - ((CAutocastAbility) createAbility).setAutoCastOn(simulation, unit, true); + ((CAutocastAbility) createAbility).setAutoCastOn(simulation, unit, true, true); } } else { if (ability.equals(unitTypeInstance.getDefaultAutocastAbility()) && (existingAbility instanceof CAutocastAbility)) { - ((CAutocastAbility) existingAbility).setAutoCastOn(simulation, unit, true); + ((CAutocastAbility) existingAbility).setAutoCastOn(simulation, unit, true, true); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayer.java index 0d48762bb..58e4011ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayer.java @@ -187,8 +187,7 @@ public void addTechtreeUnlocked(CSimulation simulation, final War3ID rawcode) { final Integer techtreeUnlocked = this.rawcodeToTechtreeUnlocked.get(rawcode); if (techtreeUnlocked == null) { this.rawcodeToTechtreeUnlocked.put(rawcode, 1); - } - else { + } else { this.rawcodeToTechtreeUnlocked.put(rawcode, techtreeUnlocked + 1); } fireRequirementUpdateForAbilities(simulation, false); @@ -204,8 +203,7 @@ public void removeTechtreeUnlocked(CSimulation simulation, final War3ID rawcode) final Integer techtreeUnlocked = this.rawcodeToTechtreeUnlocked.get(rawcode); if (techtreeUnlocked == null) { this.rawcodeToTechtreeUnlocked.put(rawcode, -1); - } - else { + } else { this.rawcodeToTechtreeUnlocked.put(rawcode, techtreeUnlocked - 1); } fireRequirementUpdateForAbilities(simulation, true); @@ -215,8 +213,7 @@ public void addTechtreeInProgress(final War3ID rawcode) { final Integer techtreeUnlocked = this.rawcodeToTechtreeInProgress.get(rawcode); if (techtreeUnlocked == null) { this.rawcodeToTechtreeInProgress.put(rawcode, 1); - } - else { + } else { this.rawcodeToTechtreeInProgress.put(rawcode, techtreeUnlocked + 1); } } @@ -225,8 +222,7 @@ public void removeTechtreeInProgress(final War3ID rawcode) { final Integer techtreeUnlocked = this.rawcodeToTechtreeInProgress.get(rawcode); if (techtreeUnlocked == null) { this.rawcodeToTechtreeInProgress.put(rawcode, -1); - } - else { + } else { this.rawcodeToTechtreeInProgress.put(rawcode, techtreeUnlocked - 1); } } @@ -343,8 +339,7 @@ public List getHeroes() { public int getHeroCount(final CSimulation game, final boolean includeInProgress) { if (!includeInProgress) { return this.heroes.size(); - } - else { + } else { int heroInProgressCount = 0; for (final Map.Entry entry : this.rawcodeToTechtreeInProgress.entrySet()) { final CUnitType unitType = game.getUnitData().getUnitType(entry.getKey()); @@ -371,6 +366,15 @@ public void fireUnitDeathEvents(final CUnit dyingUnit, final CUnit killingUnit) } } + public void fireSimpleUnitEvents(final CUnit unit, final JassGameEventsWar3 type, final CSimulation game) { + final List eventList = getEventList(type); + if (eventList != null) { + for (final CPlayerEvent event : eventList) { + event.fire(unit, CommonTriggerExecutionScope.simpleUnitScope(type, event.getTrigger(), unit, this)); + } + } + } + public void fireOrderEvents(final CUnit unit, final CSimulation game, final COrderNoTarget orderNoTarget) { final List eventList = getEventList(JassGameEventsWar3.EVENT_PLAYER_UNIT_ISSUED_ORDER); if (eventList != null) { @@ -753,8 +757,7 @@ private void setTechToLevel(final CSimulation simulation, final War3ID techIdRaw public void addFogModifer(final CSimulation game, final CFogModifier fogModifier, boolean afterUnits) { if (afterUnits) { this.fogModifiersAfterUnits.add(fogModifier); - } - else { + } else { this.fogModifiers.add(fogModifier); } fogModifier.onAdd(game, this); @@ -781,8 +784,7 @@ public void updateFogModifiersAfterUnits(final CSimulation game) { public void setAbilityEnabled(final CSimulation simulation, War3ID ability, boolean enabled) { if (enabled) { this.disabledAbilities.remove(ability); - } - else { + } else { this.disabledAbilities.add(ability); } fireRequirementUpdateForAbilities(simulation, !enabled); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/vision/CProjectileVisionFogModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/vision/CProjectileVisionFogModifier.java new file mode 100644 index 000000000..ce4f61677 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/vision/CProjectileVisionFogModifier.java @@ -0,0 +1,82 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CFogState; + +public class CProjectileVisionFogModifier extends CFogModifier { + private boolean enabled = true; + private CProjectile projectile; + private float sightRadius; + + public CProjectileVisionFogModifier(final CProjectile projectile, final float sightRadius) { + this.projectile = projectile; + this.sightRadius = sightRadius; + } + + @Override + public void setEnabled(final boolean enabled) { + this.enabled = enabled; + } + + @Override + public void update(final CSimulation game, final CPlayer player, final PathingGrid pathingGrid, + final CPlayerFogOfWar fogOfWar) { + if (enabled && !this.projectile.isDone()) { + if (sightRadius > 0) { + final boolean flying = true; + final float radSq = sightRadius * sightRadius / (CPlayerFogOfWar.GRID_STEP * CPlayerFogOfWar.GRID_STEP); + final float myX = this.projectile.getX(); + final float myY = this.projectile.getY(); + final int myZ = flying ? Integer.MAX_VALUE : game.getTerrainHeight(myX, myY); + fogOfWar.setVisible(game.getPathingGrid().getFogOfWarIndexX(myX), + game.getPathingGrid().getFogOfWarIndexY(myY), CFogState.VISIBLE); + + int myXi = game.getPathingGrid().getFogOfWarIndexX(myX); + int myYi = game.getPathingGrid().getFogOfWarIndexY(myY); + int maxXi = game.getPathingGrid().getFogOfWarIndexX(myX + sightRadius); + int maxYi = game.getPathingGrid().getFogOfWarIndexY(myY + sightRadius); + for (int a = 1; a <= Math.max(maxYi - myYi, maxXi - myXi); a++) { + if (a * a <= radSq) { + fogOfWar.checkCardinalVision(game, pathingGrid, flying, myXi, myYi - a, myXi, myYi - a + 1, myX, + myY - a * CPlayerFogOfWar.GRID_STEP, myX, myY - (a - 1) * CPlayerFogOfWar.GRID_STEP, + myZ); + fogOfWar.checkCardinalVision(game, pathingGrid, flying, myXi, myYi + a, myXi, myYi + a - 1, myX, + myY + a * CPlayerFogOfWar.GRID_STEP, myX, myY + (a - 1) * CPlayerFogOfWar.GRID_STEP, + myZ); + fogOfWar.checkCardinalVision(game, pathingGrid, flying, myXi - a, myYi, myXi - a + 1, myYi, + myX - a * CPlayerFogOfWar.GRID_STEP, myY, myX - (a - 1) * CPlayerFogOfWar.GRID_STEP, + myY, myZ); + fogOfWar.checkCardinalVision(game, pathingGrid, flying, myXi + a, myYi, myXi + a - 1, myYi, + myX + a * CPlayerFogOfWar.GRID_STEP, myY, myX + (a - 1) * CPlayerFogOfWar.GRID_STEP, + myY, myZ); + } + } + + for (int y = 1; y <= maxYi - myYi; y++) { + for (int x = 1; x <= maxXi - myXi; x++) { + if (x * x + y * y <= radSq) { + int xf = x * CPlayerFogOfWar.GRID_STEP; + int yf = y * CPlayerFogOfWar.GRID_STEP; + + fogOfWar.checkDiagonalVision(game, pathingGrid, flying, x, y, myXi - x, myYi - y, + myXi - x + 1, myYi - y + 1, myX - xf, myY - yf, + myX - xf + CPlayerFogOfWar.GRID_STEP, myY - yf + CPlayerFogOfWar.GRID_STEP, myZ); + fogOfWar.checkDiagonalVision(game, pathingGrid, flying, x, y, myXi - x, myYi + y, + myXi - x + 1, myYi + y - 1, myX - xf, myY + yf, + myX - xf + CPlayerFogOfWar.GRID_STEP, myY + yf - CPlayerFogOfWar.GRID_STEP, myZ); + fogOfWar.checkDiagonalVision(game, pathingGrid, flying, x, y, myXi + x, myYi - y, + myXi + x - 1, myYi - y + 1, myX + xf, myY - yf, + myX + xf - CPlayerFogOfWar.GRID_STEP, myY - yf + CPlayerFogOfWar.GRID_STEP, myZ); + fogOfWar.checkDiagonalVision(game, pathingGrid, flying, x, y, myXi + x, myYi + y, + myXi + x - 1, myYi + y - 1, myX + xf, myY + yf, + myX + xf - CPlayerFogOfWar.GRID_STEP, myY + yf - CPlayerFogOfWar.GRID_STEP, myZ); + } + } + } + } + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CWidgetEvent.java index 87258eef1..2cdaa5cd0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CWidgetEvent.java @@ -39,6 +39,10 @@ public JassGameEventsWar3 getEventType() { return this.eventType; } + public CWidget getWidget() { + return this.widget; + } + @Override public void remove() { this.widget.removeEvent(this); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/StateModBuffType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/StateModBuffType.java index 8517fa994..b4eebc7e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/StateModBuffType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/StateModBuffType.java @@ -7,12 +7,16 @@ public enum StateModBuffType implements CHandle { RESISTANT, SLEEPING, STUN, + PAUSED, MAGIC_IMMUNE, MORPH_IMMUNE, SNARED, + ENABLE_ATTACK, DISABLE_AUTO_ATTACK, DISABLE_AUTO_CAST, DISABLE_ASSIST_ALLY, + DISABLE_ALL, + DISABLE_MOVE, DISABLE_ATTACK, DISABLE_MELEE_ATTACK, DISABLE_RANGED_ATTACK, @@ -23,7 +27,13 @@ public enum StateModBuffType implements CHandle { INVULNERABLE, INVISIBLE, DETECTOR, - DETECTED; + DETECTED, + UNSELECTABLE, + UNTARGETABLE, + UNENUMERABLE, + BLOCK_REPAIR, + BLOCK_TRAINING, + BLOCK_CONSTRUCTION; @Override public int getHandleId() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java index ea78f2293..bfa55f4cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java @@ -14,6 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackInstant; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissile; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; @@ -26,12 +27,16 @@ public interface SimulationRenderController { CAttackProjectile createAttackProjectile(CSimulation simulation, float launchX, float launchY, float launchFacing, CUnit source, CUnitAttackMissile attack, AbilityTarget target, float damage, int bounceIndex, - CUnitAttackListener attackListener); + CUnitAttackListener attackListener, CUnitAttackSettings settings); CAbilityProjectile createProjectile(CSimulation cSimulation, float launchX, float launchY, float launchFacing, float speed, boolean homing, CUnit source, War3ID spellAlias, AbilityTarget target, CAbilityProjectileListener projectileListener); + CAbilityProjectile createProjectile(CSimulation cSimulation, float launchX, float launchY, float launchFacing, + CUnit source, CUnitAttackSettings settings, AbilityTarget target, + CAbilityProjectileListener projectileListener); + CJassProjectile createJassProjectile(CSimulation cSimulation, float launchX, float launchY, float launchFacing, float speed, boolean homing, CUnit source, War3ID spellAlias, AbilityTarget target); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java index 7dff1f06c..b6f6d788e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java @@ -3924,6 +3924,11 @@ public void abilitiesChanged() { reloadSelectedUnitUI(this.selectedUnit); } + @Override + public void upgradesChanged() { + reloadSelectedUnitUI(this.selectedUnit); + } + @Override public void inventoryChanged() { reloadSelectedUnitUI(this.selectedUnit); @@ -5088,6 +5093,13 @@ public void abilitiesChanged() { } } + @Override + public void upgradesChanged() { + if (this.disposed) { + return; + } + } + } @Override diff --git a/jassparser/src/com/etheller/interpreter/ast/scope/trigger/RemovableTriggerEvent.java b/jassparser/src/com/etheller/interpreter/ast/scope/trigger/RemovableTriggerEvent.java index 884604e94..204c2a844 100644 --- a/jassparser/src/com/etheller/interpreter/ast/scope/trigger/RemovableTriggerEvent.java +++ b/jassparser/src/com/etheller/interpreter/ast/scope/trigger/RemovableTriggerEvent.java @@ -2,7 +2,8 @@ public abstract class RemovableTriggerEvent { public RemovableTriggerEvent(final Trigger t) { - t.addEvent(this); + if (t != null) + t.addEvent(this); } public abstract void remove(); From 59f30e0049c8930a9d1d0f7de437e41364cee425 Mon Sep 17 00:00:00 2001 From: Glasir Date: Tue, 15 Apr 2025 22:39:48 -0400 Subject: [PATCH 17/44] Cast Time Overhaul! **Main Features** - Major overhaul to Cast Times in Ability Builder abilities. - Cast Time/Cast Point/Backswing Point are now properly reflected - Spells are now uninterruptable during the cast time/cast point - Transformation improvements - Transformations now remember the previous order, and return to it after transforming - Transformations now honor orders given during the transformation process properly - Transformations with a 0 duration now properly happen instantly - Transformations now send the end/finish cast events at the end of the transformation - Rebuild of Flame Strike - Due to age and complication of code, Flame Strike had numerous issues - Updated version vastly improves readability, and removes crashes - Added damage limitation to prevent taking damage from multiple stacked flame strikes **Minor Improvements to Ability Builder** - Upgrade to Damage Area type functions to allow for more control - Added option to ignore cast time for abilities that use the field for other purposes - Added "Group Effects" which create many small VFX in an area (for Flame Strike/Death&Decay/+) - Added some functions to help control how abilities send cast events for triggers - Added source ability/unit to buffs, so the origin can be determined - Added kill method for timers that prevents further actions (even if called by another timer in the same tick) - Some organizational improvements - Fixed issue with integer equality conditions **Minor Improvements to Core** - Updated stop to allow animations from other behaviors to play (may need more testing to find edge case issues) - Fixed old change that removed the Interrupted flag from being sent to behaviors - Fixed minor logic issue in Neutral targeting from v0.8 - Minor change to the StartTrigger Jass action, allowing it to restart a running Trigger **Spell Changes** - Flame Strike major rework (see above) - Boiling Oil added (as it's based on Flame Strike) - Carrion Beetles now properly stops autocasting at unit limit - All Transformation spells had improvements, particularly if duration is 0 - No-Cast time spells fixed (most notably Parasite) --- .../AttackReplacementActives.json | 6 + .../AttackReplacementPassivesItems.json | 4 +- ...ReplacementPassivesNonItemLowPriority.json | 382 ++++++++ .../assets/abilityBehaviors/DeathSummons.json | 6 +- core/assets/abilityBehaviors/DoNothings.json | 8 +- core/assets/abilityBehaviors/RaiseDead.json | 13 + .../abilityBehaviors/Transformations.json | 158 +++- .../abilityBehaviors/generalPassives.json | 24 +- .../abilityBehaviors/humanHeroActives.json | 836 +++++++----------- .../nightElfHeroUnitActives.json | 6 + .../abilityBehaviors/undeadUnitActives.json | 6 +- .../parasite.json | 6 +- .../etheller/warsmash/parsers/jass/Jass2.java | 202 ++--- .../viewer5/handlers/w3x/TextTag.java | 8 +- .../viewer5/handlers/w3x/War3MapViewer.java | 4 +- .../handlers/w3x/rendersim/RenderWidget.java | 10 + .../handlers/w3x/simulation/CUnit.java | 39 +- .../simulation/CUnitAnimationListener.java | 2 + .../abilities/generic/AbstractCBuff.java | 14 + .../simulation/abilities/generic/CBuff.java | 5 + .../simulation/abilities/jass/CBuffJass.java | 13 + .../ability/AbilityBuilderActiveAbility.java | 1 + ...AbilityAbilityBuilderActiveAutoTarget.java | 7 +- ...AbilityAbilityBuilderActiveFlexTarget.java | 21 +- .../CAbilityAbilityBuilderActiveNoTarget.java | 30 +- .../CAbilityAbilityBuilderActivePairing.java | 12 +- ...bilityAbilityBuilderActivePointTarget.java | 5 +- ...AbilityAbilityBuilderActiveUnitTarget.java | 5 +- .../CAbilityAbilityBuilderGenericActive.java | 18 +- .../GetInstantTransformationBuffVisitor.java | 16 +- ...AbilityAbilityBuilderStatAuraTemplate.java | 4 +- ...lityAbilityBuilderStatPassiveTemplate.java | 4 +- .../abilitybuilder/behavior/ABBehavior.java | 22 +- .../behavior/CBehaviorAbilityBuilderBase.java | 175 ++-- .../CBehaviorAbilityBuilderNoTarget.java | 168 ++-- .../CBehaviorFinishTransformation.java | 40 +- .../behavior/action/ABActionAddSlowBuff.java | 10 +- .../behavior/action/ABActionAddStunBuff.java | 2 + .../ABActionSendStartCastingEvents.java | 35 + .../ability/ABActionSetPreventEndEvents.java | 24 + .../attack/ABActionStartModifiedAttack.java | 2 +- ...ctionAttemptToReOrderPreviousBehavior.java | 37 + ...ActionAttemptToResumePreviousBehavior.java | 26 + .../buff/ABActionCreatePassiveBuff.java | 14 +- .../buff/ABActionCreateTargetingBuff.java | 3 +- .../buff/ABActionCreateTimedArtBuff.java | 5 +- .../action/buff/ABActionCreateTimedBuff.java | 20 +- ...ActionCreateTimedPausedExpirationBuff.java | 14 +- .../ABActionCreateTimedTargetingBuff.java | 4 +- .../buff/ABActionCreateTimedTickingBuff.java | 9 +- .../ABActionCreateTimedTickingPausedBuff.java | 9 +- ...ActionCreateTimedTickingPostDeathBuff.java | 20 +- .../ABActionCreateGroupEffectAtLocation.java | 39 + .../ABActionCreateLightningEffect.java | 2 +- ...BActionCreateLoopingSoundEffectOnUnit.java | 2 +- .../ABActionCreateSoundEffectOnUnit.java | 2 +- .../ABActionCreateSpellEffectAtLocation.java | 2 +- .../ABActionCreateSpellEffectAtPoint.java | 2 +- .../ABActionCreateSpellEffectOnUnit.java | 2 +- ...nCreateTemporarySpellEffectAtLocation.java | 2 +- ...tionCreateTemporarySpellEffectAtPoint.java | 2 +- ...ctionCreateTemporarySpellEffectOnUnit.java | 2 +- .../ABActionRemoveEffect.java} | 10 +- .../ABActionRemoveLightningEffect.java | 2 +- .../action/timer/ABActionKillTimer.java | 26 + .../timer/ABActionUpdateTimerTimeout.java | 6 +- .../ABActionChangeAttackActionToMovement.java | 4 +- .../action/unit/ABActionDamageArea.java | 93 +- .../unit/ABActionDamageAttackSplash.java | 190 +++- .../action/unit/ABActionDamageBurst.java | 145 ++- .../action/unit/ABActionDamageSplash.java | 190 +++- .../ABActionForceBeginCreatedBehavior.java | 2 +- .../action/unit/ABActionTransformUnit.java | 43 +- .../unit/ABActionTransformUnitInstant.java | 12 +- .../ABActionTransformedUnitAbilityAdd.java | 9 +- .../ABCallbackGetBuffSourceAbility.java | 22 + .../ABCallbackGetMatchingBuff.java | 25 + .../ABCallbackGetBuffDurationElapsed.java | 21 + .../floatcallbacks/ABCallbackOneGameTick.java | 16 + .../idcallbacks/ABCallbackGetBuffAlias.java | 19 + .../ABCallbackGetAbilityHandleAsInteger.java | 18 + .../ABCallbackGetBuffHandleAsInteger.java | 18 + .../integercallbacks/ABCallbackGetCastId.java | 16 + .../ABCallbackGetUnitHandleAsInteger.java | 18 + .../numeric/ABConditionIntegerEq.java | 2 +- .../numeric/ABConditionIntegerNe.java | 2 +- ...tionDoesUnitHaveBuffMatchingCondition.java | 39 + .../abilitybuilder/buff/ABBuff.java | 17 +- .../abilitybuilder/buff/ABBuffSlow.java | 9 +- .../abilitybuilder/buff/ABBuffStun.java | 5 +- .../abilitybuilder/buff/ABGenericArtBuff.java | 5 +- .../buff/ABGenericAuraBuff.java | 5 +- .../buff/ABGenericPermanentBuff.java | 9 +- .../buff/ABGenericTimedBuff.java | 5 +- .../buff/ABPermanentPassiveBuff.java | 18 +- .../abilitybuilder/buff/ABTargetingBuff.java | 5 +- .../abilitybuilder/buff/ABTimedArtBuff.java | 9 +- .../abilitybuilder/buff/ABTimedBuff.java | 9 +- .../ABTimedInstantTransformationBuff.java | 10 +- .../buff/ABTimedPausedExpirationBuff.java | 11 +- .../buff/ABTimedTargetingBuff.java | 5 +- .../buff/ABTimedTickingBuff.java | 9 +- .../buff/ABTimedTickingPausedBuff.java | 26 +- .../buff/ABTimedTickingPostDeathBuff.java | 26 +- .../buff/ABTimedTransformationBuff.java | 21 +- .../abilitybuilder/core/ABLocalStoreKeys.java | 19 +- .../core/AbilityBuilderGsonBuilder.java | 26 +- .../abilitybuilder/effects/ABGroupEffect.java | 67 ++ .../handler/TransformationHandler.java | 29 +- .../parser/AbilityBuilderOverrideFields.java | 11 + .../abilitybuilder/timer/ABTimer.java | 19 +- .../DelayInstantTransformationTimer.java | 6 +- .../behaviors/BehaviorTargetVisitor.java | 2 +- .../simulation/behaviors/CBehaviorMove.java | 9 + .../simulation/behaviors/CBehaviorStop.java | 3 +- .../w3x/simulation/orders/COrderNoTarget.java | 4 +- .../simulation/orders/COrderTargetPoint.java | 4 +- .../simulation/orders/COrderTargetWidget.java | 4 +- .../w3x/simulation/timers/CTimer.java | 11 + 119 files changed, 2749 insertions(+), 1188 deletions(-) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => fx}/ABActionCreateLightningEffect.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => fx}/ABActionCreateLoopingSoundEffectOnUnit.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => fx}/ABActionCreateSoundEffectOnUnit.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => fx}/ABActionCreateSpellEffectAtLocation.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => fx}/ABActionCreateSpellEffectAtPoint.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => fx}/ABActionCreateSpellEffectOnUnit.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => fx}/ABActionCreateTemporarySpellEffectAtLocation.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => fx}/ABActionCreateTemporarySpellEffectAtPoint.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => fx}/ABActionCreateTemporarySpellEffectOnUnit.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ABActionRemoveSpellEffect.java => fx/ABActionRemoveEffect.java} (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => fx}/ABActionRemoveLightningEffect.java (95%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABGroupEffect.java diff --git a/core/assets/abilityBehaviors/AttackReplacementActives.json b/core/assets/abilityBehaviors/AttackReplacementActives.json index 5e2212689..ccce3478f 100644 --- a/core/assets/abilityBehaviors/AttackReplacementActives.json +++ b/core/assets/abilityBehaviors/AttackReplacementActives.json @@ -2,6 +2,12 @@ "abilityList": [{ "ids": [{"id":"AHfa", "castId": "flamingarrowstarg", "autoCastOnId": "flamingarrows", "autoCastOffId": "unflamingarrows", "autoCastType": "NOAUTOCASTBEHAVIOR"}], "type": "NORMAL_UNITTARGET", + "overrideFields": { + "ignoreCastTime": { + "type": "rawBoolean", + "value": "true" + } + }, "reuseActions": { "onHit": [{ "type": "addBonusDamageDealt", diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json index 6268e91f7..838048828 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json @@ -371,8 +371,8 @@ } }], "onRemoveAbility": [{ - "type": "removeSpellEffect", - "effectToRemove": { + "type": "removeEffect", + "effect": { "type": "getStoredFXByKey", "instanceValue": { "type": "rawBoolean", diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json index 868c472d6..f58918186 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json @@ -2170,5 +2170,387 @@ "type": "getLastCreatedAttackModifier" } }] + },{ + "ids": [{"id":"Abof"}], + "type": "PASSIVE", + "reuseCallbacks": { + "notTakingDamage": { + "type": "not", + "condition": { + "type": "doesUnitHaveBuffMatchingCondition", + "unit": { + "type": "getEnumUnit" + }, + "condition": { + "type": "and", + "conditions": [{ + "type": "isIdEqual", + "id1": { + "type": "getBuffAlias", + "buff": { + "type": "getMatchingBuff" + } + }, + "id2": { + "type": "getFirstBuffId" + } + },{ + "type": "f<", + "value1": { + "type": "getBuffDurationElapsed", + "buff": { + "type": "getMatchingBuff" + } + }, + "value2": { + "type": "f-", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "curDelay" + } + }, + "value2": { + "type": "f*", + "value1": { + "type": "oneGameTick" + }, + "value2": { + "type": "rawFloat", + "value": 2 + } + } + } + }] + } + } + } + }, + "reuseActions": { + "damageUnits": [{ + "type": "damageArea", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getStoredLocationByKey", + "key": { + "type": "rawString", + "value": "targetLoc" + } + }, + "validTarget": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getEnumUnit" + } + },{ + "type": "reuseBoolean", + "name": { + "type": "rawString", + "value": "notTakingDamage" + } + }] + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } + }, + "damage": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "curDamage" + } + }, + "maxDamage": { + "type": "getAbilityDataAsFloat", + "dataField": "F" + }, + "unitSpecificDamageMod": { + "type": "inlineConditionFloat", + "condition": { + "type": "isUnitBuilding", + "unit": { + "type": "getEnumUnit" + } + }, + "pass": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + }, + "fail": { + "type": "rawFloat", + "value": 1 + } + }, + "radius": { + "type": "getAbilityArea" + }, + "extraActions": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "duration": { + "type": "f+", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "curDelay" + } + }, + "value2": { + "type": "oneGameTick" + } + } + },{ + "type": "addBuff", + "target": { + "type": "getEnumUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }], + "onHit": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "targetLoc" + }, + "valueToStore": { + "type": "getAttackImpactLocation" + } + },{ + "type": "createGroupEffectAtLocation", + "location": { + "type": "getStoredLocationByKey", + "key": { + "type": "rawString", + "value": "targetLoc" + } + }, + "radius": { + "type": "getAbilityArea" + }, + "id": { + "type": "getFirstEffectId" + }, + "effectType": "EFFECT" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "_gEff" + }, + "valueToStore": { + "type": "getLastCreatedSpellEffect" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "curDamage" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "curDelay" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "createTimer", + "timeout": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "repeats": { + "type": "rawBoolean", + "value": "true" + }, + "delay": { + "type": "rawFloat", + "value": 0 + }, + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "damageUnits" + } + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "dmgTimer" + }, + "valueToStore": { + "type": "getLastCreatedTimer" + } + },{ + "type": "createTimer", + "timeout": { + "type": "getAbilityHeroDuration" + }, + "actions": [{ + "type": "updateTimerTimeout", + "timer": { + "type": "getStoredTimerByKey", + "key": { + "type": "rawString", + "value": "dmgTimer" + } + }, + "timeout": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "curDelay" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "curDamage" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "subDmgTimer" + }, + "valueToStore": { + "type": "getLastCreatedTimer" + } + },{ + "type": "createTimer", + "timeout": { + "type": "getAbilityDuration" + }, + "actions": [{ + "type": "removeEffect", + "effect": { + "type": "getStoredFXByKey", + "key": { + "type": "rawString", + "value": "_gEff" + } + } + },{ + "type": "killTimer", + "timer": { + "type": "getStoredTimerByKey", + "key": { + "type": "rawString", + "value": "subDmgTimer" + } + } + },{ + "type": "killTimer", + "timer": { + "type": "getStoredTimerByKey", + "key": { + "type": "rawString", + "value": "dmgTimer" + } + } + },{ + "type": "cleanUpCastInstance" + }] + }] + }, + "onAddDisabledAbility": [{ + "type": "createAttackPreDamageListener", + "useCastId": { + "type": "rawBoolean", + "value": "false" + }, + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + },{ + "type": "setStacking", + "allowStacking": { + "type": "rawBoolean", + "value": "false" + }, + "allowSamePriorityStacking": { + "type": "rawBoolean", + "value": "false" + } + }] + },{ + "type": "createAttackModifier", + "priority": { + "type": "rawInteger", + "value": 10 + }, + "modification": [{ + "type": "attackModifierAddPreDamageListener", + "listener": { + "type": "getLastCreatedAttackPreDamageListener" + } + },{ + "type": "attackModifierApplyArt" + },{ + "type": "attackModifierPreventOtherModifications" + }] + }], + "onAddAbility": [{ + "type": "addAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }], + "onRemoveAbility": [{ + "type": "removeAttackModifier", + "unit": { + "type": "getCastingUnit" + }, + "modifier": { + "type": "getLastCreatedAttackModifier" + } + }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/DeathSummons.json b/core/assets/abilityBehaviors/DeathSummons.json index 862e5e305..dc28e1c30 100644 --- a/core/assets/abilityBehaviors/DeathSummons.json +++ b/core/assets/abilityBehaviors/DeathSummons.json @@ -300,9 +300,9 @@ "ids": [{"id":"ANpa", "castId": "parasite", "autoCastOnId": "parasiteon", "autoCastOffId": "parasiteoff", "autoCastType": "FARTHESTVALID"}], "type": "NORMAL_UNITTARGET", "overrideFields": { - "castTimeOverride": { - "type": "rawFloat", - "value": 0.0 + "ignoreCastTime": { + "type": "rawBoolean", + "value": "true" } }, "extraTargetConditions": [{ diff --git a/core/assets/abilityBehaviors/DoNothings.json b/core/assets/abilityBehaviors/DoNothings.json index 5da3830dd..a0e13604a 100644 --- a/core/assets/abilityBehaviors/DoNothings.json +++ b/core/assets/abilityBehaviors/DoNothings.json @@ -67,8 +67,8 @@ } }, "thenActions": [{ - "type": "removeSpellEffect", - "effectToRemove": { + "type": "removeEffect", + "effect": { "type": "getLastCreatedSpellEffect" } }] @@ -152,8 +152,8 @@ } }, "thenActions": [{ - "type": "removeSpellEffect", - "effectToRemove": { + "type": "removeEffect", + "effect": { "type": "getLastCreatedSpellEffect" } }] diff --git a/core/assets/abilityBehaviors/RaiseDead.json b/core/assets/abilityBehaviors/RaiseDead.json index 104c321ff..9f8361829 100644 --- a/core/assets/abilityBehaviors/RaiseDead.json +++ b/core/assets/abilityBehaviors/RaiseDead.json @@ -191,6 +191,19 @@ }, "reason": "THERE_ARE_NO_USABLE_CORPSES_NEARBY" }], + "extraAutoNoTargetConditions": [{ + "type": "i<", + "value1": { + "type": "getUnitQueueSize", + "queue": { + "type": "getLastCreatedUnitQueue" + } + }, + "value2": { + "type": "getAbilityDataAsInteger", + "dataField": "E" + } + }], "extraTargetConditions": [{ "type": "setCantUseReasonOnFailure", "condition": { diff --git a/core/assets/abilityBehaviors/Transformations.json b/core/assets/abilityBehaviors/Transformations.json index 21145cca9..026ed438a 100644 --- a/core/assets/abilityBehaviors/Transformations.json +++ b/core/assets/abilityBehaviors/Transformations.json @@ -11,6 +11,10 @@ "type": "rawBoolean", "value": "true" }, + "instantCast": { + "type": "rawBoolean", + "value": "true" + }, "alternateUnitId": { "type": "getAbilityUnitId" }, @@ -468,11 +472,13 @@ "type": "getFirstBuffId" }, "onTransformActions": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "onTransform" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" + } + },{ + "type": "attemptToReOrderPreviousBehavior" }], "onUntransformActions": [{ "type": "runReuseAction", @@ -486,6 +492,17 @@ "type": "rawString", "value": "clearBaseType" } + },{ + "type": "if", + "condition": { + "type": "f!=0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "attemptToReOrderPreviousBehavior" + }] }] }], "elseActions": [] @@ -544,7 +561,7 @@ "value": "onLevelChange" } }], - "onBeginCasting": [{ + "onEndCasting": [{ "type": "runReuseAction", "name": { "type": "rawString", @@ -559,6 +576,8 @@ "type": "getAlias" }, "effectType": "CASTER" + },{ + "type": "setPreventEndEvents" },{ "type": "transformUnit", "unit": { @@ -655,11 +674,13 @@ "type": "getFirstBuffId" }, "onTransformActions": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "onTransform" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" + } + },{ + "type": "attemptToReOrderPreviousBehavior" }], "onUntransformActions": [{ "type": "runReuseAction", @@ -673,6 +694,17 @@ "type": "rawString", "value": "clearBaseType" } + },{ + "type": "if", + "condition": { + "type": "f!=0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "attemptToReOrderPreviousBehavior" + }] }] },{ "type": "if", @@ -942,11 +974,13 @@ "type": "getFirstBuffId" }, "onTransformActions": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "onTransform" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" + } + },{ + "type": "attemptToReOrderPreviousBehavior" }], "onUntransformActions": [{ "type": "runReuseAction", @@ -960,6 +994,17 @@ "type": "rawString", "value": "clearBaseType" } + },{ + "type": "if", + "condition": { + "type": "f!=0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "attemptToReOrderPreviousBehavior" + }] }] }], "elseActions": [{ @@ -1075,7 +1120,7 @@ } }, "onAddDisabledAbility": [], - "onBeginCasting": [{ + "onEndCasting": [{ "type": "runReuseAction", "name": { "type": "rawString", @@ -1090,6 +1135,8 @@ "type": "getAlias" }, "effectType": "CASTER" + },{ + "type": "setPreventEndEvents" },{ "type": "transformUnit", "unit": { @@ -1194,11 +1241,13 @@ "value": "true" }, "onTransformActions": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "onTransform" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" + } + },{ + "type": "attemptToReOrderPreviousBehavior" }], "onUntransformActions": [{ "type": "runReuseAction", @@ -1273,7 +1322,7 @@ } }] }, - "onBeginCasting": [{ + "onEndCasting": [{ "type": "runReuseAction", "name": { "type": "rawString", @@ -1288,6 +1337,8 @@ "type": "getAlias" }, "effectType": "CASTER" + },{ + "type": "setPreventEndEvents" },{ "type": "transformUnit", "unit": { @@ -1383,16 +1434,14 @@ "buffId": { "type": "getFirstBuffId" }, - "instantTransformAtDurationEnd": { - "type": "rawBoolean", - "value": "true" - }, "onTransformActions": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "onTransform" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTransform" + } + },{ + "type": "attemptToReOrderPreviousBehavior" }], "onUntransformActions": [{ "type": "runReuseAction", @@ -1406,6 +1455,17 @@ "type": "rawString", "value": "clearBaseType" } + },{ + "type": "if", + "condition": { + "type": "f!=0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "attemptToReOrderPreviousBehavior" + }] }] }] },{ @@ -1435,6 +1495,10 @@ "type": "rawString", "value": "strbuff" }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, "valueToStore": { "type": "getLastCreatedNonStackingStatBuff" } @@ -1460,6 +1524,10 @@ "type": "rawString", "value": "defbuff" }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, "valueToStore": { "type": "getLastCreatedNonStackingStatBuff" } @@ -1474,6 +1542,10 @@ "key": { "type": "rawString", "value": "strbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" } } },{ @@ -1486,6 +1558,10 @@ "key": { "type": "rawString", "value": "defbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" } } }], @@ -1499,6 +1575,10 @@ "key": { "type": "rawString", "value": "strbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" } } },{ @@ -1511,6 +1591,10 @@ "key": { "type": "rawString", "value": "defbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" } } }], @@ -1521,6 +1605,10 @@ "key": { "type": "rawString", "value": "strbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" } }, "value": { @@ -1534,6 +1622,10 @@ "key": { "type": "rawString", "value": "defbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" } }, "value": { @@ -1883,6 +1975,8 @@ "type": "getAlias" }, "effectType": "CASTER" + },{ + "type": "sendStartCastingEvents" },{ "type": "transformUnit", "unit": { diff --git a/core/assets/abilityBehaviors/generalPassives.json b/core/assets/abilityBehaviors/generalPassives.json index 848df5006..fcfec8688 100644 --- a/core/assets/abilityBehaviors/generalPassives.json +++ b/core/assets/abilityBehaviors/generalPassives.json @@ -315,8 +315,8 @@ "value": "true" } },{ - "type": "removeSpellEffect", - "effectToRemove": { + "type": "removeEffect", + "effect": { "type": "getLastCreatedSpellEffect" } }, { @@ -443,8 +443,8 @@ }], "elseActions": [] },{ - "type": "removeSpellEffect", - "effectToRemove": { + "type": "removeEffect", + "effect": { "type": "getLastCreatedSpellEffect" } }, { @@ -950,8 +950,8 @@ }] }], "onRemoveAbility": [{ - "type": "removeSpellEffect", - "effectToRemove": { + "type": "removeEffect", + "effect": { "type": "getLastCreatedSpellEffect" } },{ @@ -1556,8 +1556,8 @@ } }], "undetect": [{ - "type": "removeSpellEffect", - "effectToRemove": { + "type": "removeEffect", + "effect": { "type": "getLastCreatedSpellEffect" } },{ @@ -1750,8 +1750,8 @@ "value": "false" } },{ - "type": "removeSpellEffect", - "effectToRemove": { + "type": "removeEffect", + "effect": { "type": "getStoredFXByKey", "key": { "type": "catStrings", @@ -1924,7 +1924,7 @@ } }, "thenActions": [{ - "type": "removeTimer", + "type": "killTimer", "timer": { "type": "getStoredTimerByKey", "key": { @@ -2080,7 +2080,7 @@ } }], "onRemoveAbility": [{ - "type": "removeTimer", + "type": "killTimer", "timer": { "type": "getStoredTimerByKey", "key": { diff --git a/core/assets/abilityBehaviors/humanHeroActives.json b/core/assets/abilityBehaviors/humanHeroActives.json index 2d62c10f0..85e9a26bb 100644 --- a/core/assets/abilityBehaviors/humanHeroActives.json +++ b/core/assets/abilityBehaviors/humanHeroActives.json @@ -2,35 +2,68 @@ "abilityList": [{ "ids": [{"id":"AHfs", "castId": "flamestrike"}], "type": "NORMAL_POINTTARGET", - "onBeginCasting": [{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "targetLoc" + "overrideFields": { + "ignoreCastTime": { + "type": "rawBoolean", + "value": "true" + } + }, + "reuseCallbacks": { + "notTakingDamage": { + "type": "not", + "condition": { + "type": "doesUnitHaveBuffMatchingCondition", + "unit": { + "type": "getEnumUnit" }, - "valueToStore": { - "type": "getTargetedLocation" + "condition": { + "type": "and", + "conditions": [{ + "type": "isIdEqual", + "id1": { + "type": "getBuffAlias", + "buff": { + "type": "getMatchingBuff" + } + }, + "id2": { + "type": "getFirstBuffId" + } + },{ + "type": "f<", + "value1": { + "type": "getBuffDurationElapsed", + "buff": { + "type": "getMatchingBuff" + } + }, + "value2": { + "type": "f-", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "curDelay" + } + }, + "value2": { + "type": "f*", + "value1": { + "type": "oneGameTick" + }, + "value2": { + "type": "rawFloat", + "value": 2 + } + } + } + }] } - },{ - "type": "createTemporarySpellEffectAtLocation", - "location": { - "type": "getTargetedLocation" - }, - "id": { - "type": "getAlias" - }, - "effectType": "EFFECT" - }], - "onEndCasting": [{ - "type": "createTemporarySpellEffectAtLocation", - "location": { - "type": "getTargetedLocation" - }, - "id": { - "type": "getAlias" - }, - "effectType": "SPECIAL" - },{ + } + } + }, + "reuseActions": { + "damageDest": [{ "type": "iterateDestructablesInRangeOfLocation", "location": { "type": "getTargetedLocation" @@ -58,542 +91,313 @@ "type": "rawFloat", "value": 512 } - }], - "elseActions": [] - }] - },{ - "type": "createTimer", - "timeout": { - "type": "rawFloat", - "value": 0.33 - }, - "repeats": { - "type": "rawBoolean", - "value": "true" - }, - "delay": { - "type": "rawFloat", - "value": 0 - }, - "actions": [{ - "type": "for", - "times": { - "type": "rawInteger", - "value": 10 - }, - "actions": [{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "randAngle" - }, - "valueToStore": { - "type": "randomBoundedFloat", - "bound": { - "type": "f*", - "value1": { - "type": "pi" - }, - "value2": { - "type": "rawFloat", - "value": 2 - } - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "randDist" - }, - "valueToStore": { - "type": "f*", - "value1": { - "type": "randomFloat" - }, - "value2": { - "type": "getAbilityArea" - } - } - },{ - "type": "createTemporarySpellEffectAtPoint", - "x": { - "type": "f+", - "value1": { - "type": "getLocationX", - "location": { - "type": "getStoredLocationByKey", - "key": { - "type": "rawString", - "value": "targetLoc" - } - } - }, - "value2": { - "type": "f*", - "value1": { - "type": "cos", - "angle": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "randAngle" - } - } - }, - "value2": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "randDist" - } - } - } - }, - "y": { - "type": "f+", - "value1": { - "type": "getLocationY", - "location": { - "type": "getStoredLocationByKey", - "key": { - "type": "rawString", - "value": "targetLoc" - } - } - }, - "value2": { - "type": "f*", - "value1": { - "type": "sin", - "angle": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "randAngle" - } - } - }, - "value2": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "randDist" - } - } - } - }, - "id": { - "type": "getFirstEffectId" - }, - "effectType": "EFFECT" - }] + }] }] - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "artTimer" - }, - "valueToStore": { - "type": "getLastCreatedTimer" - } - },{ - "type": "createTimer", - "timeout": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - }, - "repeats": { - "type": "rawBoolean", - "value": "true" - }, - "delay": { - "type": "rawFloat", - "value": 0 - }, - "actions": [{ - "type": "storeValueLocally", + }], + "damageUnits": [{ + "type": "damageArea", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getStoredLocationByKey", "key": { "type": "rawString", - "value": "damageDealt" - }, - "valueToStore": { - "type": "fMin", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - }, - "value2": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "F" - }, - "value2": { - "type": "i2f", - "value": { - "type": "countUnitsInRangeOfLocation", - "location": { - "type": "getStoredLocationByKey", - "key": { - "type": "rawString", - "value": "targetLoc" - } - }, - "range": { - "type": "getAbilityArea" - } - } - } + "value": "targetLoc" + } + }, + "validTarget": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getEnumUnit" + } + },{ + "type": "reuseBoolean", + "name": { + "type": "rawString", + "value": "notTakingDamage" } + }] + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" } - },{ - "type": "storeValueLocally", + }, + "damage": { + "type": "getStoredFloatByKey", "key": { "type": "rawString", - "value": "buildingDamageDealt" - }, - "valueToStore": { - "type": "f*", - "value1": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "damageDealt" - } - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "E" - } + "value": "curDamage" } - },{ - "type": "iterateUnitsInRangeOfLocationMatchingCondition", - "location": { - "type": "getStoredLocationByKey", - "key": { - "type": "rawString", - "value": "targetLoc" - } - }, - "range": { - "type": "getAbilityArea" - }, + }, + "maxDamage": { + "type": "getAbilityDataAsFloat", + "dataField": "F" + }, + "unitSpecificDamageMod": { + "type": "inlineConditionFloat", "condition": { - "type": "isUnitValidTarget", - "target": { - "type": "getMatchingUnit" + "type": "isUnitBuilding", + "unit": { + "type": "getEnumUnit" } }, - "iterationActions": [{ - "type": "createTimedArtBuff", - "buffId": { - "type": "getFirstBuffId" - }, - "duration": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "addNonStackingDisplayBuff", - "target": { - "type": "getEnumUnit" - }, - "key": { - "type": "rawString", - "value": "flamestrike" - }, - "buff": { - "type": "getLastCreatedBuff" - } - },{ - "type": "if", - "condition": { - "type": "isUnitBuilding", - "unit": { - "type": "getEnumUnit" + "pass": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + }, + "fail": { + "type": "rawFloat", + "value": 1 + } + }, + "radius": { + "type": "getAbilityArea" + }, + "extraActions": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "duration": { + "type": "f+", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "curDelay" } }, - "thenActions": [{ - "type": "damageTarget", - "source": { - "type": "getCastingUnit" - }, - "target": { - "type": "getEnumUnit" - }, - "damageType": { - "type": "getDamageTypeFromString", - "id": { - "type": "rawString", - "value": "FIRE" - } - }, - "damage": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "buildingDamageDealt" - } - } - }], - "elseActions": [{ - "type": "damageTarget", - "source": { - "type": "getCastingUnit" - }, - "target": { - "type": "getEnumUnit" - }, - "damageType": { - "type": "getDamageTypeFromString", - "id": { - "type": "rawString", - "value": "FIRE" - } - }, - "damage": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "damageDealt" - } - } - }] - }] - }] + "value2": { + "type": "oneGameTick" + } + } + },{ + "type": "addBuff", + "target": { + "type": "getEnumUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }, + "onEndCasting": [{ + "type": "beginChanneling" },{ "type": "storeValueLocally", "key": { "type": "rawString", - "value": "mainDmgTimer" + "value": "targetLoc" }, "valueToStore": { - "type": "getLastCreatedTimer" + "type": "getTargetedLocation" } },{ - "type": "createTimer", - "timeout": { - "type": "getAbilityHeroDuration" + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" }, - "actions": [{ - "type": "removeTimer", - "timer": { - "type": "getStoredTimerByKey", + "effectType": "EFFECT" + }], + "onChannelTick": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getStoredLocationByKey", + "key": { + "type": "rawString", + "value": "targetLoc" + } + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + },{ + "type": "createGroupEffectAtLocation", + "location": { + "type": "getStoredLocationByKey", "key": { "type": "rawString", - "value": "mainDmgTimer" + "value": "targetLoc" } + }, + "radius": { + "type": "getAbilityArea" + }, + "id": { + "type": "getFirstEffectId" + }, + "effectType": "EFFECT" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "_gEff" + }, + "valueToStore": { + "type": "getLastCreatedSpellEffect" } - }] - },{ - "type": "createTimer", - "timeout": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - }, - "repeats": { - "type": "rawBoolean", - "value": "true" - }, - "delay": { - "type": "f+", - "value1": { + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "damageDest" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "curDamage" + }, + "valueToStore": { "type": "getAbilityDataAsFloat", - "dataField": "D" + "dataField": "A" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "curDelay" }, - "value2": { - "type": "getAbilityHeroDuration" + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "B" } - }, - "actions": [{ - "type": "storeValueLocally", - "key": { + },{ + "type": "createTimer", + "timeout": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "repeats": { + "type": "rawBoolean", + "value": "true" + }, + "delay": { + "type": "rawFloat", + "value": 0 + }, + "actions": [{ + "type": "runReuseAction", + "name": { "type": "rawString", - "value": "damageDealt" - }, - "valueToStore": { - "type": "fMin", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "value2": { - "type": "f/", - "value1": { - "type": "getAbilityDataAsFloat", - "dataField": "F" - }, - "value2": { - "type": "i2f", - "value": { - "type": "countUnitsInRangeOfLocation", - "location": { - "type": "getStoredLocationByKey", - "key": { - "type": "rawString", - "value": "targetLoc" - } - }, - "range": { - "type": "getAbilityArea" - } - } - } - } + "value": "damageUnits" } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "buildingDamageDealt" - }, - "valueToStore": { - "type": "f*", - "value1": { - "type": "getStoredFloatByKey", + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "dmgTimer" + }, + "valueToStore": { + "type": "getLastCreatedTimer" + } + },{ + "type": "createTimer", + "timeout": { + "type": "getAbilityHeroDuration" + }, + "actions": [{ + "type": "updateTimerTimeout", + "timer": { + "type": "getStoredTimerByKey", "key": { "type": "rawString", - "value": "damageDealt" + "value": "dmgTimer" } }, - "value2": { + "timeout": { "type": "getAbilityDataAsFloat", - "dataField": "E" + "dataField": "D" } - } - },{ - "type": "iterateUnitsInRangeOfLocationMatchingCondition", - "location": { - "type": "getStoredLocationByKey", + },{ + "type": "storeValueLocally", "key": { "type": "rawString", - "value": "targetLoc" + "value": "curDelay" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "D" } - }, - "range": { - "type": "getAbilityArea" - }, - "condition": { - "type": "isUnitValidTarget", - "target": { - "type": "getMatchingUnit" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "curDamage" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "C" } - }, - "iterationActions": [{ - "type": "createTimedArtBuff", - "buffId": { - "type": "getFirstBuffId" - }, - "duration": { - "type": "getAbilityDataAsFloat", - "dataField": "D" + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "subDmgTimer" + }, + "valueToStore": { + "type": "getLastCreatedTimer" + } + },{ + "type": "createTimer", + "timeout": { + "type": "getAbilityDuration" + }, + "actions": [{ + "type": "removeEffect", + "effect": { + "type": "getStoredFXByKey", + "key": { + "type": "rawString", + "value": "_gEff" } - },{ - "type": "addNonStackingDisplayBuff", - "target": { - "type": "getEnumUnit" - }, + } + },{ + "type": "killTimer", + "timer": { + "type": "getStoredTimerByKey", "key": { "type": "rawString", - "value": "flamestrike" - }, - "buff": { - "type": "getLastCreatedBuff" + "value": "subDmgTimer" } - },{ - "type": "if", - "condition": { - "type": "isUnitBuilding", - "unit": { - "type": "getEnumUnit" - - } - }, - "thenActions": [{ - "type": "damageTarget", - "source": { - "type": "getCastingUnit" - }, - "target": { - "type": "getEnumUnit" - }, - "damageType": { - "type": "getDamageTypeFromString", - "id": { - "type": "rawString", - "value": "FIRE" - } - }, - "damage": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "buildingDamageDealt" - } - } - }], - "elseActions": [{ - "type": "damageTarget", - "source": { - "type": "getCastingUnit" - }, - "target": { - "type": "getEnumUnit" - }, - "damageType": { - "type": "getDamageTypeFromString", - "id": { - "type": "rawString", - "value": "FIRE" - } - }, - "damage": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "damageDealt" - } - } - }] - }] - }] - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "subDmgTimer" - }, - "valueToStore": { - "type": "getLastCreatedTimer" - } - },{ - "type": "createTimer", - "timeout": { - "type": "getAbilityDuration" - }, - "actions": [{ - "type": "removeTimer", - "timer": { - "type": "getStoredTimerByKey", - "key": { - "type": "rawString", - "value": "artTimer" } - } - },{ - "type": "removeTimer", - "timer": { - "type": "getStoredTimerByKey", - "key": { - "type": "rawString", - "value": "subDmgTimer" + },{ + "type": "killTimer", + "timer": { + "type": "getStoredTimerByKey", + "key": { + "type": "rawString", + "value": "dmgTimer" + } } - } - },{ - "type": "cleanUpCastInstance" - }] + },{ + "type": "cleanUpCastInstance" + }] + },{ + "type": "finishChanneling" + }], + "delaySeconds": { + "type": "getAbilityCastTime" + } }] },{ "ids": [{"id":"AHbn", "castId": "banish"}], diff --git a/core/assets/abilityBehaviors/nightElfHeroUnitActives.json b/core/assets/abilityBehaviors/nightElfHeroUnitActives.json index 4455812c6..b9acbc16c 100644 --- a/core/assets/abilityBehaviors/nightElfHeroUnitActives.json +++ b/core/assets/abilityBehaviors/nightElfHeroUnitActives.json @@ -2,6 +2,12 @@ "abilityList": [{ "ids": [{"id":"AEsh", "castId": "shadowstrike"}], "type": "NORMAL_UNITTARGET", + "overrideFields": { + "ignoreCastTime": { + "type": "rawBoolean", + "value": "true" + } + }, "onEndCasting": [{ "type": "createUnitTargetedProjectile", "source": { diff --git a/core/assets/abilityBehaviors/undeadUnitActives.json b/core/assets/abilityBehaviors/undeadUnitActives.json index d8f2297a1..f3c8ac4ee 100644 --- a/core/assets/abilityBehaviors/undeadUnitActives.json +++ b/core/assets/abilityBehaviors/undeadUnitActives.json @@ -298,9 +298,9 @@ "ids": [{"id":"Arpl", "castId": "replenishlife", "autoCastOnId": "replenishlifeon", "autoCastOffId": "replenishlifeoff", "autoCastType": "NOTARGET"}], "type": "NORMAL_NOTARGET", "overrideFields": { - "castTimeOverride": { - "type": "rawFloat", - "value": 0.0 + "ignoreCastTime": { + "type": "rawBoolean", + "value": "true" } }, "specialFields": { diff --git a/core/assets/abilityBehaviors_compatibility/parasite.json b/core/assets/abilityBehaviors_compatibility/parasite.json index a4a6585ff..2350c0537 100644 --- a/core/assets/abilityBehaviors_compatibility/parasite.json +++ b/core/assets/abilityBehaviors_compatibility/parasite.json @@ -3,9 +3,9 @@ "ids": [{"id":"ANpa", "castId": "parasite", "autoCastOnId": "parasiteon", "autoCastOffId": "parasiteoff", "autoCastType": "FARTHESTVALID"}], "type": "NORMAL_UNITTARGET", "overrideFields": { - "castTimeOverride": { - "type": "rawFloat", - "value": 0.0 + "ignoreCastTime": { + "type": "rawBoolean", + "value": "true" } }, "extraTargetConditions": [{ diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index aa290f621..f8fb77d5c 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -285,22 +285,19 @@ public static CommonEnvironment loadCommon(final DataSource dataSource, final Vi || lowerCasePath.startsWith(lowerCaseDirectoryPathLinux)) { try { readJassFile(dataSource, jassProgramVisitor, realPath); - } - catch (final Exception e) { + } catch (final Exception e) { e.printStackTrace(); JassLog.report(e); } } } - } - else { + } else { readJassFile(dataSource, jassProgramVisitor, jassFilePath); } } try { jassProgramVisitor.initialize(); - } - catch (final Exception e) { + } catch (final Exception e) { JassLog.report(e); new RuntimeException(e); } @@ -316,8 +313,7 @@ private static void readJassFile(final DataSource dataSource, final JassProgram final SmashJassParser smashJassParser = new SmashJassParser(reader); smashJassParser.scanAndParse(jassFile, jassProgramVisitor); } - } - catch (final Exception e) { + } catch (final Exception e) { e.printStackTrace(); JassLog.report(e); } @@ -351,22 +347,19 @@ public static ConfigEnvironment loadConfig(final DataSource dataSource, final Vi || lowerCasePath.startsWith(lowerCaseDirectoryPathLinux)) { try { readJassFile(dataSource, jassProgramVisitor, realPath); - } - catch (final Exception e) { + } catch (final Exception e) { e.printStackTrace(); JassLog.report(e); } } } - } - else { + } else { readJassFile(dataSource, jassProgramVisitor, jassFilePath); } } try { jassProgramVisitor.initialize(); - } - catch (final Exception e) { + } catch (final Exception e) { JassLog.report(e); new RuntimeException(e); } @@ -386,15 +379,13 @@ public static JUIEnvironment loadJUI(final DataSource dataSource, final Viewport final SmashJassParser smashJassParser = new SmashJassParser(reader); smashJassParser.scanAndParse(jassFile, jassProgramVisitor); } - } - catch (final Exception e) { + } catch (final Exception e) { e.printStackTrace(); } } try { jassProgramVisitor.initialize(); - } - catch (final Exception e) { + } catch (final Exception e) { JassLog.report(e); new RuntimeException(e); } @@ -450,8 +441,7 @@ public JUIEnvironment(final JassProgram jassProgramVisitor, final DataSource dat final String tocFileName = arguments.get(0).visit(StringJassValueVisitor.getInstance()); try { JUIEnvironment.this.gameUI.loadTOCFile(tocFileName); - } - catch (final IOException e) { + } catch (final IOException e) { throw new RuntimeException(e); } return BooleanJassValue.TRUE; @@ -826,7 +816,10 @@ private CommonEnvironment(final JassProgram jassProgramVisitor, final DataSource final Double timeout = arguments.get(1).visit(RealJassValueVisitor.getInstance()); final boolean periodic = arguments.get(2).visit(BooleanJassValueVisitor.getInstance()); final CodeJassValue handlerFunc = nullable(arguments, 3, CodeJassValueVisitor.getInstance()); - if ((timer != null) && !timer.isRunning()) { + if ((timer != null) && timer.isRunning()) { + timer.pause(simulation); + } + if ((timer != null)) { timer.setTimeoutTime(timeout.floatValue()); timer.setRepeats(periodic); timer.setHandlerFunc(handlerFunc); @@ -1006,12 +999,12 @@ public JassValue call(final List arguments, final GlobalScope globalS int abilityHandleId = 0; AbilityPointTarget targetAsPoint = new AbilityPointTarget(whichLocation.x, whichLocation.y); for (final CAbility ability : whichUnit.getAbilities()) { - ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, - false, activationReceiver); + ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, false, + activationReceiver); if (activationReceiver.isOk()) { final PointAbilityTargetCheckReceiver targetReceiver = PointAbilityTargetCheckReceiver.INSTANCE; - ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, - false, targetAsPoint, targetReceiver.reset()); + ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, false, + targetAsPoint, targetReceiver.reset()); if (targetReceiver.getTarget() != null) { targetAsPoint = targetReceiver.getTarget(); abilityHandleId = ability.getHandleId(); @@ -1039,7 +1032,8 @@ public JassValue call(final List arguments, final GlobalScope globalS AbilityPointTarget targetAsPoint = new AbilityPointTarget((float) whichLocationX, (float) whichLocationY); for (final CAbility ability : whichUnit.getAbilities()) { - ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, false, activationReceiver); + ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, false, + activationReceiver); if (activationReceiver.isOk()) { final PointAbilityTargetCheckReceiver targetReceiver = PointAbilityTargetCheckReceiver.INSTANCE; ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, false, @@ -1074,12 +1068,12 @@ public JassValue call(final List arguments, final GlobalScope globalS final int orderId = OrderIdUtils.getOrderId(orderString); int abilityHandleId = 0; for (final CAbility ability : whichUnit.getAbilities()) { - ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, - false, activationReceiver); + ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, false, + activationReceiver); if (activationReceiver.isOk()) { final CWidgetAbilityTargetCheckReceiver targetReceiver = CWidgetAbilityTargetCheckReceiver.INSTANCE; - ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, - false, whichTarget, targetReceiver.reset()); + ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, false, + whichTarget, targetReceiver.reset()); if (targetReceiver.getTarget() != null) { whichTarget = targetReceiver.getTarget(); abilityHandleId = ability.getHandleId(); @@ -1105,12 +1099,12 @@ public JassValue call(final List arguments, final GlobalScope globalS final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; int abilityHandleId = 0; for (final CAbility ability : whichUnit.getAbilities()) { - ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, - false, activationReceiver); + ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, false, + activationReceiver); if (activationReceiver.isOk()) { final CWidgetAbilityTargetCheckReceiver targetReceiver = CWidgetAbilityTargetCheckReceiver.INSTANCE; - ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, - false, whichTarget, targetReceiver.reset()); + ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, false, + whichTarget, targetReceiver.reset()); if (targetReceiver.getTarget() != null) { whichTarget = targetReceiver.getTarget(); abilityHandleId = ability.getHandleId(); @@ -1136,8 +1130,8 @@ public JassValue call(final List arguments, final GlobalScope globalS final int orderId = OrderIdUtils.getOrderId(orderString); int abilityHandleId = 0; for (final CAbility ability : whichUnit.getAbilities()) { - ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, - false, activationReceiver); + ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, false, + activationReceiver); if (activationReceiver.isOk()) { final BooleanAbilityTargetCheckReceiver targetReceiver = BooleanAbilityTargetCheckReceiver .getInstance(); @@ -1164,8 +1158,8 @@ public JassValue call(final List arguments, final GlobalScope globalS final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; int abilityHandleId = 0; for (final CAbility ability : whichUnit.getAbilities()) { - ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, - false, activationReceiver); + ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, false, + activationReceiver); if (activationReceiver.isOk()) { final BooleanAbilityTargetCheckReceiver targetReceiver = BooleanAbilityTargetCheckReceiver .getInstance(); @@ -1201,8 +1195,9 @@ public JassValue call(final List arguments, final GlobalScope globalS if (damageType == null) { damageType = CDamageType.UNKNOWN; } - target.damage(CommonEnvironment.this.simulation, whichUnit, new CGenericDamageFlags(attack, ranged), attackType, - damageType, weaponType.name(), (float) amount); + target.damage(CommonEnvironment.this.simulation, whichUnit, + new CGenericDamageFlags(attack, ranged), attackType, damageType, + weaponType.name(), (float) amount); return BooleanJassValue.TRUE; } } @@ -1511,8 +1506,7 @@ public boolean call(final CUnit unit) { globalScope.runThreadUntilCompletion(globalScope.createThread(callback, CommonTriggerExecutionScope.enumScope(triggerScope, unit))); } - } - catch (final Exception e) { + } catch (final Exception e) { throw new JassException(globalScope, "Exception during ForGroup", e); } } @@ -1651,8 +1645,7 @@ public boolean call(final CUnit unit) { globalScope.runThreadUntilCompletion(globalScope.createThread(callback, CommonTriggerExecutionScope.enumScope(triggerScope, player))); } - } - catch (final Exception e) { + } catch (final Exception e) { throw new JassException(globalScope, "Exception during ForForce", e); } return null; @@ -3047,8 +3040,7 @@ public void remove() { final float value = arguments.get(2).visit(RealJassValueVisitor.getInstance()).floatValue(); if (whichUnit != null) { whichUnit.setUnitState(CommonEnvironment.this.simulation, whichUnitState, value); - } - else { + } else { System.err.println("got SetUnitState(null," + whichUnitState + "," + value + ") call (skipping because unit is null)"); } @@ -3789,8 +3781,7 @@ public void remove() { alliedPlayer.getFogOfWar().setFogStateRect(pathingGrid, whichRect, whichState); } } - } - else { + } else { player.getFogOfWar().setFogStateRect(pathingGrid, whichRect, whichState); } @@ -3815,8 +3806,7 @@ public void remove() { whichState); } } - } - else { + } else { player.getFogOfWar().setFogStateRadius(pathingGrid, centerX, centerY, radius, whichState); } @@ -3843,8 +3833,7 @@ public void remove() { whichState); } } - } - else { + } else { player.getFogOfWar().setFogStateRadius(pathingGrid, centerX, centerY, radius, whichState); } @@ -3892,8 +3881,7 @@ public void remove() { } } return new HandleJassValue(fogmodifierType, new CFogModifierJassMulti(modifiers)); - } - else { + } else { player.addFogModifer(this.simulation, fogModifier, afterUnits); return new HandleJassValue(fogmodifierType, new CFogModifierJassSingle(player.getId(), fogModifier)); @@ -3924,8 +3912,7 @@ public void remove() { } } return new HandleJassValue(fogmodifierType, new CFogModifierJassMulti(modifiers)); - } - else { + } else { player.addFogModifer(this.simulation, fogModifier, afterUnits); return new HandleJassValue(fogmodifierType, new CFogModifierJassSingle(player.getId(), fogModifier)); @@ -3957,8 +3944,7 @@ public void remove() { } } return new HandleJassValue(fogmodifierType, new CFogModifierJassMulti(modifiers)); - } - else { + } else { player.addFogModifer(this.simulation, fogModifier, afterUnits); return new HandleJassValue(fogmodifierType, new CFogModifierJassSingle(player.getId(), fogModifier)); @@ -4095,8 +4081,7 @@ public JassValue call(final List arguments, final GlobalScope globalS try { war3MapViewer.load(filename.trim(), war3MapViewer.mapPathSolver, war3MapViewer.solverParams); - } - catch (final Exception exc) { + } catch (final Exception exc) { System.err.println("Preload(\"" + filename + "\") failed!"); exc.printStackTrace(); } @@ -4301,8 +4286,7 @@ public JassValue call(final List arguments, final GlobalScope globalS CommonEnvironment.this.simulation.getHandleIdAllocator().createId())); // TODO below code is very stupid!! return IntegerJassValue.of(1); - } - else { + } else { final int newLevel = ability.getLevel() + 1; ability.setLevel(CommonEnvironment.this.simulation, whichWidget, newLevel); return IntegerJassValue.of(newLevel); @@ -4365,8 +4349,7 @@ public JassValue call(final List arguments, final GlobalScope globalS timer.setRepeats(false); timer.setTimeoutTime(seconds.floatValue()); timer.start(this.simulation); - } - else { + } else { throw new JassException(globalScope, "Needs to sleep " + seconds + " but no thread was found", null); } @@ -4393,8 +4376,7 @@ public JassValue call(final List arguments, final GlobalScope globalS timer.setRepeats(false); timer.setTimeoutTime(seconds); timer.start(this.simulation); - } - else { + } else { throw new JassException(globalScope, "Needs to sleep " + seconds + " but no thread was found", null); } @@ -4445,8 +4427,7 @@ public JassValue call(final List arguments, final GlobalScope globalS if (attachmentPoint != null) { return new HandleJassValue(effectType, war3MapViewer.spawnSpellEffectOnUnitEx(target, new War3ID(rawcode), whichEffectType, 0, attachmentPoint)); - } - else { + } else { return new HandleJassValue(effectType, war3MapViewer.spawnSpellEffectOnUnitEx(target, new War3ID(rawcode), whichEffectType, 0)); } @@ -5085,8 +5066,7 @@ public JassValue call(final List arguments, final GlobalScope globalS final CWidget triggerWidget = ((CommonTriggerExecutionScope) triggerScope).getTriggerWidget(); if (triggerWidget instanceof CDestructable) { return new HandleJassValue(destructableType, triggerWidget); - } - else { + } else { return new HandleJassValue(destructableType, null); } }); @@ -5227,12 +5207,10 @@ public JassValue call(final List arguments, final GlobalScope globalS if (rallyPoint != null) { x = rallyPoint.getX(); y = rallyPoint.getY(); - } - else { + } else { x = y = 0; } - } - else { + } else { x = y = 0; } return new HandleJassValue(locationType, @@ -5266,12 +5244,10 @@ public HandleJassValue accept(final CItem target) { return unitType.getNullValue(); } }); - } - else { + } else { rallyUnit = unitType.getNullValue(); } - } - else { + } else { rallyUnit = unitType.getNullValue(); } return rallyUnit; @@ -5304,12 +5280,10 @@ public HandleJassValue accept(final CItem target) { return destructableType.getNullValue(); } }); - } - else { + } else { rallyDest = destructableType.getNullValue(); } - } - else { + } else { rallyDest = destructableType.getNullValue(); } return rallyDest; @@ -5320,8 +5294,7 @@ public HandleJassValue accept(final CItem target) { int orderId; if ((whichUnit != null) && (whichUnit.getCurrentOrder() != null)) { orderId = whichUnit.getCurrentOrder().getOrderId(); - } - else { + } else { orderId = 0; } return IntegerJassValue.of(orderId); @@ -5523,8 +5496,7 @@ public HandleJassValue accept(final CItem target) { if (triggerScope instanceof CommonTriggerExecutionScope) { return new HandleJassValue(timerType, ((CommonTriggerExecutionScope) triggerScope).getExpiringTimer()); - } - else { + } else { return new HandleJassValue(timerType, null); } }); @@ -6360,8 +6332,7 @@ public HandleJassValue accept(final CItem target) { try { globalScope.runThreadUntilCompletion(globalScope.createThread(callback, CommonTriggerExecutionScope.enumFileScope(triggerScope, realPath))); - } - catch (final Exception e) { + } catch (final Exception e) { throw new JassException(globalScope, "Exception during ForFiles", e); } } @@ -7249,8 +7220,7 @@ public HandleJassValue accept(final CItem target) { // the remove(CBuff) function being independent from remove(CAbility). // The difference is probably dumb. unit.remove(this.simulation, (CBuff) ability); - } - else { + } else { unit.remove(this.simulation, ability); } return null; @@ -7885,7 +7855,7 @@ public void remove() { final ABPermanentPassiveBuff ability = new ABPermanentPassiveBuff( CommonEnvironment.this.simulation.getHandleIdAllocator().createId(), - new War3ID(buffRawcode), localStore, ABActionJass.wrap(onAddAction), + new War3ID(buffRawcode), null, null, localStore, ABActionJass.wrap(onAddAction), ABActionJass.wrap(onRemoveAction), showIcon, castId, leveled, positive); if (artType != null) { ability.setArtType(artType); @@ -7902,7 +7872,7 @@ public void remove() { final CBuff ability = new ABTargetingBuff( CommonEnvironment.this.simulation.getHandleIdAllocator().createId(), - new War3ID(buffRawcode)); + new War3ID(buffRawcode), null, null); return new HandleJassValue(buffType, ability); }); @@ -7918,8 +7888,8 @@ public void remove() { final boolean dispellable = arguments.get(6).visit(BooleanJassValueVisitor.getInstance()); final ABTimedArtBuff ability = new ABTimedArtBuff( - this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), duration, - showIcon, leveled, positive, dispellable); + this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), null, null, + duration, showIcon, leveled, positive, dispellable); if (artType != null) { ability.setArtType(artType); } @@ -7944,7 +7914,7 @@ public void remove() { final boolean dispellable = arguments.get(12).visit(BooleanJassValueVisitor.getInstance()); final ABTimedBuff ability = new ABTimedBuff(this.simulation.getHandleIdAllocator().createId(), - new War3ID(buffRawcode), duration, showTimedLifeBar, localStore, + new War3ID(buffRawcode), null, null, duration, showTimedLifeBar, localStore, ABActionJass.wrap(onAddAction), ABActionJass.wrap(onRemoveAction), ABActionJass.wrap(onExpireAction), showIcon, castId, leveled, positive, dispellable); ability.setArtType(artType); @@ -7969,7 +7939,8 @@ public void remove() { final float duration = arguments.get(1).visit(RealJassValueVisitor.getInstance()).floatValue(); final CBuff ability = new ABTimedTargetingBuff( - this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), duration); + this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), null, null, + duration); return new HandleJassValue(buffType, ability); }); @@ -7992,8 +7963,8 @@ public void remove() { final boolean dispellable = arguments.get(13).visit(BooleanJassValueVisitor.getInstance()); final ABTimedTickingBuff ability = new ABTimedTickingBuff( - this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), duration, - showTimedLifeBar, localStore, ABActionJass.wrap(onAddAction), + this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), null, null, + duration, showTimedLifeBar, localStore, ABActionJass.wrap(onAddAction), ABActionJass.wrap(onRemoveAction), ABActionJass.wrap(onExpireAction), ABActionJass.wrap(onTickAction), showIcon, castId, leveled, positive, dispellable); ability.setArtType(artType); @@ -8019,8 +7990,8 @@ public void remove() { final boolean dispellable = arguments.get(13).visit(BooleanJassValueVisitor.getInstance()); final ABTimedTickingPausedBuff ability = new ABTimedTickingPausedBuff( - this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), duration, - showTimedLifeBar, localStore, ABActionJass.wrap(onAddAction), + this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), null, null, + duration, showTimedLifeBar, localStore, ABActionJass.wrap(onAddAction), ABActionJass.wrap(onRemoveAction), ABActionJass.wrap(onExpireAction), ABActionJass.wrap(onTickAction), showIcon, castId, leveled, positive, dispellable); ability.setArtType(artType); @@ -8046,8 +8017,8 @@ public void remove() { final boolean dispellable = arguments.get(13).visit(BooleanJassValueVisitor.getInstance()); final ABTimedTickingPostDeathBuff ability = new ABTimedTickingPostDeathBuff( - this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), duration, - showTimedLifeBar, localStore, ABActionJass.wrap(onAddAction), + this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), null, null, + duration, showTimedLifeBar, localStore, ABActionJass.wrap(onAddAction), ABActionJass.wrap(onRemoveAction), ABActionJass.wrap(onExpireAction), ABActionJass.wrap(onTickAction), showIcon, castId, leveled, positive, dispellable); ability.setArtType(artType); @@ -9223,8 +9194,7 @@ public void main() { final JassThread abilitiesThread = this.jassProgramVisitor.getGlobals().createThread("abilities_main", Collections.emptyList(), TriggerExecutionScope.EMPTY); this.jassProgramVisitor.getGlobals().queueThread(abilitiesThread); - } - catch (final Exception exc) { + } catch (final Exception exc) { new JassException(this.jassProgramVisitor.getGlobals(), "Exception on Line " + this.jassProgramVisitor.getGlobals().getLineNumber(), exc) .printStackTrace(); @@ -9233,8 +9203,7 @@ public void main() { final JassThread mainThread = this.jassProgramVisitor.getGlobals().createThread("main", Collections.emptyList(), TriggerExecutionScope.EMPTY); this.jassProgramVisitor.getGlobals().queueThread(mainThread); - } - catch (final Exception exc) { + } catch (final Exception exc) { throw new JassException(this.jassProgramVisitor.getGlobals(), "Exception on Line " + this.jassProgramVisitor.getGlobals().getLineNumber(), exc); } @@ -9415,8 +9384,7 @@ public void config() { final JassThread configThread = this.jassProgramVisitor.getGlobals().createThread("config", Collections.emptyList(), TriggerExecutionScope.EMPTY); this.jassProgramVisitor.getGlobals().runThreadUntilCompletion(configThread); - } - catch (final Exception exc) { + } catch (final Exception exc) { throw new JassException(this.jassProgramVisitor.getGlobals(), "Exception on Line " + this.jassProgramVisitor.getGlobals().getLineNumber(), exc); } @@ -9613,8 +9581,7 @@ public static void registerRandomNatives(final JassProgram jassProgramVisitor, f if (lowBound > highBound) { if (highBound >= 0) { lowBound = highBound; - } - else { + } else { highBound = lowBound; } } @@ -9641,8 +9608,7 @@ private static void doPreloadScript(final DataSource dataSource, final Viewport smashJassParser.scanAndParse(filename, jassProgramVisitor); } jassProgramVisitor.initialize(); - } - catch (final Exception e) { + } catch (final Exception e) { e.printStackTrace(); JassLog.report(e); } @@ -9653,8 +9619,7 @@ private static void doPreloadScript(final DataSource dataSource, final Viewport final JassThread preloadThread = jassProgramVisitor.getGlobals().createThread(mainFunction, Collections.emptyList(), TriggerExecutionScope.EMPTY); jassProgramVisitor.getGlobals().queueThread(preloadThread); - } - catch (final Exception e) { + } catch (final Exception e) { throw new JassException(jassProgramVisitor.getGlobals(), "Unable to run: " + filename, e); } } @@ -10346,8 +10311,7 @@ public static void registerTypingNatives(final JassProgram jassProgramVisitor, f final int i = arguments.get(0).visit(IntegerJassValueVisitor.getInstance()); if (i < CAttackTypeJass.VALUES.length) { return new HandleJassValue(attacktypeType, CAttackTypeJass.VALUES[i]); - } - else { + } else { return new HandleJassValue(attacktypeType, null); } }); @@ -10478,8 +10442,7 @@ public static void registerConversionAndStringNatives(final JassProgram jassProg try { final int intValue = Integer.parseInt(s); return IntegerJassValue.of(intValue); - } - catch (final Exception exc) { + } catch (final Exception exc) { return IntegerJassValue.of(0); } }); @@ -10488,8 +10451,7 @@ public static void registerConversionAndStringNatives(final JassProgram jassProg try { final double parsedValue = Double.parseDouble(s); return RealJassValue.of(parsedValue); - } - catch (final Exception exc) { + } catch (final Exception exc) { return RealJassValue.of(0); } }); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/TextTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/TextTag.java index b9aded8ad..83d5e95ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/TextTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/TextTag.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector3; import com.etheller.interpreter.ast.util.CHandle; +import com.etheller.warsmash.util.WarsmashConstants; public class TextTag implements CHandle { private final Vector3 position; @@ -40,7 +41,8 @@ public boolean update(final float deltaTime) { if (this.suspended) { return false; } - this.screenCoordTravelOffset.add(this.velocity.x * deltaTime, this.velocity.y * deltaTime); + float deltaTicks = deltaTime / WarsmashConstants.SIMULATION_STEP_TIME; + this.screenCoordTravelOffset.add(this.velocity.x * deltaTicks, this.velocity.y * deltaTicks); this.lifetime += deltaTime; final float fadeStart = getFadeStart(); final float remainingLife = getRemainingLife(); @@ -133,7 +135,9 @@ public void setColor(final int r, final int g, final int b, final float alpha) { } public void setVelocity(final float vx, final float vy) { - this.velocity.set(vx, vy); + //TODO Mult by 75 is a hack to get close to the velocities in War3 + // There's probably some better logic that would better match the game + this.velocity.set((float)(vx *75), (float)(vy *75)); } public boolean isVisible() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java index 587c5c865..3cd23fa88 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java @@ -3270,7 +3270,7 @@ public TextTag spawnTextTag(final CUnit unit, final TextTagConfigType configType } final Vector3 unitPosition = new Vector3(renderPeer.location); final Bounds bounds = renderPeer.instance.getBounds(); - final TextTag textTag = new TextTag(unitPosition, new Vector2(0, 60f), text, + final TextTag textTag = new TextTag(unitPosition, new Vector2(0, 3.328125f), text, textTagConfig.getColor(), textTagConfig.getLifetime(), textTagConfig.getFadeStart(), textTagConfig.getHeight(), BUILTIN_TEXT_TAG_REPORTED_HANDLE_ID); @@ -3293,7 +3293,7 @@ public TextTag spawnTextTag(final CUnit unit, final TextTagConfigType configType } else { unitPosition = new Vector3(0, 0, 0); } - final TextTag textTag = new TextTag(unitPosition, new Vector2(0, 60f), message, + final TextTag textTag = new TextTag(unitPosition, new Vector2(0, 3.328125f), message, textTagConfig.getColor(), textTagConfig.getLifetime(), textTagConfig.getFadeStart(), textTagConfig.getHeight(), BUILTIN_TEXT_TAG_REPORTED_HANDLE_ID); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderWidget.java index 823d6b519..ee39bc32f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderWidget.java @@ -225,6 +225,16 @@ public void queueAnimation(final PrimaryTag animationName, final EnumSet secondaryAnimationTags, boolean allowRarityVariations); + boolean isAnimationQueued(PrimaryTag animationName); + boolean addSecondaryTag(SecondaryTag secondaryTag); boolean removeSecondaryTag(SecondaryTag secondaryTag); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java index 37f887f30..22a961550 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/AbstractCBuff.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic; import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; @@ -65,4 +67,16 @@ public String getVisibilityGroup() { return null; } + @Override + public CAbility getSourceAbility() { + // TODO Auto-generated method stub + return null; + } + + @Override + public CUnit getSourceUnit() { + // TODO Auto-generated method stub + return null; + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java index 1a75199fc..427ebf9bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CBuff.java @@ -2,6 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; public interface CBuff extends CAliasedLevelingAbility { float getDurationRemaining(CSimulation game, CUnit unit); @@ -25,5 +26,9 @@ public interface CBuff extends CAliasedLevelingAbility { boolean isAura(); String getVisibilityGroup(); + + CAbility getSourceAbility(); + + CUnit getSourceUnit(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CBuffJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CBuffJass.java index 8af51abec..40954c28d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CBuffJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/jass/CBuffJass.java @@ -19,6 +19,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractCBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -179,4 +180,16 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final receiver.notAnActiveAbility(); } + @Override + public CAbility getSourceAbility() { + // TODO Auto-generated method stub + return null; + } + + @Override + public CUnit getSourceUnit() { + // TODO Auto-generated method stub + return null; + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java index 64af095b8..96a21930b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java @@ -28,6 +28,7 @@ public interface AbilityBuilderActiveAbility extends AbilityBuilderAbility, CAut public int getChargedManaCost(); public void setCastRange(float castRange); + public boolean ignoreCastTime(); public EnumSet getTargetsAllowed(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java index 14de91b12..6f1dffc11 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java @@ -49,12 +49,12 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord @Override public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { castId++; - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); CWidget target = autoTarget(game, caster); if (target != null) { this.runOnOrderIssuedActions(game, caster, orderId); this.behavior.setCastId(castId); - return this.behavior.reset(game, target); + return this.behavior.reset(game, target, orderId, autoOrder); } else { this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); @@ -66,7 +66,8 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool @Override public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget noTarget) { this.castId++; - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); + this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); CWidget target = autoTarget(game, caster); if (target != null) { this.runOnOrderIssuedActions(game, caster, orderId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java index 2f4fe169e..fd5b7dd53 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java @@ -109,7 +109,7 @@ public void onAdd(CSimulation game, CUnit unit) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final AbilityTarget target) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); if (!this.isTargetedSpell() && castless && orderId == this.getBaseOrderId()) { this.runBeginCastingActions(game, caster, orderId); this.runEndCastingActions(game, caster, orderId); @@ -123,12 +123,12 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto if (this.isTargetedSpell() && !this.isPointTarget()) { this.castId++; this.behavior.setCastId(this.castId); - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, target.visit(AbilityTargetVisitor.UNIT)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, target.visit(AbilityTargetVisitor.ITEM)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, target.visit(AbilityTargetVisitor.DESTRUCTABLE)); this.runOnOrderIssuedActions(game, caster, orderId); - return this.behavior.reset(game, target); + return this.behavior.reset(game, target, orderId, autoOrder); } else { return null; } @@ -139,10 +139,10 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto if (this.isTargetedSpell() && this.isPointTarget()) { this.castId++; this.behavior.setCastId(this.castId); - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, point); this.runOnOrderIssuedActions(game, caster, orderId); - return this.behavior.reset(game, point); + return this.behavior.reset(game, point, orderId, autoOrder); } else { return null; } @@ -156,9 +156,9 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool } else { this.castId++; this.behavior.setCastId(this.castId); - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); this.runOnOrderIssuedActions(game, caster, orderId); - return this.behavior.reset(); + return this.behavior.reset(orderId, autoOrder); } } else { return null; @@ -168,13 +168,14 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool @Override public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target) { this.castId++; + this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); if (this.isTargetedSpell()) { if (this.isPointTarget()) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, target.visit(AbilityTargetVisitor.POINT)); this.runOnOrderIssuedActions(game, caster, orderId); } else { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, target.visit(AbilityTargetVisitor.UNIT)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, target.visit(AbilityTargetVisitor.ITEM)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, target.visit(AbilityTargetVisitor.DESTRUCTABLE)); @@ -182,7 +183,7 @@ public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean a } } else { if (!castless) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); this.runOnOrderIssuedActions(game, caster, orderId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java index a76549c8b..6bd295583 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java @@ -15,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; @@ -35,15 +36,16 @@ public void onAdd(CSimulation game, CUnit unit) { super.onAdd(game, unit); determineCastless(unit); } - + @Override public void setLevel(CSimulation game, CUnit unit, int level) { super.setLevel(game, unit, level); determineCastless(unit); } - + protected void determineCastless(CUnit unit) { - if (this.item != null || this.config.getDisplayFields() != null && this.config.getDisplayFields().getCastlessNoTarget() != null + if (this.item != null || this.config.getDisplayFields() != null + && this.config.getDisplayFields().getCastlessNoTarget() != null && this.config.getDisplayFields().getCastlessNoTarget().callback(null, unit, localStore, castId)) { this.castless = true; this.behavior = null; @@ -64,9 +66,9 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto } @Override - public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - boolean autoOrder, final AbilityTarget target) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, + final AbilityTarget target) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); // System.err.println("Checking queue notarg level: " + active + " orderID : " + orderId + " offID: " + this.getOffOrderId()); if (castless && orderId == this.getBaseOrderId()) { @@ -81,6 +83,11 @@ public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, fina this.startCooldown(game, caster); this.runBeginCastingActions(game, caster, orderId); this.runEndCastingActions(game, caster, orderId); + caster.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, this, null); + caster.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this, null); + caster.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this, null); + caster.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this, null); + caster.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this, null); return false; } return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); @@ -93,7 +100,7 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool return null; } else { this.behavior.setCastId(castId); - return this.behavior.reset(); + return this.behavior.reset(orderId, autoOrder); } } @@ -101,11 +108,17 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target) { this.castId++; if (!castless) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); + this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); this.runOnOrderIssuedActions(game, caster, orderId); } } + @Override + public void cleanupInputs(int theCastId) { + this.localStore.remove(ABLocalStoreKeys.PREVIOUSBEHAVIOR); + } + @Override protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver) { @@ -132,5 +145,4 @@ protected boolean innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderI return true; } - } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java index b227ad4ff..06a45ee6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java @@ -183,7 +183,7 @@ private boolean offOrderId(final int orderId) { @Override public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget noTarget) { this.castId++; - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); //Just don't do this } @@ -192,7 +192,7 @@ public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean a @Override public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { if (checkNoTargetOrderId(game, caster, orderId)) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); // System.err.println(caster.getUnitType().getName() + " Beginning NoTarget: " + orderId); boolean isOffId = orderId == this.getOffOrderId(); @@ -266,7 +266,7 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord @Override public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { this.castId++; - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); // System.err.println(caster.getUnitType().getName() + " Received pair target order: " + orderId + " (Base: " // + this.getBaseOrderId() + ", Internal: " + this.getPairOrderId(game, caster) + ")"); if (checkTargetPrimeOrderId(game, caster, orderId)) { @@ -288,21 +288,23 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto } this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, targetUnit); this.localStore.put(ABLocalStoreKeys.ABILITYPAIREDUNIT + castId, targetUnit); + this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); // System.out.println("Starting targeted behavior"); this.runOnOrderIssuedActions(game, caster, orderId); this.behavior.setCastId(castId); - return this.behavior.reset(game, target); + return this.behavior.reset(game, target, autoOrder); } else if (checkTargetInternalOrderId(game, caster, orderId)) { // System.err.println(caster.getUnitType().getName() + " Got internal order"); final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, targetUnit); this.localStore.put(ABLocalStoreKeys.ABILITYPAIREDUNIT + castId, targetUnit); + this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); // System.out.println("Starting internal targeted behavior with target: " + targetUnit); this.runOnOrderIssuedActions(game, caster, orderId); this.behavior.setCastId(castId); - return this.behavior.reset(game, target, orderId); + return this.behavior.reset(game, target, orderId, autoOrder); } else { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java index a7f8d62f4..259e9fa02 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java @@ -48,14 +48,15 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { this.internalBegin(game, caster, orderId, autoOrder, point); this.behavior.setCastId(castId); - return this.behavior.reset(game, point); + return this.behavior.reset(game, point, orderId, autoOrder); } @Override public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget theTarget) { this.castId++; - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, theTarget.visit(AbilityTargetVisitor.POINT)); + this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); this.runOnOrderIssuedActions(game, caster, orderId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java index 2228c9197..90ca4df26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java @@ -38,16 +38,17 @@ public void onAdd(CSimulation game, CUnit unit) { public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { this.internalBegin(game, caster, orderId, autoOrder, target); this.behavior.setCastId(castId); - return this.behavior.reset(game, target); + return this.behavior.reset(game, target, orderId, autoOrder); } @Override public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target) { this.castId++; - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, orderId), autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, target.visit(AbilityTargetVisitor.UNIT)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, target.visit(AbilityTargetVisitor.ITEM)); this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, target.visit(AbilityTargetVisitor.DESTRUCTABLE)); + this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); this.runOnOrderIssuedActions(game, caster, orderId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index a27837312..38b3918ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -76,6 +76,7 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri protected float area = 0; protected float range = 0; protected float castTime = 0; + private boolean ignoreCastTime = false; protected boolean hideAreaCursor = false; @@ -293,6 +294,10 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(game, unit, localStore, castId); } + if (this.config.getOverrideFields().getIgnoreCastTime() != null) { + this.ignoreCastTime = this.config.getOverrideFields().getIgnoreCastTime().callback(game, unit, localStore, + castId); + } if (this.config.getOverrideFields().getCooldownOverride() != null) { this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(game, unit, localStore, castId); @@ -529,6 +534,10 @@ public void setCastTime(float castTime) { this.castTime = castTime; } + public boolean ignoreCastTime() { + return this.ignoreCastTime; + } + public EnumSet getTargetsAllowed() { return targetsAllowed; } @@ -716,7 +725,7 @@ protected abstract boolean innerCheckCanUseSpell(CSimulation game, CUnit unit, i @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, final CWidget target, final AbilityTargetCheckReceiver receiver) { - this.localStore.put(ABLocalStoreKeys.ISAUTOCAST, autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); if (innerCheckCastOrderId(game, unit, orderId)) { innerCheckCanTarget(game, unit, orderId, target, receiver); } else if (orderId == OrderIds.smart) { @@ -765,7 +774,7 @@ public void checkCanAutoTarget(final CSimulation game, final CUnit unit, final i @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { - this.localStore.put(ABLocalStoreKeys.ISAUTOCAST, autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); if (innerCheckCastOrderId(game, unit, orderId)) { innerCheckCanTarget(game, unit, orderId, target, receiver); } else if (orderId == OrderIds.smart) { @@ -805,7 +814,7 @@ public void checkCanAutoTarget(final CSimulation game, final CUnit unit, final i @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, final AbilityTargetCheckReceiver receiver) { - this.localStore.put(ABLocalStoreKeys.ISAUTOCAST, autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); if ((orderId != 0) && ((orderId == getAutoCastOffOrderId()) || (orderId == getAutoCastOnOrderId()))) { receiver.targetOk(null); } else if (innerCheckCastOrderId(game, unit, orderId)) { @@ -1162,7 +1171,7 @@ public void deactivate(final CSimulation game, final CUnit caster) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final AbilityTarget target) { - this.localStore.put(ABLocalStoreKeys.ISAUTOCAST, autoOrder); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); // System.err.println("Checking queue top level: " + active + " orderID : " + orderId + " offID: " + this.getOffOrderId()); if (this.allowCastlessDeactivate && this.toggleable && this.active && orderId == this.getOffOrderId()) { this.deactivate(game, caster); @@ -1252,6 +1261,7 @@ public void cleanupInputs(int theCastId) { this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + theCastId); this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + theCastId); this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + theCastId); + this.localStore.remove(ABLocalStoreKeys.PREVIOUSBEHAVIOR); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java index 018a4f1db..b1a93fd08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java @@ -4,7 +4,9 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityGenericDoNothing; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityMove; @@ -31,6 +33,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedInstantTransformationBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTransformationBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; public class GetInstantTransformationBuffVisitor implements CAbilityVisitor { @@ -41,6 +44,7 @@ public static GetInstantTransformationBuffVisitor getInstance() { } private CSimulation game; + private CUnit caster; private Map localStore; private CUnitType newType; private boolean keepRatios; @@ -51,10 +55,11 @@ public static GetInstantTransformationBuffVisitor getInstance() { private float duration; private boolean permanent; - public GetInstantTransformationBuffVisitor reset(CSimulation game, Map localStore, + public GetInstantTransformationBuffVisitor reset(CSimulation game, CUnit caster, Map localStore, CUnitType newType, final boolean keepRatios, OnTransformationActions actions, War3ID buffId, boolean addAlternateTagAfter, float transformationTime, float duration, boolean permanent) { this.game = game; + this.caster = caster; this.localStore = localStore; this.newType = newType; this.keepRatios = keepRatios; @@ -69,7 +74,8 @@ public GetInstantTransformationBuffVisitor reset(CSimulation game, Map(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java index ee92b627f..283e5e70e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java @@ -153,8 +153,8 @@ public void setLevel(CSimulation game, CUnit unit, int level) { @Override public void onAdd(CSimulation game, CUnit unit) { if (this.buffId != null) { - this.buff = new ABPermanentPassiveBuff(game.getHandleIdAllocator().createId(), this.buffId, localStore, - null, null, 0, false, true); + this.buff = new ABPermanentPassiveBuff(game.getHandleIdAllocator().createId(), this.buffId, this, unit, + localStore, null, null, 0, false, true); unit.addNonStackingDisplayBuff(game, auraStackingKey, buff); } this.caster = unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehavior.java index 4e94fa42e..5c8dad528 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehavior.java @@ -8,18 +8,24 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; public interface ABBehavior extends CBehavior { - public CBehavior reset(final CSimulation game, final CWidget target); - public CBehavior reset(final CSimulation game, final CWidget target, int orderId); + public CBehavior reset(final CSimulation game, final CWidget target, final boolean autoOrder); - public CBehavior reset(final CSimulation game, final AbilityPointTarget target); - public CBehavior reset(final CSimulation game, final AbilityPointTarget target, int orderId); + public CBehavior reset(final CSimulation game, final CWidget target, int orderId, final boolean autoOrder); + + public CBehavior reset(final CSimulation game, final AbilityPointTarget target, final boolean autoOrder); + + public CBehavior reset(final CSimulation game, final AbilityPointTarget target, int orderId, + final boolean autoOrder); + + public CBehavior reset(final boolean autoOrder); + + public CBehavior reset(int orderId, final boolean autoOrder); - public CBehavior reset(); - public CBehavior reset(int orderId); - public void setCastId(int castId); + public void setInstant(boolean instant); + public void setBehaviorCategory(CBehaviorCategory behaviorCategory); - + public CAbility getAbility(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java index 7fea2b736..d8d2f8e1e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java @@ -1,8 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; +import java.util.EnumSet; import java.util.Map; import com.etheller.warsmash.util.WarsmashConstants; +import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; @@ -15,23 +17,27 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; public class CBehaviorAbilityBuilderBase extends CAbstractRangedBehavior implements ABBehavior { private Map localStore; private AbilityBuilderActiveAbility ability; private ABAbilityTargetStillTargetableVisitor preCastTargetableVisitor; - private int castStartTick = 0; private int castBehaviorNotifyTick = 0; + + private int castStartTick = 0; + private int castTimeEndTick = 0; private int castPointTicks = 0; private int backswingTicks = 0; + private boolean doneCastTime = false; private boolean doneEffect = false; private boolean channeling = false; private boolean preventReInterrupt = false; private int castId = 0; private int orderId; + private boolean autoOrder; private boolean instant = false; private CBehaviorCategory behaviorCategory = null; @@ -53,63 +59,80 @@ public void setBehaviorCategory(CBehaviorCategory behaviorCategory) { this.behaviorCategory = behaviorCategory; } - public CBehavior reset(final CSimulation game, final CWidget target) { + public CBehavior reset(final CSimulation game, final CWidget target, final boolean autoOrder) { + this.doneCastTime = false; this.doneEffect = false; this.castStartTick = 0; - this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); - this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); + this.castTimeEndTick = this.ability.ignoreCastTime() ? 0 + : (int) (this.ability.getCastTime() / WarsmashConstants.SIMULATION_STEP_TIME); + this.castPointTicks = this.castTimeEndTick + + (int) (this.unit.getUnitType().getCastPoint() / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = this.castPointTicks + + (int) (this.unit.getUnitType().getCastBackswingPoint() / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = this.ability.getBaseOrderId(); this.preventReInterrupt = false; + this.autoOrder = autoOrder; return innerReset(game, target, false); } - public CBehavior reset(final CSimulation game, final CWidget target, int orderId) { + public CBehavior reset(final CSimulation game, final CWidget target, int orderId, final boolean autoOrder) { + this.doneCastTime = false; this.doneEffect = false; this.castStartTick = 0; - this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); - this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); + this.castTimeEndTick = this.ability.ignoreCastTime() ? 0 + : (int) (this.ability.getCastTime() / WarsmashConstants.SIMULATION_STEP_TIME); + this.castPointTicks = this.castTimeEndTick + + (int) (this.unit.getUnitType().getCastPoint() / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = this.castPointTicks + + (int) (this.unit.getUnitType().getCastBackswingPoint() / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = orderId; this.preventReInterrupt = false; + this.autoOrder = autoOrder; return innerReset(game, target, false); } - public CBehavior reset(final CSimulation game, final AbilityPointTarget target) { + public CBehavior reset(final CSimulation game, final AbilityPointTarget target, final boolean autoOrder) { + this.doneCastTime = false; this.doneEffect = false; this.castStartTick = 0; - this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); - this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); + this.castTimeEndTick = this.ability.ignoreCastTime() ? 0 + : (int) (this.ability.getCastTime() / WarsmashConstants.SIMULATION_STEP_TIME); + this.castPointTicks = this.castTimeEndTick + + (int) (this.unit.getUnitType().getCastPoint() / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = this.castPointTicks + + (int) (this.unit.getUnitType().getCastBackswingPoint() / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = this.ability.getBaseOrderId(); this.preventReInterrupt = false; + this.autoOrder = autoOrder; return innerReset(game, target, false); } - public CBehavior reset(final CSimulation game, final AbilityPointTarget target, int orderId) { + public CBehavior reset(final CSimulation game, final AbilityPointTarget target, int orderId, + final boolean autoOrder) { + this.doneCastTime = false; this.doneEffect = false; this.castStartTick = 0; - this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); - this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); + this.castTimeEndTick = this.ability.ignoreCastTime() ? 0 + : (int) (this.ability.getCastTime() / WarsmashConstants.SIMULATION_STEP_TIME); + this.castPointTicks = this.castTimeEndTick + + (int) (this.unit.getUnitType().getCastPoint() / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = this.castPointTicks + + (int) (this.unit.getUnitType().getCastBackswingPoint() / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = orderId; this.preventReInterrupt = false; + this.autoOrder = autoOrder; return innerReset(game, target, false); } - public ABBehavior reset() { + public ABBehavior reset(final boolean autoOrder) { return null; } - public ABBehavior reset(int orderId) { + public ABBehavior reset(int orderId, final boolean autoOrder) { return null; } @@ -123,46 +146,54 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { this.castBehaviorNotifyTick = (int) (this.castStartTick + 0.5 / WarsmashConstants.SIMULATION_STEP_TIME); if (!this.target.visit(this.preCastTargetableVisitor.reset(game, this.unit, ability, false, orderId))) { + cleanupInputs(); return this.unit.pollNextOrderBehavior(game); } - if (!this.unit.chargeMana(this.ability.getChargedManaCost())) { - game.getCommandErrorListener().showInterfaceError(this.unit.getPlayerIndex(), - CommandStringErrorKeys.NOT_ENOUGH_MANA); + this.ability.checkCanUse(game, unit, orderId, autoOrder, BooleanAbilityActivationReceiver.INSTANCE); + if (!BooleanAbilityActivationReceiver.INSTANCE.isOk()) { + cleanupInputs(); return this.unit.pollNextOrderBehavior(game); } - this.ability.startCooldown(game, this.unit); - - this.ability.runBeginCastingActions(game, unit, orderId); - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); - if (newBehavior != null) { - cleanupInputs(); - localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); - return newBehavior; - } - if (!instant) { - this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), - this.ability.getCastingSecondaryTags(), 1.0f, true); - } - this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, this.ability, this.target); if (this.unit.getCurrentBehavior() != prevBeh) { + cleanupInputs(); return this.unit.getCurrentBehavior(); } else if (this.unit.isPaused()) { return this; } + + if (!instant) { + if (this.castPointTicks > this.castTimeEndTick) { + EnumSet tags = this.ability.getCastingSecondaryTags().clone(); + tags.add(SecondaryTag.CHANNEL); + this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), tags, + 1.0f, true); + } + } } if (instant) { + if (!this.doneCastTime) { + // should have already checked castable/range above, as no time delay + if (!this.unit.chargeMana(this.ability.getChargedManaCost())) { + cleanupInputs(); + return this.unit.pollNextOrderBehavior(game); + } + this.ability.startCooldown(game, this.unit); + + this.ability.runBeginCastingActions(game, unit, orderId); + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, this.target); + this.doneCastTime = true; + } CBehavior beh = tryDoEffect(game, wasChanneling); if (beh != null) { + cleanupInputs(); return beh; } CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); if (newBehavior != null) { - cleanupInputs(); localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); return newBehavior; } @@ -173,19 +204,56 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { } } else { final int ticksSinceCast = game.getGameTurnTick() - this.castStartTick; - if ((ticksSinceCast >= castPointTicks) || (ticksSinceCast >= backswingTicks)) { + if (!this.doneCastTime && ticksSinceCast >= this.castTimeEndTick) { if (!this.isWithinRange(game)) { + // target moved too far, out of range now + cleanupInputs(); + return this.unit.pollNextOrderBehavior(game); + } + + this.ability.checkCanUse(game, unit, orderId, autoOrder, BooleanAbilityActivationReceiver.INSTANCE); + if (!BooleanAbilityActivationReceiver.INSTANCE.isOk() + || !this.unit.chargeMana(this.ability.getChargedManaCost())) { + cleanupInputs(); + return this.unit.pollNextOrderBehavior(game); + } + this.ability.startCooldown(game, this.unit); + CBehavior prevBeh = this.unit.getCurrentBehavior(); + + this.ability.runBeginCastingActions(game, unit, orderId); + CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + if (newBehavior != null) { + localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); + return newBehavior; + } + + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, this.target); + if (this.unit.getCurrentBehavior() != prevBeh) { + cleanupInputs(); + return this.unit.getCurrentBehavior(); + } else if (this.unit.isPaused()) { + return this; + } + + this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), + this.ability.getCastingSecondaryTags(), 1.0f, true); + this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + this.doneCastTime = true; + } + + if ((ticksSinceCast >= castPointTicks)) { + if (this.castPointTicks > this.castTimeEndTick && !this.isWithinRange(game)) { // Unit moved too far, out of range now cleanupInputs(); return this.unit.pollNextOrderBehavior(game); } CBehavior beh = tryDoEffect(game, wasChanneling); if (beh != null) { + cleanupInputs(); return beh; } CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); if (newBehavior != null) { - cleanupInputs(); localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); return newBehavior; } @@ -213,16 +281,15 @@ private CBehavior tryDoEffect(CSimulation game, boolean wasChanneling) { } this.doneEffect = true; - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, this.target); if (this.unit.getCurrentBehavior() != prevBeh) { return this.unit.getCurrentBehavior(); } else if (this.unit.isPaused()) { return this; } - + this.ability.runEndCastingActions(game, unit, orderId); this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); - + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this.ability, this.target); if (this.unit.getCurrentBehavior() != prevBeh) { return this.unit.getCurrentBehavior(); @@ -234,6 +301,7 @@ private CBehavior tryDoEffect(CSimulation game, boolean wasChanneling) { this.channeling = this.channeling && this.doChannelTick(game, this.unit, this.target); if (wasEffectDone && wasChanneling && !this.channeling) { endChannel(game, false); + return this.unit.pollNextOrderBehavior(game); } return null; } @@ -250,10 +318,13 @@ public boolean doChannelTick(CSimulation game, CUnit caster, AbilityTarget targe @Override public void end(final CSimulation game, boolean interrupted) { checkEndChannel(game, interrupted); - if (!interrupted) { - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); + Boolean preventEndEvents = (Boolean) this.localStore.get(ABLocalStoreKeys.PREVENTENDEVENTS + this.castId); + if (preventEndEvents == null || !preventEndEvents) { + if (!interrupted) { + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, this.target); + } + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.ability, this.target); } - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.ability, this.target); } private void checkEndChannel(final CSimulation game, final boolean interrupted) { @@ -316,7 +387,7 @@ public void setCastId(int castId) { @Override public boolean interruptable() { - return true; + return this.doneEffect; } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java index 02d2cb06a..535a6dbb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java @@ -1,8 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; +import java.util.EnumSet; import java.util.Map; import com.etheller.warsmash.util.WarsmashConstants; +import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; @@ -14,82 +16,94 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; public class CBehaviorAbilityBuilderNoTarget implements ABBehavior { private Map localStore; private AbilityBuilderActiveAbility ability; - + private int castStartTick = 0; + private int castTimeEndTick = 0; private int castPointTicks = 0; private int backswingTicks = 0; + private boolean doneCastTime = false; private boolean doneEffect = false; private boolean channeling = false; - + private CUnit unit; private int orderId; - + private boolean autoOrder; + private boolean instant = false; private CBehaviorCategory behaviorCategory = null; + private int castId = 0; - public CBehaviorAbilityBuilderNoTarget(final CUnit unit, - final Map localStore, AbilityBuilderActiveAbility ability) { + public CBehaviorAbilityBuilderNoTarget(final CUnit unit, final Map localStore, + AbilityBuilderActiveAbility ability) { this.unit = unit; this.localStore = localStore; this.ability = ability; } - + public void setInstant(boolean instant) { this.instant = instant; } - + public void setBehaviorCategory(CBehaviorCategory behaviorCategory) { - this.behaviorCategory = behaviorCategory; + this.behaviorCategory = behaviorCategory; } @Override - public ABBehavior reset(final CSimulation game, final CWidget target) { + public ABBehavior reset(final CSimulation game, final CWidget target, final boolean autoOrder) { return null; } @Override - public ABBehavior reset(final CSimulation game, CWidget target, int orderId) { + public ABBehavior reset(final CSimulation game, CWidget target, int orderId, final boolean autoOrder) { return null; } @Override - public ABBehavior reset(final CSimulation game, final AbilityPointTarget target) { + public ABBehavior reset(final CSimulation game, final AbilityPointTarget target, final boolean autoOrder) { return null; } @Override - public ABBehavior reset(final CSimulation game, AbilityPointTarget target, int orderId) { + public ABBehavior reset(final CSimulation game, AbilityPointTarget target, int orderId, final boolean autoOrder) { return null; } @Override - public ABBehavior reset() { + public ABBehavior reset(final boolean autoOrder) { + this.doneCastTime = false; this.doneEffect = false; this.castStartTick = 0; - this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); - this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); + this.castTimeEndTick = this.ability.ignoreCastTime() ? 0 + : (int) (this.ability.getCastTime() / WarsmashConstants.SIMULATION_STEP_TIME); + this.castPointTicks = this.castTimeEndTick + + (int) (this.unit.getUnitType().getCastPoint() / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = this.castPointTicks + + (int) (this.unit.getUnitType().getCastBackswingPoint() / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = this.ability.getBaseOrderId(); + this.autoOrder = autoOrder; return this; } @Override - public ABBehavior reset(int orderId) { + public ABBehavior reset(int orderId, final boolean autoOrder) { + this.doneCastTime = false; this.doneEffect = false; this.castStartTick = 0; - this.castPointTicks = (int) ((this.unit.getUnitType().getCastPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); - this.backswingTicks = (int) ((this.unit.getUnitType().getCastBackswingPoint() + this.ability.getCastTime()) - / WarsmashConstants.SIMULATION_STEP_TIME); + this.castTimeEndTick = this.ability.ignoreCastTime() ? 0 + : (int) (this.ability.getCastTime() / WarsmashConstants.SIMULATION_STEP_TIME); + this.castPointTicks = this.castTimeEndTick + + (int) (this.unit.getUnitType().getCastPoint() / WarsmashConstants.SIMULATION_STEP_TIME); + this.backswingTicks = this.castPointTicks + + (int) (this.unit.getUnitType().getCastBackswingPoint() / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = orderId; + this.autoOrder = autoOrder; return this; } @@ -98,37 +112,36 @@ public CBehavior update(final CSimulation game) { boolean wasChanneling = this.channeling; if (this.castStartTick == 0) { this.castStartTick = game.getGameTurnTick(); - - if (!this.unit.chargeMana(this.ability.getChargedManaCost())) { - game.getCommandErrorListener().showInterfaceError(this.unit.getPlayerIndex(), - CommandStringErrorKeys.NOT_ENOUGH_MANA); - return this.unit.pollNextOrderBehavior(game); - } - this.ability.startCooldown(game, this.unit); - - this.ability.runBeginCastingActions(game, unit, orderId); - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); - if (newBehavior != null) { - localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); - return newBehavior; - } - if (!instant) { - this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), - this.ability.getCastingSecondaryTags(), 1.0f, true); - } - this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, this.ability, null); - if (this.unit.getCurrentBehavior() != this) { - return this.unit.getCurrentBehavior(); - } else if (this.unit.isPaused()) { - return this; + // In war3, non-targeted spells cannot be interrupted by pausing on spell events + + if (!instant) { + if (this.castPointTicks > this.castTimeEndTick) { + EnumSet tags = this.ability.getCastingSecondaryTags().clone(); + tags.add(SecondaryTag.CHANNEL); + this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), + tags, 1.0f, true); + } } } - + if (instant) { + if (!this.doneCastTime) { + // should have already checked castable above, as no time delay + if (!this.unit.chargeMana(this.ability.getChargedManaCost())) { + cleanupInputs(); + return this.unit.pollNextOrderBehavior(game); + } + this.ability.startCooldown(game, this.unit); + + this.ability.runBeginCastingActions(game, unit, orderId); + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, null); + this.doneCastTime = true; + } CBehavior beh = tryDoEffect(game, wasChanneling); if (beh != null) { + cleanupInputs(); return beh; } CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); @@ -137,13 +150,38 @@ public CBehavior update(final CSimulation game) { return newBehavior; } if (!this.channeling) { + cleanupInputs(); return this.unit.pollNextOrderBehavior(game); } } else { final int ticksSinceCast = game.getGameTurnTick() - this.castStartTick; - if ((ticksSinceCast >= castPointTicks) || (ticksSinceCast >= backswingTicks)) { + if (!this.doneCastTime && ticksSinceCast >= this.castTimeEndTick) { + this.ability.checkCanUse(game, unit, orderId, autoOrder, BooleanAbilityActivationReceiver.INSTANCE); + if (!BooleanAbilityActivationReceiver.INSTANCE.isOk() + || !this.unit.chargeMana(this.ability.getChargedManaCost())) { + cleanupInputs(); + return this.unit.pollNextOrderBehavior(game); + } + this.ability.startCooldown(game, this.unit); + + this.ability.runBeginCastingActions(game, unit, orderId); + CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + if (newBehavior != null) { + localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); + return newBehavior; + } + + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, null); + + this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), + this.ability.getCastingSecondaryTags(), 1.0f, true); + this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + this.doneCastTime = true; + } + if ((ticksSinceCast >= castPointTicks)) { CBehavior beh = tryDoEffect(game, wasChanneling); if (beh != null) { + cleanupInputs(); return beh; } CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); @@ -153,37 +191,31 @@ public CBehavior update(final CSimulation game) { } } if ((ticksSinceCast >= backswingTicks) && !this.channeling) { + cleanupInputs(); return this.unit.pollNextOrderBehavior(game); } } return this; } - + private CBehavior tryDoEffect(CSimulation game, boolean wasChanneling) { boolean wasEffectDone = this.doneEffect; if (!wasEffectDone) { if (this.channeling) { game.unitLoopSoundEffectEvent(this.unit, this.ability.getAlias()); - } - else { + } else { game.unitSoundEffectEvent(this.unit, this.ability.getAlias()); } this.doneEffect = true; - + this.ability.runEndCastingActions(game, unit, orderId); this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, null); this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this.ability, null); - if (this.unit.getCurrentBehavior() != this) { - return this.unit.getCurrentBehavior(); - } else if (this.unit.isPaused()) { - return this; - } - } this.channeling = this.channeling && this.doChannelTick(game, this.unit); if (wasEffectDone && wasChanneling && !this.channeling) { endChannel(game, false); + return this.unit.pollNextOrderBehavior(game); } return null; } @@ -200,10 +232,13 @@ public boolean doChannelTick(CSimulation game, CUnit caster) { @Override public void end(final CSimulation game, boolean interrupted) { checkEndChannel(game, interrupted); - if (!interrupted) { - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); + Boolean preventEndEvents = (Boolean) this.localStore.get(ABLocalStoreKeys.PREVENTENDEVENTS+this.castId); + if (preventEndEvents == null || !preventEndEvents) { + if (!interrupted) { + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); + } + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.ability, null); } - this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.ability, null); } private void checkEndChannel(final CSimulation game, final boolean interrupted) { @@ -219,6 +254,10 @@ private void endChannel(CSimulation game, boolean interrupted) { game.unitStopSoundEffectEvent(this.unit, this.ability.getAlias()); this.ability.runEndChannelActions(game, unit, orderId); } + + private void cleanupInputs() { + this.ability.cleanupInputs(this.castId); + } @Override public int getHighlightOrderId() { @@ -226,17 +265,18 @@ public int getHighlightOrderId() { } public void setCastId(int castId) { + this.castId = castId; } @Override public boolean interruptable() { - return true; + return this.doneEffect; } @Override public CBehaviorCategory getBehaviorCategory() { if (this.behaviorCategory != null) { - return this.behaviorCategory ; + return this.behaviorCategory; } return CBehaviorCategory.SPELL; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java index f0b4fdfc0..6800b7f64 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java @@ -9,13 +9,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class CBehaviorFinishTransformation implements CBehavior { + private CUnit sourceUnit; private Map localStore; private OnTransformationActions actions; private CUnit unit; @@ -45,12 +49,13 @@ public class CBehaviorFinishTransformation implements CBehavior { private int castStartTick = 0; - public CBehaviorFinishTransformation(Map localStore, final CUnit unit, - AbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, - OnTransformationActions actions, boolean addAlternateTagAfter, final int visibleOrderId, boolean permanent, - float duration, float transformationTime, float landingDelay, float altitudeAdjustmentDelay, + public CBehaviorFinishTransformation(CUnit sourceUnit, Map localStore, final CUnit unit, + AbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, OnTransformationActions actions, + boolean addAlternateTagAfter, final int visibleOrderId, boolean permanent, float duration, + float transformationTime, float landingDelay, float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, boolean immediateLanding, boolean immediateTakeoff, War3ID buffId, CUnitType baseTypeForDuration, boolean instantTransformAtDurationEnd) { + this.sourceUnit = sourceUnit; this.localStore = localStore; this.actions = actions; this.unit = unit; @@ -61,7 +66,8 @@ public CBehaviorFinishTransformation(Map localStore, final CUnit this.permanent = permanent; this.duration = duration; this.transformationTime = transformationTime; - this.transformationTickDuration = Math.round(transformationTime / WarsmashConstants.SIMULATION_STEP_TIME); + // Minus one tick, as we need to wait one tick to start this behavior + this.transformationTickDuration = Math.round(transformationTime / WarsmashConstants.SIMULATION_STEP_TIME) - 1; this.altitudeAdjustmentDelay = altitudeAdjustmentDelay; this.altitudeAdjustmentDuration = altitudeAdjustmentDuration; this.landingDelay = landingDelay; @@ -95,26 +101,44 @@ public CBehavior update(CSimulation game) { } final int ticksSinceCast = game.getGameTurnTick() - this.castStartTick; - if (ticksSinceCast > this.transformationTickDuration) { + if (ticksSinceCast >= this.transformationTickDuration) { TransformationHandler.finishSlowTransformation(game, localStore, unit, newType, keepRatios, actions, ability, addAlternateTagAfter, permanent, takingOff); if (instantTransformAtDurationEnd) { - TransformationHandler.createInstantTransformBackBuff(game, localStore, unit, baseTypeForDuration, + TransformationHandler.createInstantTransformBackBuff(game, sourceUnit, localStore, unit, baseTypeForDuration, keepRatios, actions.createUntransformActions(), ability, buffId, addAlternateTagAfter, transformationTime, duration, permanent); } else { - TransformationHandler.createSlowTransformBackBuff(game, localStore, unit, baseTypeForDuration, + TransformationHandler.createSlowTransformBackBuff(game, sourceUnit, localStore, unit, baseTypeForDuration, keepRatios, actions.createUntransformActions(), ability, buffId, addAlternateTagAfter, transformationTime, duration, permanent, takingOff, landing, immediateTakeoff, immediateLanding, altitudeAdjustmentDelay, landingDelay, altitudeAdjustmentDuration); } + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.ability, null); + CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + if (this.equals(newBehavior)) { + } + localStore.remove(ABLocalStoreKeys.PREVIOUSBEHAVIOR); + if (newBehavior != null) { + localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); + cleanupInputs(); + return newBehavior; + } + cleanupInputs(); return this.unit.pollNextOrderBehavior(game); } return this; } + private void cleanupInputs() { + if (this.ability instanceof AbilityBuilderActiveAbility) { + ((AbilityBuilderActiveAbility) this.ability).cleanupInputs(this.actions.getCastId()); + } + } + @Override public void begin(CSimulation game) { } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java index 8e22e6f39..596fc3d57 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -42,14 +43,13 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnit theUnit = basecaster; + CWidget theTarget = null; + if (caster != null) { + theUnit = caster.callback(game, basecaster, localStore, castId); + } + if (target != null) { + theTarget = target.callback(game, basecaster, localStore, castId); + } + CAbility theAbility = (CAbility) localStore.get(ABLocalStoreKeys.ABILITY); + theUnit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, theAbility, theTarget); + theUnit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, theAbility, theTarget); + theUnit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, theAbility, theTarget); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java new file mode 100644 index 000000000..e96f4794d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionSetPreventEndEvents implements ABSingleAction { + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + localStore.put(ABLocalStoreKeys.PREVENTENDEVENTS+castId, true); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return jassTextGenerator.setUserData(ABLocalStoreKeys.CHANNELING, JassTextGeneratorType.Boolean, "true"); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java index eb620b9ac..3c615a764 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java @@ -46,7 +46,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, int castId) { + CBehavior b = (CBehavior) localStore.get(ABLocalStoreKeys.PREVIOUSBEHAVIOR); + if (b != null && b != caster.getCurrentBehavior()) { + if (checkForOrders == null || checkForOrders.callback(game, caster, localStore, castId)) { + if (caster.getOrderQueue().isEmpty()) { + if (caster.order(game, b.getHighlightOrderId(), b.visit(BehaviorTargetVisitor.INSTANCE)) + && caster.getOrderQueue().isEmpty()) { + localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, caster.getCurrentBehavior()); + } + } + } else { + if (caster.order(game, b.getHighlightOrderId(), b.visit(BehaviorTargetVisitor.INSTANCE)) + && caster.getOrderQueue().isEmpty()) { + localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, caster.getCurrentBehavior()); + } + } + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java new file mode 100644 index 000000000..23dd6f79a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABActionAttemptToResumePreviousBehavior implements ABAction { + + private ABBooleanCallback checkForOrders; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + if (checkForOrders == null || checkForOrders.callback(game, caster, localStore, castId)) { + if (caster.getOrderQueue().isEmpty()) { + localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, localStore.get(ABLocalStoreKeys.PREVIOUSBEHAVIOR)); + } + } else { + localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, localStore.get(ABLocalStoreKeys.PREVIOUSBEHAVIOR)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java index dc403eca2..35dfd5b24 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -30,7 +31,7 @@ public class ABActionCreatePassiveBuff implements ABSingleAction { private ABBooleanCallback positive; private ABStringCallback visibilityGroup; - + private List uniqueFlags; @Override @@ -50,13 +51,16 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { final ABTargetingBuff ability = new ABTargetingBuff(game.getHandleIdAllocator().createId(), - this.buffId.callback(game, caster, localStore, castId)); + this.buffId.callback(game, caster, localStore, castId), (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java index ff1478e48..3382245e3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -28,7 +29,7 @@ public class ABActionCreateTimedArtBuff implements ABSingleAction { private ABBooleanCallback stacks; private ABStringCallback visibilityGroup; - + private List uniqueFlags; public void runAction(final CSimulation game, final CUnit caster, final Map localStore, @@ -54,11 +55,13 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; private Map uniqueValues; @@ -64,7 +65,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; private Map uniqueValues; @@ -63,7 +64,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; @Override @@ -28,6 +29,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; private Map uniqueValues; @@ -64,7 +65,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; private Map uniqueValues; @@ -64,7 +65,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; @Override @@ -62,7 +63,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); + float rad = radius.callback(game, caster, localStore, castId); + War3ID theId = null; + if (id == null) { + theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + } else { + theId = id.callback(game, caster, localStore, castId); + } + final ABGroupEffect ret = new ABGroupEffect(loc, rad, theId, effectType); + game.registerTimer(ret); + localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateLightningEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java index c8cc3eef3..0b82be90d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import java.util.Map; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateLoopingSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateLoopingSoundEffectOnUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java index 63765b03c..40ec4eb00 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateLoopingSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import java.util.Map; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSoundEffectOnUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java index 32db8f65d..a4861b2bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import java.util.Map; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSpellEffectAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java index 5c0cc2bc6..776389cad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import java.util.Map; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSpellEffectAtPoint.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java index 38c0ed376..28c949fa3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import java.util.Map; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSpellEffectOnUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java index 959bbaa90..38136b69f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateSpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import java.util.Map; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java index 6d5cf6582..3a2cbae65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import java.util.Map; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectAtPoint.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java index 906203b61..cb37d2d54 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import java.util.Map; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectOnUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java index e6f64236c..5f2b4e562 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateTemporarySpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import java.util.Map; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveSpellEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveSpellEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java index bcdea676e..cc4a06e2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveSpellEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import java.util.Map; @@ -8,18 +8,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks.ABFXCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -public class ABActionRemoveSpellEffect implements ABSingleAction { +public class ABActionRemoveEffect implements ABSingleAction { - private ABFXCallback effectToRemove; + private ABFXCallback effect; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - this.effectToRemove.callback(game, caster, localStore, castId).remove(); + this.effect.callback(game, caster, localStore, castId).remove(); } @Override public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { - return "DestroyEffect(" + this.effectToRemove.generateJassEquivalent(jassTextGenerator) + ")"; + return "DestroyEffect(" + this.effect.generateJassEquivalent(jassTextGenerator) + ")"; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveLightningEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java index 36cd86977..d7d891c73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import java.util.Map; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java new file mode 100644 index 000000000..8481173b5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionKillTimer implements ABSingleAction { + + private ABTimerCallback timer; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + this.timer.callback(game, caster, localStore, castId).kill(game); + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "PauseTimer(" + this.timer.generateJassEquivalent(jassTextGenerator) + ")"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java index f81aea79b..20f4bd976 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java @@ -5,9 +5,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionUpdateTimerTimeout implements ABSingleAction { @@ -17,8 +19,8 @@ public class ABActionUpdateTimerTimeout implements ABSingleAction { @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - this.timer.callback(game, caster, localStore, castId) - .setTimeoutTime(this.timeout.callback(game, caster, localStore, castId)); + CTimer theT = this.timer.callback(game, caster, localStore, castId); + theT.resetTimeoutTime(this.timeout.callback(game, caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java index 3899fd5bf..01ede0dab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java @@ -24,14 +24,14 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (targetUnit.getCurrentBehavior().getBehaviorCategory() == CBehaviorCategory.ATTACK) { targetUnit.beginBehavior(game, targetUnit.getMoveBehavior().reset(targetUnit.getMoveBehavior().getHighlightOrderId(), - targetUnit.getCurrentBehavior().visit(BehaviorTargetVisitor.INSTANCE))); + targetUnit.getCurrentBehavior().visit(BehaviorTargetVisitor.INSTANCE)), true); } else if (targetUnit.getCurrentBehavior().getBehaviorCategory() == CBehaviorCategory.MOVEMENT) { CRangedBehavior next = targetUnit.getCurrentBehavior().visit(BehaviorNextBehaviorVisitor.INSTANCE); if (next != null && next.getBehaviorCategory() == CBehaviorCategory.ATTACK) { targetUnit.beginBehavior(game, targetUnit.getMoveBehavior().reset(targetUnit.getMoveBehavior().getHighlightOrderId(), - next.visit(BehaviorTargetVisitor.INSTANCE))); + next.visit(BehaviorTargetVisitor.INSTANCE)), true); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java index a28e1c895..052a1424b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -29,6 +30,9 @@ public class ABActionDamageArea implements ABAction { private ABFloatCallback damage; private ABBooleanCallback validTarget; + private ABFloatCallback unitSpecificDamageMod; + private ABFloatCallback maxDamage; + private ABBooleanCallback isAttack; private ABBooleanCallback isRanged; private ABAttackTypeCallback attackType; @@ -39,7 +43,7 @@ public class ABActionDamageArea implements ABAction { private ABBooleanCallback explodeOnDeath; private ABBooleanCallback onlyDamageSummons; private ABBooleanCallback nonlethal; - + private List extraActions; @Override @@ -77,40 +81,91 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId)) { AbilityPointTarget loc = target.callback(game, caster, localStore, castId); float pfullRad = 0; + float theMaxDamage = 0; CUnit theSource = caster; if (this.radius != null) { pfullRad = this.radius.callback(game, caster, localStore, castId); } + if (this.maxDamage != null) { + theMaxDamage = this.maxDamage.callback(game, caster, localStore, castId); + } if (this.source != null) { theSource = this.source.callback(game, caster, localStore, castId); } - final float fullRad = pfullRad; final CAttackType ftheAttackType = theAttackType; final CDamageType ftheDamageType = theDamageType; final CUnit ftheSource = theSource; final float baseDamage = damage.callback(game, caster, localStore, castId); - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, - new CUnitEnumFunction() { - @Override - public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { - if (enumUnit.canReach(loc, fullRad)) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); - } - } + if (theMaxDamage > 0) { + List hits = new ArrayList<>(); + List counts = new ArrayList<>(); + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + hits.add(enumUnit); + if (unitSpecificDamageMod != null) { + counts.add(unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + counts.add(1f); + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; + } + }); + + float count = 0; + for (float c : counts) { + count += c; + } + float damPerTar = baseDamage * count > theMaxDamage ? theMaxDamage / count : baseDamage; + for (CUnit hit : hits) { + if (unitSpecificDamageMod != null) { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + damPerTar * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); + } + if (extraActions != null) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + } + } + + } else { + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (unitSpecificDamageMod != null) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + baseDamage * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); - return false; } - }); + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; + } + }); + } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java index abf21f3c6..20bd2a696 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -33,6 +34,9 @@ public class ABActionDamageAttackSplash implements ABAction { private ABFloatCallback damageFactorSmall; private ABBooleanCallback validTarget; + private ABFloatCallback unitSpecificDamageMod; + private ABFloatCallback maxDamage; + private ABBooleanCallback isAttack; private ABBooleanCallback isRanged; private ABAttackTypeCallback attackType; @@ -43,7 +47,7 @@ public class ABActionDamageAttackSplash implements ABAction { private ABBooleanCallback explodeOnDeath; private ABBooleanCallback onlyDamageSummons; private ABBooleanCallback nonlethal; - + private List extraActions; @Override @@ -85,6 +89,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS float psmallRad = 0; float pmedDam = 0; float psmallDam = 0; + float theMaxDamage = 0; CUnit theSource = caster; if (this.fullDamageRadius != null) { pfullRad = this.fullDamageRadius.callback(game, caster, localStore, castId); @@ -101,6 +106,9 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (this.damageFactorSmall != null) { psmallDam = this.damageFactorSmall.callback(game, caster, localStore, castId); } + if (this.maxDamage != null) { + theMaxDamage = this.maxDamage.callback(game, caster, localStore, castId); + } if (this.source != null) { theSource = this.source.callback(game, caster, localStore, castId); } @@ -115,42 +123,164 @@ public void runAction(CSimulation game, CUnit caster, Map localS final CUnit ftheSource = theSource; final float baseDamage = damage.callback(game, caster, localStore, castId); - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), - Math.max(Math.max(pfullRad, pmedRad), psmallRad), new CUnitEnumFunction() { - @Override - public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { - if (enumUnit.canReach(loc, fullRad)) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + if (theMaxDamage > 0) { + List fullhits = new ArrayList<>(); + List medhits = new ArrayList<>(); + List smallhits = new ArrayList<>(); + List counts = new ArrayList<>(); + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + Math.max(pfullRad, Math.max(medRad, smallRad)), new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (enumUnit.canReach(loc, fullRad)) { + fullhits.add(enumUnit); + if (unitSpecificDamageMod != null) { + counts.add( + unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + counts.add(1f); } - } - } else if (enumUnit.canReach(loc, medRad)) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * medDam); - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + } else if (enumUnit.canReach(loc, medRad)) { + medhits.add(enumUnit); + if (unitSpecificDamageMod != null) { + counts.add(medDam + * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + counts.add(medDam); } - } - } else if (enumUnit.canReach(loc, smallRad)) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * smallDam); - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + } else if (enumUnit.canReach(loc, smallRad)) { + smallhits.add(enumUnit); + if (unitSpecificDamageMod != null) { + counts.add(smallDam + * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + counts.add(smallDam); } } } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); - return false; + }); + + float count = 0; + for (float c : counts) { + count += c; + } + float damPerTar = baseDamage * count > theMaxDamage + ? theMaxDamage / (fullhits.size() + medDam * medhits.size() + smallDam * smallhits.size()) + : baseDamage; + for (CUnit hit : fullhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (unitSpecificDamageMod != null) { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + damPerTar * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + for (CUnit hit : medhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (unitSpecificDamageMod != null) { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + damPerTar * medDam * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medDam); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + for (CUnit hit : smallhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (unitSpecificDamageMod != null) { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallDam + * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallDam); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); } - }); + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + + } else { + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + Math.max(Math.max(pfullRad, pmedRad), psmallRad), new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (enumUnit.canReach(loc, fullRad)) { + if (unitSpecificDamageMod != null) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + baseDamage * unitSpecificDamageMod.callback(game, caster, + localStore, castId)); + } else { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } else if (enumUnit.canReach(loc, medRad)) { + if (unitSpecificDamageMod != null) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + baseDamage * medDam * unitSpecificDamageMod.callback(game, caster, + localStore, castId)); + } else { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * medDam); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } else if (enumUnit.canReach(loc, smallRad)) { + if (unitSpecificDamageMod != null) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + baseDamage * smallDam * unitSpecificDamageMod.callback(game, caster, + localStore, castId)); + } else { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * smallDam); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; + } + }); + } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java index 63a8b9c1a..e4d91c44e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -31,6 +32,9 @@ public class ABActionDamageBurst implements ABAction { private ABFloatCallback partialDamage; private ABBooleanCallback validTarget; + private ABFloatCallback unitSpecificDamageMod; + private ABFloatCallback maxDamage; + private ABBooleanCallback isAttack; private ABBooleanCallback isRanged; private ABAttackTypeCallback attackType; @@ -41,7 +45,7 @@ public class ABActionDamageBurst implements ABAction { private ABBooleanCallback explodeOnDeath; private ABBooleanCallback onlyDamageSummons; private ABBooleanCallback nonlethal; - + private List extraActions; @Override @@ -81,6 +85,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS float pfullRad = 0; float parRad = 0; float parDam = 0; + float theMaxDamage = 0; CUnit theSource = caster; if (this.fullDamageRadius != null) { pfullRad = this.fullDamageRadius.callback(game, caster, localStore, castId); @@ -91,6 +96,9 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (this.partialDamage != null) { parDam = this.partialDamage.callback(game, caster, localStore, castId); } + if (this.maxDamage != null) { + theMaxDamage = this.maxDamage.callback(game, caster, localStore, castId); + } if (this.source != null) { theSource = this.source.callback(game, caster, localStore, castId); } @@ -103,34 +111,125 @@ public void runAction(CSimulation game, CUnit caster, Map localS final CUnit ftheSource = theSource; final float baseDamage = damage.callback(game, caster, localStore, castId); - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, partialRad), - new CUnitEnumFunction() { - @Override - public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { - if (enumUnit.canReach(loc, fullRad)) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + if (theMaxDamage > 0) { + List fullhits = new ArrayList<>(); + List partialhits = new ArrayList<>(); + List counts = new ArrayList<>(); + float partialRatio = partialDam / baseDamage; + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, partialRad), + new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (enumUnit.canReach(loc, fullRad)) { + fullhits.add(enumUnit); + if (unitSpecificDamageMod != null) { + counts.add( + unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + counts.add(1f); } - } - } else if (enumUnit.canReach(loc, partialRad)) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), partialDam); - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + } else if (enumUnit.canReach(loc, partialRad)) { + partialhits.add(enumUnit); + if (unitSpecificDamageMod != null) { + counts.add(partialRatio + * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + counts.add(partialRatio); } } } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); - return false; + }); + + float count = 0; + for (float c : counts) { + count += c; + } + float damPerTar = baseDamage * count > theMaxDamage + ? theMaxDamage / (fullhits.size() + partialRatio * partialhits.size()) + : baseDamage; + for (CUnit hit : fullhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (unitSpecificDamageMod != null) { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + damPerTar * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + for (CUnit hit : partialhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (unitSpecificDamageMod != null) { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * partialRatio + * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * partialRatio); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); } - }); + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + + } else { + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, partialRad), + new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (enumUnit.canReach(loc, fullRad)) { + if (unitSpecificDamageMod != null) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + baseDamage * unitSpecificDamageMod.callback(game, caster, + localStore, castId)); + } else { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } else if (enumUnit.canReach(loc, partialRad)) { + if (unitSpecificDamageMod != null) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + partialDam * unitSpecificDamageMod.callback(game, caster, + localStore, castId)); + } else { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), partialDam); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; + } + }); + } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java index 96b58c2cc..3f3572b9a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -33,6 +34,9 @@ public class ABActionDamageSplash implements ABAction { private ABFloatCallback smallDamageRadius; private ABBooleanCallback validTarget; + private ABFloatCallback unitSpecificDamageMod; + private ABFloatCallback maxDamage; + private ABBooleanCallback isAttack; private ABBooleanCallback isRanged; private ABAttackTypeCallback attackType; @@ -43,7 +47,7 @@ public class ABActionDamageSplash implements ABAction { private ABBooleanCallback explodeOnDeath; private ABBooleanCallback onlyDamageSummons; private ABBooleanCallback nonlethal; - + private List extraActions; @Override @@ -85,6 +89,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS float psmallRad = 0; float pmedDam = 0; float psmallDam = 0; + float theMaxDamage = 0; CUnit theSource = caster; if (this.fullDamageRadius != null) { pfullRad = this.fullDamageRadius.callback(game, caster, localStore, castId); @@ -101,6 +106,9 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (this.smallDamage != null) { psmallDam = this.smallDamage.callback(game, caster, localStore, castId); } + if (this.maxDamage != null) { + theMaxDamage = this.maxDamage.callback(game, caster, localStore, castId); + } if (this.source != null) { theSource = this.source.callback(game, caster, localStore, castId); } @@ -115,42 +123,164 @@ public void runAction(CSimulation game, CUnit caster, Map localS final CUnit ftheSource = theSource; final float baseDamage = fullDamage.callback(game, caster, localStore, castId); - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), - Math.max(Math.max(pfullRad, pmedRad), psmallRad), new CUnitEnumFunction() { - @Override - public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { - if (enumUnit.canReach(loc, fullRad)) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + if (theMaxDamage > 0) { + List fullhits = new ArrayList<>(); + List medhits = new ArrayList<>(); + List smallhits = new ArrayList<>(); + List counts = new ArrayList<>(); + float medRatio = medDam / baseDamage; + float smallRatio = smallDam / baseDamage; + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + Math.max(pfullRad, Math.max(medRad, smallRad)), new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (enumUnit.canReach(loc, fullRad)) { + fullhits.add(enumUnit); + if (unitSpecificDamageMod != null) { + counts.add( + unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + counts.add(1f); } - } - } else if (enumUnit.canReach(loc, medRad)) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), medDam); - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + } else if (enumUnit.canReach(loc, medRad)) { + medhits.add(enumUnit); + if (unitSpecificDamageMod != null) { + counts.add(medRatio + * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + counts.add(medRatio); } - } - } else if (enumUnit.canReach(loc, smallRad)) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), smallDam); - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + } else if (enumUnit.canReach(loc, smallRad)) { + smallhits.add(enumUnit); + if (unitSpecificDamageMod != null) { + counts.add(smallRatio + * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + counts.add(smallRatio); } } } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); - return false; + }); + + float count = 0; + for (float c : counts) { + count += c; + } + float damPerTar = baseDamage * count > theMaxDamage ? theMaxDamage + / (fullhits.size() + medRatio * medhits.size() + smallRatio * smallhits.size()) : baseDamage; + + for (CUnit hit : fullhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (unitSpecificDamageMod != null) { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + damPerTar * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + for (CUnit hit : medhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (unitSpecificDamageMod != null) { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medRatio * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medRatio); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + for (CUnit hit : smallhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (unitSpecificDamageMod != null) { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallRatio * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + } else { + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallRatio); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); } - }); + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + + } else { + game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + Math.max(Math.max(pfullRad, pmedRad), psmallRad), new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (enumUnit.canReach(loc, fullRad)) { + if (unitSpecificDamageMod != null) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + baseDamage * unitSpecificDamageMod.callback(game, caster, + localStore, castId)); + } else { + + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } else if (enumUnit.canReach(loc, medRad)) { + if (unitSpecificDamageMod != null) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), medDam * unitSpecificDamageMod + .callback(game, caster, localStore, castId)); + } else { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), medDam); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } else if (enumUnit.canReach(loc, smallRad)) { + if (unitSpecificDamageMod != null) { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + smallDam * unitSpecificDamageMod.callback(game, caster, localStore, + castId)); + } else { + enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), smallDam); + } + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } + } + } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + return false; + } + }); + } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java index d45a8a6bd..09534ba45 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java @@ -23,7 +23,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (newBehavior != null) { System.err.println("Forcing start of new behavior"); localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); - targetUnit.beginBehavior(game, newBehavior); + targetUnit.beginBehavior(game, newBehavior, true); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java index fd8489a6c..5c2f5ec2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java @@ -17,6 +17,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; public class ABActionTransformUnit implements ABAction { @@ -72,7 +74,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS } CUnitType targetType = null; - + boolean onlyToAlt = false; if (onlyTransformToAlternate != null) { onlyToAlt = onlyTransformToAlternate.callback(game, caster, localStore, castId); @@ -117,7 +119,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS } } OnTransformationActions actions = new OnTransformationActions(goldCost, lumberCost, foodCost, - onTransformActions, onUntransformActions); + onTransformActions, onUntransformActions, castId); boolean perm = false; boolean isKeepRatios = true; @@ -163,19 +165,32 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (instantTransformAtDurationEnd != null) { instant = instantTransformAtDurationEnd.callback(game, caster, localStore, castId); } - - int orderId = -1; - if (abil instanceof AbilityBuilderActiveAbility) { - AbilityBuilderActiveAbility activeabil = (AbilityBuilderActiveAbility) abil; - orderId = addAlternateTagAfter ? activeabil.getBaseOrderId() : activeabil.getOffOrderId(); - } - localStore.put(ABLocalStoreKeys.TRANSFORMINGTOALT + castId, addAlternateTagAfter); - localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, - new CBehaviorFinishTransformation(localStore, u1, abil, targetType, isKeepRatios, actions, - addAlternateTagAfter, orderId, perm, - dur, transTime, landTime, atlAdDelay, altAdTime, imLand, imTakeOff, theBuffId, - game.getUnitData().getUnitType(baseId), instant)); + if (transTime > 0) { + int orderId = -1; + if (abil instanceof AbilityBuilderActiveAbility) { + AbilityBuilderActiveAbility activeabil = (AbilityBuilderActiveAbility) abil; + orderId = addAlternateTagAfter ? activeabil.getBaseOrderId() : activeabil.getOffOrderId(); + } + + localStore.put(ABLocalStoreKeys.TRANSFORMINGTOALT + castId, addAlternateTagAfter); + localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, + new CBehaviorFinishTransformation(caster, localStore, u1, abil, targetType, isKeepRatios, actions, + addAlternateTagAfter, orderId, perm, dur, transTime, landTime, atlAdDelay, altAdTime, + imLand, imTakeOff, theBuffId, game.getUnitData().getUnitType(baseId), instant)); + } else { + TransformationHandler.instantTransformation(game, localStore, u1, targetType, isKeepRatios, actions, abil, + addAlternateTagAfter, perm, true); + if (dur > 0) { + OnTransformationActions unActions = new OnTransformationActions(-goldCost, -lumberCost, null, null, + onUntransformActions, castId); + TransformationHandler.createInstantTransformBackBuff(game, caster, localStore, u1, + game.getUnitData().getUnitType(baseId), isKeepRatios, unActions, abil, theBuffId, + addAlternateTagAfter, transTime, dur, perm); + } + u1.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, abil, null); + u1.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, abil, null); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java index 56ea0f335..e294551ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java @@ -81,7 +81,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (onlyTransformToAlternate != null) { onlyToAlt = onlyTransformToAlternate.callback(game, caster, localStore, castId); } - + if (!onlyToAlt && u1.getTypeId().equals(altId)) { // Transforming back targetType = baseType; @@ -122,9 +122,9 @@ public void runAction(CSimulation game, CUnit caster, Map localS } } OnTransformationActions actions = new OnTransformationActions(goldCost, lumberCost, foodCost, - onTransformActions, onUntransformActions); + onTransformActions, onUntransformActions, castId); OnTransformationActions unActions = new OnTransformationActions(-goldCost, -lumberCost, null, null, - onUntransformActions); + onUntransformActions, castId); boolean isKeepRatios = true; float dur = 0; @@ -149,14 +149,14 @@ public void runAction(CSimulation game, CUnit caster, Map localS localStore.put(ABLocalStoreKeys.TRANSFORMINGTOALT + castId, addAlternateTagAfter); if (transTime > 0) { TransformationHandler.playMorphAnimation(u1, addAlternateTagAfter); - new DelayInstantTransformationTimer(game, localStore, u1, actions, addAlternateTagAfter, transTime, + new DelayInstantTransformationTimer(game, caster, localStore, u1, actions, addAlternateTagAfter, transTime, baseType, targetType, isKeepRatios, abil, theBuffId, transTime, dur).start(game); } else { TransformationHandler.instantTransformation(game, localStore, u1, targetType, isKeepRatios, actions, abil, addAlternateTagAfter, perm, true); if (dur > 0) { - TransformationHandler.createInstantTransformBackBuff(game, localStore, u1, baseType, isKeepRatios, unActions, abil, - theBuffId, addAlternateTagAfter, transTime, dur, perm); + TransformationHandler.createInstantTransformBackBuff(game, caster, localStore, u1, baseType, isKeepRatios, + unActions, abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java index 9ff980f46..71d7e622f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java @@ -144,20 +144,21 @@ public void runAction(CSimulation game, CUnit caster, Map localS goldCost = baseType.getGoldCost(); lumberCost = baseType.getLumberCost(); } - actions = new OnTransformationActions(goldCost, lumberCost, foodCost, null, onUntransformActions); + actions = new OnTransformationActions(goldCost, lumberCost, foodCost, null, onUntransformActions, + castId); } else { - actions = new OnTransformationActions(onUntransformActions); + actions = new OnTransformationActions(onUntransformActions, castId); } if (instant) { - TransformationHandler.createInstantTransformBackBuff(game, localStore, u1, baseType, isKeepRatios, + TransformationHandler.createInstantTransformBackBuff(game, caster, localStore, u1, baseType, isKeepRatios, actions, abil, theBuffId, true, transTime, dur, perm); } else { boolean takingOff = u1.getMovementType() != MovementType.FLY && baseType.getMovementType() == MovementType.FLY; boolean landing = u1.getMovementType() == MovementType.FLY && baseType.getMovementType() != MovementType.FLY; - TransformationHandler.createSlowTransformBackBuff(game, localStore, u1, baseType, isKeepRatios, actions, + TransformationHandler.createSlowTransformBackBuff(game, caster, localStore, u1, baseType, isKeepRatios, actions, abil, theBuffId, true, transTime, dur, perm, takingOff, landing, imTakeOff, imLand, atlAdDelay, landTime, altAdTime); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java new file mode 100644 index 000000000..a0c4587e8 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetBuffSourceAbility extends ABAbilityCallback { + + private ABBuffCallback buff; + + @Override + public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return buff.callback(game, caster, localStore, castId).getSourceAbility(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java new file mode 100644 index 000000000..a0c4152d3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetMatchingBuff extends ABBuffCallback { + + @Override + public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return (CBuff) localStore.get(ABLocalStoreKeys.MATCHINGBUFF); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_MATCHINGBUFF", JassTextGeneratorType.BuffHandle); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java new file mode 100644 index 000000000..3ee8fe04a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; + +public class ABCallbackGetBuffDurationElapsed extends ABFloatCallback { + + private ABBuffCallback buff; + + @Override + public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final CBuff theBuff = buff.callback(game, caster, localStore, castId); + return theBuff.getDurationMax() - theBuff.getDurationRemaining(game, caster); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java new file mode 100644 index 000000000..ed4fc1839 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.util.WarsmashConstants; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABCallbackOneGameTick extends ABFloatCallback { + + @Override + public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return WarsmashConstants.SIMULATION_STEP_TIME + 0.000001f; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java new file mode 100644 index 000000000..d66ba745a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; + +public class ABCallbackGetBuffAlias extends ABIDCallback { + + private ABBuffCallback buff; + + @Override + public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return buff.callback(game, caster, localStore, castId).getAlias(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java new file mode 100644 index 000000000..5f7f22bfa --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; + +public class ABCallbackGetAbilityHandleAsInteger extends ABIntegerCallback { + + private ABAbilityCallback ability; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return ability.callback(game, caster, localStore, castId).getHandleId(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java new file mode 100644 index 000000000..8aba01d9b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; + +public class ABCallbackGetBuffHandleAsInteger extends ABIntegerCallback { + + private ABBuffCallback buff; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return buff.callback(game, caster, localStore, castId).getHandleId(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java new file mode 100644 index 000000000..aa4ddce16 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABCallbackGetCastId extends ABIntegerCallback { + + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return castId; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java new file mode 100644 index 000000000..4f6610724 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; + +public class ABCallbackGetUnitHandleAsInteger extends ABIntegerCallback { + + private ABUnitCallback unit; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return unit.callback(game, caster, localStore, castId).getHandleId(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java index deff563b2..9b37c4cb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java @@ -17,7 +17,7 @@ public Boolean callback(CSimulation game, CUnit caster, Map loca Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); - return v1==v2; + return v1.equals(v2); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java index dff22ca81..58e7825a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java @@ -16,7 +16,7 @@ public class ABConditionIntegerNe extends ABCondition { public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); - return v1!=v2; + return !v1.equals(v2); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java new file mode 100644 index 000000000..8ea80e8b4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java @@ -0,0 +1,39 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABConditionDoesUnitHaveBuffMatchingCondition extends ABCondition { + + private ABUnitCallback unit; + private ABBooleanCallback condition; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + for (CAbility ability : theUnit.getAbilities()) { + if (ability instanceof CBuff) { + localStore.put(ABLocalStoreKeys.MATCHINGBUFF, ability); + if (condition.callback(game, caster, localStore, castId)) { + localStore.remove(ABLocalStoreKeys.MATCHINGBUFF); + return true; + } + localStore.remove(ABLocalStoreKeys.MATCHINGBUFF); + } + } + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java index 9d42dc766..e85fe916c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractCBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -28,9 +29,13 @@ public abstract class ABBuff extends AbstractCBuff { protected List uniqueFlags = null; private String visibilityGroup = null; + private CAbility sourceAbil; + protected CUnit sourceUnit; - public ABBuff(int handleId, War3ID code, War3ID alias) { + public ABBuff(int handleId, War3ID code, War3ID alias, CAbility sourceAbility, CUnit sourceUnit) { super(handleId, code, alias); + this.sourceAbil = sourceAbility; + this.sourceUnit = sourceUnit; } @Override @@ -196,4 +201,14 @@ public void setStacks(boolean stacks) { public boolean isStacks() { return ((this.flags & STACKS) != 0); } + + @Override + public CAbility getSourceAbility() { + return this.sourceAbil; + } + + @Override + public CUnit getSourceUnit() { + return this.sourceUnit; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java index 07d8bb805..142bc4d6d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java @@ -3,6 +3,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; @@ -20,9 +21,9 @@ public class ABBuffSlow extends ABGenericTimedBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias, final float duration, + public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias, CAbility sourceAbility, CUnit sourceUnit, final float duration, boolean leveled) { - super(handleId, alias, duration, false, leveled, false, false); + super(handleId, alias, sourceAbility, sourceUnit, duration, false, leveled, false, false); if (STANDARD_ATTACK_DEBUFF == null) { STANDARD_ATTACK_DEBUFF = new NonStackingStatBuff(NonStackingStatBuffType.ATKSPD, "genericSlow", -1 * game.getGameplayConstants().getFrostAttackSpeedDecrease()); @@ -35,9 +36,9 @@ public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias this.moveSpeedDebuff = STANDARD_MOVE_DEBUFF; } - public ABBuffSlow(final int handleId, final War3ID alias, final float duration, + public ABBuffSlow(final int handleId, final War3ID alias, CAbility sourceAbility, CUnit sourceUnit, final float duration, final float attackSpeedReductionPercent, final float moveSpeedReductionPercent, boolean leveled) { - super(handleId, alias, duration, false, leveled, false, false); + super(handleId, alias, sourceAbility, sourceUnit, duration, false, leveled, false, false); this.attackSpeedDebuff = new NonStackingStatBuff(NonStackingStatBuffType.ATKSPD, "genericSlow", -1 * attackSpeedReductionPercent); this.moveSpeedDebuff = new NonStackingStatBuff(NonStackingStatBuffType.MVSPDPCT, "genericSlow", diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java index b0d9991b1..51df1ee51 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java @@ -3,6 +3,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -16,8 +17,8 @@ public class ABBuffStun extends ABGenericTimedBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABBuffStun(final int handleId, final War3ID alias, final float duration, final boolean leveled) { - super(handleId, alias, duration, false, leveled, false, false); + public ABBuffStun(final int handleId, final War3ID alias, CAbility sourceAbility, CUnit sourceUnit, final float duration, final boolean leveled) { + super(handleId, alias, sourceAbility, sourceUnit, duration, false, leveled, false, false); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java index 53d9455f2..dd8dbb2f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java @@ -3,6 +3,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -11,8 +12,8 @@ public class ABGenericArtBuff extends ABBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABGenericArtBuff(int handleId, War3ID alias) { - super(handleId, alias, alias); + public ABGenericArtBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit) { + super(handleId, alias, alias, sourceAbility, sourceUnit); this.setIconShowing(false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java index b7d58135b..df205ec99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; @@ -14,9 +15,9 @@ public class ABGenericAuraBuff extends ABBuff { private CUnit caster; - public ABGenericAuraBuff(int handleId, War3ID alias, CUnit caster, boolean leveled, + public ABGenericAuraBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit caster, boolean leveled, boolean positive) { - super(handleId, alias, alias); + super(handleId, alias, alias, sourceAbility, caster); this.caster = caster; this.fx = new HashMap<>(); this.setHero(caster.isHero()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java index 5daa13031..97de39876 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java @@ -3,18 +3,19 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; public abstract class ABGenericPermanentBuff extends ABBuff { - public ABGenericPermanentBuff(int handleId, War3ID alias, boolean showIcon, boolean leveled, boolean positive) { - super(handleId, alias, alias); + public ABGenericPermanentBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, boolean showIcon, boolean leveled, boolean positive) { + super(handleId, alias, alias, sourceAbility, sourceUnit); this.setIconShowing(showIcon); this.setLeveled(leveled); this.setPositive(positive); } - public ABGenericPermanentBuff(int handleId, War3ID alias, boolean leveled, boolean positive) { - super(handleId, alias, alias); + public ABGenericPermanentBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, boolean leveled, boolean positive) { + super(handleId, alias, alias, sourceAbility, sourceUnit); this.setLeveled(leveled); this.setPositive(positive); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java index 37889aa54..a64141f7d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java @@ -4,15 +4,16 @@ import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; public abstract class ABGenericTimedBuff extends ABBuff { private final float duration; private int currentTick = 0; private int expireTick; - public ABGenericTimedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, boolean leveled, + public ABGenericTimedBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, boolean leveled, boolean positive, boolean dispellable) { - super(handleId, alias, alias); + super(handleId, alias, alias, sourceAbility, sourceUnit); this.setTimedLifeBar(showTimedLifeBar); this.duration = duration; this.setLeveled(leveled); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java index 7eb3ba50b..96c45b4da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; @@ -27,17 +28,18 @@ public class ABPermanentPassiveBuff extends ABGenericPermanentBuff { protected int castId = 0; - public ABPermanentPassiveBuff(int handleId, War3ID alias, Map localStore, - List onAddActions, List onRemoveActions, boolean showIcon, final int castId, - boolean leveled, boolean positive) { - this(handleId, alias, localStore, onAddActions, onRemoveActions, castId, leveled, positive); + public ABPermanentPassiveBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, + Map localStore, List onAddActions, List onRemoveActions, + boolean showIcon, final int castId, boolean leveled, boolean positive) { + this(handleId, alias, sourceAbility, sourceUnit, localStore, onAddActions, onRemoveActions, castId, leveled, + positive); this.setIconShowing(showIcon); } - public ABPermanentPassiveBuff(int handleId, War3ID alias, Map localStore, - List onAddActions, List onRemoveActions, final int castId, boolean leveled, - boolean positive) { - super(handleId, alias, leveled, positive); + public ABPermanentPassiveBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, + Map localStore, List onAddActions, List onRemoveActions, + final int castId, boolean leveled, boolean positive) { + super(handleId, alias, sourceAbility, sourceUnit, leveled, positive); this.localStore = localStore; this.onAddActions = onAddActions; this.onRemoveActions = onRemoveActions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java index 1151bef60..346312a98 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java @@ -3,10 +3,11 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; public class ABTargetingBuff extends ABBuff { - public ABTargetingBuff(int handleId, War3ID alias) { - super(handleId, alias, alias); + public ABTargetingBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit) { + super(handleId, alias, alias, sourceAbility, sourceUnit); this.setIconShowing(false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java index b25027fea..7f32ecb4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java @@ -3,6 +3,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -13,15 +14,15 @@ public class ABTimedArtBuff extends ABGenericTimedBuff { private SimulationRenderComponent lsfx; private CEffectType artType = CEffectType.TARGET; - public ABTimedArtBuff(int handleId, War3ID alias, float duration, boolean showIcon, boolean leveled, + public ABTimedArtBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showIcon, boolean leveled, boolean positive, boolean dispellable) { - this(handleId, alias, duration, leveled, positive, dispellable); + this(handleId, alias, sourceAbility, sourceUnit, duration, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedArtBuff(int handleId, War3ID alias, float duration, boolean leveled, boolean positive, + public ABTimedArtBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean leveled, boolean positive, boolean dispellable) { - super(handleId, alias, duration, false, leveled, positive, dispellable); + super(handleId, alias, sourceAbility, sourceUnit, duration, false, leveled, positive, dispellable); } public void setArtType(CEffectType artType) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java index d55ab3080..6323a613b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java @@ -8,6 +8,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -28,20 +29,20 @@ public class ABTimedBuff extends ABGenericTimedBuff { protected int castId = 0; - public ABTimedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + public ABTimedBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, List onRemoveActions, List onExpireActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + this(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + public ABTimedBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, List onRemoveActions, List onExpireActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - super(handleId, alias, duration, showTimedLifeBar, leveled, positive, dispellable); + super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, leveled, positive, dispellable); this.localStore = localStore; this.onAddActions = onAddActions; this.onRemoveActions = onRemoveActions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java index a142c9643..2e5a393eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java @@ -6,10 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.DelayInstantTransformationTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABTimedInstantTransformationBuff extends ABGenericTimedBuff { @@ -23,11 +25,11 @@ public class ABTimedInstantTransformationBuff extends ABGenericTimedBuff { private float dur; private float transTime; - public ABTimedInstantTransformationBuff(int handleId, Map localStore, + public ABTimedInstantTransformationBuff(int handleId, CAbility sourceAbility, CUnit sourceUnit, Map localStore, OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderPassiveAbility ability, CUnitType newType, final boolean keepRatios, boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { - super(handleId, alias, duration, true, false, true, false); + super(handleId, alias, sourceAbility, sourceUnit, duration, true, false, true, false); this.setIconShowing(false); this.localStore = localStore; this.actions = actions; @@ -60,12 +62,14 @@ public void onDeath(CSimulation game, CUnit unit) { protected void onBuffExpire(CSimulation game, CUnit unit) { if (dur > 0) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); - new DelayInstantTransformationTimer(game, localStore, unit, actions, addAlternateTagAfter, transTime, null, + new DelayInstantTransformationTimer(game, sourceUnit, localStore, unit, actions, addAlternateTagAfter, transTime, null, targetType, keepRatios, abil, null, transTime, 0).start(game); } else { TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); } + unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.abil, null); + unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.abil, null); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java index 1a2232e6c..6338c9441 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java @@ -3,23 +3,26 @@ import java.util.List; import java.util.Map; import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; public class ABTimedPausedExpirationBuff extends ABTimedBuff implements CPausedTickingBuff { - public ABTimedPausedExpirationBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + public ABTimedPausedExpirationBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, List onRemoveActions, List onExpireActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, showIcon, castId, leveled, positive, dispellable); } - public ABTimedPausedExpirationBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + public ABTimedPausedExpirationBuff(int handleId, War3ID alias, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, List onRemoveActions, List onExpireActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, castId, leveled, positive, dispellable); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java index 2a08ea777..b1ca28544 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java @@ -3,10 +3,11 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; public class ABTimedTargetingBuff extends ABGenericTimedBuff { - public ABTimedTargetingBuff(int handleId, War3ID alias, float duration) { - super(handleId, alias, duration, false, false, true, false); + public ABTimedTargetingBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration) { + super(handleId, alias, sourceAbility, sourceUnit, duration, false, false, true, false); this.setIconShowing(false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java index 1c6eb6144..ea22222b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -13,20 +14,20 @@ public class ABTimedTickingBuff extends ABTimedBuff { private List onTickActions; - public ABTimedTickingBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + public ABTimedTickingBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + this(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedTickingBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, + public ABTimedTickingBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, + super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, castId, leveled, positive, dispellable); this.onTickActions = onTickActions; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java index 1b49d1b51..17cbd43d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -13,21 +14,22 @@ public class ABTimedTickingPausedBuff extends ABTimedBuff implements CPausedTick private List onTickActions; - public ABTimedTickingPausedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, - Map localStore, List onAddActions, List onRemoveActions, - List onExpireActions, List onTickActions, boolean showIcon, final int castId, - final boolean leveled, final boolean positive, final boolean dispellable) { - this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, - onTickActions, castId, leveled, positive, dispellable); + public ABTimedTickingPausedBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, + float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, + List onRemoveActions, List onExpireActions, List onTickActions, + boolean showIcon, final int castId, final boolean leveled, final boolean positive, + final boolean dispellable) { + this(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, + onRemoveActions, onExpireActions, onTickActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedTickingPausedBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, - Map localStore, List onAddActions, List onRemoveActions, - List onExpireActions, List onTickActions, final int castId, final boolean leveled, - final boolean positive, final boolean dispellable) { - super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, - castId, leveled, positive, dispellable); + public ABTimedTickingPausedBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, + float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, + List onRemoveActions, List onExpireActions, List onTickActions, + final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { + super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, + onRemoveActions, onExpireActions, castId, leveled, positive, dispellable); this.onTickActions = onTickActions; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java index 452b0be38..a34325470 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java @@ -6,25 +6,27 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; public class ABTimedTickingPostDeathBuff extends ABTimedTickingBuff { - public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, - Map localStore, List onAddActions, List onRemoveActions, - List onExpireActions, List onTickActions, boolean showIcon, final int castId, - final boolean leveled, final boolean positive, final boolean dispellable) { - this(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, - onTickActions, castId, leveled, positive, dispellable); + public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, + float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, + List onRemoveActions, List onExpireActions, List onTickActions, + boolean showIcon, final int castId, final boolean leveled, final boolean positive, + final boolean dispellable) { + this(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, + onRemoveActions, onExpireActions, onTickActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, float duration, boolean showTimedLifeBar, - Map localStore, List onAddActions, List onRemoveActions, - List onExpireActions, List onTickActions, final int castId, final boolean leveled, - final boolean positive, final boolean dispellable) { - super(handleId, alias, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, - onTickActions, castId, leveled, positive, dispellable); + public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, + float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, + List onRemoveActions, List onExpireActions, List onTickActions, + final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { + super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, + onRemoveActions, onExpireActions, onTickActions, castId, leveled, positive, dispellable); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java index 447aa552b..12280a63a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java @@ -6,13 +6,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorFinishTransformation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.COrderStartTransformation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.DelayInstantTransformationTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABTimedTransformationBuff extends ABGenericTimedBuff { @@ -32,12 +35,12 @@ public class ABTimedTransformationBuff extends ABGenericTimedBuff { private boolean imTakeOff; private boolean instantTransformation; - public ABTimedTransformationBuff(int handleId, Map localStore, OnTransformationActions actions, + public ABTimedTransformationBuff(int handleId, CAbility sourceAbility, CUnit sourceUnit, Map localStore, OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, boolean addAlternateTagAfter, boolean permanent, float transformationDuration, float transformationTime, float landingDelay, float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, boolean immediateLanding, boolean immediateTakeoff) { - super(handleId, alias, duration, true, false, true, false); + super(handleId, alias, sourceAbility, sourceUnit, duration, true, false, true, false); this.setIconShowing(false); this.localStore = localStore; this.actions = actions; @@ -56,10 +59,10 @@ public ABTimedTransformationBuff(int handleId, Map localStore, O this.instantTransformation = false; } - public ABTimedTransformationBuff(int handleId, Map localStore, OnTransformationActions actions, + public ABTimedTransformationBuff(int handleId, CAbility sourceAbility, CUnit sourceUnit, Map localStore, OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderAbility ability, CUnitType newType, boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { - super(handleId, alias, duration, true, false, true, false); + super(handleId, alias, sourceAbility, sourceUnit, duration, true, false, true, false); this.setIconShowing(false); this.localStore = localStore; this.actions = actions; @@ -100,19 +103,25 @@ protected void onBuffExpire(CSimulation game, CUnit unit) { visibleOrderId = addAlternateTagAfter ? actabil.getBaseOrderId() : actabil.getOffOrderId(); transformId = actabil.getBaseOrderId(); } + unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, this.abil, null); + unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.abil, null); + unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this.abil, null); if (instantTransformation) { if (dur > 0) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); - new DelayInstantTransformationTimer(game, localStore, unit, actions, addAlternateTagAfter, transTime, + new DelayInstantTransformationTimer(game, sourceUnit, localStore, unit, actions, addAlternateTagAfter, transTime, null, targetType, keepRatios, abil, null, transTime, 0).start(game); } else { TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); } + unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.abil, null); + unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.abil, null); } else { + this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, unit.getCurrentBehavior()); unit.order(game, new COrderStartTransformation( - new CBehaviorFinishTransformation(localStore, unit, abil, targetType, keepRatios, actions, + new CBehaviorFinishTransformation(sourceUnit, localStore, unit, abil, targetType, keepRatios, actions, addAlternateTagAfter, visibleOrderId, perm, dur, transTime, landTime, atlAdDelay, altAdTime, imLand, imTakeOff, this.getAlias(), targetType, instantTransformation), transformId), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index 148f9cd58..443bb42f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -12,13 +12,15 @@ public class ABLocalStoreKeys { public static final String GAME = "_game"; public static final String THISUNIT = "_thisUnit"; public static final String ABILITY = "_ability"; + public static final String CURRENTLEVEL = "_currentLevel"; public static final String BUFF = "_buff"; public static final String ITEM = "_item"; public static final String ITEMSLOT = "_itemSlot"; public static final String ITERATORCOUNT = "_i"; public static final String BREAK = "_break"; public static final String BUFFCASTINGUNIT = "_buffCastingUnit"; - + + public static final String PREVIOUSBEHAVIOR = "_previousBehavior"; public static final String NEWBEHAVIOR = "_newBehavior"; public static final String FAILEDTOCAST = "_failedToCast#"; @@ -26,10 +28,11 @@ public class ABLocalStoreKeys { public static final String CHANNELING = "_channeling#"; public static final String INTERRUPTED = "_interrupted#"; public static final String PERIODICNEXTTICK = "_periodicNextTick#"; + public static final String PREVENTENDEVENTS = "_preventEndEvents#"; public static final String CANTUSEREASON = "_cantUseReason"; - public static final String ISAUTOCAST = "_isAutoCast"; + public static final String ISAUTOCAST = "_isAutoCast#"; public static final String ISTOGGLEDABILITY = "_toggledAbility"; public static final String ISFLEXABILITY = "_flexAbility"; @@ -60,18 +63,20 @@ public class ABLocalStoreKeys { // Ability Names public static final String LASTCREATEDABILITY = "_lastCreatedAbility"; - public static final String LASTCREATEDBUFF = "_lastCreatedBuff"; public static final String LASTADDEDABILITY = "_lastAddedAbility"; - public static final String LASTADDEDBUFF = "_lastAddedBuff"; - public static final String CURRENTLEVEL = "_currentLevel"; - - public static final String ENUMBUFF = "_enumBuff"; public static final String LASTCREATEDUNITGROUP = "_lastCreatedUnitGroup"; public static final String LASTCREATEDUNITQUEUE = "_lastCreatedUnitQueue"; public static final String LASTCREATEDDESTBUFF = "_lastCreatedDestBuff"; + // Buff Names + public static final String LASTCREATEDBUFF = "_lastCreatedBuff"; + public static final String LASTADDEDBUFF = "_lastAddedBuff"; + + public static final String ENUMBUFF = "_enumBuff"; + public static final String MATCHINGBUFF = "_matchingBuff"; + //Generic Targeting public static final String ATTACKINGUNIT = "_attackingUnit#"; public static final String ATTACKTARGET = "_attackTarget#"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index d93ccbf83..f32a69cce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -5,11 +5,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.floatingtext.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.gamestate.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.item.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player.*; @@ -91,6 +93,8 @@ private static void registerAbilityCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetThisAbility.class, "getThisAbility") .registerSubtype(ABCallbackGetAbilityById.class, "getAbilityById") + .registerSubtype(ABCallbackGetBuffSourceAbility.class, "getBuffSourceAbility") + .registerSubtype(ABCallbackArgumentAbility.class, "argumentAbility") .registerSubtype(ABCallbackReuseAbility.class, "reuseAbility") .registerSubtype(ABCallbackReuseAbilityWithArguments.class, "reuseAbilityWithArguments"); @@ -186,6 +190,7 @@ private static void registerBuffCallbacks(RuntimeTypeAdapterFactory callbackType .registerSubtype(ABCallbackThisBuff.class, "thisBuff") .registerSubtype(ABCallbackGetLastCreatedBuff.class, "getLastCreatedBuff") .registerSubtype(ABCallbackEnumBuff.class, "enumBuff") + .registerSubtype(ABCallbackGetMatchingBuff.class, "getMatchingBuff") .registerSubtype(ABCallbackGetBuffById.class, "getBuffById") @@ -262,6 +267,10 @@ private static void registerFloatCallbacks(RuntimeTypeAdapterFactory callbackTyp .registerSubtype(ABCallbackGetAbilityCastRange.class, "getAbilityCastRange") .registerSubtype(ABCallbackGetAbilityHeroDuration.class, "getAbilityHeroDuration") .registerSubtype(ABCallbackGetAbilityCooldown.class, "getAbilityCooldown") + + .registerSubtype(ABCallbackGetBuffDurationElapsed.class, "getBuffDurationElapsed") + + .registerSubtype(ABCallbackOneGameTick.class, "oneGameTick") .registerSubtype(ABCallbackRawFloat.class, "rawFloat") .registerSubtype(ABCallbackIntToFloat.class, "i2f") @@ -350,6 +359,8 @@ private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFa .registerSubtype(ABCallbackGetSecondBuffId.class, "getSecondBuffId") .registerSubtype(ABCallbackGetFirstEffectId.class, "getFirstEffectId") + .registerSubtype(ABCallbackGetBuffAlias.class, "getBuffAlias") + .registerSubtype(ABCallbackGetUnitType.class, "getUnitType") .registerSubtype(ABCallbackGetNonCurrentTransformType.class, "getNonCurrentTransformType") @@ -363,6 +374,7 @@ private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFa private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackRawInteger.class, "rawInteger") .registerSubtype(ABCallbackGetStoredIntegerByKey.class, "getStoredIntegerByKey") + .registerSubtype(ABCallbackGetCastId.class, "getCastId") .registerSubtype(ABCallbackGetAbilityUniqueValueInteger.class, "getAbilityUniqueValueInteger") .registerSubtype(ABCallbackGetBuffUniqueValueInteger.class, "getBuffUniqueValueInteger") @@ -376,6 +388,10 @@ private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetUnitMaximumHp.class, "getUnitMaximumHp") .registerSubtype(ABCallbackGetUnitMaximumMp.class, "getUnitMaximumMp") + + .registerSubtype(ABCallbackGetUnitHandleAsInteger.class, "getUnitHandleAsInteger") + .registerSubtype(ABCallbackGetAbilityHandleAsInteger.class, "getAbilityHandleAsInteger") + .registerSubtype(ABCallbackGetBuffHandleAsInteger.class, "getBuffHandleAsInteger") .registerSubtype(ABCallbackCountUnitsInRangeOfUnit.class, "countUnitsInRangeOfUnit") .registerSubtype(ABCallbackCountUnitsInRangeOfLocation.class, "countUnitsInRangeOfLocation") @@ -772,6 +788,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsUnitType.class, "isUnitType") .registerSubtype(ABConditionDoesUnitHaveBuff.class, "doesUnitHaveBuff") + .registerSubtype(ABConditionDoesUnitHaveBuffMatchingCondition.class, "doesUnitHaveBuffMatchingCondition") .registerSubtype(ABConditionIsUnitMaxHp.class, "isUnitMaxHp") .registerSubtype(ABConditionIsUnitMaxMp.class, "isUnitMaxMp") .registerSubtype(ABConditionIsUnitBuilding.class, "isUnitBuilding") @@ -854,6 +871,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionCreateLoopingSoundEffectOnUnit.class, "createLoopingSoundEffectOnUnit") .registerSubtype(ABActionCreateLightningEffect.class, "createLightningEffect") .registerSubtype(ABActionRemoveLightningEffect.class, "removeLightningEffect") + .registerSubtype(ABActionCreateGroupEffectAtLocation.class, "createGroupEffectAtLocation") .registerSubtype(ABActionCreateUnitTargetedProjectile.class, "createUnitTargetedProjectile") .registerSubtype(ABActionCreateLocationTargetedProjectile.class, "createLocationTargetedProjectile") @@ -873,7 +891,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionRemoveAbility.class, "removeAbility") .registerSubtype(ABActionStoreValueLocally.class, "storeValueLocally") .registerSubtype(ABActionDeleteStoredKey.class, "deleteStoredKey") - .registerSubtype(ABActionRemoveSpellEffect.class, "removeSpellEffect") + .registerSubtype(ABActionRemoveEffect.class, "removeEffect") .registerSubtype(ABActionCreateAbilityFromId.class, "createAbilityFromId") .registerSubtype(ABActionAddDefenseBonus.class, "addDefenseBonus") .registerSubtype(ABActionRemoveDefenseBonus.class, "removeDefenseBonus") @@ -956,12 +974,15 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionAddTargetAllowed.class, "addTargetAllowed") .registerSubtype(ABActionRemoveTargetAllowed.class, "removeTargetAllowed") .registerSubtype(ABActionAbilityAttemptToApplyEffect.class, "abilityAttemptToApplyEffect") + .registerSubtype(ABActionSendStartCastingEvents.class, "sendStartCastingEvents") + .registerSubtype(ABActionSetPreventEndEvents.class, "setPreventEndEvents") .registerSubtype(ABActionCreateTimer.class, "createTimer") .registerSubtype(ABActionStartTimer.class, "startTimer") .registerSubtype(ABActionUpdateTimerTimeout.class, "updateTimerTimeout") .registerSubtype(ABActionRemoveTimer.class, "removeTimer") + .registerSubtype(ABActionKillTimer.class, "killTimer") .registerSubtype(ABActionAddBuff.class, "addBuff") .registerSubtype(ABActionAddNonStackingDisplayBuff.class, "addNonStackingDisplayBuff") @@ -1128,6 +1149,9 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionRunReuseActionWithArguments.class, "runReuseActionWithArguments") .registerSubtype(ABActionSetFalseTimeOfDay.class, "setFalseTimeOfDay") + + .registerSubtype(ABActionAttemptToReOrderPreviousBehavior.class, "attemptToReOrderPreviousBehavior") + .registerSubtype(ABActionAttemptToResumePreviousBehavior.class, "attemptToResumePreviousBehavior") ; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABGroupEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABGroupEffect.java new file mode 100644 index 000000000..c26b12ff1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABGroupEffect.java @@ -0,0 +1,67 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABGroupEffect extends CTimer implements SimulationRenderComponent { + + private AbilityPointTarget loc; + private War3ID id; + private CEffectType effectType; + + private float inRad; + private float jitter; + + private boolean removing = false; + + public ABGroupEffect(AbilityPointTarget loc, float rad, War3ID id, CEffectType effectType) { + this.loc = loc; + this.id = id; + this.effectType = effectType; + + this.inRad = rad / 2; + this.jitter = rad * 0.4f; + this.setRepeats(true); + } + + @Override + public void remove() { + this.removing = true; + } + + private float getJitter(CSimulation game) { + return this.jitter * (game.getSeededRandom().nextFloat() - 0.5f); + } + + @Override + public void onFire(CSimulation game) { + if (this.removing) { + this.setRepeats(false); + game.unregisterTimer(this); + return; + } + + int total = 2 + game.getSeededRandom().nextInt(19); + if (total > 5) { + total--; + game.spawnTemporarySpellEffectOnPoint(loc.x + this.getJitter(game), loc.y + this.getJitter(game), 0, id, + effectType, 0); + } + double angleDelta = (Math.PI * 2 / total); + double startAngle = (Math.PI * 2 * game.getSeededRandom().nextFloat()); + while (total > 0) { + total--; + double iAngle = startAngle + angleDelta * total; + double iX = inRad * Math.cos(iAngle); + double iY = inRad * Math.sin(iAngle); + game.spawnTemporarySpellEffectOnPoint((float) (loc.x + this.getJitter(game) + iX), + (float) (loc.y + this.getJitter(game) + iY), 0, id, effectType, 0); + } + this.setTimeoutTime(game.getSeededRandom().nextFloat()); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java index f6203704b..6ea8ab8b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java @@ -43,7 +43,7 @@ public static void setUnitID(final CSimulation game, final Map l if (!addAlternateTagAfter) { if (actions.onUntransformActions != null) { for (final ABAction action : actions.onUntransformActions) { - action.runAction(game, unit, localStore, 0); + action.runAction(game, unit, localStore, actions.castId); } } } @@ -66,7 +66,7 @@ public static void setUnitID(final CSimulation game, final Map l if (addAlternateTagAfter && (actions != null)) { if (actions.onTransformActions != null) { for (final ABAction action : actions.onTransformActions) { - action.runAction(game, unit, localStore, 0); + action.runAction(game, unit, localStore, actions.castId); } } } @@ -200,7 +200,7 @@ public static void instantTransformation(final CSimulation game, final Map localStore, + public static void createSlowTransformBackBuff(final CSimulation game, CUnit sourceUnit, final Map localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, final float transformationTime, final float duration, final boolean permanent, final boolean takingOff, @@ -208,21 +208,21 @@ public static void createSlowTransformBackBuff(final CSimulation game, final Map final float altitudeAdjustmentDelay, final float landingDelay, final float altitudeAdjustmentDuration) { if (addAlternateTagAfter && (duration > 0)) { unit.add(game, - new ABTimedTransformationBuff(game.getHandleIdAllocator().createId(), localStore, actions, + new ABTimedTransformationBuff(game.getHandleIdAllocator().createId(), ability, sourceUnit, localStore, actions, buffId == null ? ability.getAlias() : buffId, duration, ability, newType, keepRatios, !addAlternateTagAfter, permanent, duration, transformationTime, landingDelay, altitudeAdjustmentDelay, altitudeAdjustmentDuration, immediateLanding, immediateTakeoff)); } } - public static void createInstantTransformBackBuff(final CSimulation game, final Map localStore, + public static void createInstantTransformBackBuff(final CSimulation game, CUnit sourceUnit, final Map localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, final float transformationTime, final float duration, final boolean permanent) { if (addAlternateTagAfter && (duration > 0)) { - final ABBuff thebuff = ability - .visit(GetInstantTransformationBuffVisitor.getInstance().reset(game, localStore, newType, keepRatios, actions, - buffId, addAlternateTagAfter, transformationTime, duration, permanent)); + final ABBuff thebuff = ability.visit( + GetInstantTransformationBuffVisitor.getInstance().reset(game, sourceUnit, localStore, newType, keepRatios, + actions, buffId, addAlternateTagAfter, transformationTime, duration, permanent)); if (thebuff != null) { unit.add(game, thebuff); } @@ -235,28 +235,35 @@ public static class OnTransformationActions { private Integer foodCost; private List onTransformActions; private List onUntransformActions; + private int castId; - public OnTransformationActions(final List onUntransformActions) { + public OnTransformationActions(final List onUntransformActions, int castId) { this.onUntransformActions = onUntransformActions; + this.castId = castId; } public OnTransformationActions(final int goldCost, final int lumberCost, final Integer foodCost, - final List onTransformActions, final List onUntransformActions) { + final List onTransformActions, final List onUntransformActions, int castId) { this.goldCost = goldCost; this.lumberCost = lumberCost; this.foodCost = foodCost; this.onTransformActions = onTransformActions; this.onUntransformActions = onUntransformActions; + this.castId = castId; } public OnTransformationActions createUntransformActions() { return new OnTransformationActions(-this.goldCost, -this.lumberCost, - this.foodCost != null ? -this.foodCost : null, null, this.onUntransformActions); + this.foodCost != null ? -this.foodCost : null, null, this.onUntransformActions, this.castId); } public void setOnUntransformActions(final List onUntransformActions) { this.onUntransformActions = onUntransformActions; } + + public int getCastId() { + return this.castId; + } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java index 109afe221..7982b3fb5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java @@ -13,6 +13,8 @@ public class AbilityBuilderOverrideFields { private ABFloatCallback castTimeOverride; private ABFloatCallback cooldownOverride; private ABIntegerCallback manaCostOverride; + + private ABBooleanCallback ignoreCastTime; private ABAutocastTypeCallback autocastTypeOverride; @@ -35,6 +37,9 @@ public void updateFromParent(AbilityBuilderOverrideFields parent) { if (this.manaCostOverride == null) this.manaCostOverride = parent.manaCostOverride; + if (this.ignoreCastTime == null) + this.ignoreCastTime = parent.ignoreCastTime; + if (this.autocastTypeOverride == null) this.autocastTypeOverride = parent.autocastTypeOverride; @@ -81,6 +86,12 @@ public ABIntegerCallback getManaCostOverride() { public void setManaCostOverride(ABIntegerCallback manaCostOverride) { this.manaCostOverride = manaCostOverride; } + public ABBooleanCallback getIgnoreCastTime() { + return ignoreCastTime; + } + public void setIgnoreCastTime(ABBooleanCallback ignoreCastTime) { + this.ignoreCastTime = ignoreCastTime; + } public ABAutocastTypeCallback getAutocastTypeOverride() { return autocastTypeOverride; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java index c735a8568..c1586dbe4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java @@ -15,6 +15,7 @@ public class ABTimer extends CTimer { private List actions; private int castId = 0; + private boolean alive = true; public ABTimer(CUnit caster, Map localStore, List actions, final int castId) { super(); @@ -24,13 +25,23 @@ public ABTimer(CUnit caster, Map localStore, List acti this.castId = castId; } + public void kill(CSimulation simulation) { + simulation.unregisterTimer(this); + this.alive = false; + this.caster = null; + this.localStore = null; + this.actions = null; + } public void onFire(CSimulation simulation) { - localStore.put(ABLocalStoreKeys.FIRINGTIMER, this); - if (actions != null) { - for (ABAction action : actions) { - action.runAction(simulation, caster, localStore, castId); + if (alive) { + localStore.put(ABLocalStoreKeys.FIRINGTIMER, this); + if (actions != null) { + for (ABAction action : actions) { + action.runAction(simulation, caster, localStore, castId); + } } + localStore.remove(ABLocalStoreKeys.FIRINGTIMER); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java index 15a38b777..df6428d43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java @@ -12,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class DelayInstantTransformationTimer extends CTimer { + private CUnit sourceUnit; private Map localStore; private OnTransformationActions actions; private CUnit unit; @@ -25,11 +26,12 @@ public class DelayInstantTransformationTimer extends CTimer { private float transTime; private float dur; - public DelayInstantTransformationTimer(CSimulation game, Map localStore, CUnit unit, + public DelayInstantTransformationTimer(CSimulation game, CUnit sourceUnit, Map localStore, CUnit unit, OnTransformationActions actions, boolean addAlternateTagAfter, float delay, CUnitType baseType, CUnitType targetType, final boolean keepRatios, AbilityBuilderAbility ability, War3ID buffId, float transformationTime, float duration) { super(); + this.sourceUnit = sourceUnit; this.localStore = localStore; this.unit = unit; this.actions = actions; @@ -49,7 +51,7 @@ public void onFire(CSimulation game) { TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, false); if (dur > 0) { - TransformationHandler.createInstantTransformBackBuff(game, localStore, unit, baseType, keepRatios, + TransformationHandler.createInstantTransformBackBuff(game, sourceUnit, localStore, unit, baseType, keepRatios, actions.createUntransformActions(), abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java index edd712d8f..4bfc163cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java @@ -29,7 +29,7 @@ public AbilityTarget accept(CBehaviorAbilityBuilderNoTarget target) { @Override public AbilityTarget accept(CBehaviorMove target) { - return null; + return target.getTarget(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java index aaa1d3232..a5c22b7f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java @@ -504,4 +504,13 @@ public T visit(final CBehaviorVisitor visitor) { public CBehaviorCategory getBehaviorCategory() { return CBehaviorCategory.MOVEMENT; } + + public AbilityTarget getTarget() { + if (this.rangedBehavior != null) { + return this.rangedBehavior.getTarget(); + } else if (this.followUnit != null) { + return this.followUnit; + } + return new AbilityPointTarget(this.target.x, this.target.y); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorStop.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorStop.java index dac2bd17d..3b8852101 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorStop.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorStop.java @@ -29,7 +29,8 @@ public CBehavior update(final CSimulation game) { @Override public void begin(final CSimulation game) { - if (!this.unit.isConstructingOrUpgrading()) { + if (!this.unit.isConstructingOrUpgrading() + && !unit.getUnitAnimationListener().isAnimationQueued(PrimaryTag.STAND)) { this.unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.STAND, SequenceUtils.EMPTY, 1.0f, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderNoTarget.java index 322c5bce7..8af4d91f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderNoTarget.java @@ -46,7 +46,9 @@ public CBehavior begin(final CSimulation game, final CUnit caster) { } final CAbility ability = game.getAbility(this.abilityHandleId); if (ability == null) { - game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: No such ability"); + if (!caster.order(game, this.orderId, null)) { + game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: No such ability"); + } return caster.pollNextOrderBehavior(game); } ability.checkCanUse(game, caster, this.orderId, this.autoOrder, this.abilityActivationReceiver.reset()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetPoint.java index d38266f29..5c34fd9ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetPoint.java @@ -52,7 +52,9 @@ public boolean isQueued() { public CBehavior begin(final CSimulation game, final CUnit caster) { final CAbility ability = game.getAbility(this.abilityHandleId); if (ability == null) { - game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: No such ability"); + if (!caster.order(game, this.orderId, this.target)) { + game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: No such ability"); + } return caster.pollNextOrderBehavior(game); } ability.checkCanUse(game, caster, this.orderId, this.autoOrder, this.abilityActivationReceiver.reset()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetWidget.java index 36302a79f..07cae5009 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/orders/COrderTargetWidget.java @@ -52,7 +52,9 @@ public boolean isQueued() { public CBehavior begin(final CSimulation game, final CUnit caster) { final CAbility ability = game.getAbility(this.abilityHandleId); if (ability == null) { - game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: No such ability"); + if (!caster.order(game, this.orderId, this.getTarget(game))) { + game.getCommandErrorListener().showInterfaceError(caster.getPlayerIndex(), "NOTEXTERN: No such ability"); + } return caster.pollNextOrderBehavior(game); } ability.checkCanUse(game, caster, this.orderId, this.autoOrder, abilityActivationReceiver.reset()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/timers/CTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/timers/CTimer.java index 2a022dca4..4fb570a76 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/timers/CTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/timers/CTimer.java @@ -15,6 +15,12 @@ public void setTimeoutTime(final float timeoutTime) { this.timeoutTime = timeoutTime; } + public void resetTimeoutTime(final float timeoutTime) { + this.timeoutTime = timeoutTime; + final int ticks = (int) (timeoutTime / WarsmashConstants.SIMULATION_STEP_TIME); + this.engineFireTick = this.scheduleTick + ticks; + } + public boolean isRepeats() { return this.repeats; } @@ -55,6 +61,11 @@ public void pause(final CSimulation simulation) { this.remainingTimeAfterPause = getRemaining(simulation); simulation.unregisterTimer(this); } + + public void kill(final CSimulation simulation) { + this.pause(simulation); + this.repeats = false; + } public void resume(final CSimulation simulation) { if (this.remainingTimeAfterPause == 0) { From 92d5d942662fe2e2a65deacfd85b8f86b154b976 Mon Sep 17 00:00:00 2001 From: Glasir Date: Thu, 17 Apr 2025 22:18:12 -0400 Subject: [PATCH 18/44] Quick fix for TextTags, getting the velocity to properly match War3 --- .../warsmash/viewer5/handlers/w3x/TextTag.java | 8 ++------ .../viewer5/handlers/w3x/War3MapViewer.java | 16 ++++++++++------ .../viewer5/handlers/w3x/ui/MeleeUI.java | 3 ++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/TextTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/TextTag.java index 83d5e95ca..b9aded8ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/TextTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/TextTag.java @@ -4,7 +4,6 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector3; import com.etheller.interpreter.ast.util.CHandle; -import com.etheller.warsmash.util.WarsmashConstants; public class TextTag implements CHandle { private final Vector3 position; @@ -41,8 +40,7 @@ public boolean update(final float deltaTime) { if (this.suspended) { return false; } - float deltaTicks = deltaTime / WarsmashConstants.SIMULATION_STEP_TIME; - this.screenCoordTravelOffset.add(this.velocity.x * deltaTicks, this.velocity.y * deltaTicks); + this.screenCoordTravelOffset.add(this.velocity.x * deltaTime, this.velocity.y * deltaTime); this.lifetime += deltaTime; final float fadeStart = getFadeStart(); final float remainingLife = getRemainingLife(); @@ -135,9 +133,7 @@ public void setColor(final int r, final int g, final int b, final float alpha) { } public void setVelocity(final float vx, final float vy) { - //TODO Mult by 75 is a hack to get close to the velocities in War3 - // There's probably some better logic that would better match the game - this.velocity.set((float)(vx *75), (float)(vy *75)); + this.velocity.set(vx, vy); } public boolean isVisible() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java index 3cd23fa88..0fe96eed0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java @@ -2416,7 +2416,8 @@ public CAttackProjectile createAttackProjectile(final CSimulation simulation, - (projectileLaunchX * cosFacing); final float height = War3MapViewer.this.terrain.getGroundHeight(x, y) - + (settings.getZ() != null ? settings.getZ() : (source.getFlyHeight() + projectileLaunchZ)); + + (settings.getZ() != null ? settings.getZ() + : (source.getFlyHeight() + projectileLaunchZ)); final CAttackProjectile simulationAttackProjectile = new CAttackProjectileMissile(x, y, projectileSpeed, target, source, damage, unitAttack, bounceIndex, attackListener, settings); @@ -2523,7 +2524,8 @@ public CAbilityProjectile createProjectile(final CSimulation cSimulation, - (projectileLaunchX * cosFacing); final float height = War3MapViewer.this.terrain.getGroundHeight(x, y) - + (settings.getZ() != null ? settings.getZ() : (source.getFlyHeight() + projectileLaunchZ)); + + (settings.getZ() != null ? settings.getZ() + : (source.getFlyHeight() + projectileLaunchZ)); final CAbilityProjectile simulationAbilityProjectile = new CAbilityProjectile(x, y, projectileSpeed, target, homing, source, projectileListener); @@ -3270,8 +3272,9 @@ public TextTag spawnTextTag(final CUnit unit, final TextTagConfigType configType } final Vector3 unitPosition = new Vector3(renderPeer.location); final Bounds bounds = renderPeer.instance.getBounds(); - final TextTag textTag = new TextTag(unitPosition, new Vector2(0, 3.328125f), text, - textTagConfig.getColor(), textTagConfig.getLifetime(), + final TextTag textTag = new TextTag(unitPosition, + new Vector2(textTagConfig.getVelocity()[0], textTagConfig.getVelocity()[1]), + text, textTagConfig.getColor(), textTagConfig.getLifetime(), textTagConfig.getFadeStart(), textTagConfig.getHeight(), BUILTIN_TEXT_TAG_REPORTED_HANDLE_ID); War3MapViewer.this.textTags.add(textTag); @@ -3293,8 +3296,9 @@ public TextTag spawnTextTag(final CUnit unit, final TextTagConfigType configType } else { unitPosition = new Vector3(0, 0, 0); } - final TextTag textTag = new TextTag(unitPosition, new Vector2(0, 3.328125f), message, - textTagConfig.getColor(), textTagConfig.getLifetime(), + final TextTag textTag = new TextTag(unitPosition, + new Vector2(textTagConfig.getVelocity()[0], textTagConfig.getVelocity()[1]), + message, textTagConfig.getColor(), textTagConfig.getLifetime(), textTagConfig.getFadeStart(), textTagConfig.getHeight(), BUILTIN_TEXT_TAG_REPORTED_HANDLE_ID); War3MapViewer.this.textTags.add(textTag); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java index b6f6d788e..77d866a47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java @@ -2102,7 +2102,8 @@ public void render(final SpriteBatch batch, final GlyphLayout glyphLayout) { if (this.war3MapViewer.worldScene.camera.rect.contains(screenCoordsVector.x, (Gdx.graphics.getHeight() - screenCoordsVector.y))) { final Vector2 unprojected = this.uiViewport.unproject(screenCoordsVector); - unprojected.add(textTag.getScreenCoordTravelOffset()); + unprojected.add(this.uiViewport.getMinWorldWidth() * textTag.getScreenCoordTravelOffset().x, + this.uiViewport.getMinWorldHeight() * textTag.getScreenCoordTravelOffset().y); this.textTagFontParam.size = (int) GameUI.convertY(this.uiViewport, textTag.getFontHeight() * 0.5f); // below: generateFont is a caching call, so hopefully this is not allocating // font object on every loop, which would be wasteful From 3844d5d7ca77d9473ea8b75cd05b332c95fbd1ea Mon Sep 17 00:00:00 2001 From: Glasir Date: Wed, 14 May 2025 00:49:52 -0400 Subject: [PATCH 19/44] Added Terrain Deformations! UberSplat Creation! And improvements to AB loops! **Main Features** - Added functions for abilities to modify terrain - Implemented the three related abilities - Added default AB effects for bowl/hill, ripple, and wave effects - Notable difference from War3: the camera follows the adjusted terrain in Warsmash - Added functions for abilities to create UberSplats - Added AB actions to interact with Destructables - Made notable improvements to how AB loops (for/periodic) work - Added unique setting to For loops, allowing nesting - Allowed the periodic action to run multiple times if the delay is less than 1 Turn Tick - Periodic Action now determines the next tick after running actions rather than before. This allows the actions to modify the delay duration - Added an action to reset the periodic time for a given periodic loop - Added AB support for lists (though currently limited in types) **Major Fixes to core Features** - Spell Effects will no longer play death animations twice - Newly created destructables will not appear solid black **Minor Improvements to Ability Builder Features** - Added lists of state and stat buffs on AB Timed Buffs, that automatically add/remove with the buff - This should allow for a simplification of stat buffs, and avoid cases where leveling an ability changes current buff effects (pending) - Updated behavior to play channel animation continuously - Modified AOE damage effects to apply extra effects first. This avoids adding buffs after a unit dies - Updated AB Buffs to have more types of buffs support Unique Values - Added setting to override the AOE cursor size (rather than just turning it off) - Added actions to create locations from xy-offsets in addition to dist-angle offsets - Non-collision projectiles can now get the current location on hit **Minor Improvements to Core Features** - Certain functions for creating projectiles can now properly load missile speed/homing settings from abilities and buffs - Added spell effects that attach to destructables (for sentinal) --- .../AttackReplacementPassivesItems.json | 2 +- ...ReplacementPassivesNonItemLowPriority.json | 2 +- core/assets/abilityBehaviors/DoNothings.json | 12 +- .../abilityBehaviors/TerrainDeform.json | 2001 +++++++++++++++++ .../abilityBehaviors/generalPassives.json | 12 +- .../abilityBehaviors/humanHeroActives.json | 2 +- .../undeadHeroUnitActives.json | 3 +- .../etheller/warsmash/parsers/jass/Jass2.java | 30 +- .../warsmash/parsers/w3x/w3e/Corner.java | 4 + .../viewer5/handlers/w3x/War3MapViewer.java | 121 +- .../handlers/w3x/environment/Terrain.java | 111 +- .../handlers/w3x/rendersim/RenderDoodad.java | 14 +- .../w3x/rendersim/RenderSpellEffect.java | 1 + .../w3x/rendersim/ability/AbilityDataUI.java | 13 +- .../w3x/rendersim/ability/BuffUI.java | 8 +- .../ability/EffectAttachmentUIMissile.java | 14 +- .../w3x/simulation/CDestructable.java | 8 +- .../handlers/w3x/simulation/CSimulation.java | 33 +- .../abilities/targeting/AbilityTarget.java | 12 + .../CAbilityAbilityBuilderGenericActive.java | 106 +- .../GetInstantTransformationBuffVisitor.java | 23 +- ...AbilityAbilityBuilderStatAuraTemplate.java | 3 +- .../behavior/CBehaviorAbilityBuilderBase.java | 11 +- .../behavior/action/ABActionAddSlowBuff.java | 2 +- .../behavior/action/ABActionAddStunBuff.java | 2 +- .../buff/ABActionCreatePassiveBuff.java | 7 + .../buff/ABActionCreateTargetingBuff.java | 12 +- .../buff/ABActionCreateTimedArtBuff.java | 11 +- .../action/buff/ABActionCreateTimedBuff.java | 39 +- ...ActionCreateTimedPausedExpirationBuff.java | 39 +- .../ABActionCreateTimedTargetingBuff.java | 9 +- .../buff/ABActionCreateTimedTickingBuff.java | 39 +- .../ABActionCreateTimedTickingPausedBuff.java | 39 +- ...ActionCreateTimedTickingPostDeathBuff.java | 46 +- .../ABActionCreateDestructable.java | 57 + .../ABActionKillDestructable.java | 20 + .../ABActionRemoveDestructable.java | 20 + .../ABActionCreateTerrainBowlAtLocation.java | 59 + ...ABActionCreateTerrainRippleAtLocation.java | 48 + .../ABActionCreateTerrainWaveAtLocation.java | 46 + .../action/fx/ABActionCreateUberSplat.java | 27 + .../fx/ABActionModifyTerrainVertex.java | 23 + .../action/list/ABActionListRemove.java | 29 + .../action/list/ABActionLocationListAdd.java | 31 + .../list/ABActionSortableListRemove.java | 29 + ...teLocationTargetedCollisionProjectile.java | 40 +- ...ctionCreateLocationTargetedProjectile.java | 27 +- ...reateLocationTargetedPseudoProjectile.java | 42 +- ...CreateUnitTargetedCollisionProjectile.java | 40 +- .../ABActionCreateUnitTargetedProjectile.java | 32 +- ...ionCreateUnitTargetedPseudoProjectile.java | 42 +- .../action/structural/ABActionFor.java | 10 +- .../structural/ABActionPeriodicExecute.java | 32 +- .../ABActionResetPeriodicExecute.java | 25 + .../action/unit/ABActionDamageArea.java | 24 +- .../unit/ABActionDamageAttackSplash.java | 36 +- .../action/unit/ABActionDamageBurst.java | 28 +- .../action/unit/ABActionDamageSplash.java | 57 +- .../ABCallbackGetLastCreatedDestructable.java | 17 + .../floatcallbacks/ABCallbackDegToRad.java | 17 + .../ABCallbackGetAbilityProjectileSpeed.java | 21 + .../floatcallbacks/ABCallbackTan.java | 17 + ...t.java => ABCallbackGetLastCreatedFX.java} | 2 +- .../ABCallbackGetIntegerFromList.java | 20 + .../ABCallbackGetListSize.java | 18 + .../ABCallbackGetSortableListSize.java | 18 + .../integercallbacks/ABCallbackIterator.java | 9 +- .../callback/list/ABCallbackArgumentList.java | 36 + .../list/ABCallbackArgumentSortableList.java | 36 + .../list/ABCallbackGetStoredListByKey.java | 26 + .../ABCallbackGetStoredSortableListByKey.java | 26 + .../list/ABCallbackInlineConditionList.java | 24 + ...ABCallbackInlineConditionSortableList.java | 24 + .../callback/list/ABCallbackListSorted.java | 33 + .../callback/list/ABCallbackReuseList.java | 44 + .../ABCallbackReuseListWithArguments.java | 51 + .../list/ABCallbackReuseSortableList.java | 44 + ...allbackReuseSortableListWithArguments.java | 51 + .../callback/list/ABListCallback.java | 14 + .../callback/list/ABListSortType.java | 7 + .../callback/list/ABSortableListCallback.java | 14 + .../integer/ABCallbackEmptyIntegerList.java | 16 + .../integer/ABCallbackIntegerListOfRange.java | 34 + .../list/integer/ABIntegerListCallback.java | 14 + .../location/ABCallbackEmptyLocationList.java | 17 + .../list/location/ABLocationListCallback.java | 15 + .../ABCallbackArgumentLocation.java | 2 +- .../ABCallbackCreateLocationFromXYOffset.java | 23 + .../ABCallbackGetLocationFromList.java | 22 + .../ABCallbackModifyLocationWithOffset.java | 34 + .../ABCallbackModifyLocationWithXYOffset.java | 24 + .../abilitybuilder/buff/ABBuff.java | 96 +- .../abilitybuilder/buff/ABBuffSlow.java | 15 +- .../abilitybuilder/buff/ABBuffStun.java | 7 +- .../abilitybuilder/buff/ABGenericArtBuff.java | 7 +- .../buff/ABGenericAuraBuff.java | 10 +- .../buff/ABGenericPermanentBuff.java | 12 +- .../buff/ABGenericTimedBuff.java | 15 +- .../buff/ABPermanentPassiveBuff.java | 4 +- .../abilitybuilder/buff/ABTargetingBuff.java | 7 +- .../abilitybuilder/buff/ABTimedArtBuff.java | 15 +- .../abilitybuilder/buff/ABTimedBuff.java | 91 +- .../ABTimedInstantTransformationBuff.java | 18 +- .../buff/ABTimedPausedExpirationBuff.java | 26 +- .../buff/ABTimedTargetingBuff.java | 7 +- .../buff/ABTimedTickingBuff.java | 25 +- .../buff/ABTimedTickingPausedBuff.java | 13 +- .../buff/ABTimedTickingPostDeathBuff.java | 13 +- .../buff/ABTimedTransformationBuff.java | 41 +- .../abilitybuilder/core/ABLocalStoreKeys.java | 5 +- .../core/AbilityBuilderGsonBuilder.java | 89 +- .../effects/ABTerrainBowlEffect.java | 98 + .../effects/ABTerrainEffect.java | 109 + .../effects/ABTerrainRippleEffect.java | 106 + .../effects/ABTerrainWaveEffect.java | 137 ++ .../handler/TransformationHandler.java | 2 +- .../AbilityBuilderSpecialDisplayFields.java | 10 + .../projectile/ABProjectileListener.java | 3 + .../util/SimulationRenderController.java | 16 +- 119 files changed, 4756 insertions(+), 626 deletions(-) create mode 100644 core/assets/abilityBehaviors/TerrainDeform.json create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainBowlAtLocation.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/{ABCallbackGetLastCreatedSpellEffect.java => ABCallbackGetLastCreatedFX.java} (90%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListSortType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainBowlEffect.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainEffect.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainRippleEffect.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainWaveEffect.java diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json index 838048828..d448694ad 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json @@ -286,7 +286,7 @@ "value": "_orbEff" }, "valueToStore": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } },{ "type": "addNonStackingStatBuff", diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json index f58918186..bf2b4eac1 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json @@ -2357,7 +2357,7 @@ "value": "_gEff" }, "valueToStore": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } },{ "type": "storeValueLocally", diff --git a/core/assets/abilityBehaviors/DoNothings.json b/core/assets/abilityBehaviors/DoNothings.json index a0e13604a..f88331aa7 100644 --- a/core/assets/abilityBehaviors/DoNothings.json +++ b/core/assets/abilityBehaviors/DoNothings.json @@ -30,7 +30,7 @@ "conditions": [{ "type": "isNull", "value": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } },{ "type": "unitHasResearch", @@ -63,13 +63,13 @@ "condition": { "type": "notNull", "value": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } }, "thenActions": [{ "type": "removeEffect", "effect": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } }] },{ @@ -115,7 +115,7 @@ "conditions": [{ "type": "isNull", "value": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } },{ "type": "unitHasResearch", @@ -148,13 +148,13 @@ "condition": { "type": "notNull", "value": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } }, "thenActions": [{ "type": "removeEffect", "effect": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } }] },{ diff --git a/core/assets/abilityBehaviors/TerrainDeform.json b/core/assets/abilityBehaviors/TerrainDeform.json new file mode 100644 index 000000000..bb5336cda --- /dev/null +++ b/core/assets/abilityBehaviors/TerrainDeform.json @@ -0,0 +1,2001 @@ +{ + "abilityList": [{ + "ids": [{"id":"AOeq", "castId": "earthquake"}], + "type": "NORMAL_POINTTARGET", + "displayFields": { + "areaCursorOverride": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + }, + "reuseActions": { + "onTick": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "radius" + }, + "valueToStore": { + "type": "f+", + "value1": { + "type": "getAbilityArea" + }, + "value2": { + "type": "f*", + "value1": { + "type": "f-", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "value2": { + "type": "getAbilityArea" + } + }, + "value2": { + "type": "f/", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "icnt" + } + }, + "value2": { + "type": "getAbilityDuration" + } + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "icnt" + }, + "valueToStore": { + "type": "f+", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "icnt" + } + }, + "value2": { + "type": "rawFloat", + "value": 1 + } + } + },{ + "type": "iterateDestructablesInRangeOfLocation", + "location": { + "type": "getTargetedLocation" + }, + "range": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "radius" + } + }, + "iterationActions": [{ + "type": "if", + "condition": { + "type": "isDestructableValidTarget", + "target": { + "type": "getEnumDestructable" + } + }, + "thenActions": [{ + "type": "damageDestructable", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getEnumDestructable" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }] + }] + },{ + "type": "iterateUnitsInRangeOfLocationMatchingCondition", + "location": { + "type": "getTargetedLocation" + }, + "range": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "radius" + } + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + }, + "iterationActions": [{ + "type": "if", + "condition": { + "type": "isUnitBuilding", + "unit": { + "type": "getEnumUnit" + } + }, + "thenActions": [{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getEnumUnit" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "UNIVERSAL" + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }], + "elseActions": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "rawFloat", + "value": 2 + }, + "statBuffs": [{ + "type": "getLastCreatedNonStackingStatBuff" + }] + },{ + "type": "addBuff", + "target": { + "type": "getEnumUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }] + }, + "onEndCasting": [{ + "type": "if", + "condition": { + "type": "f!=0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "beginChanneling" + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "earthquake" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "radius" + }, + "valueToStore": { + "type": "getAbilityArea" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "icnt" + }, + "valueToStore": { + "type": "rawFloat", + "value": 0 + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "begun" + }, + "valueToStore": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "delay" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }] + }], + "onChannelTick": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "if", + "condition": { + "type": "getStoredBooleanByKey", + "key": { + "type": "rawString", + "value": "begun" + } + }, + "thenActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTick" + } + }], + "elseActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "begun" + }, + "valueToStore": { + "type": "rawBoolean", + "value": "true" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "delay" + }, + "valueToStore": { + "type": "rawFloat", + "value": 1 + } + },{ + "type": "createSpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getFirstEffectId" + }, + "effectType": "EFFECT" + },{ + "type": "storeValueLocally", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "center" + }, + "valueToStore": { + "type": "getLastCreatedFX" + } + },{ + "type": "createTerrainRippleAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "startRadius": { + "type": "getAbilityArea" + }, + "finalRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "depth": { + "type": "rawFloat", + "value": 200 + }, + "duration": { + "type": "getAbilityDuration" + }, + "period": { + "type": "rawFloat", + "value": 500 + }, + "spaceWaves": { + "type": "rawInteger", + "value": 3 + }, + "timeWaves": { + "type": "rawInteger", + "value": 2 + }, + "onlyNegative": { + "type": "rawBoolean", + "value": "true" + } + },{ + "type": "storeValueLocally", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "deform" + }, + "valueToStore": { + "type": "getLastCreatedFX" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onTick" + } + }] + }], + "delaySeconds": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "delay" + } + }, + "unique": { + "type": "rawString", + "value": "iter" + } + },{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "finishChanneling" + }], + "delaySeconds": { + "type": "getAbilityDuration" + }, + "unique": { + "type": "rawString", + "value": "end" + } + }], + "onEndChannel": [{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getStoredFXByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "center" + } + } + }, + "thenActions": [{ + "type": "removeEffect", + "effect": { + "type": "getStoredFXByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "center" + } + } + }] + },{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getStoredFXByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "deform" + } + } + }, + "thenActions": [{ + "type": "removeEffect", + "effect": { + "type": "getStoredFXByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "deform" + } + } + }] + },{ + "type": "cleanUpCastInstance" + }] + },{ + "ids": [{"id":"ANvc", "castId": "volcano"}], + "type": "NORMAL_POINTTARGET", + "reuseActions": { + "fireRock": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "flyingRocks" + }, + "valueToStore": { + "type": "i+", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "flyingRocks" + } + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + },{ + "type": "createLocationTargetedProjectile", + "source": { + "type": "getCastingUnit" + }, + "sourceLoc": { + "type": "getTargetedLocation" + }, + "target": { + "type": "argumentLocation", + "name": { + "type": "rawString", + "value": "rockTar" + } + }, + "id": { + "type": "getFirstEffectId" + }, + "onHit": [{ + "type": "iterateDestructablesInRangeOfLocation", + "location": { + "type": "getProjectileCurrentLocation" + }, + "range": { + "type": "getAbilityArea" + }, + "iterationActions": [{ + "type": "if", + "condition": { + "type": "isDestructableValidTarget", + "target": { + "type": "getEnumDestructable" + } + }, + "thenActions": [{ + "type": "damageDestructable", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getEnumDestructable" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + }] + }] + },{ + "type": "damageBurst", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getProjectileCurrentLocation" + }, + "validTarget": { + "type": "isUnitValidTarget", + "target": { + "type": "getEnumUnit" + } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "NORMAL" + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + }, + "fullDamageRadius": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "fullDamageRadius" + } + }, + "partialDamage": { + "type": "f*", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "F" + } + }, + "partialDamageRadius": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "partialDamageRadius" + } + }, + "extraActions": [{ + "type": "if", + "condition": { + "type": "doesUnitHaveBuff", + "unit": { + "type": "getEnumUnit" + }, + "id": { + "type": "getSecondBuffId" + } + }, + "thenActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mod" + }, + "valueToStore": { + "type": "rawFloat", + "value": 0 + } + }], + "elseActions": [{ + "type": "if", + "condition": { + "type": "isUnitBuilding", + "unit": { + "type": "getEnumUnit" + } + }, + "thenActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mod" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + }], + "elseActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mod" + }, + "valueToStore": { + "type": "rawFloat", + "value": 1 + } + },{ + "type": "addStunBuff", + "unit": { + "type": "getEnumUnit" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getEnumUnit" + } + } + }] + },{ + "type": "createTimedTargetingBuff", + "buffId": { + "type": "getSecondBuffId" + }, + "duration": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "addBuff", + "target": { + "type": "getEnumUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }], + "unitSpecificDamageMod": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "mod" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "flyingRocks" + }, + "valueToStore": { + "type": "i-", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "flyingRocks" + } + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + },{ + "type": "if", + "condition": { + "type": "and", + "conditions": [{ + "type": "getStoredBooleanByKey", + "key": { + "type": "rawString", + "value": "finished" + } + },{ + "type": "i=0", + "value": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "flyingRocks" + } + } + }] + }, + "thenActions": [{ + "type": "cleanUpCastInstance" + }] + }] + }], + "calculateRockCount": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rockCount" + }, + "valueToStore": { + "type": "rawInteger", + "value": 1 + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rocksPerRing" + }, + "valueToStore": { + "type": "rawInteger", + "value": 5 + } + },{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "A" + }, + "actions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rockCount" + }, + "valueToStore": { + "type": "i+", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rockCount" + } + }, + "value2": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rocksPerRing" + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rocksPerRing" + }, + "valueToStore": { + "type": "i+", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rocksPerRing" + } + }, + "value2": { + "type": "rawInteger", + "value": 2 + } + } + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rockCount" + }, + "valueToStore": { + "type": "iMin", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rockCount" + } + }, + "value2": { + "type": "rawInteger", + "value": 32 + } + } + }], + "generateRockLists": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "indexList" + }, + "valueToStore": { + "type": "listSorted", + "list": { + "type": "integerListOfRange", + "end": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rockCount" + } + } + }, + "sort": "RAND" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "locList" + }, + "valueToStore": { + "type": "emptyLocationList" + } + },{ + "type": "locationListAdd", + "list": { + "type": "getStoredListByKey", + "key": { + "type": "rawString", + "value": "locList" + } + }, + "location": { + "type": "createLocationFromXYOffset", + "origin": { + "type": "getTargetedLocation" + }, + "xdist": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "maxJitter" + } + }, + "value2": { + "type": "f-", + "value1": { + "type": "randomFloat" + }, + "value2": { + "type": "rawFloat", + "value": 0.5 + } + } + }, + "ydist": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "maxJitter" + } + }, + "value2": { + "type": "f-", + "value1": { + "type": "randomFloat" + }, + "value2": { + "type": "rawFloat", + "value": 0.5 + } + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rocksPerRing" + }, + "valueToStore": { + "type": "rawInteger", + "value": 5 + } + },{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "A" + }, + "actions": [{ + "type": "if", + "condition": { + "type": "i<", + "value1": { + "type": "getListSize", + "list": { + "type": "getStoredListByKey", + "key": { + "type": "rawString", + "value": "locList" + } + } + }, + "value2": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rockCount" + } + } + }, + "thenActions": [{ + "type": "for", + "times": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rocksPerRing" + } + }, + "unique": { + "type": "rawString", + "value": "rock" + }, + "actions": [{ + "type": "locationListAdd", + "list": { + "type": "getStoredListByKey", + "key": { + "type": "rawString", + "value": "locList" + } + }, + "location": { + "type": "modifyLocationWithXYOffset", + "origin": { + "type": "createLocationFromOffset", + "origin": { + "type": "getTargetedLocation" + }, + "dist": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "partialDamageRadius" + } + }, + "value2": { + "type": "f+", + "value1": { + "type": "f+", + "value1": { + "type": "rawFloat", + "value": 0.5 + }, + "value2": { + "type": "i2f", + "value": { + "type": "iterator" + } + } + }, + "value2": { + "type": "f*", + "value1": { + "type": "rawFloat", + "value": 0.5 + }, + "value2": { + "type": "f+", + "value1": { + "type": "rawFloat", + "value": 0.95 + }, + "value2": { + "type": "randomBoundedFloat", + "bound": { + "type": "rawFloat", + "value": 0.1 + } + } + } + } + } + }, + "angle": { + "type": "f+", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "waveAngle" + } + }, + "value2": { + "type": "f*", + "value1": { + "type": "pi" + }, + "value2": { + "type": "f+", + "value1": { + "type": "i2f", + "value": { + "type": "iterator" + } + }, + "value2": { + "type": "f/", + "value1": { + "type": "f*", + "value1": { + "type": "i2f", + "value": { + "type": "iterator", + "unique": { + "type": "rawString", + "value": "rock" + } + } + }, + "value2": { + "type": "rawFloat", + "value": 2 + } + }, + "value2": { + "type": "i2f", + "value": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rocksPerRing" + } + } + } + } + } + } + } + }, + "xdist": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "maxJitter" + } + }, + "value2": { + "type": "f-", + "value1": { + "type": "randomFloat" + }, + "value2": { + "type": "rawFloat", + "value": 0.5 + } + } + }, + "ydist": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "maxJitter" + } + }, + "value2": { + "type": "f-", + "value1": { + "type": "randomFloat" + }, + "value2": { + "type": "rawFloat", + "value": 0.5 + } + } + } + } + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rocksPerRing" + }, + "valueToStore": { + "type": "i+", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rocksPerRing" + } + }, + "value2": { + "type": "rawInteger", + "value": 2 + } + } + }] + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rocksLeft" + }, + "valueToStore": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rockCount" + } + } + }] + }, + "onEndCasting": [{ + "type": "createTerrainBowlAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "radius": { + "type": "f*", + "value1": { + "type": "getAbilityArea" + }, + "value2": { + "type": "rawFloat", + "value": 0.5 + } + }, + "depth": { + "type": "negativeFloat", + "value": { + "type": "f*", + "value1": { + "type": "f*", + "value1": { + "type": "getAbilityArea" + }, + "value2": { + "type": "tan", + "angle": { + "type": "degToRad", + "angle": { + "type": "rawFloat", + "value": 30 + } + } + } + }, + "value2": { + "type": "rawFloat", + "value": 2 + } + } + }, + "sinkTime": { + "type": "rawFloat", + "value": 5000 + }, + "staticTime": { + "type": "f*", + "value1": { + "type": "f*", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + }, + "value2": { + "type": "rawFloat", + "value": 1000 + } + }, + "stopDuration": { + "type": "rawFloat", + "value": 500 + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "deform" + }, + "valueToStore": { + "type": "getLastCreatedFX" + } + },{ + "type": "createDestructable", + "id": { + "type": "getAbilityUnitId" + }, + "location": { + "type": "getTargetedLocation" + } + },{ + "type": "createUberSplat", + "id": { + "type": "getWar3IDFromString", + "id": "NVOL" + }, + "location": { + "type": "getTargetedLocation" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "splat" + }, + "valueToStore": { + "type": "getLastCreatedFX" + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "calculateRockCount" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rockBaseDelay" + }, + "valueToStore": { + "type": "f-", + "value1": { + "type": "f/", + "value1": { + "type": "f/", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "value2": { + "type": "rawFloat", + "value": 2 + } + }, + "value2": { + "type": "i2f", + "value": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rockCount" + } + } + } + }, + "value2": { + "type": "rawFloat", + "value": 0.01 + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "waveDelay" + }, + "valueToStore": { + "type": "rawFloat", + "value": 1 + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rockDelay" + }, + "valueToStore": { + "type": "rawFloat", + "value": 0 + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "finished" + }, + "valueToStore": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "flyingRocks" + }, + "valueToStore": { + "type": "rawInteger", + "value": 0 + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rocksLeft" + }, + "valueToStore": { + "type": "rawInteger", + "value": 0 + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "partialDamageRadius" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getAbilityArea" + }, + "value2": { + "type": "f+", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "value2": { + "type": "rawFloat", + "value": 0.5 + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "fullDamageRadius" + }, + "valueToStore": { + "type": "f/", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "partialDamageRadius" + } + }, + "value2": { + "type": "rawFloat", + "value": 2 + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "maxJitter" + }, + "valueToStore": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "fullDamageRadius" + } + }, + "value2": { + "type": "rawFloat", + "value": 0.3 + } + } + },{ + "type": "beginChanneling" + }], + "onChannelTick": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "waveAngle" + }, + "valueToStore": { + "type": "f*", + "value1": { + "type": "f*", + "value1": { + "type": "pi" + }, + "value2": { + "type": "rawFloat", + "value": 2 + } + }, + "value2": { + "type": "randomFloat" + } + } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "generateRockLists" + } + },{ + "type": "resetPeriodicExecute", + "unique": { + "type": "rawString", + "value": "rock" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "waveDelay" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + }], + "delaySeconds": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "waveDelay" + } + }, + "unique": { + "type": "rawString", + "value": "wave" + } + },{ + "type": "if", + "condition": { + "type": "i!=0", + "value": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rocksLeft" + } + } + }, + "thenActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "if", + "condition": { + "type": "i=0", + "value": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rocksLeft" + } + } + }, + "thenActions": [{ + "type": "break" + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rocksLeft" + }, + "valueToStore": { + "type": "i-", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "rocksLeft" + } + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + },{ + "type": "runReuseActionWithArguments", + "name": { + "type": "rawString", + "value": "fireRock" + }, + "arguments": { + "rockTar": { + "type": "getLocationFromList", + "list": { + "type": "getStoredListByKey", + "key": { + "type": "rawString", + "value": "locList" + } + }, + "index": { + "type": "getIntegerFromList", + "list": { + "type": "getStoredSortableListByKey", + "key": { + "type": "rawString", + "value": "indexList" + } + }, + "index": { + "type": "rawInteger", + "value": 0 + } + } + } + } + },{ + "type": "sortableListRemove", + "list": { + "type": "getStoredSortableListByKey", + "key": { + "type": "rawString", + "value": "indexList" + } + }, + "index": { + "type": "rawInteger", + "value": 0 + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "rockDelay" + }, + "valueToStore": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "rockBaseDelay" + } + }, + "value2": { + "type": "f+", + "value1": { + "type": "randomBoundedFloat", + "bound": { + "type": "rawFloat", + "value": 0.5 + } + }, + "value2": { + "type": "rawFloat", + "value": 0.5 + } + } + } + }], + "delaySeconds": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "rockDelay" + } + }, + "initialTick": { + "type": "rawBoolean", + "value": "true" + }, + "unique": { + "type": "rawString", + "value": "rock" + } + }] + },{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "finishChanneling" + }], + "delaySeconds": { + "type": "f*", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + }, + "unique": { + "type": "rawString", + "value": "end" + } + }], + "onEndChannel": [{ + "type": "removeEffect", + "effect": { + "type": "getStoredFXByKey", + "key": { + "type": "rawString", + "value": "deform" + } + } + },{ + "type": "removeEffect", + "effect": { + "type": "getStoredFXByKey", + "key": { + "type": "rawString", + "value": "splat" + } + } + },{ + "type": "killDestructable", + "dest": { + "type": "getLastCreatedDestructable" + } + },{ + "type": "storeValueLocally", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "volc" + },{ + "type": "i2s", + "value": { + "type": "getCastId" + } + }] + }, + "valueToStore": { + "type": "getLastCreatedDestructable" + } + },{ + "type": "createTimer", + "timeout": { + "type": "rawFloat", + "value": 5 + }, + "actions": [{ + "type": "removeDestructable", + "dest": { + "type": "getStoredDestructableByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "volc" + },{ + "type": "i2s", + "value": { + "type": "getCastId" + } + }] + } + } + },{ + "type": "deleteStoredKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "volc" + },{ + "type": "i2s", + "value": { + "type": "getCastId" + } + }] + } + }] + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getFirstEffectId" + }, + "effectType": "SPECIAL" + },{ + "type": "if", + "condition": { + "type": "i=0", + "value": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "flyingRocks" + } + } + }, + "thenActions": [{ + "type": "cleanUpCastInstance" + }], + "elseActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "finished" + }, + "valueToStore": { + "type": "rawBoolean", + "value": "true" + } + }] + }] + },{ + "ids": [{"id":"AOsh", "castId": "shockwave"}], + "type": "NORMAL_POINTTARGET", + "displayFields": { + "hideAreaCursor": { + "type": "rawBoolean", + "value": "true" + } + }, + "onEndCasting": [{ + "type": "createTerrainWaveAtLocation", + "startLocation": { + "type": "createLocationFromOffset", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "dist": { + "type": "getAbilityArea" + }, + "angle": { + "type": "getAngleBetweenLocations", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "target": { + "type": "getTargetedLocation" + } + } + }, + "targetLocation": { + "type": "getTargetedLocation" + }, + "radius": { + "type": "getAbilityArea" + }, + "depth": { + "type": "rawFloat", + "value": 100 + }, + "distance": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "speed": { + "type": "getAbilityProjectileSpeed" + }, + "trailTime": { + "type": "rawInteger", + "value": 200 + } + },{ + "type": "createLocationTargetedCollisionProjectile", + "source": { + "type": "getCastingUnit" + }, + "sourceLoc": { + "type": "createLocationFromOffset", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "dist": { + "type": "getAbilityArea" + }, + "angle": { + "type": "getAngleBetweenLocations", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "target": { + "type": "getTargetedLocation" + } + } + }, + "target": { + "type": "createLocationFromOffset", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "dist": { + "type": "f+", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "value2": { + "type": "getAbilityArea" + } + }, + "angle": { + "type": "getAngleBetweenLocations", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "target": { + "type": "getTargetedLocation" + } + } + }, + "id": { + "type": "getAlias" + }, + "startingRadius": { + "type": "getAbilityArea" + }, + "endingRadius": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "provideCounts": { + "type": "rawBoolean", + "value": "true" + }, + "onLaunch": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "remainDmg" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }], + "onPreHits": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "dpt" + }, + "valueToStore": { + "type": "fMin", + "value1": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "value2": { + "type": "f/", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "remainDmg" + } + }, + "value2": { + "type": "i2f", + "value": { + "type": "getProjectileUnitTargets" + } + } + } + } + }], + "canHitTarget": [{ + "type": "and", + "conditions": [{ + "type": "isValidTarget", + "target": { + "type": "getProjectileHitWidget" + } + },{ + "type": "isUnitEnemy", + "unit": { + "type": "getProjectileHitUnit" + } + }] + }], + "onHit": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "remainDmg" + }, + "valueToStore": { + "type": "f-", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "remainDmg" + } + }, + "value2": { + "type": "fMin", + "value1": { + "type": "getUnitCurrentHp", + "unit": { + "type": "getProjectileHitUnit" + } + }, + "value2": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "dpt" + } + } + } + } + },{ + "type": "if", + "condition": { + "type": "f>", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "dpt" + } + }, + "value2": { + "type": "rawFloat", + "value": 1 + } + }, + "thenActions": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getProjectileHitUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + },{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getProjectileHitUnit" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "DISEASE" + } + }, + "damage": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "dpt" + } + } + }], + "elseActions": [] + }] + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/generalPassives.json b/core/assets/abilityBehaviors/generalPassives.json index fcfec8688..3ab0fd204 100644 --- a/core/assets/abilityBehaviors/generalPassives.json +++ b/core/assets/abilityBehaviors/generalPassives.json @@ -317,7 +317,7 @@ },{ "type": "removeEffect", "effect": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } }, { "type": "finishReincarnating" @@ -445,7 +445,7 @@ },{ "type": "removeEffect", "effect": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } }, { "type": "finishReincarnating" @@ -952,7 +952,7 @@ "onRemoveAbility": [{ "type": "removeEffect", "effect": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } },{ "type": "removeBuff", @@ -1558,7 +1558,7 @@ "undetect": [{ "type": "removeEffect", "effect": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } },{ "type": "removeStateModBuff", @@ -1685,7 +1685,7 @@ "value": "false" }, "valueToStore": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } }] },{ @@ -1905,7 +1905,7 @@ "value": "false" }, "valueToStore": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } },{ "type": "break" diff --git a/core/assets/abilityBehaviors/humanHeroActives.json b/core/assets/abilityBehaviors/humanHeroActives.json index 85e9a26bb..495464c16 100644 --- a/core/assets/abilityBehaviors/humanHeroActives.json +++ b/core/assets/abilityBehaviors/humanHeroActives.json @@ -251,7 +251,7 @@ "value": "_gEff" }, "valueToStore": { - "type": "getLastCreatedSpellEffect" + "type": "getLastCreatedFX" } },{ "type": "runReuseAction", diff --git a/core/assets/abilityBehaviors/undeadHeroUnitActives.json b/core/assets/abilityBehaviors/undeadHeroUnitActives.json index a117a21ad..637b1eaea 100644 --- a/core/assets/abilityBehaviors/undeadHeroUnitActives.json +++ b/core/assets/abilityBehaviors/undeadHeroUnitActives.json @@ -224,7 +224,7 @@ }] }] },{ - "ids": [{"id":"AUcs", "castId": "carrionswarm"},{"id":"AOsh", "castId": "shockwave"}], + "ids": [{"id":"AUcs", "castId": "carrionswarm"}], "type": "NORMAL_POINTTARGET", "displayFields": { "hideAreaCursor": { @@ -439,7 +439,6 @@ "elseActions": [] }] }] - },{ "ids": [{"id":"AUim", "castId": "impale"}], "type": "NORMAL_POINTTARGET", diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index f8fb77d5c..2d84f8eb8 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -7869,10 +7869,12 @@ public void remove() { jassProgramVisitor.getJassNativeManager().createNative("CreateTargetingBuff", (arguments, globalScope, triggerScope) -> { final int buffRawcode = arguments.get(0).visit(IntegerJassValueVisitor.getInstance()); + final Map localStore = nullable(arguments, 1, + ObjectJassValueVisitor.getInstance()); final CBuff ability = new ABTargetingBuff( CommonEnvironment.this.simulation.getHandleIdAllocator().createId(), - new War3ID(buffRawcode), null, null); + new War3ID(buffRawcode), localStore, null, null); return new HandleJassValue(buffType, ability); }); @@ -7886,10 +7888,12 @@ public void remove() { final boolean leveled = arguments.get(4).visit(BooleanJassValueVisitor.getInstance()); final boolean positive = arguments.get(5).visit(BooleanJassValueVisitor.getInstance()); final boolean dispellable = arguments.get(6).visit(BooleanJassValueVisitor.getInstance()); + final Map localStore = nullable(arguments, 7, + ObjectJassValueVisitor.getInstance()); final ABTimedArtBuff ability = new ABTimedArtBuff( - this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), null, null, - duration, showIcon, leveled, positive, dispellable); + this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), localStore, + null, null, duration, showIcon, leveled, positive, dispellable); if (artType != null) { ability.setArtType(artType); } @@ -7914,7 +7918,7 @@ public void remove() { final boolean dispellable = arguments.get(12).visit(BooleanJassValueVisitor.getInstance()); final ABTimedBuff ability = new ABTimedBuff(this.simulation.getHandleIdAllocator().createId(), - new War3ID(buffRawcode), null, null, duration, showTimedLifeBar, localStore, + new War3ID(buffRawcode), localStore, null, null, duration, showTimedLifeBar, ABActionJass.wrap(onAddAction), ABActionJass.wrap(onRemoveAction), ABActionJass.wrap(onExpireAction), showIcon, castId, leveled, positive, dispellable); ability.setArtType(artType); @@ -7937,10 +7941,12 @@ public void remove() { (arguments, globalScope, triggerScope) -> { final int buffRawcode = arguments.get(0).visit(IntegerJassValueVisitor.getInstance()); final float duration = arguments.get(1).visit(RealJassValueVisitor.getInstance()).floatValue(); + final Map localStore = nullable(arguments, 2, + ObjectJassValueVisitor.getInstance()); final CBuff ability = new ABTimedTargetingBuff( - this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), null, null, - duration); + this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), localStore, null, + null, duration); return new HandleJassValue(buffType, ability); }); @@ -7963,8 +7969,8 @@ public void remove() { final boolean dispellable = arguments.get(13).visit(BooleanJassValueVisitor.getInstance()); final ABTimedTickingBuff ability = new ABTimedTickingBuff( - this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), null, null, - duration, showTimedLifeBar, localStore, ABActionJass.wrap(onAddAction), + this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), localStore, null, + null, duration, showTimedLifeBar, ABActionJass.wrap(onAddAction), ABActionJass.wrap(onRemoveAction), ABActionJass.wrap(onExpireAction), ABActionJass.wrap(onTickAction), showIcon, castId, leveled, positive, dispellable); ability.setArtType(artType); @@ -7990,8 +7996,8 @@ public void remove() { final boolean dispellable = arguments.get(13).visit(BooleanJassValueVisitor.getInstance()); final ABTimedTickingPausedBuff ability = new ABTimedTickingPausedBuff( - this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), null, null, - duration, showTimedLifeBar, localStore, ABActionJass.wrap(onAddAction), + this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), localStore, null, + null, duration, showTimedLifeBar, ABActionJass.wrap(onAddAction), ABActionJass.wrap(onRemoveAction), ABActionJass.wrap(onExpireAction), ABActionJass.wrap(onTickAction), showIcon, castId, leveled, positive, dispellable); ability.setArtType(artType); @@ -8017,8 +8023,8 @@ public void remove() { final boolean dispellable = arguments.get(13).visit(BooleanJassValueVisitor.getInstance()); final ABTimedTickingPostDeathBuff ability = new ABTimedTickingPostDeathBuff( - this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), null, null, - duration, showTimedLifeBar, localStore, ABActionJass.wrap(onAddAction), + this.simulation.getHandleIdAllocator().createId(), new War3ID(buffRawcode), localStore, null, + null, duration, showTimedLifeBar, ABActionJass.wrap(onAddAction), ABActionJass.wrap(onRemoveAction), ABActionJass.wrap(onExpireAction), ABActionJass.wrap(onTickAction), showIcon, castId, leveled, positive, dispellable); ability.setArtType(artType); diff --git a/core/src/com/etheller/warsmash/parsers/w3x/w3e/Corner.java b/core/src/com/etheller/warsmash/parsers/w3x/w3e/Corner.java index a8c5ae40d..251efe276 100644 --- a/core/src/com/etheller/warsmash/parsers/w3x/w3e/Corner.java +++ b/core/src/com/etheller/warsmash/parsers/w3x/w3e/Corner.java @@ -83,6 +83,10 @@ public void save(final LittleEndianDataOutputStream stream) throws IOException { ParseUtils.writeUInt8(stream, (short) ((this.cliffVariation << 5) | this.groundVariation)); ParseUtils.writeUInt8(stream, (short) ((this.cliffTexture << 4) + this.layerHeight)); } + + public void setGroundHeight(float groundHeight) { + this.groundHeight = groundHeight; + } public float getGroundHeight() { return this.groundHeight; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java index 0fe96eed0..9a6cc1e79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java @@ -2000,7 +2000,7 @@ public List getEffectAttachmentUIList(final War3ID alias, fi effectAttachmentUI = buffUI.getSpecialArt(); break; case MISSILE: - effectAttachmentUI = buffUI.getMissileArt(); + effectAttachmentUI = new ArrayList<>(buffUI.getMissileArt()); break; default: throw new IllegalArgumentException("Unsupported effect type: " + effectType); @@ -2142,8 +2142,63 @@ public RenderSpellEffect addSpecialEffectTarget(final String modelName, final CW // TODO this is stupid api, who would do this? throw new UnsupportedOperationException("API for addSpecialEffectTarget() on item is NYI"); } else if (targetWidget instanceof CDestructable) { - // TODO this is stupid api, who would do this? - throw new UnsupportedOperationException("API for addSpecialEffectTarget() on destructable is NYI"); + if (attachPointNames.isEmpty() || ((attachPointNames.size() == 1) && attachPointNames.get(0).isEmpty())) { + attachPointNames = ORIGIN_STRING_LIST; + } + final RenderDestructable renderDest = War3MapViewer.this.destructableToRenderPeer.get(targetWidget); + + if (renderDest == null) { + final NullPointerException nullPointerException = new NullPointerException( + "renderDest is null! targetWidget is \"" + + ((CDestructable) targetWidget).getDestType().getName() + "\", attachPointName=\"" + + attachPointNames + "\""); + if (WarsmashConstants.ENABLE_DEBUG) { + throw nullPointerException; + } else { + nullPointerException.printStackTrace(); + } + } + final MdxModel spawnedEffectModel = loadModelMdx(modelName); + if (spawnedEffectModel != null) { + final MdxComplexInstance modelInstance = (MdxComplexInstance) spawnedEffectModel.addInstance(); + if (renderDest != null) { + { + final MdxModel model = (MdxModel) renderDest.instance.model; + int index = -1; + int bestFitAttachmentNameLength = Integer.MAX_VALUE; + for (int i = 0; i < model.attachments.size(); i++) { + final Attachment attachment = model.attachments.get(i); + boolean match = true; + for (final String attachmentPointNameToken : attachPointNames) { + if (!attachment.getName().contains(attachmentPointNameToken)) { + match = false; + } + } + final int attachmentNameLength = attachment.getName().length(); + if (match && (attachmentNameLength < bestFitAttachmentNameLength)) { + index = i; + bestFitAttachmentNameLength = attachmentNameLength; + } + } + if (index != -1) { + modelInstance.detach(); + final MdxNode attachment = renderDest.getInstance().getAttachment(index); + modelInstance.setParent(attachment); + modelInstance.setLocation(0, 0, 0); + } else { + // TODO This is not consistent with War3, is it? Should look nice though. + modelInstance.setLocation(renderDest.getX(), renderDest.getY(), 0); + } + } + } else { + modelInstance.setLocation(0, 0, 0); + } + modelInstance.setScene(War3MapViewer.this.worldScene); + final RenderSpellEffect renderAttackInstant = new RenderSpellEffect(modelInstance, War3MapViewer.this, + 0, RenderSpellEffect.DEFAULT_ANIMATION_QUEUE, SequenceUtils.EMPTY); + War3MapViewer.this.projectiles.add(renderAttackInstant); + return renderAttackInstant; + } } return null; } @@ -2452,13 +2507,15 @@ public CAttackProjectile createAttackProjectile(final CSimulation simulation, @Override public CAbilityProjectile createProjectile(final CSimulation cSimulation, final float launchX, final float launchY, final float launchFacing, - final float projectileSpeed, final boolean homing, final CUnit source, + final Float projectileSpeed, final Boolean homing, final CUnit source, final War3ID spellAlias, final AbilityTarget target, final CAbilityProjectileListener projectileListener) { final War3ID typeId = source.getTypeId(); final AbilityUI spellDataUI = War3MapViewer.this.abilityDataUI.getUI(spellAlias); final EffectAttachmentUIMissile abilityMissileArt = spellDataUI.getMissileArt(0); final float projectileArc = abilityMissileArt == null ? 0 : abilityMissileArt.getArc(); + final float pSpeed = projectileSpeed == null ? abilityMissileArt.getSpeed() : projectileSpeed; + final boolean pHome = homing == null ? abilityMissileArt.isHoming() : homing; final String missileArt = abilityMissileArt == null ? "" : abilityMissileArt.getModelPath(); final float projectileLaunchX = War3MapViewer.this.simulation.getUnitData() @@ -2479,7 +2536,7 @@ public CAbilityProjectile createProjectile(final CSimulation cSimulation, final float height = War3MapViewer.this.terrain.getGroundHeight(x, y) + source.getFlyHeight() + projectileLaunchZ; final CAbilityProjectile simulationAbilityProjectile = new CAbilityProjectile(x, y, - projectileSpeed, target, homing, source, projectileListener); + pSpeed, target, pHome, source, projectileListener); final MdxModel model = loadModelMdx(missileArt); final MdxComplexInstance modelInstance = (MdxComplexInstance) model.addInstance(); @@ -2765,6 +2822,30 @@ public SimulationRenderComponentLightning createAbilityLightning( renderPeerTarget, duration); } + @Override + public SimulationRenderComponent createStaticUberSplat(final float x, final float y, final War3ID uberId) { + if (uberId != null) { + final Element uberSplatInfo = War3MapViewer.this.terrain.uberSplatTable.get(uberId.asStringValue()); + if (uberSplatInfo != null) { + String uberSplatTexturePath = uberSplatInfo.getField("Dir") + "\\" + uberSplatInfo.getField("file") + ".blp"; + float uberSplatScaleValue = uberSplatInfo.getFieldFloatValue("Scale"); + final SplatMover buildingUberSplatDynamicIngame = War3MapViewer.this.terrain.addUberSplat(uberSplatTexturePath, x, y, + 1, uberSplatScaleValue, false, false, false, false); + return new SimulationRenderComponent() { + @Override + public void remove() { + buildingUberSplatDynamicIngame.destroy(Gdx.gl30, War3MapViewer.this.terrain.centerOffset); + } + }; + } + } + return new SimulationRenderComponent() { + @Override + public void remove() { + } + }; + } + @Override public void spawnDamageSound(final CWidget damagedDestructable, final String weaponSound, final String armorType) { @@ -3424,6 +3505,36 @@ public void setBlight(final float x, final float y, final float radius, War3MapViewer.this.setBlight(x, y, radius, blighted); } + @Override + public int[] getTerrainModBufferSize(float x, float y, float width, float height) { + return War3MapViewer.this.terrain.getTerrainModBufferSize(x, y, width, height); + } + + @Override + public int[] getTerrainModBufferSize(float centerX, float centerY, float radius) { + return War3MapViewer.this.terrain.getTerrainModBufferSize(centerX, centerY, radius); + } + + @Override + public void adjustTerrain(int[] rect, float[] modBuffer) { + War3MapViewer.this.terrain.updateGroundBuffer(rect, modBuffer); + } + + @Override + public void adjustTerrain(float x, float y, float i) { + War3MapViewer.this.terrain.updateGroundBuffer(x, y, i); + } + + @Override + public float getTerrainSpaceX(final float x) { + return War3MapViewer.this.terrain.getTerrainSpaceX(x); + } + + @Override + public float getTerrainSpaceY(final float y) { + return War3MapViewer.this.terrain.getTerrainSpaceY(y); + } + @Override public int getTerrainHeight(final float x, final float y) { final RenderCorner corner = War3MapViewer.this.terrain.getCorner(x, y); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/environment/Terrain.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/environment/Terrain.java index c8931c29c..fe1cf0795 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/environment/Terrain.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/environment/Terrain.java @@ -136,9 +136,10 @@ public class Terrain { private final int[] mapBounds; private final float[] shaderMapBounds; private final int[] mapSize; + public FloatBuffer renderGroundBuffer; public final SoftwareGroundMesh softwareGroundMesh; public final SoftwareWaterAndGroundMesh softwareWaterAndGroundMesh; - private final int testArrayBuffer; + private int testArrayBuffer; private final int testElementBuffer; private boolean initShadowsFinished = false; private byte[] staticShadowData; @@ -201,8 +202,7 @@ public Terrain(final War3MapW3e w3eFile, final War3MapWpm terrainPathing, final this.waterHeightOffset = waterInfo.getFieldFloatValue("height"); this.waterTextureCount = waterInfo.getFieldValue("numTex"); this.waterIncreasePerFrame = waterInfo.getFieldValue("texRate"); - } - else { + } else { this.waterHeightOffset = 0; this.waterTextureCount = 0; this.waterIncreasePerFrame = 0; @@ -440,8 +440,9 @@ public Terrain(final War3MapW3e w3eFile, final War3MapWpm terrainPathing, final this.testArrayBuffer = gl.glGenBuffer(); gl.glBindBuffer(GL30.GL_ARRAY_BUFFER, this.testArrayBuffer); - gl.glBufferData(GL30.GL_ARRAY_BUFFER, this.softwareGroundMesh.vertices.length, - RenderMathUtils.wrap(this.softwareGroundMesh.vertices), GL30.GL_STATIC_DRAW); + this.renderGroundBuffer = RenderMathUtils.wrap(this.softwareGroundMesh.vertices); + gl.glBufferData(GL30.GL_ARRAY_BUFFER, this.softwareGroundMesh.vertices.length, this.renderGroundBuffer, + GL30.GL_STATIC_DRAW); this.testElementBuffer = gl.glGenBuffer(); // gl.glBindBuffer(GL30.GL_ELEMENT_ARRAY_BUFFER, this.testElementBuffer); @@ -614,18 +615,15 @@ private void updateCliffMeshes(final Rectangle area) throws IOException { final int bottomRightCliffTex = bottomRight.getCliffTexture(); if (bottomRightCliffTex == 15) { bottomLeftCliffTex -= 14; - } - else { + } else { bottomLeftCliffTex = bottomRightCliffTex; foundTexture = true; } - } - else { + } else { bottomLeftCliffTex = topRightCliffTex; foundTexture = true; } - } - else { + } else { bottomLeftCliffTex = topLeftCliffTex; foundTexture = true; } @@ -653,20 +651,16 @@ private void updateCliffMeshes(final Rectangle area) throws IOException { if (DISALLOW_HEIGHT_3_RAMPS) { if (rampBlockedByCliff) { invalidRamp = true; - } - else if (topLeftHeight > 1) { + } else if (topLeftHeight > 1) { invalidRamp = true; topLeft.setRamp(0); - } - else if (topRightHeight > 1) { + } else if (topRightHeight > 1) { invalidRamp = true; topRight.setRamp(0); - } - else if (bottomRightHeight > 1) { + } else if (bottomRightHeight > 1) { invalidRamp = true; bottomRight.setRamp(0); - } - else if (bottomLeftHeight > 1) { + } else if (bottomLeftHeight > 1) { invalidRamp = true; bottomLeft.setRamp(0); } @@ -795,8 +789,7 @@ public void removeTerrainCell(final int i, final int j) { uploadGroundTexture(); try { updateCliffMeshes(new Rectangle(i - 1, j - 1, 1, 1)); // TODO does this work? - } - catch (final IOException e) { + } catch (final IOException e) { throw new RuntimeException(e); } } @@ -810,8 +803,7 @@ public void flushRemovedTerrainCells() { uploadGroundTexture(); try { updateCliffMeshes(new Rectangle(0, 0, this.columns - 1, this.rows - 1)); - } - catch (final IOException e) { + } catch (final IOException e) { throw new RuntimeException(e); } } @@ -925,19 +917,15 @@ public short getVariation(final int groundTexture, final int variation) { if (texture.extended) { if (variation <= 15) { return (short) (16 + variation); - } - else if (variation == 16) { + } else if (variation == 16) { return 15; - } - else { + } else { return 0; } - } - else { + } else { if (variation == 0) { return 0; - } - else { + } else { return 15; } } @@ -1462,8 +1450,7 @@ public float getGroundHeight(final float x, final float y) { if ((sqX + sqY) < 1) { height = bottomLeft + ((bottomRight - bottomLeft) * sqX) + ((topLeft - bottomLeft) * sqY); - } - else { + } else { height = topRight + ((bottomRight - topRight) * (1 - sqY)) + ((topLeft - topRight) * (1 - sqX)); } @@ -1473,6 +1460,10 @@ public float getGroundHeight(final float x, final float y) { return 0; } + public float getTerrainSpaceX(float x) { + return (x - this.centerOffset[0]) / 128.0f; + } + public int get128CellX(final float x) { final float userCellSpaceX = (x - this.centerOffset[0]) / 128.0f; final int cellX = (int) userCellSpaceX; @@ -1483,6 +1474,10 @@ public float get128WorldCoordinateFromCellX(final int cellX) { return (cellX * 128.0f) + this.centerOffset[0]; } + public float getTerrainSpaceY(float y) { + return (y - this.centerOffset[1]) / 128.0f; + } + public int get128CellY(final float y) { final float userCellSpaceY = (y - this.centerOffset[1]) / 128.0f; final int cellY = (int) userCellSpaceY; @@ -1523,8 +1518,7 @@ public float getWaterHeight(final float x, final float y) { if ((sqX + sqY) < 1) { height = bottomLeft + ((bottomRight - bottomLeft) * sqX) + ((topLeft - bottomLeft) * sqY); - } - else { + } else { height = topRight + ((bottomRight - topRight) * (1 - sqY)) + ((topLeft - topRight) * (1 - sqX)); } @@ -1649,8 +1643,7 @@ private SoftwareWaterAndGroundMesh(final float waterHeightOffset, final float[] if (waterExistsData[groundCornerHeightIndex] != 0) { height = Math.max(groundCornerHeights[groundCornerHeightIndex], waterHeights[groundCornerHeightIndex] + waterHeightOffset); - } - else { + } else { height = groundCornerHeights[groundCornerHeightIndex]; } this.vertices[(instanceId * 4 * 3) + (vertexId * 3)] = ((vPositionX + x) * 128f) @@ -1722,8 +1715,7 @@ private static char getRampLetter(final int layerHeightOffset, final boolean isR default: throw new IllegalArgumentException("Invalid ramp"); } - } - else { + } else { return (char) ('A' + layerHeightOffset); } } @@ -1767,4 +1759,45 @@ public void setWaterBaseColor(float red, float green, float blue, float alpha) { this.minShallowColorApplied[i] = this.minShallowColor[i] * rgba[i]; } } + + private static Rectangle tempRect = new Rectangle(); + + public void updateGroundBuffer(float x, float y, float i) { + int nodeX = get128CellX(x); + int nodeY = get128CellY(y); + final int instanceId = (nodeY * (columns - 1)) + nodeX; + final int vertexZ = (instanceId * 4 * 3) + (0 * 3) + 2; + softwareGroundMesh.vertices[vertexZ] = softwareGroundMesh.vertices[vertexZ] + i; + this.corners[nodeX][nodeY].setGroundHeight(this.corners[nodeX][nodeY].getGroundHeight() + i / 512); + this.updateGroundHeights(tempRect.set(nodeX, nodeY, 1, 1)); + } + + public int[] getTerrainModBufferSize(float x, float y, float width, float height) { + return new int[] { Math.min(this.rows - 1, Math.max(0, get128CellX(x))), + Math.min(this.columns - 1, Math.max(0, get128CellY(y))), + Math.min(this.rows - 1, Math.max(0, get128CellX(x + width)+1)), + Math.min(this.columns - 1, Math.max(0, get128CellY(y + height)+1)) }; + } + + public int[] getTerrainModBufferSize(float centerX, float centerY, float radius) { + return getTerrainModBufferSize(centerX - radius, centerY - radius, radius * 2, radius * 2); + } + + public void updateGroundBuffer(int[] rect, float[] modBuffer) { + updateGroundBuffer(rect[0], rect[1], rect[2]-rect[0] + 1, rect[3]-rect[1] + 1, modBuffer); + } + + public void updateGroundBuffer(int x, int y, int width, int height, float[] modBuffer) { + for (int j = (int) y; j < (y + height); j++) { + for (int i = (int) x; i < (x + width); i++) { + final int vertexZ = (((j * (columns - 1)) + i) * 4 * 3) + 2; + softwareGroundMesh.vertices[vertexZ] = softwareGroundMesh.vertices[vertexZ] + + modBuffer[(i - x) + (j - y) * width]; + this.corners[i][j].setGroundHeight( + this.corners[i][j].getGroundHeight() + modBuffer[(i - x) + (j - y) * width] / 512); + } + } + this.updateGroundHeights(tempRect.set(x, y, width, height)); + + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderDoodad.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderDoodad.java index 30d45a1bf..aef174ca4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderDoodad.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderDoodad.java @@ -31,6 +31,7 @@ public class RenderDoodad { private static final String DOODAD_COLOR_BLUE = "vertB"; // replaced from 'dvb1' private CFogState fogState; + private byte lastFogStateColor; private final float[] vertexColorBase; private final float[] vertexColorFogged; @@ -101,8 +102,16 @@ public RenderDoodad(final War3MapViewer map, final MdxModel model, final GameObj this.instance = instance; this.row = row; - this.fogState = CFogState.MASKED; - ((MdxComplexInstance) instance).setVertexColor(VERTEX_COLOR_BLACK); + final CPlayerFogOfWar fogOfWar = map.getFogOfWar(); + final PathingGrid pathingGrid = map.simulation.getPathingGrid(); + final int fogOfWarIndexX = pathingGrid.getFogOfWarIndexX(this.x); + final int fogOfWarIndexY = pathingGrid.getFogOfWarIndexY(this.y); + this.fogState = fogOfWar.getFogState(map.simulation, fogOfWarIndexX, fogOfWarIndexY); + this.lastFogStateColor = this.fogState.getMask(); + for (int i = 0; i < this.vertexColorBase.length; i++) { + VERTEX_COLOR_HEAP[i] = (this.vertexColorBase[i] * (255 - (this.lastFogStateColor & 0xFF))) / 255f; + } + ((MdxComplexInstance) this.instance).setVertexColor(VERTEX_COLOR_HEAP); } @@ -121,7 +130,6 @@ public PrimaryTag getAnimation() { return PrimaryTag.STAND; } - private byte lastFogStateColor = 0; public void updateFog(final War3MapViewer war3MapViewer) { final CPlayerFogOfWar fogOfWar = war3MapViewer.getFogOfWar(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderSpellEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderSpellEffect.java index 139bf7fcd..f20200fe4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderSpellEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderSpellEffect.java @@ -88,6 +88,7 @@ public void setAnimations(final PrimaryTag[] animations, final boolean killWhenD this.animationQueueIndex = 0; setKillWhenDone(killWhenDone); applySequence(); + this.animationQueueIndex++; } public void setKillWhenDone(final boolean killWhenDone) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/AbilityDataUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/AbilityDataUI.java index c9a705606..42a17c58c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/AbilityDataUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/AbilityDataUI.java @@ -57,6 +57,8 @@ public class AbilityDataUI { private static final String AREA_EFFECT_ART = "Areaeffectart"; // replaced from 'aaea' private static final String MISSILE_ART = "Missileart"; // replaced from 'amat' private static final String MISSILE_ARC = "Missilearc"; // replaced from 'amac' + private static final String MISSILE_SPEED = "Missilespeed"; // replaced from 'amac' + private static final String MISSILE_HOMING = "MissileHoming"; // replaced from 'amac' private static final String LIGHTNING_EFFECTS = "LightningEffect"; // Standard buff icon fields @@ -230,8 +232,10 @@ public AbilityDataUI(final Warcraft3MapRuntimeObjectData allObjectData, final Ga .asList(abilityTypeData.getFieldAsString(MISSILE_ART, 0).split(",")); final float missileArc = abilityTypeData.getFieldAsFloat(MISSILE_ARC, 0); + final float missileSpeed = abilityTypeData.getFieldAsFloat(MISSILE_SPEED, 0); + final boolean missileHoming = abilityTypeData.getFieldAsBoolean(MISSILE_HOMING, 0); for (final String missileArtPath : missileArtPaths) { - missileArt.add(new EffectAttachmentUIMissile(missileArtPath, Collections.emptyList(), missileArc)); + missileArt.add(new EffectAttachmentUIMissile(missileArtPath, Collections.emptyList(), missileArc, missileSpeed, missileHoming)); } final List LightningEffectList = Arrays @@ -300,11 +304,14 @@ public AbilityDataUI(final Warcraft3MapRuntimeObjectData allObjectData, final Ga : Arrays.asList(effectAttach); effectArt.add(new EffectAttachmentUI(modelPath, attachmentPoints)); } - final List missileArt = new ArrayList<>(); + final List missileArt = new ArrayList<>(); final List missileArtPaths = Arrays .asList(abilityTypeData.getFieldAsString(BUFF_MISSILE_ART, 0).split(",")); + final float missileArc = abilityTypeData.getFieldAsFloat(MISSILE_ARC, 0); + final float missileSpeed = abilityTypeData.getFieldAsFloat(MISSILE_SPEED, 0); + final boolean missileHoming = abilityTypeData.getFieldAsBoolean(MISSILE_HOMING, 0); for (final String missileArtPath : missileArtPaths) { - missileArt.add(new EffectAttachmentUI(missileArtPath, Collections.emptyList())); + missileArt.add(new EffectAttachmentUIMissile(missileArtPath, Collections.emptyList(), missileArc, missileSpeed, missileHoming)); } final String effectSound = abilityTypeData.getFieldAsString(BUFF_ABILITY_EFFECT_SOUND, 0); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/BuffUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/BuffUI.java index d75dae4bb..d974a55e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/BuffUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/BuffUI.java @@ -7,13 +7,13 @@ public class BuffUI { private final List targetArt; private final List specialArt; private final List effectArt; - private final List missileArt; + private final List missileArt; private final String effectSound; private final String effectSoundLooped; public BuffUI(final IconUI onIconUI, final List targetArt, final List specialArt, final List effectArt, - final List missileArt, final String effectSound, final String effectSoundLooped) { + final List missileArt, final String effectSound, final String effectSoundLooped) { this.onIconUI = onIconUI; this.targetArt = targetArt; this.specialArt = specialArt; @@ -39,7 +39,7 @@ public EffectAttachmentUI getEffectArt(final int index) { return AbilityUI.tryGet(this.effectArt, index); } - public EffectAttachmentUI getMissileArt(final int index) { + public EffectAttachmentUIMissile getMissileArt(final int index) { return AbilityUI.tryGet(this.missileArt, index); } @@ -63,7 +63,7 @@ public List getEffectArt() { return effectArt; } - public List getMissileArt() { + public List getMissileArt() { return missileArt; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/EffectAttachmentUIMissile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/EffectAttachmentUIMissile.java index 943bfff6d..ec8054b70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/EffectAttachmentUIMissile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/ability/EffectAttachmentUIMissile.java @@ -9,13 +9,25 @@ public class EffectAttachmentUIMissile extends EffectAttachmentUI { private float arc; + private float speed; + private boolean homing; - public EffectAttachmentUIMissile(String modelPath, List attachmentPoint, float arc) { + public EffectAttachmentUIMissile(String modelPath, List attachmentPoint, float arc, float speed, boolean homing) { super(modelPath, attachmentPoint); this.arc = arc; + this.speed = speed; + this.homing = homing; } public float getArc() { return arc; } + + public float getSpeed() { + return speed; + } + + public boolean isHoming() { + return homing; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java index 4ac807d34..ba59f314b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java @@ -24,7 +24,7 @@ public class CDestructable extends CWidget { private final CDestructableType destType; private final RemovablePathingMapInstance pathingInstance; private final RemovablePathingMapInstance pathingInstanceDeath; - private UnitAnimationListenerImpl unitAnimationListenerImpl; + private UnitAnimationListenerImpl unitAnimationListener; private boolean invulnerable; private boolean blighted; private Rectangle registeredEnumRectangle; @@ -187,7 +187,11 @@ public CDestructableType getDestType() { } public void setUnitAnimationListener(final UnitAnimationListenerImpl unitAnimationListenerImpl) { - this.unitAnimationListenerImpl = unitAnimationListenerImpl; + this.unitAnimationListener = unitAnimationListenerImpl; + } + + public CUnitAnimationListener getUnitAnimationListener() { + return this.unitAnimationListener; } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java index 74f498d57..2f68b209f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java @@ -31,6 +31,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.TextTag; +import com.etheller.warsmash.viewer5.handlers.w3x.War3MapViewer; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.RemovablePathingMapInstance; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; @@ -404,7 +405,7 @@ public CAttackProjectile createProjectile(final CUnit source, final float launch } public CAbilityProjectile createProjectile(final CUnit source, final War3ID spellAlias, final float launchX, - final float launchY, final float launchFacing, final float speed, final boolean homing, + final float launchY, final float launchFacing, final Float speed, final Boolean homing, final AbilityTarget target, final CAbilityProjectileListener projectileListener) { final CAbilityProjectile projectile = this.simulationRenderController.createProjectile(this, launchX, launchY, launchFacing, speed, homing, source, spellAlias, target, projectileListener); @@ -424,7 +425,7 @@ public CAbilityProjectile createProjectile(final CUnit source, final CUnitAttack } public CJassProjectile createProjectile(final CUnit source, final War3ID spellAlias, final float launchX, - final float launchY, final float launchFacing, final float speed, final boolean homing, + final float launchY, final float launchFacing, final Float speed, final Boolean homing, final AbilityTarget target) { final CJassProjectile projectile = this.simulationRenderController.createJassProjectile(this, launchX, launchY, launchFacing, speed, homing, source, spellAlias, target); @@ -486,6 +487,10 @@ public SimulationRenderComponentLightning createAbilityLightning(final CUnit sou duration); } + public SimulationRenderComponent createStaticUberSplat(float x, float y, War3ID id) { + return this.simulationRenderController.createStaticUberSplat(x, y, id); + } + public void createInstantAttackEffect(final CUnit source, final CUnitAttackInstant attack, final CWidget target) { this.simulationRenderController.createInstantAttackEffect(this, source, attack, target); } @@ -1161,6 +1166,30 @@ public GlobalScope getGlobalScope() { return this.globalScope; } + public int[] getTerrainModBufferSize(float x, float y, float width, float height) { + return this.simulationRenderController.getTerrainModBufferSize(x, y, width, height); + } + + public int[] getTerrainModBufferSize(float centerX, float centerY, float radius) { + return this.simulationRenderController.getTerrainModBufferSize(centerX, centerY, radius); + } + + public void adjustTerrain(int[] rect, float[] modBuffer) { + this.simulationRenderController.adjustTerrain(rect, modBuffer); + } + + public void adjustTerrain(float x, float y, float i) { + this.simulationRenderController.adjustTerrain(x, y, i); + } + + public float getTerrainSpaceX(final float x) { + return this.simulationRenderController.getTerrainSpaceX(x); + } + + public float getTerrainSpaceY(final float y) { + return this.simulationRenderController.getTerrainSpaceY(y); + } + public int getTerrainHeight(final float x, final float y) { return this.simulationRenderController.getTerrainHeight(x, y); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/targeting/AbilityTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/targeting/AbilityTarget.java index c172d19f5..96741d09c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/targeting/AbilityTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/targeting/AbilityTarget.java @@ -6,4 +6,16 @@ public interface AbilityTarget { float getY(); T visit(AbilityTargetVisitor visitor); + + public static double angleBetween(final AbilityTarget source, final AbilityTarget target) { + final double dx = target.getX() - source.getX(); + final double dy = target.getY() - source.getY(); + return StrictMath.atan2(dy, dx); + } + + public static double distanceBetweenPoints(final AbilityTarget source, final AbilityTarget target) { + final double dx = target.getX() - source.getX(); + final double dy = target.getY() - source.getY(); + return StrictMath.sqrt((dx * dx) + (dy * dy)); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index 38b3918ca..964ec4c6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -66,7 +66,7 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri protected boolean allowCastlessDeactivate = true; protected PrimaryTag castingPrimaryTag; protected EnumSet castingSecondaryTags; - + protected byte clickDisabled = 0; protected CItem item = null; @@ -79,6 +79,7 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri private boolean ignoreCastTime = false; protected boolean hideAreaCursor = false; + private Float areaCursorOverride; protected int bufferMana = 0; private ManaDepletedCheckTimer timer; @@ -91,9 +92,9 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri private boolean physical = false; private boolean magic = true; private boolean universal = false; - + protected Set uniqueFlags = null; - + private boolean isMenu = false; private int visibleMenuId = 0; @@ -105,7 +106,7 @@ public CAbilityAbilityBuilderGenericActive(int handleId, War3ID code, War3ID ali this.config = config; this.localStore = localStore; localStore.put(ABLocalStoreKeys.ABILITY, this); - + if (config.getCastId() != null) { orderId = OrderIdUtils.getOrderId(config.getCastId()); } else { @@ -140,25 +141,25 @@ public CAbilityAbilityBuilderGenericActive(int handleId, War3ID code, War3ID ali final int levels = editorData.getFieldAsInteger(AbilityFields.LEVELS, 0); localStore.put(ABLocalStoreKeys.ISABILITYLEVELED, levels > 1); } - + @Override public int getAbilityIntField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getFieldValue(field); } - + @Override public float getAbilityFloatField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getFieldFloatValue(field); } - + @Override public String getAbilityStringField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getField(field); } - + @Override public boolean getAbilityBooleanField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); @@ -211,7 +212,7 @@ public void onRemoveDisabled(CSimulation game, CUnit unit) { } } } - + private void addInitialUniqueFlags(CSimulation game, CUnit unit) { if (this.config.getInitialUniqueFlags() != null && !this.config.getInitialUniqueFlags().isEmpty()) { this.uniqueFlags = new HashSet<>(); @@ -221,7 +222,6 @@ private void addInitialUniqueFlags(CSimulation game, CUnit unit) { } } - private void determineToggleableFields(CSimulation game, CUnit unit) { if (config.getDisplayFields() != null && config.getDisplayFields().getSeparateOnAndOff() != null) { this.separateOnAndOff = config.getDisplayFields().getSeparateOnAndOff().callback(game, unit, localStore, @@ -295,8 +295,8 @@ protected void setSpellFields(CSimulation game, CUnit unit) { castId); } if (this.config.getOverrideFields().getIgnoreCastTime() != null) { - this.ignoreCastTime = this.config.getOverrideFields().getIgnoreCastTime().callback(game, unit, localStore, - castId); + this.ignoreCastTime = this.config.getOverrideFields().getIgnoreCastTime().callback(game, unit, + localStore, castId); } if (this.config.getOverrideFields().getCooldownOverride() != null) { this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(game, unit, localStore, @@ -307,8 +307,8 @@ protected void setSpellFields(CSimulation game, CUnit unit) { castId); } if (this.config.getOverrideFields().getAutocastTypeOverride() != null) { - this.autocastType = this.config.getOverrideFields().getAutocastTypeOverride().callback(game, unit, localStore, - castId); + this.autocastType = this.config.getOverrideFields().getAutocastTypeOverride().callback(game, unit, + localStore, castId); } if (this.config.getOverrideFields().getOnTooltipOverride() != null) { @@ -316,28 +316,29 @@ protected void setSpellFields(CSimulation game, CUnit unit) { localStore, castId); } if (this.config.getOverrideFields().getOffTooltipOverride() != null) { - this.offTooltipOverride = this.config.getOverrideFields().getOffTooltipOverride().callback(game, - unit, localStore, castId); + this.offTooltipOverride = this.config.getOverrideFields().getOffTooltipOverride().callback(game, unit, + localStore, castId); } if (this.config.getOverrideFields().getPhysicalSpell() != null) { - this.physical = this.config.getOverrideFields().getPhysicalSpell().callback(game, - unit, localStore, castId); - this.magic = this.physical ? false : this.magic; // Spells that just declare physical:true default to magic:false + this.physical = this.config.getOverrideFields().getPhysicalSpell().callback(game, unit, localStore, + castId); + this.magic = this.physical ? false : this.magic; // Spells that just declare physical:true default to + // magic:false } if (this.config.getOverrideFields().getMagicSpell() != null) { - this.magic = this.config.getOverrideFields().getMagicSpell().callback(game, - unit, localStore, castId); + this.magic = this.config.getOverrideFields().getMagicSpell().callback(game, unit, localStore, castId); } if (this.config.getOverrideFields().getUniversalSpell() != null) { - this.universal = this.config.getOverrideFields().getUniversalSpell().callback(game, - unit, localStore, castId); + this.universal = this.config.getOverrideFields().getUniversalSpell().callback(game, unit, localStore, + castId); } } GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); final int requiredLevel = editorData.getFieldAsInteger(AbilityFields.REQUIRED_LEVEL, 0); this.targetsAllowed = levelDataLevel.getTargetsAllowed(); - if ((requiredLevel < 6 || game.getGameplayConstants().isMagicImmuneResistsUltimates()) && !isPhysical() && !isUniversal()) { + if ((requiredLevel < 6 || game.getGameplayConstants().isMagicImmuneResistsUltimates()) && !isPhysical() + && !isUniversal()) { this.targetsAllowed.add(CTargetType.NON_MAGIC_IMMUNE); } if (isPhysical() && !isUniversal()) { @@ -348,13 +349,15 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.hideAreaCursor = this.config.getDisplayFields().getHideAreaCursor().callback(game, unit, localStore, castId); } + if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getAreaCursorOverride() != null) { + this.areaCursorOverride = this.config.getDisplayFields().getAreaCursorOverride().callback(game, unit, + localStore, castId); + } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getIsMenu() != null) { - this.isMenu = this.config.getDisplayFields().getIsMenu().callback(game, unit, localStore, - this.getLevel()); + this.isMenu = this.config.getDisplayFields().getIsMenu().callback(game, unit, localStore, this.getLevel()); if (this.isMenu) { if (this.config.getDisplayFields().getMenuId() != null) { - this.orderId = this.config.getDisplayFields().getMenuId().callback(game, unit, localStore, - castId); + this.orderId = this.config.getDisplayFields().getMenuId().callback(game, unit, localStore, castId); } else { if (this.orderId == 0) { this.orderId = this.getHandleId(); @@ -410,7 +413,7 @@ public void setItemAbility(final CItem item, int slot) { this.localStore.put(ABLocalStoreKeys.ITEM, item); this.localStore.put(ABLocalStoreKeys.ITEMSLOT, slot); } - + @Override public CItem getItem() { return this.item; @@ -445,7 +448,7 @@ public AbilityBuilderConfiguration getConfig() { public Map getLocalStore() { return this.localStore; } - + @Override public boolean hasUniqueFlag(String flag) { if (this.uniqueFlags != null) { @@ -453,14 +456,14 @@ public boolean hasUniqueFlag(String flag) { } return false; } - + public void addUniqueFlag(String flag) { if (this.uniqueFlags == null) { this.uniqueFlags = new HashSet<>(); } this.uniqueFlags.add(flag); } - + public void removeUniqueFlag(String flag) { if (this.uniqueFlags != null) { this.uniqueFlags.remove(flag); @@ -472,15 +475,15 @@ public void removeUniqueFlag(String flag) { public T getUniqueValue(String key, Class cls) { Object o = this.localStore.get(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); if (o != null && o.getClass() == cls) { - return (T)o; + return (T) o; } return null; } - + public void addUniqueValue(Object item, String key) { this.localStore.put(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId()), item); } - + public void removeUniqueValue(String key) { this.localStore.remove(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); } @@ -507,7 +510,9 @@ public int getChargedManaCost() { @Override public float getUIAreaOfEffect() { - return (this.area == 0 || this.hideAreaCursor) ? Float.NaN : this.area; + return ((this.area == 0 && (this.areaCursorOverride == null || this.areaCursorOverride == 0)) + || this.hideAreaCursor) ? Float.NaN + : (this.areaCursorOverride == null ? this.area : this.areaCursorOverride); } public float getCooldown() { @@ -533,11 +538,11 @@ public float getCastTime() { public void setCastTime(float castTime) { this.castTime = castTime; } - + public boolean ignoreCastTime() { return this.ignoreCastTime; } - + public EnumSet getTargetsAllowed() { return targetsAllowed; } @@ -556,7 +561,7 @@ public boolean isToggleOn() { public boolean isActive() { return this.active; } - + @Override public boolean isClickDisabled() { return this.clickDisabled != 0; @@ -566,8 +571,7 @@ public boolean isClickDisabled() { public final void setClickDisabled(final boolean disabled, final CAbilityDisableType type) { if (disabled) { this.clickDisabled |= type.getMask(); - } - else { + } else { this.clickDisabled &= ~type.getMask(); } } @@ -588,7 +592,8 @@ public boolean isAutoCastOn() { } @Override - public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn, final boolean notify) { + public void setAutoCastOn(final CSimulation simulation, final CUnit caster, final boolean autoCastOn, + final boolean notify) { this.localStore.put(ABLocalStoreKeys.WASAUTOCASTON, this.autocasting); this.autocasting = autoCastOn; if (notify) { @@ -772,8 +777,8 @@ public void checkCanAutoTarget(final CSimulation game, final CUnit unit, final i } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); if (innerCheckCastOrderId(game, unit, orderId)) { innerCheckCanTarget(game, unit, orderId, target, receiver); @@ -812,8 +817,8 @@ public void checkCanAutoTarget(final CSimulation game, final CUnit unit, final i } @Override - public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - boolean autoOrder, final AbilityTargetCheckReceiver receiver) { + public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final AbilityTargetCheckReceiver receiver) { this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); if ((orderId != 0) && ((orderId == getAutoCastOffOrderId()) || (orderId == getAutoCastOnOrderId()))) { receiver.targetOk(null); @@ -913,7 +918,8 @@ protected boolean innerCheckCastOrderId(final CSimulation game, final CUnit unit || ((this.active || this.separateOnAndOff) && orderId == getOffOrderId()); } - protected boolean innerCheckTargetTargetable(CSimulation game, CUnit unit, CWidget target, final AbilityTargetCheckReceiver receiver) { + protected boolean innerCheckTargetTargetable(CSimulation game, CUnit unit, CWidget target, + final AbilityTargetCheckReceiver receiver) { return target.canBeTargetedBy(game, unit, targetsAllowed, receiver); } @@ -1169,8 +1175,8 @@ public void deactivate(final CSimulation game, final CUnit caster) { } @Override - public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - boolean autoOrder, final AbilityTarget target) { + public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, + final AbilityTarget target) { this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); // System.err.println("Checking queue top level: " + active + " orderID : " + orderId + " offID: " + this.getOffOrderId()); if (this.allowCastlessDeactivate && this.toggleable && this.active && orderId == this.getOffOrderId()) { @@ -1268,7 +1274,7 @@ public void cleanupInputs(int theCastId) { public int getIconVisibleMenuId() { return this.visibleMenuId; } - + @Override public void setIconVisibleMenuId(int menu) { this.visibleMenuId = menu; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java index b1a93fd08..18dc77e49 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java @@ -74,10 +74,9 @@ public GetInstantTransformationBuffVisitor reset(CSimulation game, CUnit caster, @Override public ABBuff accept(final AbilityBuilderActiveAbility ability) { - return new ABTimedTransformationBuff(game.getHandleIdAllocator().createId(), - ability, caster, localStore, actions, - buffId == null ? ability.getAlias() : buffId, duration, ability, newType, !addAlternateTagAfter, - permanent, transformationTime); + return new ABTimedTransformationBuff(game.getHandleIdAllocator().createId(), localStore, ability, caster, + actions, buffId == null ? ability.getAlias() : buffId, duration, ability, newType, + !addAlternateTagAfter, permanent, transformationTime); } @Override @@ -88,10 +87,10 @@ public ABBuff accept(final GenericSingleIconActiveAbility ability) { @Override public ABBuff accept(GenericSingleIconPassiveAbility ability) { if (ability instanceof AbilityBuilderPassiveAbility) { - return new ABTimedInstantTransformationBuff(game.getHandleIdAllocator().createId(), - ability, caster, localStore, actions, - buffId == null ? ability.getAlias() : buffId, duration, (AbilityBuilderPassiveAbility) ability, - newType, keepRatios, !addAlternateTagAfter, permanent, transformationTime); + return new ABTimedInstantTransformationBuff(game.getHandleIdAllocator().createId(), localStore, ability, + caster, actions, buffId == null ? ability.getAlias() : buffId, duration, + (AbilityBuilderPassiveAbility) ability, newType, keepRatios, !addAlternateTagAfter, permanent, + transformationTime); } return null; } @@ -99,10 +98,10 @@ public ABBuff accept(GenericSingleIconPassiveAbility ability) { @Override public ABBuff accept(final GenericNoIconAbility ability) { if (ability instanceof AbilityBuilderPassiveAbility) { - return new ABTimedInstantTransformationBuff(game.getHandleIdAllocator().createId(), - ability, caster, localStore, actions, - buffId == null ? ability.getAlias() : buffId, duration, (AbilityBuilderPassiveAbility) ability, - newType, keepRatios, !addAlternateTagAfter, permanent, transformationTime); + return new ABTimedInstantTransformationBuff(game.getHandleIdAllocator().createId(), localStore, ability, + caster, actions, buffId == null ? ability.getAlias() : buffId, duration, + (AbilityBuilderPassiveAbility) ability, newType, keepRatios, !addAlternateTagAfter, permanent, + transformationTime); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java index 4f2d914df..1085c5f28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java @@ -247,7 +247,8 @@ public void setLevel(CSimulation game, CUnit unit, int level) { @Override public void onAdd(CSimulation game, CUnit unit) { if (this.buffId != null) { - this.buff = new ABGenericAuraBuff(game.getHandleIdAllocator().createId(), this.buffId, this, unit, + this.buff = new ABGenericAuraBuff(game.getHandleIdAllocator().createId(), this.buffId, + localStore, this, unit, this.leveled, true); } game.getAbilityData().createAbility(getAlias(), game.getHandleIdAllocator().createId()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java index d8d2f8e1e..999bddb45 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java @@ -235,11 +235,18 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { return this; } - this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), - this.ability.getCastingSecondaryTags(), 1.0f, true); this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); this.doneCastTime = true; } + if (this.channeling) { + EnumSet tags = this.ability.getCastingSecondaryTags().clone(); + tags.add(SecondaryTag.CHANNEL); + this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), tags, + 1.0f, true); + } else { + this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), + this.ability.getCastingSecondaryTags(), 1.0f, true); + } if ((ticksSinceCast >= castPointTicks)) { if (this.castPointTicks > this.castTimeEndTick && !this.isWithinRange(game)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java index 596fc3d57..a1416bc2b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java @@ -44,7 +44,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; + private Map uniqueValues; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, @@ -77,6 +79,11 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueFlags; + private Map uniqueValues; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { final ABTargetingBuff ability = new ABTargetingBuff(game.getHandleIdAllocator().createId(), - this.buffId.callback(game, caster, localStore, castId), (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster); + this.buffId.callback(game, caster, localStore, castId), localStore, + (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); } } + if (uniqueValues != null) { + for (String key : uniqueValues.keySet()) { + ability.addUniqueValue(uniqueValues.get(key).callback(game, caster, localStore, castId), key); + } + } localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java index 3382245e3..88cbfc2fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -12,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedArtBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -31,6 +32,7 @@ public class ABActionCreateTimedArtBuff implements ABSingleAction { private ABStringCallback visibilityGroup; private List uniqueFlags; + private Map uniqueValues; public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { @@ -54,13 +56,13 @@ public void runAction(final CSimulation game, final CUnit caster, final Map onAddActions; private List onRemoveActions; private List onExpireActions; + + private List statBuffs; + private List stateMods; + private ABBooleanCallback showIcon; private CEffectType artType; private ABBooleanCallback hideArt; @@ -78,19 +87,35 @@ public void runAction(final CSimulation game, final CUnit caster, final Map buffMods = new ArrayList<>(); + for (ABStateModBuffCallback mod : stateMods) { + buffMods.add(mod.callback(game, caster, localStore, castId)); + } + ability.setStateMods(buffMods); + } + if (statBuffs != null) { + List buffStats = new ArrayList<>(); + for (ABNonStackingStatBuffCallback mod : statBuffs) { + buffStats.add(mod.callback(game, caster, localStore, castId)); + } + ability.setStatBuffs(buffStats); } + if (artType != null) { ability.setArtType(artType); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java index b4cb6b65d..c0ca32b68 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -9,6 +10,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedPausedExpirationBuff; @@ -16,6 +19,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABActionCreateTimedPausedExpirationBuff implements ABAction { @@ -25,6 +30,10 @@ public class ABActionCreateTimedPausedExpirationBuff implements ABAction { private List onAddActions; private List onRemoveActions; private List onExpireActions; + + private List statBuffs; + private List stateMods; + private ABBooleanCallback showIcon; private CEffectType artType; private ABBooleanCallback hideArt; @@ -77,19 +86,35 @@ public void runAction(final CSimulation game, final CUnit caster, final Map buffMods = new ArrayList<>(); + for (ABStateModBuffCallback mod : stateMods) { + buffMods.add(mod.callback(game, caster, localStore, castId)); + } + ability.setStateMods(buffMods); + } + if (statBuffs != null) { + List buffStats = new ArrayList<>(); + for (ABNonStackingStatBuffCallback mod : statBuffs) { + buffStats.add(mod.callback(game, caster, localStore, castId)); + } + ability.setStatBuffs(buffStats); } + if (artType != null) { ability.setArtType(artType); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java index 78458e90a..16c1c4979 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java @@ -12,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTargetingBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -23,12 +24,13 @@ public class ABActionCreateTimedTargetingBuff implements ABSingleAction { private ABBooleanCallback stacks; private List uniqueFlags; + private Map uniqueValues; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { final ABTimedTargetingBuff ability = new ABTimedTargetingBuff(game.getHandleIdAllocator().createId(), - this.buffId.callback(game, caster, localStore, castId), + this.buffId.callback(game, caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, this.duration.callback(game, caster, localStore, castId)); if (uniqueFlags != null) { @@ -36,6 +38,11 @@ public void runAction(final CSimulation game, final CUnit caster, final Map onRemoveActions; private List onExpireActions; private List onTickActions; + + private List statBuffs; + private List stateMods; + private ABBooleanCallback showIcon; private CEffectType artType; @@ -78,18 +87,34 @@ public void runAction(final CSimulation game, final CUnit caster, final Map buffMods = new ArrayList<>(); + for (ABStateModBuffCallback mod : stateMods) { + buffMods.add(mod.callback(game, caster, localStore, castId)); + } + ability.setStateMods(buffMods); + } + if (statBuffs != null) { + List buffStats = new ArrayList<>(); + for (ABNonStackingStatBuffCallback mod : statBuffs) { + buffStats.add(mod.callback(game, caster, localStore, castId)); + } + ability.setStatBuffs(buffStats); } + if (artType != null) { ability.setArtType(artType); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java index e8ddd8b8b..bb4430196 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -10,6 +11,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPausedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -17,6 +20,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABActionCreateTimedTickingPausedBuff implements ABSingleAction { @@ -27,6 +32,10 @@ public class ABActionCreateTimedTickingPausedBuff implements ABSingleAction { private List onRemoveActions; private List onExpireActions; private List onTickActions; + + private List statBuffs; + private List stateMods; + private ABBooleanCallback showIcon; private CEffectType artType; @@ -78,18 +87,34 @@ public void runAction(final CSimulation game, final CUnit caster, final Map buffMods = new ArrayList<>(); + for (ABStateModBuffCallback mod : stateMods) { + buffMods.add(mod.callback(game, caster, localStore, castId)); + } + ability.setStateMods(buffMods); + } + if (statBuffs != null) { + List buffStats = new ArrayList<>(); + for (ABNonStackingStatBuffCallback mod : statBuffs) { + buffStats.add(mod.callback(game, caster, localStore, castId)); + } + ability.setStatBuffs(buffStats); } + if (artType != null) { ability.setArtType(artType); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java index a614c95c2..35281c0d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -10,12 +11,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPostDeathBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABActionCreateTimedTickingPostDeathBuff implements ABSingleAction { @@ -26,6 +32,10 @@ public class ABActionCreateTimedTickingPostDeathBuff implements ABSingleAction { private List onRemoveActions; private List onExpireActions; private List onTickActions; + + private List statBuffs; + private List stateMods; + private ABBooleanCallback showIcon; private CEffectType artType; @@ -39,6 +49,7 @@ public class ABActionCreateTimedTickingPostDeathBuff implements ABSingleAction { private ABStringCallback visibilityGroup; private List uniqueFlags; + private Map uniqueValues; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, @@ -76,24 +87,40 @@ public void runAction(final CSimulation game, final CUnit caster, final Map buffMods = new ArrayList<>(); + for (ABStateModBuffCallback mod : stateMods) { + buffMods.add(mod.callback(game, caster, localStore, castId)); + } + ability.setStateMods(buffMods); + } + if (statBuffs != null) { + List buffStats = new ArrayList<>(); + for (ABNonStackingStatBuffCallback mod : statBuffs) { + buffStats.add(mod.callback(game, caster, localStore, castId)); + } + ability.setStatBuffs(buffStats); + } + ability.setMagic(isMagic); ability.setPhysical(isPhysical); boolean isStacks = false; @@ -111,6 +138,11 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + float theFacing = 0; + float theScale = 1; + int theVariation = 0; + boolean play = true; + if (this.facing != null) { + theFacing = this.facing.callback(game, caster, localStore, castId); + } + if (this.scale != null) { + theScale = this.scale.callback(game, caster, localStore, castId); + } + if (this.variation != null) { + theVariation = this.variation.callback(game, caster, localStore, castId); + } + if (this.playBirthAnim != null) { + play = this.playBirthAnim.callback(game, caster, localStore, castId); + } + final AbilityPointTarget location = this.location.callback(game, caster, localStore, castId); + final CDestructable createdDest = game.createDestructable(this.id.callback(game, caster, localStore, castId), + location.getX(), location.getY(), theFacing, theScale, theVariation); + if (play) { + createdDest.getUnitAnimationListener().playAnimation(true, PrimaryTag.BIRTH, SequenceUtils.EMPTY, 1.0f, + true); + } + localStore.put(ABLocalStoreKeys.LASTCREATEDDESTRUCTABLE, createdDest); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java new file mode 100644 index 000000000..0bbcfa818 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionKillDestructable implements ABAction { + + private ABDestructableCallback dest; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + dest.callback(game, caster, localStore, castId).setLife(game, 0); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java new file mode 100644 index 000000000..e543294df --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionRemoveDestructable implements ABAction { + + private ABDestructableCallback dest; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + game.removeDestructable(dest.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainBowlAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainBowlAtLocation.java new file mode 100644 index 000000000..4eec40c98 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainBowlAtLocation.java @@ -0,0 +1,59 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainBowlEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; + +public class ABActionCreateTerrainBowlAtLocation implements ABAction { + + private ABLocationCallback location; + private ABFloatCallback radius; + private ABFloatCallback depth; + private ABFloatCallback sinkTime; + private ABFloatCallback staticTime; + private ABFloatCallback fillTime; + + private ABFloatCallback stopDuration; + private ABFloatCallback startDepth; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); + final float rad = radius.callback(game, caster, localStore, castId); + final float theDepth = -1 * depth.callback(game, caster, localStore, castId); + float startDep = 0; + if (startDepth != null) { + startDep = startDepth.callback(game, caster, localStore, castId); + } + + float snkTm = 0; + float sttTm = 0; + float fllTm = 0; + float stpTm = 0; + if (sinkTime != null) { + snkTm = sinkTime.callback(game, caster, localStore, castId); + } + if (staticTime != null) { + sttTm = staticTime.callback(game, caster, localStore, castId); + } + if (fillTime != null) { + fllTm = fillTime.callback(game, caster, localStore, castId); + } + if (stopDuration != null) { + stpTm = stopDuration.callback(game, caster, localStore, castId); + } + + ABTerrainEffect fx = new ABTerrainBowlEffect(game, loc, rad, theDepth, snkTm, sttTm, fllTm, stpTm, startDep); + game.registerTimer(fx); + localStore.put(ABLocalStoreKeys.LASTCREATEDFX, fx); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java new file mode 100644 index 000000000..f51c13b37 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java @@ -0,0 +1,48 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainRippleEffect; + +public class ABActionCreateTerrainRippleAtLocation implements ABAction { + + private ABLocationCallback location; + private ABFloatCallback startRadius; + private ABFloatCallback finalRadius; + private ABFloatCallback depth; + private ABFloatCallback duration; + private ABFloatCallback period; + private ABIntegerCallback spaceWaves; + private ABIntegerCallback timeWaves; + private ABBooleanCallback onlyNegative; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); + final float startRad = startRadius.callback(game, caster, localStore, castId); + final float endRad = finalRadius.callback(game, caster, localStore, castId); + final float theDepth = depth.callback(game, caster, localStore, castId); + final float thePeriod = period.callback(game, caster, localStore, castId); + final int swaves = spaceWaves.callback(game, caster, localStore, castId); + final int twaves = timeWaves.callback(game, caster, localStore, castId); + final boolean onlyNeg = onlyNegative.callback(game, caster, localStore, castId); + + final float dur = duration.callback(game, caster, localStore, castId); + final int intervals = (int)dur; + + ABTerrainEffect fx = new ABTerrainRippleEffect(game, loc, startRad, endRad, theDepth, thePeriod, 2 * intervals, swaves, twaves, onlyNeg); + game.registerTimer(fx); + localStore.put(ABLocalStoreKeys.LASTCREATEDFX, fx); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java new file mode 100644 index 000000000..8ee95b780 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java @@ -0,0 +1,46 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainWaveEffect; + +public class ABActionCreateTerrainWaveAtLocation implements ABAction { + + private ABLocationCallback startLocation; + private ABLocationCallback targetLocation; + private ABFloatCallback radius; + private ABFloatCallback depth; + private ABFloatCallback distance; + private ABFloatCallback speed; + private ABIntegerCallback trailTime; + private ABIntegerCallback count; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityPointTarget loc = this.startLocation.callback(game, caster, localStore, castId); + final AbilityPointTarget tarloc = this.targetLocation.callback(game, caster, localStore, castId); + final float rad = radius.callback(game, caster, localStore, castId); + final float theDepth = depth.callback(game, caster, localStore, castId); + final float dist = distance.callback(game, caster, localStore, castId); + final float spd = speed.callback(game, caster, localStore, castId); + final int trlTime = trailTime.callback(game, caster, localStore, castId); + int cnt = 1; + if (count != null) { + cnt = count.callback(game, caster, localStore, castId); + } + + ABTerrainEffect fx = new ABTerrainWaveEffect(game, loc, tarloc, rad, theDepth, dist, spd, trlTime, cnt); + game.registerTimer(fx); + localStore.put(ABLocalStoreKeys.LASTCREATEDFX, fx); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java new file mode 100644 index 000000000..17a441888 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java @@ -0,0 +1,27 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABActionCreateUberSplat implements ABAction { + + private ABIDCallback id; + private ABLocationCallback location; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + AbilityPointTarget loc = location.callback(game, caster, localStore, castId); + SimulationRenderComponent splat = game.createStaticUberSplat(loc.getX(), loc.getY(), + id.callback(game, caster, localStore, castId)); + localStore.put(ABLocalStoreKeys.LASTCREATEDFX, splat); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java new file mode 100644 index 000000000..4e9cef23e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionModifyTerrainVertex implements ABAction { + + private ABLocationCallback location; + private ABFloatCallback dz; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); + game.adjustTerrain(loc.x, loc.y, dz.callback(game, caster, localStore, castId)); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java new file mode 100644 index 000000000..c1d748f69 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java @@ -0,0 +1,29 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; + +public class ABActionListRemove implements ABAction { + + private ABListCallback list; + private ABIntegerCallback index; + private ABCallback object; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final List l = this.list.callback(game, caster, localStore, castId); + if (object != null) { + l.remove(object.callback(game, caster, localStore, castId)); + } else { + l.remove(index.callback(game, caster, localStore, castId).intValue()); + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java new file mode 100644 index 000000000..f0d2f467e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java @@ -0,0 +1,31 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionLocationListAdd implements ABAction { + + private ABListCallback list; + private ABLocationCallback location; + private ABIntegerCallback index; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final List l = this.list.callback(game, caster, localStore, castId); + if (index != null) { + l.add(index.callback(game, caster, localStore, castId), + location.callback(game, caster, localStore, castId)); + } else { + l.add(location.callback(game, caster, localStore, castId)); + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java new file mode 100644 index 000000000..05471ceaf --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java @@ -0,0 +1,29 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; + +public class ABActionSortableListRemove implements ABAction { + + private ABSortableListCallback list; + private ABIntegerCallback index; + private ABCallback object; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final List l = this.list.callback(game, caster, localStore, castId); + if (object != null) { + l.remove(object.callback(game, caster, localStore, castId)); + } else { + l.remove(index.callback(game, caster, localStore, castId).intValue()); + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java index 70b02488d..6cc0142bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java @@ -4,12 +4,10 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -48,8 +46,8 @@ public class ABActionCreateLocationTargetedCollisionProjectile implements ABSing @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - float theSpeed = 0; - boolean isHoming = true; + Float theSpeed = null; + Boolean isHoming = null; int theMaxHits = 0; int theHitsPerTarget = 1; float theStartingRadius = 0; @@ -72,13 +70,11 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - float theSpeed = 0; - boolean isHoming = true; + Float theSpeed = null; + Boolean isHoming = null; final CUnit theSource = this.source.callback(game, caster, localStore, castId); AbilityTarget sourceLocation = theSource; - final GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); - if (this.sourceLoc != null) { sourceLocation = this.sourceLoc.callback(game, caster, localStore, castId); } if (this.speed != null) { theSpeed = this.speed.callback(game, caster, localStore, castId); } - else { - theSpeed = editorData.getFieldAsFloat(AbilityFields.PROJECTILE_SPEED, 0); - } if (this.homing != null) { isHoming = this.homing.callback(game, caster, localStore, castId); } - else { - isHoming = editorData.getFieldAsBoolean(AbilityFields.PROJECTILE_HOMING_ENABLED, 0); - } final AbilityPointTarget theTarget = this.target.callback(game, caster, localStore, castId); @@ -66,8 +56,8 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - float theSpeed = 0; - boolean isHoming = true; + Float theSpeed = null; + Boolean isHoming = null; int theMaxHits = 0; int theHitsPerTarget = 1; float theStartingRadius = 0; @@ -86,13 +84,11 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - float theSpeed = 0; - boolean isHoming = true; + Float theSpeed = null; + Boolean isHoming = null; int theMaxHits = 0; int theHitsPerTarget = 1; float theStartingRadius = 0; @@ -71,13 +69,11 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - float theSpeed = 0; - boolean isHoming = true; + Float theSpeed = null; + Boolean isHoming = null; int theMaxHits = 0; int theHitsPerTarget = 1; float theStartingRadius = 0; @@ -85,13 +83,11 @@ public void runAction(final CSimulation game, final CUnit caster, final Map actions; + + private ABCallback unique; @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { final int max = this.times.callback(game, caster, localStore, castId); for (int i = 0; i < max; i++) { - localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT, castId), i); + if (this.unique != null) { + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT+"$"+this.unique.callback(game, caster, localStore, castId), castId), i); + } + else { + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT, castId), i); + } for (final ABAction iterationAction : this.actions) { iterationAction.runAction(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java index 8de183363..f1bf227d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java @@ -14,6 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; public class ABActionPeriodicExecute implements ABAction { + private final static int HARD_LOOP_CAP = 100; private List periodicActions; private ABFloatCallback delaySeconds; @@ -24,38 +25,51 @@ public class ABActionPeriodicExecute implements ABAction { @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - int nextActiveTick = 0; + float nextActiveTick = 0; Object u = null; if (this.unique != null) { u = this.unique.callback(game, caster, localStore, castId); if (localStore.containsKey(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + u)) { - nextActiveTick = (int) localStore.get(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + u); + nextActiveTick = (float) localStore.get(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + u); } } else { if (localStore.containsKey(ABLocalStoreKeys.PERIODICNEXTTICK + castId)) { - nextActiveTick = (int) localStore.get(ABLocalStoreKeys.PERIODICNEXTTICK + castId); + nextActiveTick = (float) localStore.get(ABLocalStoreKeys.PERIODICNEXTTICK + castId); } } final int currentTick = game.getGameTurnTick(); - if (currentTick >= nextActiveTick) { - final int delayTicks = (int) (this.delaySeconds.callback(game, caster, localStore, castId) - / WarsmashConstants.SIMULATION_STEP_TIME); - if (nextActiveTick == 0) { - nextActiveTick = currentTick + delayTicks; + int iter = 0; + boolean run = true; + while (run && currentTick >= (int)nextActiveTick && iter < HARD_LOOP_CAP) { + if (nextActiveTick <= 0) { if ((this.initialTick != null) && this.initialTick.callback(game, caster, localStore, castId)) { for (final ABAction periodicAction : this.periodicActions) { periodicAction.runAction(game, caster, localStore, castId); + final Boolean brk = (Boolean) localStore.remove(ABLocalStoreKeys.BREAK); + if ((brk != null) && brk) { + run = false; + break; + } } } + nextActiveTick = currentTick + (this.delaySeconds.callback(game, caster, localStore, castId) + / WarsmashConstants.SIMULATION_STEP_TIME); } else { - nextActiveTick = currentTick + delayTicks; for (final ABAction periodicAction : this.periodicActions) { periodicAction.runAction(game, caster, localStore, castId); + final Boolean brk = (Boolean) localStore.remove(ABLocalStoreKeys.BREAK); + if ((brk != null) && brk) { + run = false; + break; + } } + nextActiveTick += (this.delaySeconds.callback(game, caster, localStore, castId) + / WarsmashConstants.SIMULATION_STEP_TIME); } + iter++; } if (this.unique != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java new file mode 100644 index 000000000..52d3ff3cd --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABActionResetPeriodicExecute implements ABAction { + + private ABCallback unique; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + if (this.unique != null) { + localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + + this.unique.callback(game, caster, localStore, castId)); + } else { + localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java index 052a1424b..ab81d8fd4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java @@ -124,6 +124,12 @@ public boolean call(final CUnit enumUnit) { } float damPerTar = baseDamage * count > theMaxDamage ? theMaxDamage / count : baseDamage; for (CUnit hit : hits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } if (unitSpecificDamageMod != null) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -132,13 +138,7 @@ public boolean call(final CUnit enumUnit) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); } - if (extraActions != null) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); - } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); - } + localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); } } else { @@ -147,6 +147,11 @@ public boolean call(final CUnit enumUnit) { public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } if (unitSpecificDamageMod != null) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -155,11 +160,6 @@ public boolean call(final CUnit enumUnit) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); } - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); - } - } } localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java index 20bd2a696..31bdcd6e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java @@ -174,6 +174,11 @@ public boolean call(final CUnit enumUnit) { : baseDamage; for (CUnit hit : fullhits) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } if (unitSpecificDamageMod != null) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -182,14 +187,14 @@ public boolean call(final CUnit enumUnit) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); } + } + for (CUnit hit : medhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(game, caster, localStore, castId); } } - } - for (CUnit hit : medhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (unitSpecificDamageMod != null) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -198,14 +203,14 @@ public boolean call(final CUnit enumUnit) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medDam); } + } + for (CUnit hit : smallhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(game, caster, localStore, castId); } } - } - for (CUnit hit : smallhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (unitSpecificDamageMod != null) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallDam @@ -214,11 +219,6 @@ public boolean call(final CUnit enumUnit) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallDam); } - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); - } - } } localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); @@ -230,6 +230,11 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } if (unitSpecificDamageMod != null) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -239,12 +244,12 @@ public boolean call(final CUnit enumUnit) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); } + } else if (enumUnit.canReach(loc, medRad)) { if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(game, caster, localStore, castId); } } - } else if (enumUnit.canReach(loc, medRad)) { if (unitSpecificDamageMod != null) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -254,12 +259,12 @@ public boolean call(final CUnit enumUnit) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * medDam); } + } else if (enumUnit.canReach(loc, smallRad)) { if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(game, caster, localStore, castId); } } - } else if (enumUnit.canReach(loc, smallRad)) { if (unitSpecificDamageMod != null) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -269,11 +274,6 @@ public boolean call(final CUnit enumUnit) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * smallDam); } - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); - } - } } } localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java index e4d91c44e..b2f7eadee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java @@ -154,6 +154,11 @@ public boolean call(final CUnit enumUnit) { : baseDamage; for (CUnit hit : fullhits) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } if (unitSpecificDamageMod != null) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -162,14 +167,14 @@ public boolean call(final CUnit enumUnit) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); } + } + for (CUnit hit : partialhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(game, caster, localStore, castId); } } - } - for (CUnit hit : partialhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (unitSpecificDamageMod != null) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * partialRatio @@ -178,11 +183,6 @@ public boolean call(final CUnit enumUnit) { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * partialRatio); } - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); - } - } } localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); @@ -194,6 +194,11 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } if (unitSpecificDamageMod != null) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -203,12 +208,12 @@ public boolean call(final CUnit enumUnit) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); } + } else if (enumUnit.canReach(loc, partialRad)) { if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(game, caster, localStore, castId); } } - } else if (enumUnit.canReach(loc, partialRad)) { if (unitSpecificDamageMod != null) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -218,11 +223,6 @@ public boolean call(final CUnit enumUnit) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), partialDam); } - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); - } - } } } localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java index 3f3572b9a..562735d65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java @@ -171,54 +171,57 @@ public boolean call(final CUnit enumUnit) { for (float c : counts) { count += c; } - float damPerTar = baseDamage * count > theMaxDamage ? theMaxDamage - / (fullhits.size() + medRatio * medhits.size() + smallRatio * smallhits.size()) : baseDamage; + float damPerTar = baseDamage * count > theMaxDamage + ? theMaxDamage / (fullhits.size() + medRatio * medhits.size() + smallRatio * smallhits.size()) + : baseDamage; for (CUnit hit : fullhits) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), - damPerTar * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), + damPerTar * unitSpecificDamageMod.callback(game, caster, localStore, castId)); } else { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); } + } + for (CUnit hit : medhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(game, caster, localStore, castId); } } - } - for (CUnit hit : medhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medRatio * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medRatio + * unitSpecificDamageMod.callback(game, caster, localStore, castId)); } else { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medRatio); } + } + for (CUnit hit : smallhits) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(game, caster, localStore, castId); } } - } - for (CUnit hit : smallhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallRatio * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallRatio + * unitSpecificDamageMod.callback(game, caster, localStore, castId)); } else { hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallRatio); } - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); - } - } } localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); @@ -230,6 +233,11 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(game, caster, localStore, castId); + } + } if (unitSpecificDamageMod != null) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -240,12 +248,12 @@ public boolean call(final CUnit enumUnit) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); } + } else if (enumUnit.canReach(loc, medRad)) { if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(game, caster, localStore, castId); } } - } else if (enumUnit.canReach(loc, medRad)) { if (unitSpecificDamageMod != null) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), medDam * unitSpecificDamageMod @@ -254,12 +262,12 @@ public boolean call(final CUnit enumUnit) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), medDam); } + } else if (enumUnit.canReach(loc, smallRad)) { if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(game, caster, localStore, castId); } } - } else if (enumUnit.canReach(loc, smallRad)) { if (unitSpecificDamageMod != null) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -269,11 +277,6 @@ public boolean call(final CUnit enumUnit) { enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), smallDam); } - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); - } - } } } localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java new file mode 100644 index 000000000..eb933ca6e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetLastCreatedDestructable extends ABDestructableCallback { + + @Override + public CDestructable callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (CDestructable) localStore.get(ABLocalStoreKeys.LASTCREATEDDESTRUCTABLE); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java new file mode 100644 index 000000000..da8cb70ee --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABCallbackDegToRad extends ABFloatCallback { + + private ABFloatCallback angle; + + @Override + public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (float) StrictMath.toRadians(angle.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java new file mode 100644 index 000000000..679d206c5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.units.GameObject; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetAbilityProjectileSpeed extends ABFloatCallback { + + @Override + public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + + final GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + return editorData.getFieldAsFloat(AbilityFields.PROJECTILE_SPEED, 0); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java new file mode 100644 index 000000000..264dabb12 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABCallbackTan extends ABFloatCallback { + + private ABFloatCallback angle; + + @Override + public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (float) StrictMath.tan(angle.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedSpellEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedSpellEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java index 6b0691b8e..0349ffee4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedSpellEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; -public class ABCallbackGetLastCreatedSpellEffect extends ABFXCallback { +public class ABCallbackGetLastCreatedFX extends ABFXCallback { @Override public SimulationRenderComponent callback(CSimulation game, CUnit caster, Map localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java new file mode 100644 index 000000000..1ea08bb23 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; + +public class ABCallbackGetIntegerFromList extends ABIntegerCallback { + + private ABSortableListCallback list; + private ABIntegerCallback index; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, + final int castId) { + return list.callback(game, caster, localStore, castId).get(index.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java new file mode 100644 index 000000000..cd5b23062 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; + +public class ABCallbackGetListSize extends ABIntegerCallback { + + private ABListCallback list; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return list.callback(game, caster, localStore, castId).size(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java new file mode 100644 index 000000000..28128e402 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; + +public class ABCallbackGetSortableListSize extends ABIntegerCallback { + + private ABSortableListCallback list; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return list.callback(game, caster, localStore, castId).size(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java index 07d8a118c..1561204be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java @@ -4,14 +4,21 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; public class ABCallbackIterator extends ABIntegerCallback { + private ABCallback unique; @Override public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT, castId)); + if (this.unique != null) { + return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT+"$"+this.unique.callback(game, caster, localStore, castId), castId)); + } + else { + return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT, castId)); + } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java new file mode 100644 index 000000000..e97330db2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java @@ -0,0 +1,36 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentList extends ABListCallback { + + private ABStringCallback name; + + @SuppressWarnings("unchecked") + @Override + public List callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABListCallback) { + return ((ABListCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ArgumentLocationCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java new file mode 100644 index 000000000..9ef29af44 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java @@ -0,0 +1,36 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackArgumentSortableList> extends ABSortableListCallback { + + private ABStringCallback name; + + @SuppressWarnings("unchecked") + @Override + public List callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final String keyS = name.callback(game, caster, localStore, castId); + ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + if (cbck != null && cbck instanceof ABListCallback) { + return ((ABListCallback) cbck).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ArgumentLocationCallback, but key is missing or callback was the wrong type: " + keyS); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java new file mode 100644 index 000000000..6e7014410 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetStoredListByKey extends ABListCallback { + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @SuppressWarnings("unchecked") + @Override + public List callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + return (List) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + } else { + return (List) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java new file mode 100644 index 000000000..8e13586a1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetStoredSortableListByKey> extends ABSortableListCallback { + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @SuppressWarnings("unchecked") + @Override + public List callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + return (List) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + } else { + return (List) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java new file mode 100644 index 000000000..b89ce90b4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionList extends ABListCallback { + + private ABCondition condition; + private ABListCallback pass; + private ABListCallback fail; + + @Override + public List callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java new file mode 100644 index 000000000..f9ed6c74b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABCallbackInlineConditionSortableList> extends ABSortableListCallback { + + private ABCondition condition; + private ABListCallback pass; + private ABListCallback fail; + + @Override + public List callback(CSimulation game, CUnit caster, Map localStore, int castId) { + if (condition != null && condition.callback(game, caster, localStore, castId)) { + return pass.callback(game, caster, localStore, castId); + } + return fail.callback(game, caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java new file mode 100644 index 000000000..b569e9047 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java @@ -0,0 +1,33 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABCallbackListSorted> extends ABSortableListCallback { + + private ABSortableListCallback list; + private ABListSortType sort; + + @Override + public List callback(final CSimulation game, final CUnit caster, + final Map localStore, final int castId) { + List theList = list.callback(game, caster, localStore, castId); + switch(sort){ + case DSC: + theList.sort(Collections.reverseOrder()); + break; + case RAND: + Collections.shuffle(theList, game.getSeededRandom()); + break; + default: + case ASC: + Collections.sort(theList); + break; + } + return theList; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java new file mode 100644 index 000000000..3fc1d57fc --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java @@ -0,0 +1,44 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseList extends ABListCallback { + + private ABStringCallback name; + + @SuppressWarnings("unchecked") + @Override + public List callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABListCallback) { + return ((ABListCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseLocationCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java new file mode 100644 index 000000000..15c9e6c6a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java @@ -0,0 +1,51 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseListWithArguments extends ABListCallback { + + private ABStringCallback name; + private Map arguments; + + @SuppressWarnings("unchecked") + @Override + public List callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABListCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABListCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseLocationCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java new file mode 100644 index 000000000..4230e162f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java @@ -0,0 +1,44 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseSortableList> extends ABSortableListCallback { + + private ABStringCallback name; + + @SuppressWarnings("unchecked") + @Override + public List callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABListCallback) { + return ((ABListCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseLocationCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java new file mode 100644 index 000000000..bddcd7081 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java @@ -0,0 +1,51 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; + +public class ABCallbackReuseSortableListWithArguments> extends ABSortableListCallback { + + private ABStringCallback name; + private Map arguments; + + @SuppressWarnings("unchecked") + @Override + public List callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + .getConfig(); + final String keyS = name.callback(game, caster, localStore, castId); + if (config.getReuseCallbacks() != null) { + ABCallback callback = config.getReuseCallbacks().get(keyS); + if (callback != null && callback instanceof ABListCallback) { + if (arguments != null && !arguments.isEmpty()) { + for (String argKey : arguments.keySet()) { + localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); + } + } + + return ((ABListCallback) callback).callback(game, caster, localStore, castId); + } else { + System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); + } + } else { + System.err.println("Trying to run ReuseLocationCallback, but none defined"); + } + return null; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "TODOJASS"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java new file mode 100644 index 000000000..f9bd8775d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; + +public abstract class ABListCallback implements ABCallback { + + abstract public List callback(final CSimulation game, final CUnit caster, + final Map localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListSortType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListSortType.java new file mode 100644 index 000000000..ca4741c7a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListSortType.java @@ -0,0 +1,7 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +public enum ABListSortType { + ASC, + DSC, + RAND; +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java new file mode 100644 index 000000000..315f0b0e5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; + +public abstract class ABSortableListCallback> implements ABCallback { + + abstract public List callback(final CSimulation game, final CUnit caster, + final Map localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java new file mode 100644 index 000000000..0364073aa --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.integer; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABCallbackEmptyIntegerList extends ABIntegerListCallback { + + @Override + public List callback(CSimulation game, CUnit caster, Map localStore, int castId) { + return new ArrayList<>(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java new file mode 100644 index 000000000..a1a383a00 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java @@ -0,0 +1,34 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.integer; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; + +public class ABCallbackIntegerListOfRange extends ABIntegerListCallback { + + private ABIntegerCallback start; + private ABIntegerCallback end; + + private ABBooleanCallback inclusiveEnd; + + @Override + public List callback(CSimulation game, CUnit caster, Map localStore, int castId) { + int theStart = 0; + if (start != null) { + theStart = start.callback(game, caster, localStore, castId); + } + if (inclusiveEnd != null && inclusiveEnd.callback(game, caster, localStore, castId)) { + return IntStream.rangeClosed(theStart, end.callback(game, caster, localStore, castId)).boxed() + .collect(Collectors.toList()); + } + return IntStream.range(theStart, end.callback(game, caster, localStore, castId)).boxed() + .collect(Collectors.toList()); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java new file mode 100644 index 000000000..344e63879 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.integer; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; + +public abstract class ABIntegerListCallback extends ABSortableListCallback { + + abstract public List callback(final CSimulation game, final CUnit caster, + final Map localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java new file mode 100644 index 000000000..25ab97f42 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.location; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; + +public class ABCallbackEmptyLocationList extends ABLocationListCallback { + + @Override + public List callback(CSimulation game, CUnit caster, Map localStore, int castId) { + return new ArrayList<>(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java new file mode 100644 index 000000000..a1463ce23 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.location; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; + +public abstract class ABLocationListCallback extends ABListCallback { + + abstract public List callback(final CSimulation game, final CUnit caster, + final Map localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java index ce6a85643..a8f55e03f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java @@ -22,7 +22,7 @@ public AbilityPointTarget callback(final CSimulation game, final CUnit caster, f if (cbck != null && cbck instanceof ABLocationCallback) { return ((ABLocationCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println("Trying to run ArgumentLocationCallback, but key is missing or callback was the wrong type: " + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java new file mode 100644 index 000000000..8b25bd132 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; + +public class ABCallbackCreateLocationFromXYOffset extends ABLocationCallback { + + private ABLocationCallback origin; + private ABFloatCallback xdist; + private ABFloatCallback ydist; + + @Override + public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, + final int castId) { + final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); + return new AbilityPointTarget((float) (orig.x + xdist.callback(game, caster, localStore, castId)), (float) (orig.y + ydist.callback(game, caster, localStore, castId))); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java new file mode 100644 index 000000000..062e4cd5c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; + +public class ABCallbackGetLocationFromList extends ABLocationCallback { + + private ABListCallback list; + private ABIntegerCallback index; + + @Override + public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, + final int castId) { + return list.callback(game, caster, localStore, castId).get(index.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java new file mode 100644 index 000000000..2360f80af --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java @@ -0,0 +1,34 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; + +public class ABCallbackModifyLocationWithOffset extends ABLocationCallback { + + private ABLocationCallback origin; + private ABFloatCallback dist; + private ABFloatCallback angle; + + private ABBooleanCallback angleInDegrees; + + @Override + public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, + final int castId) { + final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); + final float d = this.dist.callback(game, caster, localStore, castId); + final float a = this.angle.callback(game, caster, localStore, castId); + + if (angleInDegrees != null && angleInDegrees.callback(game, caster, localStore, castId)) { + orig.add((float)(d * Math.cos(Math.toRadians(a))), (float)(d * Math.sin(Math.toRadians(a)))); + return orig; + } + orig.add((float)(d * Math.cos(a)), (float)(d * Math.sin(a))); + return orig; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java new file mode 100644 index 000000000..067f1f406 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; + +public class ABCallbackModifyLocationWithXYOffset extends ABLocationCallback { + + private ABLocationCallback origin; + private ABFloatCallback xdist; + private ABFloatCallback ydist; + + @Override + public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, + final int castId) { + final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); + orig.add(xdist.callback(game, caster, localStore, castId), ydist.callback(game, caster, localStore, castId)); + return orig; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java index e85fe916c..30c4ad635 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java @@ -1,7 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Set; + import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractCBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; @@ -24,16 +29,19 @@ public abstract class ABBuff extends AbstractCBuff { protected static int MAGIC = 0b1000000; protected static int AURA = 0b10000000; protected static int STACKS = 0b100000000; - + protected int flags = DISPELLABLE; - + + protected Map localStore; protected List uniqueFlags = null; private String visibilityGroup = null; private CAbility sourceAbil; protected CUnit sourceUnit; - public ABBuff(int handleId, War3ID code, War3ID alias, CAbility sourceAbility, CUnit sourceUnit) { + public ABBuff(int handleId, War3ID code, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit) { super(handleId, code, alias); + this.localStore = localStore; this.sourceAbil = sourceAbility; this.sourceUnit = sourceUnit; } @@ -43,13 +51,14 @@ public void onCancelFromQueue(final CSimulation game, final CUnit unit, final in } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, + final CWidget target) { return null; } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - boolean autoOrder, final AbilityPointTarget point) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, + final AbilityPointTarget point) { return null; } @@ -65,14 +74,14 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override - public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - boolean autoOrder, final AbilityTargetCheckReceiver receiver) { + public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @@ -81,12 +90,12 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final final AbilityActivationReceiver receiver) { receiver.notAnActiveAbility(); } - + @Override public T visit(final CAbilityVisitor visitor) { return visitor.accept(this); } - + @Override public boolean hasUniqueFlag(String flag) { if (this.uniqueFlags != null) { @@ -94,34 +103,57 @@ public boolean hasUniqueFlag(String flag) { } return false; } - + public void addUniqueFlag(String flag) { if (this.uniqueFlags == null) { this.uniqueFlags = new ArrayList<>(); } this.uniqueFlags.add(flag); } - + public void removeUniqueFlag(String flag) { if (this.uniqueFlags != null) { this.uniqueFlags.remove(flag); } } - + + @SuppressWarnings("unchecked") @Override public T getUniqueValue(String key, Class cls) { + Object o = this.localStore.get(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); + if (o != null && o.getClass() == cls) { + return (T) o; + } return null; } - + + public void addUniqueValue(Object item, String key) { + this.localStore.put(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId()), item); + } + + public void removeUniqueValue(String key) { + this.localStore.remove(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); + } + + public void cleanUpUniqueValues() { + final Set keySet = new HashSet<>(localStore.keySet()); + String search = ABLocalStoreKeys.combineUniqueValueKey("", this.getHandleId()); + for (final String key : keySet) { + if (key.contains(search)) { + localStore.remove(key); + } + } + } + public void setVisibilityGroup(String visibilityGroup) { this.visibilityGroup = visibilityGroup; } - + @Override public String getVisibilityGroup() { return this.visibilityGroup; } - + public void setTimedLifeBar(boolean timedLife) { this.flags = timedLife ? this.flags | TIMEDLIFE : this.flags & ~TIMEDLIFE; } @@ -130,7 +162,7 @@ public void setTimedLifeBar(boolean timedLife) { public boolean isTimedLifeBar() { return ((this.flags & TIMEDLIFE) != 0); } - + public void setPositive(boolean positive) { this.flags = positive ? this.flags & ~NEGATIVE : this.flags | NEGATIVE; } @@ -139,25 +171,25 @@ public void setPositive(boolean positive) { public boolean isPositive() { return ((this.flags & NEGATIVE) == 0); } - + public void setLeveled(boolean leveled) { this.flags = leveled ? this.flags | LEVELED : this.flags & ~LEVELED; } @Override public boolean isLeveled() { - return ((this.flags & LEVELED) != 0); + return ((this.flags & LEVELED) != 0); } - + public void setDispellable(boolean dispellable) { this.flags = dispellable ? this.flags | DISPELLABLE : this.flags & ~DISPELLABLE; } @Override public boolean isDispellable() { - return ((this.flags & DISPELLABLE) != 0); + return ((this.flags & DISPELLABLE) != 0); } - + public void setHero(boolean hero) { this.flags = hero ? this.flags | HERO : this.flags & ~HERO; } @@ -166,40 +198,40 @@ public void setHero(boolean hero) { public boolean isHero() { return ((this.flags & HERO) != 0); } - + public void setPhysical(boolean physical) { this.flags = physical ? this.flags | PHYSICAL : this.flags & ~PHYSICAL; } @Override public boolean isPhysical() { - return ((this.flags & PHYSICAL) != 0); + return ((this.flags & PHYSICAL) != 0); } - + public void setMagic(boolean magic) { this.flags = magic ? this.flags | MAGIC : this.flags & ~MAGIC; } @Override public boolean isMagic() { - return ((this.flags & MAGIC) != 0); + return ((this.flags & MAGIC) != 0); } - + public void setAura(boolean aura) { this.flags = aura ? this.flags | AURA : this.flags & ~AURA; } @Override public boolean isAura() { - return ((this.flags & AURA) != 0); + return ((this.flags & AURA) != 0); } - + public void setStacks(boolean stacks) { this.flags = stacks ? this.flags | STACKS : this.flags & ~STACKS; } public boolean isStacks() { - return ((this.flags & STACKS) != 0); + return ((this.flags & STACKS) != 0); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java index 142bc4d6d..dc7aae75d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java @@ -1,5 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +import java.util.Map; + import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -21,9 +23,9 @@ public class ABBuffSlow extends ABGenericTimedBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias, CAbility sourceAbility, CUnit sourceUnit, final float duration, - boolean leveled) { - super(handleId, alias, sourceAbility, sourceUnit, duration, false, leveled, false, false); + public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias, Map localStore, + CAbility sourceAbility, CUnit sourceUnit, final float duration, boolean leveled) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, false, false); if (STANDARD_ATTACK_DEBUFF == null) { STANDARD_ATTACK_DEBUFF = new NonStackingStatBuff(NonStackingStatBuffType.ATKSPD, "genericSlow", -1 * game.getGameplayConstants().getFrostAttackSpeedDecrease()); @@ -36,9 +38,10 @@ public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias this.moveSpeedDebuff = STANDARD_MOVE_DEBUFF; } - public ABBuffSlow(final int handleId, final War3ID alias, CAbility sourceAbility, CUnit sourceUnit, final float duration, - final float attackSpeedReductionPercent, final float moveSpeedReductionPercent, boolean leveled) { - super(handleId, alias, sourceAbility, sourceUnit, duration, false, leveled, false, false); + public ABBuffSlow(final int handleId, final War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, final float duration, final float attackSpeedReductionPercent, + final float moveSpeedReductionPercent, boolean leveled) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, false, false); this.attackSpeedDebuff = new NonStackingStatBuff(NonStackingStatBuffType.ATKSPD, "genericSlow", -1 * attackSpeedReductionPercent); this.moveSpeedDebuff = new NonStackingStatBuff(NonStackingStatBuffType.MVSPDPCT, "genericSlow", diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java index 51df1ee51..71078d6c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java @@ -1,5 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +import java.util.Map; + import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -17,8 +19,9 @@ public class ABBuffStun extends ABGenericTimedBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABBuffStun(final int handleId, final War3ID alias, CAbility sourceAbility, CUnit sourceUnit, final float duration, final boolean leveled) { - super(handleId, alias, sourceAbility, sourceUnit, duration, false, leveled, false, false); + public ABBuffStun(final int handleId, final War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, final float duration, final boolean leveled) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, false, false); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java index dd8dbb2f4..e2e0ab16f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java @@ -1,5 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +import java.util.Map; + import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -12,8 +14,9 @@ public class ABGenericArtBuff extends ABBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABGenericArtBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit) { - super(handleId, alias, alias, sourceAbility, sourceUnit); + public ABGenericArtBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit) { + super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setIconShowing(false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java index df205ec99..a4af957f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java @@ -11,13 +11,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; public class ABGenericAuraBuff extends ABBuff { - private Map fx; - + private Map fx; + private CUnit caster; - public ABGenericAuraBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit caster, boolean leveled, - boolean positive) { - super(handleId, alias, alias, sourceAbility, caster); + public ABGenericAuraBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit caster, boolean leveled, boolean positive) { + super(handleId, alias, alias, localStore, sourceAbility, caster); this.caster = caster; this.fx = new HashMap<>(); this.setHero(caster.isHero()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java index 97de39876..7e1b7eddd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java @@ -1,5 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +import java.util.Map; + import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -7,15 +9,17 @@ public abstract class ABGenericPermanentBuff extends ABBuff { - public ABGenericPermanentBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, boolean showIcon, boolean leveled, boolean positive) { - super(handleId, alias, alias, sourceAbility, sourceUnit); + public ABGenericPermanentBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, boolean showIcon, boolean leveled, boolean positive) { + super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setIconShowing(showIcon); this.setLeveled(leveled); this.setPositive(positive); } - public ABGenericPermanentBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, boolean leveled, boolean positive) { - super(handleId, alias, alias, sourceAbility, sourceUnit); + public ABGenericPermanentBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, boolean leveled, boolean positive) { + super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setLeveled(leveled); this.setPositive(positive); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java index a64141f7d..98b72085d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java @@ -1,5 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +import java.util.Map; + import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -11,16 +13,17 @@ public abstract class ABGenericTimedBuff extends ABBuff { private int currentTick = 0; private int expireTick; - public ABGenericTimedBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, boolean leveled, - boolean positive, boolean dispellable) { - super(handleId, alias, alias, sourceAbility, sourceUnit); + public ABGenericTimedBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, boolean leveled, boolean positive, + boolean dispellable) { + super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setTimedLifeBar(showTimedLifeBar); this.duration = duration; this.setLeveled(leveled); this.setPositive(positive); this.setDispellable(dispellable); } - + @Override public boolean equals(Object obj) { if (this == obj) @@ -52,10 +55,6 @@ public void onRemove(CSimulation game, CUnit unit) { this.cleanUpUniqueValues(); } - protected void cleanUpUniqueValues() { - // Do nothing - } - protected abstract void onBuffRemove(CSimulation game, CUnit unit); protected abstract void onBuffExpire(CSimulation game, CUnit unit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java index 96c45b4da..32486399c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java @@ -14,7 +14,6 @@ public class ABPermanentPassiveBuff extends ABGenericPermanentBuff { - protected Map localStore; private List onAddActions; private List onRemoveActions; @@ -39,8 +38,7 @@ public ABPermanentPassiveBuff(int handleId, War3ID alias, CAbility sourceAbility public ABPermanentPassiveBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, Map localStore, List onAddActions, List onRemoveActions, final int castId, boolean leveled, boolean positive) { - super(handleId, alias, sourceAbility, sourceUnit, leveled, positive); - this.localStore = localStore; + super(handleId, alias, localStore, sourceAbility, sourceUnit, leveled, positive); this.onAddActions = onAddActions; this.onRemoveActions = onRemoveActions; this.castId = castId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java index 346312a98..0f981d1ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java @@ -1,13 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +import java.util.Map; + import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; public class ABTargetingBuff extends ABBuff { - public ABTargetingBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit) { - super(handleId, alias, alias, sourceAbility, sourceUnit); + public ABTargetingBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit) { + super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setIconShowing(false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java index 7f32ecb4c..54a89e62c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java @@ -1,5 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +import java.util.Map; + import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -14,15 +16,16 @@ public class ABTimedArtBuff extends ABGenericTimedBuff { private SimulationRenderComponent lsfx; private CEffectType artType = CEffectType.TARGET; - public ABTimedArtBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showIcon, boolean leveled, - boolean positive, boolean dispellable) { - this(handleId, alias, sourceAbility, sourceUnit, duration, leveled, positive, dispellable); + public ABTimedArtBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showIcon, boolean leveled, boolean positive, + boolean dispellable) { + this(handleId, alias, localStore, sourceAbility, sourceUnit, duration, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedArtBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean leveled, boolean positive, - boolean dispellable) { - super(handleId, alias, sourceAbility, sourceUnit, duration, false, leveled, positive, dispellable); + public ABTimedArtBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean leveled, boolean positive, boolean dispellable) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, positive, dispellable); } public void setArtType(CEffectType artType) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java index 6323a613b..dd3d531ed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java @@ -1,10 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -13,11 +10,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABTimedBuff extends ABGenericTimedBuff { - protected Map localStore; private List onAddActions; private List onRemoveActions; private List onExpireActions; @@ -29,55 +27,30 @@ public class ABTimedBuff extends ABGenericTimedBuff { protected int castId = 0; - public ABTimedBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, - Map localStore, List onAddActions, List onRemoveActions, - List onExpireActions, boolean showIcon, final int castId, final boolean leveled, - final boolean positive, final boolean dispellable) { - this(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, - castId, leveled, positive, dispellable); + private List stateMods = null; + private List statBuffs = null; + + public ABTimedBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, + List onRemoveActions, List onExpireActions, boolean showIcon, final int castId, + final boolean leveled, final boolean positive, final boolean dispellable) { + this(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, + onRemoveActions, onExpireActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, - Map localStore, List onAddActions, List onRemoveActions, - List onExpireActions, final int castId, final boolean leveled, final boolean positive, - final boolean dispellable) { - super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, leveled, positive, dispellable); - this.localStore = localStore; + public ABTimedBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, + List onRemoveActions, List onExpireActions, final int castId, final boolean leveled, + final boolean positive, final boolean dispellable) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, leveled, positive, + dispellable); this.onAddActions = onAddActions; this.onRemoveActions = onRemoveActions; this.onExpireActions = onExpireActions; this.castId = castId; - - this.setLevel(null, null, (int) localStore.getOrDefault(ABLocalStoreKeys.CURRENTLEVEL, 1)); - } - - @SuppressWarnings("unchecked") - @Override - public T getUniqueValue(String key, Class cls) { - Object o = this.localStore.get(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); - if (o != null && o.getClass() == cls) { - return (T)o; - } - return null; - } - - public void addUniqueValue(Object item, String key) { - this.localStore.put(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId()), item); - } - - public void removeUniqueValue(String key) { - this.localStore.remove(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); - } - public void cleanUpUniqueValues() { - final Set keySet = new HashSet<>(localStore.keySet()); - String search = ABLocalStoreKeys.combineUniqueValueKey("", this.getHandleId()); - for (final String key : keySet) { - if (key.contains(search)) { - localStore.remove(key); - } - } + this.setLevel(null, null, (int) localStore.getOrDefault(ABLocalStoreKeys.CURRENTLEVEL, 1)); } public void setArtType(CEffectType artType) { @@ -96,6 +69,16 @@ protected void onBuffAdd(CSimulation game, CUnit unit) { this.sfx = game.unitSoundEffectEvent(unit, getAlias()); this.lsfx = game.unitLoopSoundEffectEvent(unit, getAlias()); } + if (this.statBuffs != null) { + for (NonStackingStatBuff buff : this.statBuffs) { + unit.addNonStackingStatBuff(game, buff); + } + } + if (this.stateMods != null) { + for (StateModBuff mod : this.stateMods) { + unit.addStateModBuff(mod); + } + } if (onAddActions != null) { localStore.put(ABLocalStoreKeys.BUFF, this); for (ABAction action : onAddActions) { @@ -123,6 +106,16 @@ protected void onBuffRemove(CSimulation game, CUnit unit) { } localStore.remove(ABLocalStoreKeys.BUFF); } + if (this.statBuffs != null) { + for (NonStackingStatBuff buff : this.statBuffs) { + unit.removeNonStackingStatBuff(game, buff); + } + } + if (this.stateMods != null) { + for (StateModBuff mod : this.stateMods) { + unit.removeStateModBuff(mod); + } + } } @Override @@ -136,4 +129,12 @@ protected void onBuffExpire(CSimulation game, CUnit unit) { } } + public void setStateMods(List stateMods) { + this.stateMods = stateMods; + } + + public void setStatBuffs(List statBuffs) { + this.statBuffs = statBuffs; + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java index 2e5a393eb..640662698 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java @@ -15,7 +15,6 @@ public class ABTimedInstantTransformationBuff extends ABGenericTimedBuff { - private Map localStore; private OnTransformationActions actions; private AbilityBuilderPassiveAbility abil; private CUnitType targetType; @@ -25,13 +24,12 @@ public class ABTimedInstantTransformationBuff extends ABGenericTimedBuff { private float dur; private float transTime; - public ABTimedInstantTransformationBuff(int handleId, CAbility sourceAbility, CUnit sourceUnit, Map localStore, - OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderPassiveAbility ability, - CUnitType newType, final boolean keepRatios, boolean addAlternateTagAfter, boolean permanent, - float transformationDuration) { - super(handleId, alias, sourceAbility, sourceUnit, duration, true, false, true, false); + public ABTimedInstantTransformationBuff(int handleId, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, OnTransformationActions actions, War3ID alias, float duration, + AbilityBuilderPassiveAbility ability, CUnitType newType, final boolean keepRatios, + boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, true, false, true, false); this.setIconShowing(false); - this.localStore = localStore; this.actions = actions; this.abil = ability; this.targetType = newType; @@ -57,13 +55,13 @@ public void onDeath(CSimulation game, CUnit unit) { unit.remove(game, this); } } - + @Override protected void onBuffExpire(CSimulation game, CUnit unit) { if (dur > 0) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); - new DelayInstantTransformationTimer(game, sourceUnit, localStore, unit, actions, addAlternateTagAfter, transTime, null, - targetType, keepRatios, abil, null, transTime, 0).start(game); + new DelayInstantTransformationTimer(game, sourceUnit, localStore, unit, actions, addAlternateTagAfter, + transTime, null, targetType, keepRatios, abil, null, transTime, 0).start(game); } else { TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java index 6338c9441..e6c2a7873 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java @@ -9,21 +9,21 @@ public class ABTimedPausedExpirationBuff extends ABTimedBuff implements CPausedTickingBuff { - public ABTimedPausedExpirationBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, - Map localStore, List onAddActions, List onRemoveActions, - List onExpireActions, boolean showIcon, final int castId, final boolean leveled, - final boolean positive, final boolean dispellable) { - super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, - showIcon, castId, leveled, positive, dispellable); + public ABTimedPausedExpirationBuff(int handleId, War3ID alias, Map localStore, + CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, + List onAddActions, List onRemoveActions, List onExpireActions, + boolean showIcon, final int castId, final boolean leveled, final boolean positive, + final boolean dispellable) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, + onRemoveActions, onExpireActions, showIcon, castId, leveled, positive, dispellable); } - public ABTimedPausedExpirationBuff(int handleId, War3ID alias, CAbility sourceAbility, - CUnit sourceUnit, float duration, boolean showTimedLifeBar, - Map localStore, List onAddActions, List onRemoveActions, - List onExpireActions, final int castId, final boolean leveled, final boolean positive, - final boolean dispellable) { - super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, - castId, leveled, positive, dispellable); + public ABTimedPausedExpirationBuff(int handleId, War3ID alias, Map localStore, + CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, + List onAddActions, List onRemoveActions, List onExpireActions, + final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, + onRemoveActions, onExpireActions, castId, leveled, positive, dispellable); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java index b1ca28544..120bac8ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java @@ -1,13 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +import java.util.Map; + import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; public class ABTimedTargetingBuff extends ABGenericTimedBuff { - public ABTimedTargetingBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration) { - super(handleId, alias, sourceAbility, sourceUnit, duration, false, false, true, false); + public ABTimedTargetingBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, false, true, false); this.setIconShowing(false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java index ea22222b3..88c593f7d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java @@ -14,21 +14,22 @@ public class ABTimedTickingBuff extends ABTimedBuff { private List onTickActions; - public ABTimedTickingBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, - Map localStore, List onAddActions, List onRemoveActions, - List onExpireActions, List onTickActions, boolean showIcon, final int castId, - final boolean leveled, final boolean positive, final boolean dispellable) { - this(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, - onTickActions, castId, leveled, positive, dispellable); + public ABTimedTickingBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, + List onRemoveActions, List onExpireActions, List onTickActions, + boolean showIcon, final int castId, final boolean leveled, final boolean positive, + final boolean dispellable) { + this(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, + onRemoveActions, onExpireActions, onTickActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedTickingBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, - Map localStore, List onAddActions, List onRemoveActions, - List onExpireActions, List onTickActions, final int castId, final boolean leveled, - final boolean positive, final boolean dispellable) { - super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, onRemoveActions, onExpireActions, - castId, leveled, positive, dispellable); + public ABTimedTickingBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, + List onRemoveActions, List onExpireActions, List onTickActions, + final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, + onRemoveActions, onExpireActions, castId, leveled, positive, dispellable); this.onTickActions = onTickActions; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java index 17cbd43d3..0e4b48449 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java @@ -14,21 +14,22 @@ public class ABTimedTickingPausedBuff extends ABTimedBuff implements CPausedTick private List onTickActions; - public ABTimedTickingPausedBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, - float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, + public ABTimedTickingPausedBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, CUnit sourceUnit, + float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - this(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, + this(handleId, alias, localStore, + sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedTickingPausedBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, - float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, + public ABTimedTickingPausedBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, CUnit sourceUnit, + float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, onRemoveActions, onExpireActions, castId, leveled, positive, dispellable); this.onTickActions = onTickActions; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java index a34325470..ece23a0c3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java @@ -11,21 +11,22 @@ public class ABTimedTickingPostDeathBuff extends ABTimedTickingBuff { - public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, - float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, + public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, CUnit sourceUnit, + float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - this(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, + this(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, - float duration, boolean showTimedLifeBar, Map localStore, List onAddActions, + public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, CUnit sourceUnit, + float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - super(handleId, alias, sourceAbility, sourceUnit, duration, showTimedLifeBar, localStore, onAddActions, + super(handleId, alias, localStore, + sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, leveled, positive, dispellable); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java index 12280a63a..f8c091cf5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java @@ -19,7 +19,6 @@ public class ABTimedTransformationBuff extends ABGenericTimedBuff { - private Map localStore; private OnTransformationActions actions; private AbilityBuilderAbility abil; private CUnitType targetType; @@ -35,14 +34,14 @@ public class ABTimedTransformationBuff extends ABGenericTimedBuff { private boolean imTakeOff; private boolean instantTransformation; - public ABTimedTransformationBuff(int handleId, CAbility sourceAbility, CUnit sourceUnit, Map localStore, OnTransformationActions actions, - War3ID alias, float duration, AbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, - boolean addAlternateTagAfter, boolean permanent, float transformationDuration, float transformationTime, - float landingDelay, float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, - boolean immediateLanding, boolean immediateTakeoff) { - super(handleId, alias, sourceAbility, sourceUnit, duration, true, false, true, false); + public ABTimedTransformationBuff(int handleId, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, OnTransformationActions actions, War3ID alias, float duration, + AbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, boolean addAlternateTagAfter, + boolean permanent, float transformationDuration, float transformationTime, float landingDelay, + float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, boolean immediateLanding, + boolean immediateTakeoff) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, true, false, true, false); this.setIconShowing(false); - this.localStore = localStore; this.actions = actions; this.abil = ability; this.targetType = newType; @@ -59,12 +58,12 @@ public ABTimedTransformationBuff(int handleId, CAbility sourceAbility, CUnit sou this.instantTransformation = false; } - public ABTimedTransformationBuff(int handleId, CAbility sourceAbility, CUnit sourceUnit, Map localStore, OnTransformationActions actions, - War3ID alias, float duration, AbilityBuilderAbility ability, CUnitType newType, - boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { - super(handleId, alias, sourceAbility, sourceUnit, duration, true, false, true, false); + public ABTimedTransformationBuff(int handleId, Map localStore, CAbility sourceAbility, + CUnit sourceUnit, OnTransformationActions actions, War3ID alias, float duration, + AbilityBuilderAbility ability, CUnitType newType, boolean addAlternateTagAfter, boolean permanent, + float transformationDuration) { + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, true, false, true, false); this.setIconShowing(false); - this.localStore = localStore; this.actions = actions; this.abil = ability; this.targetType = newType; @@ -109,8 +108,8 @@ protected void onBuffExpire(CSimulation game, CUnit unit) { if (instantTransformation) { if (dur > 0) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); - new DelayInstantTransformationTimer(game, sourceUnit, localStore, unit, actions, addAlternateTagAfter, transTime, - null, targetType, keepRatios, abil, null, transTime, 0).start(game); + new DelayInstantTransformationTimer(game, sourceUnit, localStore, unit, actions, addAlternateTagAfter, + transTime, null, targetType, keepRatios, abil, null, transTime, 0).start(game); } else { TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); @@ -119,13 +118,11 @@ protected void onBuffExpire(CSimulation game, CUnit unit) { unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.abil, null); } else { this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, unit.getCurrentBehavior()); - unit.order(game, - new COrderStartTransformation( - new CBehaviorFinishTransformation(sourceUnit, localStore, unit, abil, targetType, keepRatios, actions, - addAlternateTagAfter, visibleOrderId, perm, dur, transTime, landTime, atlAdDelay, - altAdTime, imLand, imTakeOff, this.getAlias(), targetType, instantTransformation), - transformId), - false); + unit.order(game, new COrderStartTransformation( + new CBehaviorFinishTransformation(sourceUnit, localStore, unit, abil, targetType, keepRatios, + actions, addAlternateTagAfter, visibleOrderId, perm, dur, transTime, landTime, atlAdDelay, + altAdTime, imLand, imTakeOff, this.getAlias(), targetType, instantTransformation), + transformId), false); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index 443bb42f4..9e0675217 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -59,7 +59,10 @@ public class ABLocalStoreKeys { public static final String COMPUNIT2 = "_compUnit2"; // Item Names - public static final Object LASTCREATEDITEM = "_lastCreatedItem"; + public static final String LASTCREATEDITEM = "_lastCreatedItem"; + + // Destructable Names + public static final String LASTCREATEDDESTRUCTABLE = "_lastCreatedDest"; // Ability Names public static final String LASTCREATEDABILITY = "_lastCreatedAbility"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index f32a69cce..2e47e257c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -14,6 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.gamestate.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.item.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats.*; @@ -47,6 +48,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.integer.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.location.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.*; @@ -225,6 +229,7 @@ private static void registerDestructableCallbacks(RuntimeTypeAdapterFactory call callbackTypeFactory .registerSubtype(ABCallbackGetStoredDestructableByKey.class, "getStoredDestructableByKey") .registerSubtype(ABCallbackInlineConditionDestructable.class, "inlineConditionDestructable") + .registerSubtype(ABCallbackGetLastCreatedDestructable.class, "getLastCreatedDestructable") .registerSubtype(ABCallbackGetEnumDestructable.class, "getEnumDestructable") .registerSubtype(ABCallbackGetAttackedDestructable.class, "getAttackedDestructable") .registerSubtype(ABCallbackGetProjectileHitDestructable.class, "getProjectileHitDestructable") @@ -267,6 +272,7 @@ private static void registerFloatCallbacks(RuntimeTypeAdapterFactory callbackTyp .registerSubtype(ABCallbackGetAbilityCastRange.class, "getAbilityCastRange") .registerSubtype(ABCallbackGetAbilityHeroDuration.class, "getAbilityHeroDuration") .registerSubtype(ABCallbackGetAbilityCooldown.class, "getAbilityCooldown") + .registerSubtype(ABCallbackGetAbilityProjectileSpeed.class, "getAbilityProjectileSpeed") .registerSubtype(ABCallbackGetBuffDurationElapsed.class, "getBuffDurationElapsed") @@ -277,6 +283,8 @@ private static void registerFloatCallbacks(RuntimeTypeAdapterFactory callbackTyp .registerSubtype(ABCallbackNegativeFloat.class, "negativeFloat") .registerSubtype(ABCallbackPi.class, "pi").registerSubtype(ABCallbackCos.class, "cos") .registerSubtype(ABCallbackSin.class, "sin") + .registerSubtype(ABCallbackTan.class, "tan") + .registerSubtype(ABCallbackDegToRad.class, "degToRad") .registerSubtype(ABCallbackFMaxValue.class, "fMaxValue") @@ -337,7 +345,7 @@ private static void registerSpecialFloatCallbacks(RuntimeTypeAdapterFactory call } private static void registerFxCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { - callbackTypeFactory.registerSubtype(ABCallbackGetLastCreatedSpellEffect.class, "getLastCreatedSpellEffect") + callbackTypeFactory.registerSubtype(ABCallbackGetLastCreatedFX.class, "getLastCreatedFX") .registerSubtype(ABCallbackGetStoredFXByKey.class, "getStoredFXByKey") .registerSubtype(ABCallbackInlineConditionFX.class, "inlineConditionFX") @@ -420,6 +428,10 @@ private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackIntegerZeroIfFalse.class, "i0IfFalse") .registerSubtype(ABCallbackIntegerZeroIfNull.class, "i0IfNull") + .registerSubtype(ABCallbackGetIntegerFromList.class, "getIntegerFromList") + + .registerSubtype(ABCallbackGetListSize.class, "getListSize") + .registerSubtype(ABCallbackGetSortableListSize.class, "getSortableListSize") .registerSubtype(ABCallbackGetUnitGroupSize.class, "getUnitGroupSize") .registerSubtype(ABCallbackGetUnitQueueSize.class, "getUnitQueueSize") @@ -451,9 +463,38 @@ private static void registerLightningCallbacks(RuntimeTypeAdapterFactory callbac .registerSubtype(ABCallbackGetStoredLightningByKey.class, "getStoredLightningByKey"); } + private static void registerListCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { + callbackTypeFactory.registerSubtype(ABCallbackArgumentList.class, "argumentList") + .registerSubtype(ABCallbackGetStoredListByKey.class, "getStoredListByKey") + .registerSubtype(ABCallbackInlineConditionList.class, "inlineConditionList") + .registerSubtype(ABCallbackReuseList.class, "reuseList") + .registerSubtype(ABCallbackReuseListWithArguments.class, "reuseListWithArguments"); + } + + private static void registerSortableListCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { + callbackTypeFactory.registerSubtype(ABCallbackArgumentSortableList.class, "argumentSortableList") + .registerSubtype(ABCallbackGetStoredSortableListByKey.class, "getStoredSortableListByKey") + .registerSubtype(ABCallbackInlineConditionSortableList.class, "inlineConditionSortableList") + .registerSubtype(ABCallbackListSorted.class, "listSorted") + .registerSubtype(ABCallbackReuseSortableList.class, "reuseSortableList") + .registerSubtype(ABCallbackReuseSortableListWithArguments.class, "reuseSortableListWithArguments"); + } + + private static void registerIntegerListCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { + callbackTypeFactory.registerSubtype(ABCallbackIntegerListOfRange.class, "integerListOfRange") + .registerSubtype(ABCallbackEmptyIntegerList.class, "emptyIntegerList"); + } + + private static void registerLocationListCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { + callbackTypeFactory.registerSubtype(ABCallbackEmptyLocationList.class, "emptyLocationList"); + } + private static void registerLocationCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackCreateLocationFromXY.class, "createLocationFromXY") .registerSubtype(ABCallbackCreateLocationFromOffset.class, "createLocationFromOffset") + .registerSubtype(ABCallbackCreateLocationFromXYOffset.class, "createLocationFromXYOffset") + .registerSubtype(ABCallbackModifyLocationWithOffset.class, "modifyLocationWithOffset") + .registerSubtype(ABCallbackModifyLocationWithXYOffset.class, "modifyLocationWithXYOffset") .registerSubtype(ABCallbackGetStoredLocationByKey.class, "getStoredLocationByKey") .registerSubtype(ABCallbackInlineConditionLocation.class, "inlineConditionLocation") .registerSubtype(ABCallbackGetTargetedLocation.class, "getTargetedLocation") @@ -464,6 +505,7 @@ private static void registerLocationCallbacks(RuntimeTypeAdapterFactory callback .registerSubtype(ABCallbackGetProjectileCurrentLocation.class, "getProjectileCurrentLocation") .registerSubtype(ABCallbackGetUnitLocation.class, "getUnitLocation") + .registerSubtype(ABCallbackGetLocationFromList.class, "getLocationFromList") .registerSubtype(ABCallbackArgumentLocation.class, "argumentLocation") .registerSubtype(ABCallbackReuseLocation.class, "reuseLocation") .registerSubtype(ABCallbackReuseLocationWithArguments.class, "reuseLocationWithArguments"); @@ -855,6 +897,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.class, "iterateUnitsInRangeOfLocationMatchingConditionWithSort") .registerSubtype(ABActionIterateUnitsInRect.class, "iterateUnitsInRect") .registerSubtype(ABActionPeriodicExecute.class, "periodicExecute") + .registerSubtype(ABActionResetPeriodicExecute.class, "resetPeriodicExecute") .registerSubtype(ABActionCleanUpCastInstance.class, "cleanUpCastInstance") .registerSubtype(ABActionCheckAbilityEffectReaction.class, "checkAbilityEffectReaction") @@ -872,6 +915,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionCreateLightningEffect.class, "createLightningEffect") .registerSubtype(ABActionRemoveLightningEffect.class, "removeLightningEffect") .registerSubtype(ABActionCreateGroupEffectAtLocation.class, "createGroupEffectAtLocation") + .registerSubtype(ABActionCreateUberSplat.class, "createUberSplat") .registerSubtype(ABActionCreateUnitTargetedProjectile.class, "createUnitTargetedProjectile") .registerSubtype(ABActionCreateLocationTargetedProjectile.class, "createLocationTargetedProjectile") @@ -1096,11 +1140,15 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionAttackModifierAddAnimationTag.class, "attackModifierAddAnimationTag") .registerSubtype(ABActionAttackModifierRemoveAnimationTag.class, "attackModifierRemoveAnimationTag") + .registerSubtype(ABActionCreateDestructable.class, "createDestructable") + .registerSubtype(ABActionDamageDestructable.class, "damageDestructable") + .registerSubtype(ABActionKillDestructable.class, "killDestructable") + .registerSubtype(ABActionRemoveDestructable.class, "removeDestructable") + .registerSubtype(ABActionAddDestructableBuff.class, "addDestructableBuff") .registerSubtype(ABActionCreateDestructableBuff.class, "createDestructableBuff") .registerSubtype(ABActionRemoveDestructableBuff.class, "removeDestructableBuff") .registerSubtype(ABActionIterateDestructablesInRangeOfLocation.class, "iterateDestructablesInRangeOfLocation") - .registerSubtype(ABActionDamageDestructable.class, "damageDestructable") .registerSubtype(ABActionCreateFloatingTextOnUnit.class, "createFloatingTextOnUnit") .registerSubtype(ABActionCreateNumericFloatingTextOnUnit.class, "createNumericFloatingTextOnUnit") @@ -1139,7 +1187,11 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionCreateWidgetEvent.class, "createWidgetEvent") .registerSubtype(ABActionRegisterWidgetEvent.class, "registerWidgetEvent") .registerSubtype(ABActionUnregisterWidgetEvent.class, "unregisterWidgetEvent") + + .registerSubtype(ABActionListRemove.class, "listRemove") + .registerSubtype(ABActionSortableListRemove.class, "sortableListRemove") + .registerSubtype(ABActionLocationListAdd.class, "locationListAdd") .registerSubtype(ABActionCreateSubroutine.class, "createSubroutine") @@ -1152,6 +1204,11 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionAttemptToReOrderPreviousBehavior.class, "attemptToReOrderPreviousBehavior") .registerSubtype(ABActionAttemptToResumePreviousBehavior.class, "attemptToResumePreviousBehavior") + + .registerSubtype(ABActionModifyTerrainVertex.class, "modifyTerrainVertex") + .registerSubtype(ABActionCreateTerrainRippleAtLocation.class, "createTerrainRippleAtLocation") + .registerSubtype(ABActionCreateTerrainBowlAtLocation.class, "createTerrainBowlAtLocation") + .registerSubtype(ABActionCreateTerrainWaveAtLocation.class, "createTerrainWaveAtLocation") ; } @@ -1190,6 +1247,10 @@ public static Gson create() { registerIdCallbacks(callbackTypeFactory); registerIntegerCallbacks(callbackTypeFactory); registerItemCallbacks(callbackTypeFactory); + registerListCallbacks(callbackTypeFactory); + registerSortableListCallbacks(callbackTypeFactory); + registerIntegerListCallbacks(callbackTypeFactory); + registerLocationListCallbacks(callbackTypeFactory); registerLightningCallbacks(callbackTypeFactory); registerLocationCallbacks(callbackTypeFactory); registerLongCallbacks(callbackTypeFactory); @@ -1336,6 +1397,30 @@ public static Gson create() { registerLightningCallbacks(lightningCallbackTypeFactory); gsonBuilder.registerTypeAdapterFactory(lightningCallbackTypeFactory); + final RuntimeTypeAdapterFactory listCallbackTypeFactory = RuntimeTypeAdapterFactory + .of(ABListCallback.class, "type"); + registerListCallbacks(listCallbackTypeFactory); + registerLocationListCallbacks(listCallbackTypeFactory); + gsonBuilder.registerTypeAdapterFactory(listCallbackTypeFactory); + + final RuntimeTypeAdapterFactory sortableListCallbackTypeFactory = RuntimeTypeAdapterFactory + .of(ABSortableListCallback.class, "type"); + registerSortableListCallbacks(sortableListCallbackTypeFactory); + registerIntegerListCallbacks(sortableListCallbackTypeFactory); + gsonBuilder.registerTypeAdapterFactory(sortableListCallbackTypeFactory); + + final RuntimeTypeAdapterFactory locationListCallbackTypeFactory = RuntimeTypeAdapterFactory + .of(ABLocationListCallback.class, "type"); + registerListCallbacks(locationListCallbackTypeFactory); + registerLocationListCallbacks(locationListCallbackTypeFactory); + gsonBuilder.registerTypeAdapterFactory(locationListCallbackTypeFactory); + + final RuntimeTypeAdapterFactory integerListCallbackTypeFactory = RuntimeTypeAdapterFactory + .of(ABIntegerListCallback.class, "type"); + registerSortableListCallbacks(integerListCallbackTypeFactory); + registerIntegerListCallbacks(integerListCallbackTypeFactory); + gsonBuilder.registerTypeAdapterFactory(integerListCallbackTypeFactory); + final RuntimeTypeAdapterFactory locationCallbackTypeFactory = RuntimeTypeAdapterFactory .of(ABLocationCallback.class, "type"); registerLocationCallbacks(locationCallbackTypeFactory); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainBowlEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainBowlEffect.java new file mode 100644 index 000000000..45f2607b8 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainBowlEffect.java @@ -0,0 +1,98 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.Terrain; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; + +public class ABTerrainBowlEffect extends ABTerrainEffect { + + private int[] rect; + private int rectW; + private int rectH; + private float cx; + private float cy; + + private float[] inverseTotalModBuffer; + + private boolean permanent; + + private float depth; + + private float terrainRadius; + private float terrainRadiusSq; + + private float sinkTime; + private float fillTime; + private float startDepth; + + public ABTerrainBowlEffect(CSimulation game, AbilityPointTarget loc, float radius, float depth, float sinkTime, + float staticTime, float fillTime, float stopDuration, float startDepth) { + super(sinkTime + staticTime + fillTime, 1); + this.depth = depth; + this.sinkTime = sinkTime / (sinkTime + staticTime + fillTime); + this.fillTime = (sinkTime + staticTime) / (sinkTime + staticTime + fillTime); + this.startDepth = startDepth; + + this.stopDuration = stopDuration; + + this.terrainRadius = radius / Terrain.CELL_SIZE; + this.terrainRadiusSq = this.terrainRadius * this.terrainRadius; + + this.rect = game.getTerrainModBufferSize(loc.x, loc.y, radius); + this.rectW = (this.rect[2] - this.rect[0] + 1); + this.rectH = (this.rect[3] - this.rect[1] + 1); + this.cx = game.getTerrainSpaceX(loc.x) - rect[0]; + this.cy = game.getTerrainSpaceY(loc.y) - rect[1]; + this.inverseTotalModBuffer = new float[this.rectW * this.rectH]; + } + + @Override + protected void onTick(CSimulation game, float timeRatio, float stopRatio) { + if (this.stopping || timeRatio <= this.sinkTime || timeRatio >= this.fillTime) { + boolean changed = false; + float[] terrainModBuffer = new float[this.inverseTotalModBuffer.length]; + for (int x = 0; x < this.rectW; x++) { + for (int y = 0; y < this.rectH; y++) { + float dz = 0; + float dsq = (x - cx) * (x - cx) + (y - cy) * (y - cy); + if (dsq <= this.terrainRadiusSq) { + float d = Math.min(Math.max((float) Math.sqrt(dsq) / this.terrainRadius, 0.0f), 1.0f); + float timeFraction = 1; + if (this.sinkTime <= timeRatio) { + if (timeRatio > this.fillTime) { + timeFraction = 1 - ((timeRatio - this.fillTime) / (1 - this.fillTime)); + } + } else { + timeFraction = timeRatio / this.sinkTime; + } + dz = (float) ((this.startDepth + timeFraction * this.depth) * Math.cos(d * 0.5 * Math.PI)); + if (this.stopping) { + dz *= stopRatio; + } + dz += this.inverseTotalModBuffer[x + y * this.rectW]; + } + + if (dz != 0) { + terrainModBuffer[x + y * this.rectW] = dz; + changed = true; + } + } + } + + if (changed) { + game.adjustTerrain(rect, terrainModBuffer); + for (int i = 0; i < terrainModBuffer.length; i++) { + this.inverseTotalModBuffer[i] -= terrainModBuffer[i]; + } + } + } + } + + @Override + protected void onRemove(CSimulation game) { + if (!permanent) { + game.adjustTerrain(rect, inverseTotalModBuffer); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainEffect.java new file mode 100644 index 000000000..7b4ef46f1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainEffect.java @@ -0,0 +1,109 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects; + +import com.etheller.warsmash.util.WarsmashConstants; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public abstract class ABTerrainEffect extends CTimer implements SimulationRenderComponent { + + private boolean removing = false; + + private float period; + protected int totalCount; + + private float elapsedTime; + private float startTime; + protected int count; + private boolean loop; + + protected boolean stopping; + protected float stopDuration; + private float stopBegan; + + public ABTerrainEffect(float period, int totalCount) { + this.period = period; + this.totalCount = Math.max(totalCount, 1); + + this.setRepeats(true); + this.setTimeoutTime(0); + this.startTime = 0; + this.elapsedTime = 0; + this.count = 0; + this.loop = period < 0; + + this.stopping = false; + this.stopDuration = 0; + this.stopBegan = 0; + } + + @Override + public void remove() { + if (this.stopDuration > 0) { + this.stopBegan = this.elapsedTime; + this.stopping = true; + } else { + this.removing = true; + } + } + + public void remove(float stopDuration) { + if (stopDuration > 0) { + this.stopDuration = stopDuration; + this.stopBegan = this.elapsedTime; + this.stopping = true; + } else { + this.removing = true; + } + } + + @Override + public void onFire(CSimulation game) { + if (this.removing) { + this.onRemove(game); + this.setRepeats(false); + game.unregisterTimer(this); + return; + } + + this.elapsedTime += WarsmashConstants.SIMULATION_STEP_TIME * 1000; + + float timeRatio = 1; + if (this.period != 0) { + timeRatio = (this.elapsedTime - this.startTime) / this.period; + } + boolean rolledOver = false; + if(timeRatio > 1) { + this.count += (int) timeRatio; + timeRatio = timeRatio % 1; + rolledOver = true; + } + if (rolledOver) { + this.startTime = this.elapsedTime - (timeRatio * this.period); + } + boolean ending = !this.loop && this.count >= this.totalCount; + if (ending) { + timeRatio = 1; + } + + float stopRatio = 1; + if (this.stopping) { + float stopFraction = Math.min((this.elapsedTime - this.stopBegan) / this.stopDuration, 1); + if (stopFraction >= 1) { + this.removing = true; + return; + } + stopRatio = 1 - stopFraction; + } + this.onTick(game, timeRatio, stopRatio); + + if (ending) { + this.removing = true; + } + } + + protected abstract void onTick(CSimulation game, float timeRatio, float stopRatio); + + protected abstract void onRemove(CSimulation game); + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainRippleEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainRippleEffect.java new file mode 100644 index 000000000..065f86041 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainRippleEffect.java @@ -0,0 +1,106 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.Terrain; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; + +public class ABTerrainRippleEffect extends ABTerrainEffect { + + private float startRadius; + private float radius; + + private int[] rect; + private int rectW; + private int rectH; + private float cx; + private float cy; + + private float[] inverseTotalModBuffer; + + private boolean permanent; + + private float depth; + private float spaceWaves; + private float timeWaves; + private boolean onlyNegative; + private boolean radChanges; + + private float terrainRadius; + private float terrainRadiusSq; + + public ABTerrainRippleEffect(CSimulation game, AbilityPointTarget loc, float startRadius, float endRadius, + float depth, float period, int totalPeriodCount, int spaceWaves, int timeWaves, boolean onlyNegative) { + super(period, totalPeriodCount); + this.radius = endRadius; + this.depth = depth; + this.spaceWaves = (float) (spaceWaves * Math.PI); + this.timeWaves = (float) (timeWaves * Math.PI); + this.startRadius = startRadius; + this.onlyNegative = onlyNegative; + + this.radChanges = this.startRadius != this.radius; + this.terrainRadius = startRadius / Terrain.CELL_SIZE; + this.terrainRadiusSq = this.terrainRadius * this.terrainRadius; + + this.rect = game.getTerrainModBufferSize(loc.x, loc.y, Math.max(startRadius, endRadius)); + this.rectW = (this.rect[2] - this.rect[0] + 1); + this.rectH = (this.rect[3] - this.rect[1] + 1); + this.cx = game.getTerrainSpaceX(loc.x) - rect[0]; + this.cy = game.getTerrainSpaceY(loc.y) - rect[1]; + this.inverseTotalModBuffer = new float[this.rectW * this.rectH]; + } + + @Override + protected void onTick(CSimulation game, float timeRatio, float stopRatio) { + float timeFactorRepetitions = (this.count + timeRatio) / this.totalCount; + if (this.radChanges) { + float currentRadiusSq = (this.startRadius + (this.radius - this.startRadius) * timeFactorRepetitions); + currentRadiusSq /= Terrain.CELL_SIZE; + this.terrainRadius = currentRadiusSq; + this.terrainRadiusSq = currentRadiusSq * currentRadiusSq; + } + + boolean changed = false; + float[] terrainModBuffer = new float[this.inverseTotalModBuffer.length]; + + for (int x = 0; x < this.rectW; x++) { + for (int y = 0; y < this.rectH; y++) { + float dz = 0; + float dsq = (x - cx) * (x - cx) + (y - cy) * (y - cy); + if (dsq <= this.terrainRadiusSq) { + float d = Math.min(Math.max((float) Math.sqrt(dsq) / this.terrainRadius, 0.0f), 1.0f); + dz = (float) ((this.depth * (Math.sin(d * this.spaceWaves + this.timeWaves * timeRatio))) * (1 - timeFactorRepetitions)); + if (this.stopping) { + dz *= stopRatio; + } + dz += this.inverseTotalModBuffer[x + y * this.rectW]; + if (this.onlyNegative && (dz - this.inverseTotalModBuffer[x + y * this.rectW]) > 0) { + dz = this.inverseTotalModBuffer[x + y * this.rectW]; + } + } else if (this.inverseTotalModBuffer[x + y * this.rectW] != 0) { + dz = this.inverseTotalModBuffer[x + y * this.rectW]; + } + + if (dz != 0) { + terrainModBuffer[x + y * this.rectW] = dz; + changed = true; + } + } + } + + if (changed) { + game.adjustTerrain(rect, terrainModBuffer); + for (int i = 0; i < terrainModBuffer.length; i++) { + this.inverseTotalModBuffer[i] -= terrainModBuffer[i]; + } + } + } + + @Override + protected void onRemove(CSimulation game) { + if (!permanent) { + game.adjustTerrain(rect, inverseTotalModBuffer); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainWaveEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainWaveEffect.java new file mode 100644 index 000000000..df01f2f65 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainWaveEffect.java @@ -0,0 +1,137 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects; + +import com.badlogic.gdx.math.Vector2; +import com.etheller.warsmash.viewer5.handlers.w3x.environment.Terrain; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; + +public class ABTerrainWaveEffect extends ABTerrainEffect { + + private AbilityPointTarget targetLoc; + + private float trailStart; + private float leadEnd; + + private int[] rect; + private int rectW; + private int rectH; + private float distX; + private float distY; + private float slope; + + private float[] inverseTotalModBuffer; + + private boolean permanent; + + private float depth; + + private float terrainRadius; + private float terrainRadiusSq; + + private float terrainStartX; + private float terrainStartY; + private float terrainTargetX; + + public ABTerrainWaveEffect(CSimulation game, AbilityPointTarget start, AbilityPointTarget target, float radius, + float depth, float distance, float speed, int trailTime, int count) { + super((distance / speed) * 1000 + trailTime, count); + + Vector2 v = new Vector2(target.x - start.x, target.y - start.y); + v = v.nor(); + this.targetLoc = new AbilityPointTarget(start.x + v.x * distance, start.y + v.y * distance); + this.depth = depth; + + float travelTime = (distance / speed) * 1000; + this.trailStart = trailTime / (travelTime + trailTime); + this.leadEnd = travelTime / (travelTime + trailTime); + + this.terrainRadius = radius / Terrain.CELL_SIZE; + this.terrainRadiusSq = this.terrainRadius * this.terrainRadius; + + this.rect = game.getTerrainModBufferSize(Math.min(start.x, targetLoc.x) - radius, + Math.min(start.y, targetLoc.y) - radius, + Math.max(start.x, targetLoc.x) - Math.min(start.x, targetLoc.x) + radius, + Math.max(start.y, targetLoc.y) - Math.min(start.y, targetLoc.y) + radius); + this.rectW = (this.rect[2] - this.rect[0] + 1); + this.rectH = (this.rect[3] - this.rect[1] + 1); + + this.terrainStartX = game.getTerrainSpaceX(start.x) - this.rect[0]; + this.terrainStartY = game.getTerrainSpaceY(start.y) - this.rect[1]; + this.terrainTargetX = game.getTerrainSpaceX(targetLoc.x) - this.rect[0]; + float terrainTargetY = game.getTerrainSpaceY(targetLoc.y) - this.rect[1]; + this.distX = terrainTargetX - terrainStartX; + this.distY = terrainTargetY - terrainStartY; + this.slope = this.distY / this.distX; + + this.inverseTotalModBuffer = new float[this.rectW * this.rectH]; + } + + @Override + protected void onTick(CSimulation game, float timeRatio, float stopRatio) { + boolean changed = false; + float[] terrainModBuffer = new float[this.inverseTotalModBuffer.length]; + + final float leadX = timeRatio <= this.leadEnd ? terrainStartX + ((timeRatio / this.leadEnd) * this.distX) + : terrainTargetX; + final float tailX = this.trailStart <= timeRatio + ? terrainStartX + (((timeRatio - this.trailStart) / (1 - this.trailStart)) * this.distX) + : terrainStartX; + final float projX = this.terrainStartX + this.distX * timeRatio; + final float dpx; + final float dpy; + if ((projX <= leadX || terrainTargetX <= terrainStartX) + && (leadX <= projX || terrainStartX <= terrainTargetX)) { + if ((tailX <= projX || terrainTargetX <= terrainStartX) + && (projX <= tailX || terrainStartX <= terrainTargetX)) { + dpx = projX; + dpy = this.terrainStartY + this.distY * timeRatio; + } else { + dpx = tailX; + dpy = (terrainStartY + ((tailX - terrainStartX) * slope)); + } + } else { + dpx = leadX; + dpy = (terrainStartY + ((leadX - terrainStartX) * slope)); + } + + for (int x = 0; x < this.rectW; x++) { + for (int y = 0; y < this.rectH; y++) { + float dz = 0; + float dsq = (x - dpx) * (x - dpx) + (y - dpy) * (y - dpy); + if (dsq <= this.terrainRadiusSq) { + float d = Math.min(Math.max((float) Math.sqrt(dsq) / this.terrainRadius, 0.0f), 1.0f); + dz = (float) (-0.5 * this.depth * (Math.cos(d * Math.PI) + 1)); + if (timeRatio > 0.89999998) { + dz *= (1.0 - ((timeRatio - 0.89999998) / 0.10000002)); + } + if (this.stopping) { + dz *= stopRatio; + } + dz += this.inverseTotalModBuffer[x + y * this.rectW]; + } else { + dz = this.inverseTotalModBuffer[x + y * this.rectW]; + } + + if (dz != 0) { + terrainModBuffer[x + y * this.rectW] = dz; + changed = true; + } + } + } + + if (changed) { + game.adjustTerrain(rect, terrainModBuffer); + for (int i = 0; i < terrainModBuffer.length; i++) { + this.inverseTotalModBuffer[i] -= terrainModBuffer[i]; + } + } + } + + @Override + protected void onRemove(CSimulation game) { + if (!permanent) { + game.adjustTerrain(rect, inverseTotalModBuffer); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java index 6ea8ab8b1..a3ffa3d0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java @@ -208,7 +208,7 @@ public static void createSlowTransformBackBuff(final CSimulation game, CUnit sou final float altitudeAdjustmentDelay, final float landingDelay, final float altitudeAdjustmentDuration) { if (addAlternateTagAfter && (duration > 0)) { unit.add(game, - new ABTimedTransformationBuff(game.getHandleIdAllocator().createId(), ability, sourceUnit, localStore, actions, + new ABTimedTransformationBuff(game.getHandleIdAllocator().createId(), localStore, ability, sourceUnit, actions, buffId == null ? ability.getAlias() : buffId, duration, ability, newType, keepRatios, !addAlternateTagAfter, permanent, duration, transformationTime, landingDelay, altitudeAdjustmentDelay, altitudeAdjustmentDuration, immediateLanding, immediateTakeoff)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java index a1cbd793f..b9955b443 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java @@ -1,6 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -13,6 +14,7 @@ public class AbilityBuilderSpecialDisplayFields { private ABIntegerCallback lumberCost; private ABBooleanCallback hideAreaCursor; + private ABFloatCallback areaCursorOverride; private ABBooleanCallback instantCast; private ABBooleanCallback castlessNoTarget; @@ -37,6 +39,8 @@ public void updateFromParent(AbilityBuilderSpecialDisplayFields parent) { if (this.hideAreaCursor == null) this.hideAreaCursor = parent.hideAreaCursor; + if (this.areaCursorOverride == null) + this.areaCursorOverride = parent.areaCursorOverride; if (this.instantCast == null) this.instantCast = parent.instantCast; if (this.castlessNoTarget == null) @@ -82,6 +86,12 @@ public ABBooleanCallback getHideAreaCursor() { public void setHideAreaCursor(ABBooleanCallback hideAreaCursor) { this.hideAreaCursor = hideAreaCursor; } + public ABFloatCallback getAreaCursorOverride() { + return areaCursorOverride; + } + public void setAreaCursorOverride(ABFloatCallback areaCursorOverride) { + this.areaCursorOverride = areaCursorOverride; + } public ABBooleanCallback getInstantCast() { return instantCast; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java index 0099d6a55..a285a3db1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -51,12 +52,14 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target localStore.put(ABLocalStoreKeys.THISPROJECTILE+castId, projectile); localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT+castId, targetUnit); localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST+castId, targetDest); + localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC+castId, new AbilityPointTarget(projectile.getX(), projectile.getY())); for (ABAction action : onHit) { action.runAction(game, caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT+castId); localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST+castId); localStore.remove(ABLocalStoreKeys.THISPROJECTILE+castId); + localStore.remove(ABLocalStoreKeys.PROJECTILECURRENTLOC+castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java index bfa55f4cf..a67055cb5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java @@ -30,7 +30,7 @@ CAttackProjectile createAttackProjectile(CSimulation simulation, float launchX, CUnitAttackListener attackListener, CUnitAttackSettings settings); CAbilityProjectile createProjectile(CSimulation cSimulation, float launchX, float launchY, float launchFacing, - float speed, boolean homing, CUnit source, War3ID spellAlias, AbilityTarget target, + Float speed, Boolean homing, CUnit source, War3ID spellAlias, AbilityTarget target, CAbilityProjectileListener projectileListener); CAbilityProjectile createProjectile(CSimulation cSimulation, float launchX, float launchY, float launchFacing, @@ -63,6 +63,8 @@ SimulationRenderComponentLightning createAbilityLightning(CSimulation simulation SimulationRenderComponentLightning createAbilityLightning(CSimulation simulation, War3ID lightningId, CUnit source, CUnit target, int index, Float duration); + SimulationRenderComponent createStaticUberSplat(float x, float y, War3ID id); + CUnit createUnit(CSimulation simulation, final War3ID typeId, final int playerIndex, final float x, final float y, final float facing); @@ -163,6 +165,18 @@ SimulationRenderComponentModel createSpellEffectOverDestructable(CUnit source, C float[] getUnitVertexColor(CUnit unit); + int[] getTerrainModBufferSize(float x, float y, float width, float height); + + int[] getTerrainModBufferSize(float centerX, float centerY, float radius); + + void adjustTerrain(float x, float y, float i); + + void adjustTerrain(int[] rect, float[] modBuffer); + + float getTerrainSpaceX(float x); + + float getTerrainSpaceY(float y); + int getTerrainHeight(float x, float y); boolean isTerrainRomp(float x, float y); From e88ba8259f7cc7f80a9d5fe0611ec56d3cfa9ee5 Mon Sep 17 00:00:00 2001 From: Glasir Date: Wed, 14 May 2025 09:02:43 -0400 Subject: [PATCH 20/44] Refactor of AB buffs to simplify state and stat buffs. Another fix to cast animations. **Major Improvements to Ability Builder Features** - Refactor of all buffs to use the statBuffs and stateMods fields to simplify the process of tracking effects on timed buffs - Reduces the Add/Remove action calls - Allows the buff to track the correct references to remove without having to store them manually - Changes the dynamic of onLevel actions to recreate buffs rather than modify. This prevents cases of changing the effects of active buffs by leveling the spell - Another set of fixes to how Ability Builder abilities play cast animations (should be right this time) - Plays STAND CHANNEL during the cast time - Plays SPELL once and queues STAND for normal cast - Continuously plays SPELL CHANNEL while channeling **Fixes to Ability Builder Features** - Fixed an issue in the last push that broke Pseudo Projectiles (Impale) - Fixed an issue with the stateMods feature on buffs where the unit state was not recomputed **Minor Improvements to Ability Builder Features** - Added action for queueing animations, and added that to Avatar to prevent animation freeze after the morph animation - Added stacking to Dust of Appearance so multiple players can reveal a unit at the same time --- .../AttackReplacementActives.json | 326 +---- .../AttackReplacementPassivesItems.json | 196 +-- ...ReplacementPassivesNonItemLowPriority.json | 484 +------ .../assets/abilityBehaviors/DeathSummons.json | 390 ++---- core/assets/abilityBehaviors/activeBuffs.json | 1057 ++++++--------- .../abilityBehaviors/activeDebuffs.json | 1163 ++++++----------- .../abilityBehaviors/humanHeroActives.json | 263 ++-- .../abilityBehaviors/humanUnitActives.json | 589 +++------ core/assets/abilityBehaviors/itemSimple.json | 41 +- .../neutralHeroUnitActives.json | 244 ++-- .../nightElfHeroUnitActives.json | 55 +- .../abilityBehaviors/nightElfUnitActives.json | 639 +++------ .../abilityBehaviors/orcHeroActives.json | 71 +- .../undeadHeroUnitActives.json | 89 +- .../parasite.json | 74 +- .../viewer5/handlers/w3x/War3MapViewer.java | 12 +- .../handlers/w3x/simulation/CSimulation.java | 8 +- .../behavior/CBehaviorAbilityBuilderBase.java | 37 +- .../CBehaviorAbilityBuilderNoTarget.java | 40 +- ...reateLocationTargetedPseudoProjectile.java | 22 +- ...ionCreateUnitTargetedPseudoProjectile.java | 22 +- .../animation/ABActionQueueAnimation.java | 34 + .../abilitybuilder/buff/ABTimedBuff.java | 2 + .../core/AbilityBuilderGsonBuilder.java | 1 + ...Projectile.java => CPseudoProjectile.java} | 6 +- .../util/SimulationRenderController.java | 6 +- 26 files changed, 1829 insertions(+), 4042 deletions(-) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/{CPsuedoProjectile.java => CPseudoProjectile.java} (98%) diff --git a/core/assets/abilityBehaviors/AttackReplacementActives.json b/core/assets/abilityBehaviors/AttackReplacementActives.json index ccce3478f..e6295087c 100644 --- a/core/assets/abilityBehaviors/AttackReplacementActives.json +++ b/core/assets/abilityBehaviors/AttackReplacementActives.json @@ -494,172 +494,25 @@ } } }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - }, + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", "instanceValue": { "type": "rawBoolean", "value": "false" }, - "valueToStore": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - }, + "type": "getStoredNonStackingStatBuffByKey", "instanceValue": { "type": "rawBoolean", "value": "false" }, - "valueToStore": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - } - },{ - "type": "deleteStoredKey", "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - },{ - "type": "deleteStoredKey", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] + "type": "rawString", + "value": "asbuff" } }] },{ @@ -1100,172 +953,25 @@ } } }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - }, + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", "instanceValue": { "type": "rawBoolean", "value": "false" }, - "valueToStore": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - }, + "type": "getStoredNonStackingStatBuffByKey", "instanceValue": { "type": "rawBoolean", "value": "false" }, - "valueToStore": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - } - },{ - "type": "deleteStoredKey", "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - },{ - "type": "deleteStoredKey", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] + "type": "rawString", + "value": "asbuff" } }] },{ diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json index d448694ad..37859d6cc 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json @@ -457,16 +457,10 @@ } }], "levelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" } }], "onHit": [{ @@ -488,23 +482,8 @@ "type": "rawBoolean", "value": "false" }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } + "statBuffs": [{ + "type": "getLastCreatedNonStackingStatBuff" }] },{ "type": "addBuff", @@ -1302,172 +1281,25 @@ } } }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - }, + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", "instanceValue": { "type": "rawBoolean", "value": "false" }, - "valueToStore": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - }, + "type": "getStoredNonStackingStatBuffByKey", "instanceValue": { "type": "rawBoolean", "value": "false" }, - "valueToStore": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - } - },{ - "type": "deleteStoredKey", "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - },{ - "type": "deleteStoredKey", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] + "type": "rawString", + "value": "asbuff" } }] },{ diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json index bf2b4eac1..188d1c0d4 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json @@ -182,166 +182,55 @@ "type": "rawBoolean", "value": "false" }, - "onAddActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "stun" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - } - } - },{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "dAll" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - } - } - },{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "bRep" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - } - } - },{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "bTrn" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - } - } - },{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "bCon" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - } - } - }], - "onRemoveActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" + "stateMods": [{ + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "stun" }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "stun" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - } + "instanceValue": { + "type": "rawBoolean", + "value": "false" } },{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "dAll" }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "dAll" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - } + "instanceValue": { + "type": "rawBoolean", + "value": "false" } },{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "bRep" }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "bRep" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - } + "instanceValue": { + "type": "rawBoolean", + "value": "false" } },{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "bTrn" }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "bTrn" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - } + "instanceValue": { + "type": "rawBoolean", + "value": "false" } },{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "bCon" }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "bCon" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - } + "instanceValue": { + "type": "rawBoolean", + "value": "false" } }] },{ @@ -518,47 +407,30 @@ "type": "rawBoolean", "value": "false" }, - "onAddActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "asbuff" } }], + "stateMods": [{ + "type": "getLastCreatedStateModBuff" + }], "onTickActions": [{ "type": "periodicExecute", "periodicActions": [{ @@ -584,47 +456,6 @@ "type": "getBuffedUnit" } } - }], - "onRemoveActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } }] },{ "type": "addBuff", @@ -701,45 +532,11 @@ } }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } }] },{ "ids": [{"id":"Afbk"}], @@ -1184,172 +981,25 @@ } } }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - }, + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", "instanceValue": { "type": "rawBoolean", "value": "false" }, - "valueToStore": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - }, + "type": "getStoredNonStackingStatBuffByKey", "instanceValue": { "type": "rawBoolean", "value": "false" }, - "valueToStore": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - } - },{ - "type": "deleteStoredKey", "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } - },{ - "type": "deleteStoredKey", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] + "type": "rawString", + "value": "asbuff" } }] },{ diff --git a/core/assets/abilityBehaviors/DeathSummons.json b/core/assets/abilityBehaviors/DeathSummons.json index dc28e1c30..fc4d6b356 100644 --- a/core/assets/abilityBehaviors/DeathSummons.json +++ b/core/assets/abilityBehaviors/DeathSummons.json @@ -173,14 +173,8 @@ "type": "rawBoolean", "value": "false" }, - "onAddActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } + "stateMods": [{ + "type": "getLastCreatedStateModBuff" }], "onTickActions": [{ "type": "periodicExecute", @@ -209,75 +203,67 @@ } }], "onRemoveActions": [{ - "type": "removeStateModBuff", - "targetUnit": { + "type": "if", + "condition": { + "type": "isUnitDead", + "unit": { "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" } - },{ - "type": "if", - "condition": { - "type": "isUnitDead", - "unit": { - "type": "getBuffedUnit" - } + }, + "thenActions": [{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "B" }, - "thenActions": [{ - "type": "for", - "times": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "actions": [{ - "type": "createUnit", - "id": { - "type": "getAbilityUnitId" - }, - "owner": { - "type": "getOwnerOfUnit", - "unit": { - "type": "getBuffCastingUnit" - } - }, - "loc": { - "type": "getUnitLocation", - "unit": { - "type": "getBuffedUnit" - } - }, - "facing": { - "type": "getUnitFacing", - "unit": { - "type": "getBuffedUnit" - } + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "owner": { + "type": "getOwnerOfUnit", + "unit": { + "type": "getBuffCastingUnit" } - },{ - "type": "createTimedLifeBuff", - "buffId": { - "type": "getSecondBuffId" - }, - "duration": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - }, - "explode": { - "type": "rawBoolean", - "value": "false" + }, + "loc": { + "type": "getUnitLocation", + "unit": { + "type": "getBuffedUnit" } - },{ - "type": "addBuff", - "target": { - "type": "getLastCreatedUnit" - }, - "buff": { - "type": "getLastCreatedBuff" + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getBuffedUnit" } - },{ - "type": "cleanUpCastInstance" - }] + } + },{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getSecondBuffId" + }, + "duration": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + },{ + "type": "cleanUpCastInstance" }] + }] }] },{ "type": "addBuff", @@ -537,95 +523,25 @@ } } }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - }, + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", "instanceValue": { "type": "rawBoolean", "value": "false" }, - "valueToStore": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } },{ - "type": "storeValueLocally", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - }, + "type": "getStoredNonStackingStatBuffByKey", "instanceValue": { "type": "rawBoolean", "value": "false" }, - "valueToStore": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "asbuff" } }], "onTickActions": [{ @@ -672,142 +588,66 @@ } }], "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { + "type": "if", + "condition": { + "type": "isUnitDead", + "unit": { "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" - } - }] - } } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + }, + "thenActions": [{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "E" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" - },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "owner": { + "type": "getOwnerOfUnit", + "unit": { + "type": "getBuffCastingUnit" } - }] - } - } - },{ - "type": "deleteStoredKey", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "mvbuff" + }, + "loc": { + "type": "getUnitLocation", + "unit": { + "type": "getBuffedUnit" + } + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getBuffedUnit" + } + } },{ - "type": "getBuffHandleAsString", - "buff": { - "type": "thisBuff" + "type": "createTimedLifeBuff", + "buffId": { + "type": "getSecondBuffId" + }, + "duration": { + "type": "getAbilityCastTime" + }, + "explode": { + "type": "rawBoolean", + "value": "false" } - }] - } - },{ - "type": "deleteStoredKey", - "key": { - "type": "catStrings", - "stringList": [{ - "type": "rawString", - "value": "asbuff" },{ - "type": "getBuffHandleAsString", + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, "buff": { - "type": "thisBuff" + "type": "getLastCreatedBuff" } - }] - } - },{ - "type": "if", - "condition": { - "type": "isUnitDead", - "unit": { - "type": "getBuffedUnit" - } - }, - "thenActions": [{ - "type": "for", - "times": { - "type": "getAbilityDataAsInteger", - "dataField": "E" - }, - "actions": [{ - "type": "createUnit", - "id": { - "type": "getAbilityUnitId" - }, - "owner": { - "type": "getOwnerOfUnit", - "unit": { - "type": "getBuffCastingUnit" - } - }, - "loc": { - "type": "getUnitLocation", - "unit": { - "type": "getBuffedUnit" - } - }, - "facing": { - "type": "getUnitFacing", - "unit": { - "type": "getBuffedUnit" - } - } - },{ - "type": "createTimedLifeBuff", - "buffId": { - "type": "getSecondBuffId" - }, - "duration": { - "type": "getAbilityCastTime" - }, - "explode": { - "type": "rawBoolean", - "value": "false" - } - },{ - "type": "addBuff", - "target": { - "type": "getLastCreatedUnit" - }, - "buff": { - "type": "getLastCreatedBuff" - } - },{ - "type": "cleanUpCastInstance" - }] + },{ + "type": "cleanUpCastInstance" }] + }] }] },{ "type": "addBuff", diff --git a/core/assets/abilityBehaviors/activeBuffs.json b/core/assets/abilityBehaviors/activeBuffs.json index 216610929..5e854daa0 100644 --- a/core/assets/abilityBehaviors/activeBuffs.json +++ b/core/assets/abilityBehaviors/activeBuffs.json @@ -18,65 +18,74 @@ "value": "false" } }, - "onAddDisabledAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { "type": "rawString", - "value": "MVSPDPCT" + "value": "berserk" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" } - }, - "stackingKey": { - "type": "rawString", - "value": "berserk" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mvbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "ATKSPD" + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" } - }, - "stackingKey": { - "type": "rawString", - "value": "berserk" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "storeValueLocally", - "key": { + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "berserk" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { "type": "rawString", - "value": "asbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" + "value": "setupBuffs" } },{ "type": "createDamageTakenModificationListener", @@ -115,87 +124,44 @@ "type": "getCastingUnit" } }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } },{ - "type": "addDamageTakenModificationListener", - "targetUnit": { - "type": "getCastingUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "listener": { - "type": "getLastCreatedDamageTakenModificationListener" + "key": { + "type": "rawString", + "value": "asbuff" } }], + "onAddActions": [{ + "type": "addDamageTakenModificationListener", + "targetUnit": { + "type": "getCastingUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenModificationListener" + } + }], "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - },{ - "type": "removeDamageTakenModificationListener", - "targetUnit": { - "type": "getCastingUnit" - }, - "listener": { - "type": "getLastCreatedDamageTakenModificationListener" - } + "type": "removeDamageTakenModificationListener", + "targetUnit": { + "type": "getCastingUnit" + }, + "listener": { + "type": "getLastCreatedDamageTakenModificationListener" + } }] },{ "type": "addBuff", @@ -207,141 +173,122 @@ } }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } + }] + },{ + "ids": [{"id":"AHav", "castId": "avatar"}], + "type": "NORMAL_NOTARGET", + "displayFields": { + "castlessNoTarget": { + "type": "rawBoolean", + "value": "true" + } + }, + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "DEF" + } + }, + "stackingKey": { + "type": "rawString", + "value": "avatar" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "defbuff" + }, "instanceValue": { "type": "rawBoolean", "value": "false" }, - "key": { + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MAXHP" + } + }, + "stackingKey": { "type": "rawString", - "value": "mvbuff" + "value": "avatar" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "hpbuff" + }, "instanceValue": { "type": "rawBoolean", "value": "false" }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ALLATK" + } + }, + "stackingKey": { + "type": "rawString", + "value": "avatar" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "storeValueLocally", "key": { "type": "rawString", - "value": "asbuff" + "value": "atkbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - }] - },{ - "ids": [{"id":"AHav", "castId": "avatar"}], - "type": "NORMAL_NOTARGET", - "displayFields": { - "castlessNoTarget": { - "type": "rawBoolean", - "value": "true" - } + }] }, "onAddDisabledAbility": [{ "type": "createStateModBuff", "buffType": "MAGIC_IMMUNE" },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "DEF" - } - }, - "stackingKey": { - "type": "rawString", - "value": "avatar" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "defbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "MAXHP" - } - }, - "stackingKey": { - "type": "rawString", - "value": "avatar" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "hpbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "ALLATK" - } - }, - "stackingKey": { - "type": "rawString", - "value": "avatar" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - },{ - "type": "storeValueLocally", - "key": { + "type": "runReuseAction", + "name": { "type": "rawString", - "value": "atkbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" + "value": "setupBuffs" } },{ "type": "createDamageTakenModificationListener", @@ -406,6 +353,40 @@ "type": "rawBoolean", "value": "true" }, + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "defbuff" + } + },{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "hpbuff" + } + },{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "atkbuff" + } + }], + "stateMods": [{ + "type": "getLastCreatedStateModBuff" + }], "onAddActions": [{ "type": "disableAbility" },{ @@ -444,52 +425,13 @@ "value": "MORPH" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "hpbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { + "type": "queueAnimation", + "unit": { "type": "getBuffedUnit" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } + "tag": { + "type": "rawString", + "value": "STAND" } },{ "type": "addDamageTakenModificationListener", @@ -499,14 +441,6 @@ "listener": { "type": "getLastCreatedDamageTakenModificationListener" } - },{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } }], "onRemoveActions": [{ "type": "enableAbility" @@ -538,52 +472,13 @@ "value": "MORPH" } },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "hpbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { + "type": "queueAnimation", + "unit": { "type": "getBuffedUnit" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } + "tag": { + "type": "rawString", + "value": "STAND" } },{ "type": "removeDamageTakenModificationListener", @@ -593,14 +488,6 @@ "listener": { "type": "getLastCreatedDamageTakenModificationListener" } - },{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } }] },{ "type": "addBuff", @@ -612,76 +499,40 @@ } }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "hpbuff" - } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }] },{ "ids": [{"id":"Auhf", "castId": "unholyfrenzy"}], "type": "NORMAL_UNITTARGET", - "onAddDisabledAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { "type": "rawString", - "value": "ATKSPD" + "value": "unholyfrenzy" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" } - }, - "stackingKey": { + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { "type": "rawString", - "value": "unholyfrenzy" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" + "value": "setupBuffs" } }], "onEndCasting": [{ @@ -715,14 +566,8 @@ "type": "getAbilityTargetedUnit" } }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } + "statBuffs": [{ + "type": "getLastCreatedNonStackingStatBuff" }], "onTickActions": [{ "type": "periodicExecute", @@ -749,15 +594,6 @@ "type": "getBuffedUnit" } } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } }] },{ "type": "addBuff", @@ -770,13 +606,10 @@ }] }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" } }] },{ @@ -795,7 +628,8 @@ } } }], - "onAddDisabledAbility": [{ + "reuseActions": { + "setupBuffs": [{ "type": "createNonStackingStatBuff", "buffType": { "type": "getNonStackingStatBuffTypeFromString", @@ -812,6 +646,14 @@ "type": "getAbilityDataAsFloat", "dataField": "B" } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } },{ "type": "createDamageTakenListener", "actions": [{ @@ -863,15 +705,10 @@ "type": "getAbilityDataAsFloat", "dataField": "A" }, + "statBuffs": [{ + "type": "getLastCreatedNonStackingStatBuff" + }], "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ "type": "addDamageTakenListener", "targetUnit": { "type": "getBuffedUnit" @@ -881,14 +718,6 @@ } }], "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ "type": "removeDamageTakenListener", "targetUnit": { "type": "getBuffedUnit" @@ -908,14 +737,11 @@ }] }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }] },{ "ids": [{"id":"Ablo", "castId": "bloodlust", "autoCastOnId": "bloodluston", "autoCastOffId": "bloodlustoff", "autoCastType": "ATTACKINGENEMY"}], @@ -932,66 +758,75 @@ } } }], - "onAddDisabledAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { "type": "rawString", - "value": "ATKSPD" + "value": "bloodlust" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" } - }, - "stackingKey": { - "type": "rawString", - "value": "bloodlust" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "asbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "MVSPDPCT" + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" } - }, - "stackingKey": { - "type": "rawString", - "value": "bloodlust" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mvbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "bloodlust" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }], "onEndCasting": [{ "type": "checkAbilityEffectReaction", @@ -1009,110 +844,67 @@ "type": "getAbilityTargetedUnit" } }, - "onAddActions": [{ - "type": "multiplyUnitScale", - "unit": { - "type": "getBuffedUnit" + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "value": { - "type": "f+", - "value1": { - "type": "rawFloat", - "value": 1.0 - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } + "key": { + "type": "rawString", + "value": "asbuff" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + }], + "onAddActions": [{ + "type": "multiplyUnitScale", + "unit": { + "type": "getBuffedUnit" + }, + "value": { + "type": "f+", + "value1": { + "type": "rawFloat", + "value": 1.0 }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "C" } + } }], "onRemoveActions": [{ - "type": "multiplyUnitScale", - "unit": { - "type": "getBuffedUnit" + "type": "multiplyUnitScale", + "unit": { + "type": "getBuffedUnit" + }, + "value": { + "type": "f/", + "value1": { + "type": "rawFloat", + "value": 1.0 }, - "value": { - "type": "f/", + "value2": { + "type": "f+", "value1": { "type": "rawFloat", "value": 1.0 }, "value2": { - "type": "f+", - "value1": { - "type": "rawFloat", - "value": 1.0 - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" + "type": "getAbilityDataAsFloat", + "dataField": "C" } } + } }] },{ "type": "addBuff", @@ -1125,39 +917,11 @@ }] }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }] },{ "ids": [{"id":"AHds", "castId": "divineshield", "uncastId": "undivineshield"}], @@ -1209,6 +973,9 @@ "type": "getCastingUnit" } }, + "stateMods": [{ + "type": "getLastCreatedStateModBuff" + }], "onAddActions": [{ "type": "if", "condition": { @@ -1231,25 +998,9 @@ "type": "enumBuff" } } - },{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } }], "onRemoveActions": [{ - "type": "enableAbility" - },{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } + "type": "enableAbility" }] },{ "type": "addBuff", diff --git a/core/assets/abilityBehaviors/activeDebuffs.json b/core/assets/abilityBehaviors/activeDebuffs.json index f301e3d8a..d37deceb4 100644 --- a/core/assets/abilityBehaviors/activeDebuffs.json +++ b/core/assets/abilityBehaviors/activeDebuffs.json @@ -2,105 +2,114 @@ "abilityList": [{ "ids": [{"id":"Acri", "castId": "cripple"}], "type": "NORMAL_UNITTARGET", - "onAddDisabledAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { "type": "rawString", - "value": "MVSPDPCT" - } - }, - "stackingKey": { - "type": "rawString", - "value": "cripple" - }, - "value": { - "type": "negativeFloat", + "value": "cripple" + }, "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mvbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "ATKSPD" - } - }, - "stackingKey": { - "type": "rawString", - "value": "cripple" - }, - "value": { - "type": "negativeFloat", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "cripple" + }, "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "asbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "ALLATKPCT" - } - }, - "stackingKey": { - "type": "rawString", - "value": "cripple" - }, - "value": { - "type": "negativeFloat", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ALLATKPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "cripple" + }, "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "atkbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }], "onEndCasting": [{ "type": "createTemporarySpellEffectOnUnit", @@ -127,102 +136,35 @@ "type": "getAbilityTargetedUnit" } }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "asbuff" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } - } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } + "key": { + "type": "rawString", + "value": "atkbuff" } }] },{ @@ -236,195 +178,150 @@ }] }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } + }] + },{ + "ids": [{"id":"ANht", "castId": "howlofterror"}], + "type": "NORMAL_NOTARGET", + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ALLATKPCT" + } }, - "key": { + "stackingKey": { "type": "rawString", - "value": "mvbuff" - } - }, - "value": { - "type": "negativeFloat", + "value": "howlofterror" + }, "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkbuff" + }, "instanceValue": { "type": "rawBoolean", "value": "false" }, - "key": { + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "DEF" + } + }, + "stackingKey": { "type": "rawString", - "value": "asbuff" - } - }, - "value": { - "type": "negativeFloat", + "value": "howlofterror" + }, "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "defbuff" + }, "instanceValue": { "type": "rawBoolean", "value": "false" }, - "key": { + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "HPGEN" + } + }, + "stackingKey": { "type": "rawString", - "value": "atkbuff" - } - }, - "value": { - "type": "negativeFloat", + "value": "howlofterror" + }, "value": { "type": "getAbilityDataAsFloat", "dataField": "C" } - } - }] - },{ - "ids": [{"id":"ANht", "castId": "howlofterror"}], - "type": "NORMAL_NOTARGET", - "onAddDisabledAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "ALLATKPCT" - } - }, - "stackingKey": { - "type": "rawString", - "value": "howlofterror" - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "atkbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + "value": "hpbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MPGEN" + } + }, + "stackingKey": { "type": "rawString", - "value": "DEF" - } - }, - "stackingKey": { - "type": "rawString", - "value": "howlofterror" - }, - "value": { - "type": "negativeFloat", + "value": "howlofterror" + }, "value": { "type": "getAbilityDataAsFloat", - "dataField": "B" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "defbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "HPGEN" + "dataField": "D" } - }, - "stackingKey": { - "type": "rawString", - "value": "howlofterror" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "hpbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "MPGEN" + "value": "mpbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" } - }, - "stackingKey": { - "type": "rawString", - "value": "howlofterror" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mpbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }], "onEndCasting": [{ "type": "createTemporarySpellEffectOnUnit", @@ -454,134 +351,45 @@ "type": "getEnumUnit" } }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "hpbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mpbuff" - } - } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } + "key": { + "type": "rawString", + "value": "atkbuff" } },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } + "key": { + "type": "rawString", + "value": "defbuff" } },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "hpbuff" - } + "key": { + "type": "rawString", + "value": "hpbuff" } },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mpbuff" - } + "key": { + "type": "rawString", + "value": "mpbuff" } }] },{ @@ -601,181 +409,122 @@ } }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } + }] + },{ + "ids": [{"id":"ANso", "castId": "soulburn"}], + "type": "NORMAL_UNITTARGET", + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ALLATKPCT" + } }, - "key": { + "stackingKey": { "type": "rawString", - "value": "atkbuff" - } - }, - "value": { - "type": "negativeFloat", + "value": "soulburn" + }, "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkbuff" + }, "instanceValue": { "type": "rawBoolean", "value": "false" }, - "key": { + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { "type": "rawString", - "value": "defbuff" - } - }, - "value": { - "type": "negativeFloat", + "value": "soulburn" + }, "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, "instanceValue": { "type": "rawBoolean", "value": "false" }, - "key": { + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { "type": "rawString", - "value": "hpbuff" + "value": "soulburn" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, "instanceValue": { "type": "rawBoolean", "value": "false" }, - "key": { - "type": "rawString", - "value": "mpbuff" + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - } - }] - },{ - "ids": [{"id":"ANso", "castId": "soulburn"}], - "type": "NORMAL_UNITTARGET", + }] + }, "onAddDisabledAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "ALLATKPCT" - } - }, - "stackingKey": { - "type": "rawString", - "value": "soulburn" - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "atkbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "ATKSPD" - } - }, - "stackingKey": { - "type": "rawString", - "value": "soulburn" - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "E" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "asbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "MVSPDPCT" - } - }, - "stackingKey": { - "type": "rawString", - "value": "soulburn" - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - } - } - },{ - "type": "storeValueLocally", - "key": { + "type": "runReuseAction", + "name": { "type": "rawString", - "value": "mvbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" + "value": "setupBuffs" } },{ "type": "createStateModBuff", @@ -810,63 +559,40 @@ "type": "rawBoolean", "value": "false" }, - "onAddActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getLastCreatedStateModBuff" + "key": { + "type": "rawString", + "value": "atkbuff" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "asbuff" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } }], + "stateMods": [{ + "type": "getLastCreatedStateModBuff" + }], "onTickActions": [{ "type": "periodicExecute", "periodicActions": [{ @@ -892,63 +618,6 @@ "type": "getBuffedUnit" } } - }], - "onRemoveActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } }] },{ "type": "addBuff", @@ -961,65 +630,11 @@ }] }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "E" - } - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/humanHeroActives.json b/core/assets/abilityBehaviors/humanHeroActives.json index 495464c16..f3248f471 100644 --- a/core/assets/abilityBehaviors/humanHeroActives.json +++ b/core/assets/abilityBehaviors/humanHeroActives.json @@ -402,74 +402,83 @@ },{ "ids": [{"id":"AHbn", "castId": "banish"}], "type": "NORMAL_UNITTARGET", - "onAddAbility": [{ - "type": "createStateModBuff", - "buffType": "ETHEREAL" - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { "type": "rawString", - "value": "ATKSPD" - } - }, - "stackingKey": { - "type": "rawString", - "value": "slow" - }, - "value": { - "type": "negativeFloat", + "value": "slow" + }, "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "asbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "MVSPDPCT" + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" } - }, - "stackingKey": { - "type": "rawString", - "value": "slow" - }, - "value": { - "type": "negativeFloat", + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "slow" + }, "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } } - } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }] + }, + "onAddAbility": [{ + "type": "createStateModBuff", + "buffType": "ETHEREAL" },{ - "type": "storeValueLocally", - "key": { + "type": "runReuseAction", + "name": { "type": "rawString", - "value": "mvbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" + "value": "setupBuffs" } }], "onEndCasting": [{ @@ -503,87 +512,29 @@ "type": "getAbilityTargetedUnit" } }, - "onAddActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "asbuff" } }], - "onRemoveActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getCastingUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } + "stateMods": [{ + "type": "getLastCreatedStateModBuff" }] },{ "type": "addBuff", @@ -596,45 +547,11 @@ }] }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/humanUnitActives.json b/core/assets/abilityBehaviors/humanUnitActives.json index 0a8947dcd..f41cfc966 100644 --- a/core/assets/abilityBehaviors/humanUnitActives.json +++ b/core/assets/abilityBehaviors/humanUnitActives.json @@ -14,72 +14,81 @@ } } }], - "onAddAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { "type": "rawString", - "value": "ATKSPD" - } - }, - "stackingKey": { - "type": "rawString", - "value": "slow" - }, - "value": { - "type": "negativeFloat", + "value": "slow" + }, "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "asbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "MVSPDPCT" + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" } - }, - "stackingKey": { - "type": "rawString", - "value": "slow" - }, - "value": { - "type": "negativeFloat", + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "slow" + }, "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mvbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }] + }, + "onAddAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }], "onEndCasting": [{ "type": "checkAbilityEffectReaction", @@ -110,70 +119,25 @@ "type": "rawBoolean", "value": "false" }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "asbuff" } }] },{ @@ -187,45 +151,11 @@ }] }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }] },{ "ids": [{"id":"Amls", "castId": "magicleash"}], @@ -769,96 +699,105 @@ } } }], - "onAddAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ALLATKPCT" + } + }, + "stackingKey": { "type": "rawString", - "value": "ALLATKPCT" + "value": "innerFire" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" } - }, - "stackingKey": { - "type": "rawString", - "value": "innerFire" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "atkbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "DEF" + "value": "atkbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" } - }, - "stackingKey": { - "type": "rawString", - "value": "innerFire" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "defbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "DEF" + } + }, + "stackingKey": { + "type": "rawString", + "value": "innerFire" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "HPGEN" + "value": "defbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" } - }, - "stackingKey": { - "type": "rawString", - "value": "innerFire" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "hpbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "HPGEN" + } + }, + "stackingKey": { + "type": "rawString", + "value": "innerFire" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "hpbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }] + }, + "onAddAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }], "onEndCasting": [{ "type": "checkAbilityEffectReaction", @@ -876,102 +815,35 @@ "type": "getAbilityTargetedUnit" } }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } + "key": { + "type": "rawString", + "value": "atkbuff" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "hpbuff" - } - } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } + "key": { + "type": "rawString", + "value": "defbuff" } },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "hpbuff" - } + "key": { + "type": "rawString", + "value": "hpbuff" } }] },{ @@ -985,56 +857,11 @@ }] }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "hpbuff" - } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }] },{ "ids": [{"id":"Aivs", "castId": "invisibility"}], diff --git a/core/assets/abilityBehaviors/itemSimple.json b/core/assets/abilityBehaviors/itemSimple.json index 08ce5c81b..f987581f6 100644 --- a/core/assets/abilityBehaviors/itemSimple.json +++ b/core/assets/abilityBehaviors/itemSimple.json @@ -92,31 +92,22 @@ "type": "rawBoolean", "value": "false" }, - "onAddActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "detected" - } - } - }], - "onRemoveActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "detected" - } - } + "stacks": { + "type": "rawBoolean", + "value": "true" + }, + "visibilityGroup": { + "type": "id2s", + "value": { + "type": "getAlias" + } + }, + "stateMods": [{ + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "detected" + } }] },{ "type": "addBuff", diff --git a/core/assets/abilityBehaviors/neutralHeroUnitActives.json b/core/assets/abilityBehaviors/neutralHeroUnitActives.json index 3d4a5af62..23067c979 100644 --- a/core/assets/abilityBehaviors/neutralHeroUnitActives.json +++ b/core/assets/abilityBehaviors/neutralHeroUnitActives.json @@ -163,6 +163,69 @@ },{ "ids": [{"id":"ANsi", "castId": "silence"}], "type": "NORMAL_POINTTARGET", + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "silence" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "silence" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }] + }, "onAddAbility": [{ "type": "createAttackPreDamageListener", "actions": [{ @@ -193,64 +256,10 @@ "elseActions": [] }] },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "ATKSPD" - } - }, - "stackingKey": { + "type": "runReuseAction", + "name": { "type": "rawString", - "value": "silence" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "asbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "MVSPDPCT" - } - }, - "stackingKey": { - "type": "rawString", - "value": "silence" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mvbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" + "value": "setupBuffs" } },{ "type": "createStateModBuff", @@ -358,6 +367,27 @@ "type": "rawBoolean", "value": "false" }, + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + },{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + }], "onAddActions": [{ "type": "addAttackPreDamageListener", "targetUnit": { @@ -370,38 +400,6 @@ "listener": { "type": "getLastCreatedAttackPreDamageListener" } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } },{ "type": "if", "condition": { @@ -563,38 +561,6 @@ "listener": { "type": "getLastCreatedAttackPreDamageListener" } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } },{ "type": "removeStateModBuff", "targetUnit": { @@ -671,38 +637,10 @@ }] }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "D" + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" } },{ "type": "addTargetAllowed", diff --git a/core/assets/abilityBehaviors/nightElfHeroUnitActives.json b/core/assets/abilityBehaviors/nightElfHeroUnitActives.json index b9acbc16c..95b794c43 100644 --- a/core/assets/abilityBehaviors/nightElfHeroUnitActives.json +++ b/core/assets/abilityBehaviors/nightElfHeroUnitActives.json @@ -294,29 +294,17 @@ "type": "rawBoolean", "value": "false" }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "key": { - "type": "rawString", - "value": "atkSpdBuff" - } + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "atkSpdBuff" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "key": { - "type": "rawString", - "value": "moveBuff" - } + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "moveBuff" } }], "onTickActions": [{ @@ -426,31 +414,6 @@ "type": "rawString", "value": "slow" } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "key": { - "type": "rawString", - "value": "moveBuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "key": { - "type": "rawString", - "value": "atkSpdBuff" - } - } }] },{ "type": "addBuff", diff --git a/core/assets/abilityBehaviors/nightElfUnitActives.json b/core/assets/abilityBehaviors/nightElfUnitActives.json index 6f4d094bf..7e88fb5ef 100644 --- a/core/assets/abilityBehaviors/nightElfUnitActives.json +++ b/core/assets/abilityBehaviors/nightElfUnitActives.json @@ -2,126 +2,135 @@ "abilityList": [{ "ids": [{"id":"Aroa", "castId": "roar"},{"id":"ANbr", "castId": "battleroar"}], "type": "NORMAL_NOTARGET", - "onAddAbility": [{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ALLATKPCT" + } + }, + "stackingKey": { "type": "rawString", - "value": "ALLATKPCT" + "value": "roar" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" } - }, - "stackingKey": { - "type": "rawString", - "value": "roar" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "atkbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "DEF" + "value": "atkbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" } - }, - "stackingKey": { - "type": "rawString", - "value": "roar" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "defbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "DEF" + } + }, + "stackingKey": { "type": "rawString", - "value": "HPGEN" + "value": "roar" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" } - }, - "stackingKey": { - "type": "rawString", - "value": "roar" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "hpbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { + },{ + "type": "storeValueLocally", + "key": { "type": "rawString", - "value": "MPGEN" + "value": "defbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" } - }, - "stackingKey": { - "type": "rawString", - "value": "roar" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "mpbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "HPGEN" + } + }, + "stackingKey": { + "type": "rawString", + "value": "roar" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "hpbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MPGEN" + } + }, + "stackingKey": { + "type": "rawString", + "value": "roar" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mpbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }] + }, + "onAddAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }], "onEndCasting": [{ "type": "createTemporarySpellEffectOnUnit", @@ -151,134 +160,45 @@ "type": "getEnumUnit" } }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "hpbuff" - } - } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mpbuff" - } - } - }], - "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } + "key": { + "type": "rawString", + "value": "atkbuff" } },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } + "key": { + "type": "rawString", + "value": "defbuff" } },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "hpbuff" - } + "key": { + "type": "rawString", + "value": "hpbuff" } },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mpbuff" - } + "key": { + "type": "rawString", + "value": "mpbuff" } }] },{ @@ -298,85 +218,11 @@ } }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "atkbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "hpbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - } - },{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mpbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "D" - } - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }] },{ "ids": [{"id":"Arej", "castId": "rejuvination"}], @@ -756,7 +602,8 @@ } } }], - "onAddAbility": [{ + "reuseActions": { + "setupBuffs": [{ "type": "createNonStackingStatBuff", "buffType": { "type": "getNonStackingStatBuffTypeFromString", @@ -776,19 +623,14 @@ "dataField": "A" } } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "defbuff" - }, - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "valueToStore": { - "type": "getLastCreatedNonStackingStatBuff" - } + }] + }, + "onAddAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } }], "onEndCasting": [{ "type": "checkAbilityEffectReaction", @@ -796,6 +638,25 @@ "type": "getAbilityTargetedUnit" }, "onHitActions": [{ + "type": "createStateModBuff", + "buffType": "DETECTED", + "value": { + "type": "createDetectedData", + "detectionLevel": { + "type": "rawInteger", + "value": 127 + }, + "player": { + "type": "playerToStateModValue", + "player": { + "type": "getOwnerOfUnit", + "unit": { + "type": "getCastingUnit" + } + } + } + } + },{ "type": "createTimedBuff", "buffId": { "type": "getFirstBuffId" @@ -810,23 +671,13 @@ "type": "rawBoolean", "value": "false" }, + "statBuffs": [{ + "type": "getLastCreatedNonStackingStatBuff" + }], + "stateMods": [{ + "type": "getLastCreatedStateModBuff" + }], "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } - } - },{ "type": "createUnitVisionModifier", "unit": { "type": "getBuffedUnit" @@ -850,86 +701,22 @@ "valueToStore": { "type": "getLastCreatedVisionModifier" } - },{ - "type": "createStateModBuff", - "buffType": "DETECTED", - "value": { - "type": "createDetectedData", - "detectionLevel": { - "type": "rawInteger", - "value": 127 - }, - "player": { - "type": "playerToStateModValue", - "player": { - "type": "getOwnerOfUnit", - "unit": { - "type": "getBuffCastingUnit" - } - } - } - } - },{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedStateModBuff" - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "detected" - }, - "valueToStore": { - "type": "getLastCreatedStateModBuff" - } }], "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } - } - },{ - "type": "removeVisionModifier", - "modifier": { - "type": "getStoredVisionModifierByKey", - "key": { - "type": "rawString", - "value": "vision" - } - }, - "player": { - "type": "getOwnerOfUnit", - "unit": { - "type": "getBuffCastingUnit" - } + "type": "removeVisionModifier", + "modifier": { + "type": "getStoredVisionModifierByKey", + "key": { + "type": "rawString", + "value": "vision" } - },{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "key": { - "type": "rawString", - "value": "detected" - } + }, + "player": { + "type": "getOwnerOfUnit", + "unit": { + "type": "getBuffCastingUnit" } + } }] },{ "type": "addBuff", @@ -942,24 +729,10 @@ }] }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "defbuff" - } - }, - "value": { - "type": "negativeFloat", - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" } }] },{ diff --git a/core/assets/abilityBehaviors/orcHeroActives.json b/core/assets/abilityBehaviors/orcHeroActives.json index 5822ae659..fe4d9677f 100644 --- a/core/assets/abilityBehaviors/orcHeroActives.json +++ b/core/assets/abilityBehaviors/orcHeroActives.json @@ -9,6 +9,24 @@ } }, "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "windwalk" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }], "addStateMods": [{ "type": "changeAttackActionToMovement" },{ @@ -127,6 +145,12 @@ }] }, "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } + },{ "type": "createStateModBuff", "buffType": "INVISIBLE" },{ @@ -174,23 +198,6 @@ "valueToStore": { "type": "getLastCreatedStateModBuff" } - },{ - "type": "createNonStackingStatBuff", - "buffType": { - "type": "getNonStackingStatBuffTypeFromString", - "id": { - "type": "rawString", - "value": "MVSPDPCT" - } - }, - "stackingKey": { - "type": "rawString", - "value": "windwalk" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" - } },{ "type": "createAttackPreDamageListener", "actions": [{ @@ -315,13 +322,10 @@ }] }], "onLevelChange": [{ - "type": "updateNonStackingStatBuff", - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - }, - "value": { - "type": "getAbilityDataAsFloat", - "dataField": "B" + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" } }], "onEndCasting": [{ @@ -332,6 +336,9 @@ "duration": { "type": "getAbilityHeroDuration" }, + "statBuffs": [{ + "type": "getLastCreatedNonStackingStatBuff" + }], "onAddActions": [{ "type": "disableAbility" },{ @@ -339,14 +346,6 @@ "unit": { "type": "getBuffedUnit" } - },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } },{ "type": "addAttackModifier", "unit": { @@ -434,14 +433,6 @@ "type": "rawBoolean", "value": "false" } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getLastCreatedNonStackingStatBuff" - } },{ "type": "removeAttackModifier", "unit": { diff --git a/core/assets/abilityBehaviors/undeadHeroUnitActives.json b/core/assets/abilityBehaviors/undeadHeroUnitActives.json index 637b1eaea..fe93fb97d 100644 --- a/core/assets/abilityBehaviors/undeadHeroUnitActives.json +++ b/core/assets/abilityBehaviors/undeadHeroUnitActives.json @@ -66,39 +66,16 @@ "type": "rawBoolean", "value": "false" }, - "onAddActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "invuln" - } - } - }], - "onRemoveActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "invuln" - } - } + "stateMods": [{ + "type": "getStoredStateModBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "invuln" + } }] },{ "type": "addBuff", @@ -123,23 +100,18 @@ "type": "rawBoolean", "value": "false" }, + "stateMods": [{ + "type": "getStoredStateModBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "sleep" + } + }], "onAddActions": [{ - "type": "addStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "sleep" - } - } - },{ "type": "createDamageTakenListener", "actions": [{ "type": "removeDamageTakenListener", @@ -186,23 +158,7 @@ } }], "onRemoveActions": [{ - "type": "removeStateModBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredStateModBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "sleep" - } - } - },{ - "type": "cleanUpCastInstance" + "type": "cleanUpCastInstance" }] },{ "type": "addBuff", @@ -901,6 +857,5 @@ } }] }] - }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors_compatibility/parasite.json b/core/assets/abilityBehaviors_compatibility/parasite.json index 2350c0537..926cd2288 100644 --- a/core/assets/abilityBehaviors_compatibility/parasite.json +++ b/core/assets/abilityBehaviors_compatibility/parasite.json @@ -218,37 +218,25 @@ "type": "rawBoolean", "value": "false" }, - "onAddActions": [{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } + "key": { + "type": "rawString", + "value": "mvbuff" } },{ - "type": "addNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } + "key": { + "type": "rawString", + "value": "asbuff" } }], "onTickActions": [{ @@ -295,38 +283,6 @@ } }], "onRemoveActions": [{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "mvbuff" - } - } - },{ - "type": "removeNonStackingStatBuff", - "targetUnit": { - "type": "getBuffedUnit" - }, - "buff": { - "type": "getStoredNonStackingStatBuffByKey", - "instanceValue": { - "type": "rawBoolean", - "value": "false" - }, - "key": { - "type": "rawString", - "value": "asbuff" - } - } - },{ "type": "if", "condition": { "type": "isUnitDead", diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java index 9a6cc1e79..ec17327d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java @@ -141,7 +141,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectileMissile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CCollisionProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CJassProjectile; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CPsuedoProjectile; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CPseudoProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.config.War3MapConfig; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; @@ -2661,7 +2661,7 @@ public CJassProjectile createJassProjectile(final CSimulation cSimulation, @Override public CCollisionProjectile createCollisionProjectile(final CSimulation cSimulation, final float launchX, final float launchY, final float launchFacing, - final float projectileSpeed, final boolean homing, final CUnit source, + final Float projectileSpeed, final Boolean homing, final CUnit source, final War3ID spellAlias, final AbilityTarget target, final int maxHits, final int hitsPerTarget, final float startingRadius, final float finalRadius, final float collisionInterval, @@ -2671,6 +2671,8 @@ public CCollisionProjectile createCollisionProjectile(final CSimulation cSimulat final AbilityUI spellDataUI = War3MapViewer.this.abilityDataUI.getUI(spellAlias); final EffectAttachmentUIMissile abilityMissileArt = spellDataUI.getMissileArt(0); final float projectileArc = abilityMissileArt == null ? 0 : abilityMissileArt.getArc(); + final float pSpeed = projectileSpeed == null ? abilityMissileArt.getSpeed() : projectileSpeed; + final boolean pHome = homing == null ? abilityMissileArt.isHoming() : homing; final String missileArt = abilityMissileArt == null ? "" : abilityMissileArt.getModelPath(); final float projectileLaunchX = War3MapViewer.this.simulation.getUnitData() @@ -2691,7 +2693,7 @@ public CCollisionProjectile createCollisionProjectile(final CSimulation cSimulat final float height = War3MapViewer.this.terrain.getGroundHeight(x, y) + source.getFlyHeight() + projectileLaunchZ; final CCollisionProjectile simulationAbilityProjectile = new CCollisionProjectile(x, y, - projectileSpeed, target, homing, source, maxHits, hitsPerTarget, startingRadius, + pSpeed, target, pHome, source, maxHits, hitsPerTarget, startingRadius, finalRadius, collisionInterval, projectileListener, provideCounts); final MdxModel model = loadModelMdx(missileArt); @@ -2714,7 +2716,7 @@ public CCollisionProjectile createCollisionProjectile(final CSimulation cSimulat } @Override - public CPsuedoProjectile createPseudoProjectile(final CSimulation cSimulation, + public CPseudoProjectile createPseudoProjectile(final CSimulation cSimulation, final float launchX, final float launchY, final float launchFacing, final float projectileSpeed, final float projectileStepInterval, final int projectileArtSkip, final boolean homing, final CUnit source, @@ -2738,7 +2740,7 @@ public CPsuedoProjectile createPseudoProjectile(final CSimulation cSimulation, final float y = (launchY + (projectileLaunchY * sinFacing)) - (projectileLaunchX * cosFacing); - final CPsuedoProjectile simulationAbilityProjectile = new CPsuedoProjectile(x, y, + final CPseudoProjectile simulationAbilityProjectile = new CPseudoProjectile(x, y, projectileSpeed, projectileStepInterval, projectileArtSkip, target, homing, source, spellAlias, effectType, effectArtIndex, maxHits, hitsPerTarget, startingRadius, finalRadius, projectileListener, provideCounts); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java index 2f68b209f..7a30a7285 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java @@ -49,7 +49,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CCollisionProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CJassProjectile; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CPsuedoProjectile; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CPseudoProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.config.CBasePlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.config.CPlayerAPI; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.config.War3MapConfig; @@ -434,7 +434,7 @@ public CJassProjectile createProjectile(final CUnit source, final War3ID spellAl } public CCollisionProjectile createCollisionProjectile(final CUnit source, final War3ID spellAlias, - final float launchX, final float launchY, final float launchFacing, final float speed, final boolean homing, + final float launchX, final float launchY, final float launchFacing, final Float speed, final Boolean homing, final AbilityTarget target, final int maxHits, final int hitsPerTarget, final float startingRadius, final float finalRadius, final float collisionInterval, final CAbilityCollisionProjectileListener projectileListener, final boolean provideCounts) { @@ -446,13 +446,13 @@ public CCollisionProjectile createCollisionProjectile(final CUnit source, final return projectile; } - public CPsuedoProjectile createPseudoProjectile(final CUnit source, final War3ID spellAlias, + public CPseudoProjectile createPseudoProjectile(final CUnit source, final War3ID spellAlias, final CEffectType effectType, final int effectArtIndex, final float launchX, final float launchY, final float launchFacing, final float speed, final float projectileStepInterval, final int projectileArtSkip, final boolean homing, final AbilityTarget target, final int maxHits, final int hitsPerTarget, final float startingRadius, final float finalRadius, final CAbilityCollisionProjectileListener projectileListener, final boolean provideCounts) { - final CPsuedoProjectile projectile = this.simulationRenderController.createPseudoProjectile(this, launchX, + final CPseudoProjectile projectile = this.simulationRenderController.createPseudoProjectile(this, launchX, launchY, launchFacing, speed, projectileStepInterval, projectileArtSkip, homing, source, spellAlias, effectType, effectArtIndex, target, maxHits, hitsPerTarget, startingRadius, finalRadius, projectileListener, provideCounts); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java index 999bddb45..4b928bfd8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java @@ -4,6 +4,8 @@ import java.util.Map; import com.etheller.warsmash.util.WarsmashConstants; +import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; +import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -41,6 +43,7 @@ public class CBehaviorAbilityBuilderBase extends CAbstractRangedBehavior impleme private boolean instant = false; private CBehaviorCategory behaviorCategory = null; + private EnumSet channelTags; public CBehaviorAbilityBuilderBase(final CUnit unit, final Map localStore, AbilityBuilderActiveAbility ability) { @@ -73,6 +76,9 @@ public CBehavior reset(final CSimulation game, final CWidget target, final boole this.orderId = this.ability.getBaseOrderId(); this.preventReInterrupt = false; this.autoOrder = autoOrder; + + this.channelTags = this.ability.getCastingSecondaryTags().clone(); + this.channelTags.add(SecondaryTag.CHANNEL); return innerReset(game, target, false); } @@ -90,6 +96,9 @@ public CBehavior reset(final CSimulation game, final CWidget target, int orderId this.orderId = orderId; this.preventReInterrupt = false; this.autoOrder = autoOrder; + + this.channelTags = this.ability.getCastingSecondaryTags().clone(); + this.channelTags.add(SecondaryTag.CHANNEL); return innerReset(game, target, false); } @@ -107,6 +116,9 @@ public CBehavior reset(final CSimulation game, final AbilityPointTarget target, this.orderId = this.ability.getBaseOrderId(); this.preventReInterrupt = false; this.autoOrder = autoOrder; + + this.channelTags = this.ability.getCastingSecondaryTags().clone(); + this.channelTags.add(SecondaryTag.CHANNEL); return innerReset(game, target, false); } @@ -125,6 +137,9 @@ public CBehavior reset(final CSimulation game, final AbilityPointTarget target, this.orderId = orderId; this.preventReInterrupt = false; this.autoOrder = autoOrder; + + this.channelTags = this.ability.getCastingSecondaryTags().clone(); + this.channelTags.add(SecondaryTag.CHANNEL); return innerReset(game, target, false); } @@ -164,13 +179,9 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { return this; } - if (!instant) { - if (this.castPointTicks > this.castTimeEndTick) { - EnumSet tags = this.ability.getCastingSecondaryTags().clone(); - tags.add(SecondaryTag.CHANNEL); - this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), tags, - 1.0f, true); - } + if (!instant && this.castTimeEndTick > 0) { + this.unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.STAND, + EnumSet.of(SecondaryTag.CHANNEL), 1.0f, true); } } @@ -236,16 +247,16 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { } this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + if (!this.channeling) { + this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), + this.ability.getCastingSecondaryTags(), 1.0f, true); + this.unit.getUnitAnimationListener().queueAnimation(PrimaryTag.STAND, SequenceUtils.EMPTY, true); + } this.doneCastTime = true; } if (this.channeling) { - EnumSet tags = this.ability.getCastingSecondaryTags().clone(); - tags.add(SecondaryTag.CHANNEL); - this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), tags, - 1.0f, true); - } else { this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), - this.ability.getCastingSecondaryTags(), 1.0f, true); + this.channelTags, 1.0f, true); } if ((ticksSinceCast >= castPointTicks)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java index 535a6dbb9..c1e2aebfe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java @@ -4,6 +4,8 @@ import java.util.Map; import com.etheller.warsmash.util.WarsmashConstants; +import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; +import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -37,6 +39,7 @@ public class CBehaviorAbilityBuilderNoTarget implements ABBehavior { private boolean instant = false; private CBehaviorCategory behaviorCategory = null; private int castId = 0; + private EnumSet channelTags; public CBehaviorAbilityBuilderNoTarget(final CUnit unit, final Map localStore, AbilityBuilderActiveAbility ability) { @@ -87,6 +90,9 @@ public ABBehavior reset(final boolean autoOrder) { this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = this.ability.getBaseOrderId(); this.autoOrder = autoOrder; + + this.channelTags = this.ability.getCastingSecondaryTags().clone(); + this.channelTags.add(SecondaryTag.CHANNEL); return this; } @@ -104,6 +110,9 @@ public ABBehavior reset(int orderId, final boolean autoOrder) { this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = orderId; this.autoOrder = autoOrder; + + this.channelTags = this.ability.getCastingSecondaryTags().clone(); + this.channelTags.add(SecondaryTag.CHANNEL); return this; } @@ -116,13 +125,9 @@ public CBehavior update(final CSimulation game) { this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, this.ability, null); // In war3, non-targeted spells cannot be interrupted by pausing on spell events - if (!instant) { - if (this.castPointTicks > this.castTimeEndTick) { - EnumSet tags = this.ability.getCastingSecondaryTags().clone(); - tags.add(SecondaryTag.CHANNEL); - this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), - tags, 1.0f, true); - } + if (!instant && this.castTimeEndTick > 0) { + this.unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.STAND, + EnumSet.of(SecondaryTag.CHANNEL), 1.0f, true); } } @@ -134,7 +139,7 @@ public CBehavior update(final CSimulation game) { return this.unit.pollNextOrderBehavior(game); } this.ability.startCooldown(game, this.unit); - + this.ability.runBeginCastingActions(game, unit, orderId); this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, null); this.doneCastTime = true; @@ -170,14 +175,21 @@ public CBehavior update(final CSimulation game) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); return newBehavior; } - + this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, null); - this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), - this.ability.getCastingSecondaryTags(), 1.0f, true); this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + if (!this.channeling) { + this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), + this.ability.getCastingSecondaryTags(), 1.0f, true); + this.unit.getUnitAnimationListener().queueAnimation(PrimaryTag.STAND, SequenceUtils.EMPTY, true); + } this.doneCastTime = true; } + if (this.channeling) { + this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), + this.channelTags, 1.0f, true); + } if ((ticksSinceCast >= castPointTicks)) { CBehavior beh = tryDoEffect(game, wasChanneling); if (beh != null) { @@ -232,7 +244,7 @@ public boolean doChannelTick(CSimulation game, CUnit caster) { @Override public void end(final CSimulation game, boolean interrupted) { checkEndChannel(game, interrupted); - Boolean preventEndEvents = (Boolean) this.localStore.get(ABLocalStoreKeys.PREVENTENDEVENTS+this.castId); + Boolean preventEndEvents = (Boolean) this.localStore.get(ABLocalStoreKeys.PREVENTENDEVENTS + this.castId); if (preventEndEvents == null || !preventEndEvents) { if (!interrupted) { this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); @@ -254,7 +266,7 @@ private void endChannel(CSimulation game, boolean interrupted) { game.unitStopSoundEffectEvent(this.unit, this.ability.getAlias()); this.ability.runEndChannelActions(game, unit, orderId); } - + private void cleanupInputs() { this.ability.cleanupInputs(this.castId); } @@ -265,7 +277,7 @@ public int getHighlightOrderId() { } public void setCastId(int castId) { - this.castId = castId; + this.castId = castId; } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java index 6a80b84c1..d4e59c32f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java @@ -4,10 +4,12 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -50,8 +52,8 @@ public class ABActionCreateLocationTargetedPseudoProjectile implements ABSingleA @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - Float theSpeed = null; - Boolean isHoming = null; + float theSpeed = 0; + boolean isHoming = false; int theMaxHits = 0; int theHitsPerTarget = 1; float theStartingRadius = 0; @@ -104,11 +106,19 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - Float theSpeed = null; - Boolean isHoming = null; + float theSpeed = 0; + boolean isHoming = false; int theMaxHits = 0; int theHitsPerTarget = 1; float theStartingRadius = 0; @@ -103,11 +105,19 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + boolean av = false; + if (this.allowVariations != null) { + av = this.allowVariations.callback(game, caster, localStore, castId); + } + + targetUnit.getUnitAnimationListener().queueAnimation( + PrimaryTag.valueOf(this.tag.callback(game, caster, localStore, castId)), SequenceUtils.EMPTY, av); + } + + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java index dd3d531ed..55479a858 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java @@ -77,6 +77,7 @@ protected void onBuffAdd(CSimulation game, CUnit unit) { if (this.stateMods != null) { for (StateModBuff mod : this.stateMods) { unit.addStateModBuff(mod); + unit.computeUnitState(game, mod.getBuffType()); } } if (onAddActions != null) { @@ -114,6 +115,7 @@ protected void onBuffRemove(CSimulation game, CUnit unit) { if (this.stateMods != null) { for (StateModBuff mod : this.stateMods) { unit.removeStateModBuff(mod); + unit.computeUnitState(game, mod.getBuffType()); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index 2e47e257c..05259bb3e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -989,6 +989,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionSetUnitMovementTypeNoCollision.class, "setUnitMovementTypeNoCollision") .registerSubtype(ABActionPlayAnimation.class, "playAnimation") + .registerSubtype(ABActionQueueAnimation.class, "queueAnimation") .registerSubtype(ABActionAddSecondaryAnimationTag.class, "addSecondaryAnimationTag") .registerSubtype(ABActionRemoveSecondaryAnimationTag.class, "removeSecondaryAnimationTag") diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CPsuedoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CPseudoProjectile.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CPsuedoProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CPseudoProjectile.java index d9307adbb..984f71570 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CPsuedoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/projectile/CPseudoProjectile.java @@ -16,7 +16,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; -public class CPsuedoProjectile extends CProjectile { +public class CPseudoProjectile extends CProjectile { private static final Rectangle recycleRect = new Rectangle(); @@ -52,7 +52,7 @@ public class CPsuedoProjectile extends CProjectile { private int stepCount = 0; - public CPsuedoProjectile(final float x, final float y, final float speed, final float projectileStepInterval, final int projectileArtSkip, + public CPseudoProjectile(final float x, final float y, final float speed, final float projectileStepInterval, final int projectileArtSkip, final AbilityTarget target, boolean homingEnabled, final CUnit source, final War3ID alias, final CEffectType effectType, final int effectArtIndex, final int maxHits, final int hitsPerTarget, final float startingRadius, final float finalRadius, final CAbilityCollisionProjectileListener projectileListener, boolean provideCounts) { @@ -195,7 +195,7 @@ public boolean call(final CUnit enumUnit) { this.x = this.x + this.dx; this.y = this.y + this.dy; - + this.nextActionTick = game.getGameTurnTick() + this.stepInterval; this.stepCount++; this.done |= this.stepCount > this.steps; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java index a67055cb5..e5ad6f3c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java @@ -21,7 +21,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CCollisionProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CJassProjectile; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CPsuedoProjectile; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CPseudoProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public interface SimulationRenderController { @@ -41,11 +41,11 @@ CJassProjectile createJassProjectile(CSimulation cSimulation, float launchX, flo float speed, boolean homing, CUnit source, War3ID spellAlias, AbilityTarget target); CCollisionProjectile createCollisionProjectile(CSimulation cSimulation, float launchX, float launchY, - float launchFacing, float projectileSpeed, boolean homing, CUnit source, War3ID spellAlias, + float launchFacing, Float projectileSpeed, Boolean homing, CUnit source, War3ID spellAlias, AbilityTarget target, int maxHits, int hitsPerTarget, float startingRadius, float finalRadius, float collisionInterval, CAbilityCollisionProjectileListener projectileListener, boolean provideCounts); - CPsuedoProjectile createPseudoProjectile(CSimulation cSimulation, float launchX, float launchY, float launchFacing, + CPseudoProjectile createPseudoProjectile(CSimulation cSimulation, float launchX, float launchY, float launchFacing, float projectileSpeed, float projectileStepInterval, int projectileArtSkip, boolean homing, CUnit source, War3ID spellAlias, CEffectType effectType, int effectArtIndex, AbilityTarget target, int maxHits, int hitsPerTarget, float startingRadius, float finalRadius, From d7c460822991b4f5e0ef1ce7c4d68d702eede1e7 Mon Sep 17 00:00:00 2001 From: Glasir Date: Fri, 16 May 2025 14:40:55 -0400 Subject: [PATCH 21/44] Addition of War Stomp and Thunder Clap implementations with terrain deform --- .../abilityBehaviors/TerrainDeform.json | 262 +++++++++++++++++- ...ABActionCreateTerrainRippleAtLocation.java | 35 ++- .../w3x/simulation/data/CAbilityData.java | 4 +- 3 files changed, 291 insertions(+), 10 deletions(-) diff --git a/core/assets/abilityBehaviors/TerrainDeform.json b/core/assets/abilityBehaviors/TerrainDeform.json index bb5336cda..be99e2e67 100644 --- a/core/assets/abilityBehaviors/TerrainDeform.json +++ b/core/assets/abilityBehaviors/TerrainDeform.json @@ -316,7 +316,7 @@ }, "depth": { "type": "rawFloat", - "value": 200 + "value": 140 }, "duration": { "type": "getAbilityDuration" @@ -1997,5 +1997,265 @@ "elseActions": [] }] }] + },{ + "ids": [{"id":"AHtc", "castId": "thunderclap"}], + "type": "NORMAL_NOTARGET", + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "slow" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "slow" + }, + "value": { + "type": "negativeFloat", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }], + "addBuff": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getEnumUnit" + } + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + },{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getEnumUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } + }], + "onEndCasting": [{ + "type": "createTerrainRippleAtLocation", + "location": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "radius": { + "type": "getAbilityArea" + }, + "depth": { + "type": "rawFloat", + "value": 100 + }, + "rippleCount": { + "type": "rawInteger", + "value": 1 + }, + "period": { + "type": "rawFloat", + "value": 300 + }, + "spaceWaves": { + "type": "rawInteger", + "value": 1 + }, + "timeWaves": { + "type": "rawInteger", + "value": 2 + }, + "onlyNegative": { + "type": "rawBoolean", + "value": "true" + } + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "damageArea", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "validTarget": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getEnumUnit" + } + },{ + "type": "isUnitEnemy", + "unit": { + "type": "getEnumUnit" + } + }] + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "SONIC" + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "radius": { + "type": "getAbilityArea" + }, + "extraActions": [{ + "type": "if", + "condition": { + "type": "isUnitBuilding", + "unit": { + "type": "getEnumUnit" + } + }, + "elseActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "addBuff" + } + }] + }] + }] + },{ + "ids": [{"id":"AOws", "castId": "stomp"}], + "type": "INHERIT", + "parentId": "AHtc", + "reuseActions": { + "setupBuffs": [], + "addBuff": [{ + "type": "addStunBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "unit": { + "type": "getEnumUnit" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getEnumUnit" + } + } + }] + } }] } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java index f51c13b37..4b4009f17 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java @@ -17,11 +17,18 @@ public class ABActionCreateTerrainRippleAtLocation implements ABAction { private ABLocationCallback location; + private ABFloatCallback startRadius; private ABFloatCallback finalRadius; + private ABFloatCallback radius; + private ABFloatCallback depth; + private ABFloatCallback duration; + private ABIntegerCallback rippleCount; + private ABFloatCallback period; + private ABIntegerCallback spaceWaves; private ABIntegerCallback timeWaves; private ABBooleanCallback onlyNegative; @@ -30,18 +37,32 @@ public class ABActionCreateTerrainRippleAtLocation implements ABAction { public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); - final float startRad = startRadius.callback(game, caster, localStore, castId); - final float endRad = finalRadius.callback(game, caster, localStore, castId); + + float startRad = 0; + float endRad = 0; + if (radius != null) { + startRad = radius.callback(game, caster, localStore, castId); + endRad = startRad; + } else { + startRad = startRadius.callback(game, caster, localStore, castId); + endRad = finalRadius.callback(game, caster, localStore, castId); + } final float theDepth = depth.callback(game, caster, localStore, castId); final float thePeriod = period.callback(game, caster, localStore, castId); final int swaves = spaceWaves.callback(game, caster, localStore, castId); final int twaves = timeWaves.callback(game, caster, localStore, castId); final boolean onlyNeg = onlyNegative.callback(game, caster, localStore, castId); - - final float dur = duration.callback(game, caster, localStore, castId); - final int intervals = (int)dur; - - ABTerrainEffect fx = new ABTerrainRippleEffect(game, loc, startRad, endRad, theDepth, thePeriod, 2 * intervals, swaves, twaves, onlyNeg); + + int intervals = 0; + if (rippleCount != null) { + intervals = rippleCount.callback(game, caster, localStore, castId); + } else { + final float dur = duration.callback(game, caster, localStore, castId); + intervals = ((int) dur) * 2; + } + + ABTerrainEffect fx = new ABTerrainRippleEffect(game, loc, startRad, endRad, theDepth, thePeriod, intervals, + swaves, twaves, onlyNeg); game.registerTimer(fx); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, fx); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java index 2d55d6a14..e12814ee0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java @@ -146,8 +146,8 @@ private void registerCodes() { new CAbilityTypeDefinitionSpellBase((handleId, alias) -> new CAbilityChainLightning(handleId, alias))); // Tauren Chieftain - this.codeToAbilityTypeDefinition.put(War3ID.fromString("AOws"), - new CAbilityTypeDefinitionSpellBase((handleId, alias) -> new CAbilityWarStomp(handleId, alias))); +// this.codeToAbilityTypeDefinition.put(War3ID.fromString("AOws"), +// new CAbilityTypeDefinitionSpellBase((handleId, alias) -> new CAbilityWarStomp(handleId, alias))); // Burrow: this.codeToAbilityTypeDefinition.put(War3ID.fromString("Abun"), new CAbilityTypeDefinitionCargoHoldBurrow()); From d6f6c223d6259e6126019db122d325053311a424 Mon Sep 17 00:00:00 2001 From: Glasir Date: Thu, 19 Jun 2025 02:21:25 -0400 Subject: [PATCH 22/44] Partial commit of working changes --- .../AttackReplacementActives.json | 2 +- core/assets/abilityBehaviors/Dispels.json | 1826 +++++++++++++++++ .../abilityBehaviors/TerrainDeform.json | 17 +- .../neutralHeroUnitActives.json | 19 +- .../viewer5/handlers/w3x/War3MapViewer.java | 48 +- .../w3x/simulation/CDestructable.java | 4 + .../w3x/simulation/CGameplayConstants.java | 12 + .../handlers/w3x/simulation/CSimulation.java | 4 + .../handlers/w3x/simulation/CUnit.java | 136 +- .../handlers/w3x/simulation/CUnitType.java | 14 +- .../abilities/generic/CDestructableBuff.java | 2 + .../inventory/CAbilityInventory.java | 147 +- .../CAbilityAbilityBuilderGenericActive.java | 23 + ...ABAbilityTargetStillTargetableVisitor.java | 19 +- .../behavior/CBehaviorAbilityBuilderBase.java | 46 +- .../CBehaviorAbilityBuilderNoTarget.java | 35 +- .../ABActionAbilityAttemptToApplyEffect.java | 11 +- .../ABActionDispelDestructableBuffs.java | 47 + ...ionCreateLoopingSoundEffectAtLocation.java | 26 + .../ABActionCreateSoundEffectAtLocation.java | 26 + ...nCreateUnitTargetedBouncingProjectile.java | 275 +++ .../structural/ABActionChainEffect.java | 168 ++ .../action/unit/ABActionDispelBuffs.java | 6 +- ...allbackGetAbilityTargetedDestructable.java | 17 + .../ABCallbackEnumDestructableBuff.java | 17 + .../ABCallbackMatchingDestructableBuff.java | 17 + .../ABCallbackGetStoredTargetTypeByKey.java | 30 + .../ABCallbackGetTargetTypeFromString.java | 20 + .../ABCallbackRawTargetType.java | 18 + .../ABCallbackRawWeaponType.java | 4 +- .../enumcallbacks/ABTargetTypeCallback.java | 13 + ...backCountBuffsOnUnitMatchingCondition.java | 39 + .../ABCallbackGetThisProjectile.java | 2 +- .../unitcallbacks/ABCallbackGetChainUnit.java | 26 + .../unitcallbacks/ABCallbackGetCompUnit1.java | 2 +- .../unitcallbacks/ABCallbackGetCompUnit2.java | 2 +- .../ABCallbackGetProjectileSourceUnit.java | 21 + ...ConditionIsPassAllAbilityTargetChecks.java | 8 +- ...itionIsUnitPassAllAbilityTargetChecks.java | 3 +- ...ABConditionIsAutoCastCurrentlyActive.java} | 2 +- .../ability/ABConditionWasAutoCast.java | 25 + ...ConditionWasAutoCastPreviouslyActive.java} | 2 +- .../condition/buff/ABConditionIsBuffAlly.java | 23 + .../buff/ABConditionIsBuffEnemy.java | 23 + .../buff/ABConditionIsBuffNegative.java | 21 + .../buff/ABConditionIsBuffPositive.java | 21 + .../ABConditionDoesDestructableHaveBuff.java | 30 + ...DestructableHaveBuffMatchingCondition.java | 35 + .../ABConditionIsDestructableBuffMagic.java | 21 + ...tionGameplayConstantSmartAbolishMagic.java | 16 + .../numeric/ABConditionFloatGt0.java | 20 + .../numeric/ABConditionIntegerGt0.java | 20 + .../unit/ABConditionIsUnitAlive.java | 25 + .../unit/ABConditionIsUnitFriend.java | 45 + .../unit/ABConditionIsUnitSleeping.java | 26 + .../unit/ABConditionIsUnitVisible.java | 43 + .../buff/ABDestructableBuff.java | 14 +- .../buff/ABGenericTimedBuff.java | 2 +- .../abilitybuilder/core/ABLocalStoreKeys.java | 3 + .../core/AbilityBuilderGsonBuilder.java | 45 +- .../iterstructs/ABNearestUnitComparator.java | 14 + .../parser/AbilityBuilderOverrideFields.java | 26 + .../simulation/behaviors/CBehaviorMove.java | 10 +- .../simulation/combat/CBaseDamageFlags.java | 12 + .../w3x/simulation/combat/CDamageFlags.java | 4 + .../w3x/simulation/combat/CTargetType.java | 1 + .../combat/attacks/CUnitAttack.java | 4 +- .../w3x/simulation/data/CAbilityData.java | 4 +- .../w3x/simulation/data/CUnitData.java | 16 +- .../util/SimulationRenderController.java | 2 + 70 files changed, 3517 insertions(+), 190 deletions(-) create mode 100644 core/assets/abilityBehaviors/Dispels.json create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/{ABConditionIsAutoCastOn.java => ABConditionIsAutoCastCurrentlyActive.java} (93%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/{ABConditionWasAutoCastOn.java => ABConditionWasAutoCastPreviouslyActive.java} (93%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABNearestUnitComparator.java diff --git a/core/assets/abilityBehaviors/AttackReplacementActives.json b/core/assets/abilityBehaviors/AttackReplacementActives.json index e6295087c..42cbf63f7 100644 --- a/core/assets/abilityBehaviors/AttackReplacementActives.json +++ b/core/assets/abilityBehaviors/AttackReplacementActives.json @@ -83,7 +83,7 @@ "onChangeAutoCast": [{ "type": "if", "condition": { - "type": "isAutoCastOn" + "type": "isAutoCastCurrentlyActive" }, "thenActions": [{ "type": "addAttackModifier", diff --git a/core/assets/abilityBehaviors/Dispels.json b/core/assets/abilityBehaviors/Dispels.json new file mode 100644 index 000000000..e48f30bc1 --- /dev/null +++ b/core/assets/abilityBehaviors/Dispels.json @@ -0,0 +1,1826 @@ +{ + "abilityList": [{ + "ids": [{"id":"Adis", "castId": "dispel"},{"id":"Adch", "castId": "disenchant"},{"id":"AIdi", "castId": "itemdispelaoe"}], + "type": "NORMAL_POINTTARGET", + "reuseActions": { + "dispelLoc": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "EFFECT" + },{ + "type": "createSoundEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + } + },{ + "type": "iterateUnitsInRangeOfLocationMatchingCondition", + "location": { + "type": "getTargetedLocation" + }, + "range": { + "type": "getAbilityArea" + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + }, + "iterationActions": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getEnumUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + },{ + "type": "if", + "condition": { + "type": "isUnitEnemy", + "unit": { + "type": "getEnumUnit" + } + }, + "thenActions": [{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getEnumUnit" + }, + "onlyDamageSummons": { + "type": "rawBoolean", + "value": "true" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }] + },{ + "type": "if", + "condition": { + "type": "isUnitAlive", + "unit": { + "type": "getEnumUnit" + } + }, + "thenActions": [{ + "type": "if", + "condition": { + "type": "not", + "condition": { + "type": "isUnitMagicImmune", + "unit": { + "type": "getEnumUnit" + } + } + }, + "thenActions": [{ + "type": "subtractMp", + "unit": { + "type": "getEnumUnit" + }, + "amount": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }] + },{ + "type": "dispelBuffs", + "unit": { + "type": "getEnumUnit" + }, + "filter": { + "type": "isBuffMagic", + "buff": { + "type": "enumBuff" + } + } + }] + }] + },{ + "type": "iterateDestructablesInRangeOfLocation", + "location": { + "type": "getTargetedLocation" + }, + "range": { + "type": "getAbilityArea" + }, + "iterationActions": [{ + "type": "if", + "condition": { + "type": "isDestructableValidTarget", + "target": { + "type": "getEnumDestructable" + } + }, + "thenActions": [{ + "type": "dispelDestructableBuffs", + "dest": { + "type": "getEnumDestructable" + }, + "filter": { + "type": "isDestructableBuffMagic", + "buff": { + "type": "enumDestructableBuff" + } + } + }] + }] + }] + }, + "onEndCasting": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "dispelLoc" + } + }] + },{ + "ids": [{"id":"Adtn", "castId": "detonate"}], + "type": "INHERIT", + "parentId": "Adch", + "onEndCasting": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "dispelLoc" + } + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + },{ + "type": "killUnit", + "unit": { + "type": "getCastingUnit" + } + }] + },{ + "ids": [{"id":"Aprg", "castId": "purge"}], + "type": "NORMAL_UNITTARGET", + "overrideFields": { + "dispel": { + "type": "rawBoolean", + "value": "true" + } + }, + "extraTargetConditions": [{ + "type": "or", + "conditions": [{ + "type": "notNull", + "value": { + "type": "getAbilityTargetedUnit" + } + },{ + "type": "and", + "conditions": [{ + "type": "notNull", + "value": { + "type": "getAbilityTargetedDestructable" + } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "doesDestructableHaveBuffMatchingCondition", + "dest": { + "type": "getAbilityTargetedDestructable" + }, + "condition": { + "type": "isDestructableBuffMagic", + "buff": { + "type": "matchingDestructableBuff" + } + } + }, + "reason": "THAT_TREE_IS_NOT_OCCUPIED_BY_AN_OWL" + }] + }] + }], + "reuseActions": { + "purgeUnit": [{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getAbilityTargetedUnit" + }, + "onHitActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "purgeUnitBuffs" + } + }] + }], + "purgeUnitBuffs": [{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getUnitLocation", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + },{ + "type": "if", + "condition": { + "type": "isUnitEnemy", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "thenActions": [{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getAbilityTargetedUnit" + }, + "onlyDamageSummons": { + "type": "rawBoolean", + "value": "true" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + },{ + "type": "if", + "condition": { + "type": "isUnitAlive", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "thenActions": [{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "fMin", + "value1": { + "type": "inlineConditionFloat", + "condition": { + "type": "isUnitHero", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "pass": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + }, + "fail": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + } + } + }, + "thenActions": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "visibilityGroup": { + "type": "id2s", + "value": { + "type": "getAlias" + } + }, + "duration": { + "type": "fMin", + "value1": { + "type": "inlineConditionFloat", + "condition": { + "type": "isUnitHero", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "pass": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + }, + "fail": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + } + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "stateMods": [{ + "type": "getLastCreatedStateModBuff" + }] + },{ + "type": "addBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + },{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + } + }, + "thenActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkSpdAmt" + }, + "valueToStore": { + "type": "inlineConditionFloat", + "condition": { + "type": "i!=0", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + } + }, + "pass": { + "type": "rawFloat", + "value": -1 + }, + "fail": { + "type": "rawFloat", + "value": 0 + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkSpdStep" + }, + "valueToStore": { + "type": "inlineConditionFloat", + "condition": { + "type": "i!=0", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + } + }, + "pass": { + "type": "f/", + "value1": { + "type": "rawFloat", + "value": 1 + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }, + "fail": { + "type": "rawFloat", + "value": 0 + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkSpdDelay" + }, + "valueToStore": { + "type": "inlineConditionFloat", + "condition": { + "type": "i!=0", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + } + }, + "pass": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "atkSpdStep" + } + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + } + }, + "fail": { + "type": "rawFloat", + "value": 999999 + } + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "purge" + }, + "value": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "atkSpdAmt" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkSpdBuff" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "moveAmt" + }, + "valueToStore": { + "type": "inlineConditionFloat", + "condition": { + "type": "i!=0", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "A" + } + }, + "pass": { + "type": "rawFloat", + "value": -1 + }, + "fail": { + "type": "rawFloat", + "value": 0 + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "moveStep" + }, + "valueToStore": { + "type": "inlineConditionFloat", + "condition": { + "type": "i!=0", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "A" + } + }, + "pass": { + "type": "f/", + "value1": { + "type": "rawFloat", + "value": 1 + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }, + "fail": { + "type": "rawFloat", + "value": 0 + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "moveDelay" + }, + "valueToStore": { + "type": "inlineConditionFloat", + "condition": { + "type": "i!=0", + "value": { + "type": "getAbilityDataAsInteger", + "dataField": "A" + } + }, + "pass": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "moveStep" + } + }, + "value2": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + } + }, + "fail": { + "type": "rawFloat", + "value": 999999 + } + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "purge" + }, + "value": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "moveAmt" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "moveBuff" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createTimedTickingBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "visibilityGroup": { + "type": "id2s", + "value": { + "type": "getAlias" + } + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + }, + "stacks": { + "type": "rawBoolean", + "value": "true" + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "magic": { + "type": "rawBoolean", + "value": "false" + }, + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "atkSpdBuff" + } + },{ + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "moveBuff" + } + }], + "onTickActions": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "moveAmt" + }, + "valueToStore": { + "type": "f+", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "moveAmt" + } + }, + "value2": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "moveStep" + } + } + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "moveBuff" + } + }, + "value": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "moveAmt" + } + } + },{ + "type": "recomputeStatBuffsOnUnit", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + } + }], + "delaySeconds": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "moveDelay" + } + }, + "unique": { + "type": "rawString", + "value": "move" + } + },{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "atkSpdAmt" + }, + "valueToStore": { + "type": "f+", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "atkSpdAmt" + } + }, + "value2": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "atkSpdStep" + } + } + } + },{ + "type": "updateNonStackingStatBuff", + "buff": { + "type": "getStoredNonStackingStatBuffByKey", + "key": { + "type": "rawString", + "value": "atkSpdBuff" + } + }, + "value": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "atkSpdAmt" + } + } + },{ + "type": "recomputeStatBuffsOnUnit", + "targetUnit": { + "type": "getBuffedUnit" + }, + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + } + }], + "delaySeconds": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "atkSpdDelay" + } + }, + "unique": { + "type": "rawString", + "value": "atk" + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }] + },{ + "type": "if", + "condition": { + "type": "isUnitAlive", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "thenActions": [{ + "type": "if", + "condition": { + "type": "not", + "condition": { + "type": "isUnitMagicImmune", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + }, + "thenActions": [{ + "type": "subtractMp", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "amount": { + "type": "getAbilityDataAsFloat", + "dataField": "F" + } + }] + },{ + "type": "dispelBuffs", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "filter": { + "type": "isBuffMagic", + "buff": { + "type": "enumBuff" + } + } + }] + }], + "purgeDest": [{ + "type": "dispelDestructableBuffs", + "dest": { + "type": "getAbilityTargetedDestructable" + }, + "filter": { + "type": "isDestructableBuffMagic", + "buff": { + "type": "enumDestructableBuff" + } + } + }] + }, + "onAddDisabledAbility": [{ + "type": "createStateModBuff", + "buffType": "SNARED" + }], + "onEndCasting": [{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getAbilityTargetedUnit" + } + }, + "thenActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "purgeUnit" + } + }], + "elseActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "purgeDest" + } + }] + }] + },{ + "ids": [{"id":"AIlp", "castId": "itemlightningpurge"}], + "type": "INHERIT", + "parentId": "Aprg", + "overrideFields": { + "physicalSpell": { + "type": "rawBoolean", + "value": "false" + }, + "magicSpell": { + "type": "rawBoolean", + "value": "false" + } + }, + "reuseActions": { + "purgeUnit": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "purgeUnitBuffs" + } + }] + } + },{ + "ids": [{"id":"Aadm", "castId": "autodispel", "autoCastOnId": "autodispelon", "autoCastOffId": "autodispeloff", "autoCastType": "NEARESTVALID"}], + "type": "NORMAL_UNITTARGET", + "overrideFields": { + "dispel": { + "type": "rawBoolean", + "value": "true" + } + }, + "extraTargetConditions": [{ + "type": "or", + "conditions": [{ + "type": "notNull", + "value": { + "type": "getAbilityTargetedUnit" + } + },{ + "type": "and", + "conditions": [{ + "type": "notNull", + "value": { + "type": "getAbilityTargetedDestructable" + } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "doesDestructableHaveBuffMatchingCondition", + "dest": { + "type": "getAbilityTargetedDestructable" + }, + "condition": { + "type": "isDestructableBuffMagic", + "buff": { + "type": "matchingDestructableBuff" + } + } + }, + "reason": "THAT_TREE_IS_NOT_OCCUPIED_BY_AN_OWL" + }] + }] + }], + "extraAutoTargetConditions": [{ + "type": "or", + "conditions": [{ + "type": "and", + "conditions": [{ + "type": "isUnitFriend", + "unit": { + "type": "getAbilityTargetedUnit" + } + },{ + "type": "doesUnitHaveBuffMatchingCondition", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "condition": { + "type": "isBuffNegative", + "buff": { + "type": "getMatchingBuff" + } + } + }] + },{ + "type": "and", + "conditions": [{ + "type": "isUnitEnemy", + "unit": { + "type": "getAbilityTargetedUnit" + } + },{ + "type": "doesUnitHaveBuffMatchingCondition", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "condition": { + "type": "isBuffPositive", + "buff": { + "type": "getMatchingBuff" + } + } + }] + }] + }], + "reuseActions": { + "purgeUnit": [{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getAbilityTargetedUnit" + }, + "onHitActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "purgeUnitBuffs" + } + }] + }], + "purgeUnitBuffs": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + },{ + "type": "if", + "condition": { + "type": "isUnitEnemy", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "thenActions": [{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getAbilityTargetedUnit" + }, + "onlyDamageSummons": { + "type": "rawBoolean", + "value": "true" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }] + },{ + "type": "if", + "condition": { + "type": "isUnitAlive", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "thenActions": [{ + "type": "if", + "condition": { + "type": "not", + "condition": { + "type": "isUnitMagicImmune", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + }, + "thenActions": [{ + "type": "subtractMp", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "amount": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }] + },{ + "type": "if", + "condition": { + "type": "and", + "conditions": [{ + "type": "wasAutoCast" + },{ + "type": "gameplayConstantSmartAbolishMagic" + }] + }, + "thenActions": [{ + "type": "if", + "condition": { + "type": "isUnitEnemy", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "thenActions": [{ + "type": "dispelBuffs", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "filter": { + "type": "and", + "conditions": [{ + "type": "isBuffMagic", + "buff": { + "type": "enumBuff" + } + },{ + "type": "isBuffPositive", + "buff": { + "type": "enumBuff" + } + }] + } + }], + "elseActions": [{ + "type": "dispelBuffs", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "filter": { + "type": "and", + "conditions": [{ + "type": "isBuffMagic", + "buff": { + "type": "enumBuff" + } + },{ + "type": "isBuffNegative", + "buff": { + "type": "enumBuff" + } + }] + } + }] + }], + "elseActions": [{ + "type": "dispelBuffs", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "filter": { + "type": "isBuffMagic", + "buff": { + "type": "enumBuff" + } + } + }] + }] + }], + "purgeDest": [{ + "type": "dispelDestructableBuffs", + "dest": { + "type": "getAbilityTargetedDestructable" + }, + "filter": { + "type": "isDestructableBuffMagic", + "buff": { + "type": "enumDestructableBuff" + } + } + }] + }, + "onEndCasting": [{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getAbilityTargetedUnit" + } + }, + "thenActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "purgeUnit" + } + }], + "elseActions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "purgeDest" + } + }] + }] + },{ + "ids": [{"id":"Advm", "castId": "devourmagic"}], + "type": "NORMAL_POINTTARGET", + "reuseActions": { + "healProj": [{ + "type": "if", + "condition": { + "type": "isUnitEqual", + "unit1": { + "type": "getCastingUnit" + }, + "unit2": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "source" + } + } + }, + "thenActions": [{ + "type": "runReuseActionWithArguments", + "name": { + "type": "rawString", + "value": "healEffect" + }, + "arguments": { + "buffCount": { + "type": "argumentFloat", + "name": { + "type": "rawString", + "value": "buffCnt" + } + }, + "unitCount": { + "type": "argumentBoolean", + "name": { + "type": "rawString", + "value": "unitCnt" + } + } + } + }], + "elseActions": [{ + "type": "if", + "condition": { + "type": "or", + "conditions": [{ + "type": "argumentBoolean", + "name": { + "type": "rawString", + "value": "unitCnt" + } + },{ + "type": "f>0", + "value": { + "type": "argumentFloat", + "name": { + "type": "rawString", + "value": "buffCnt" + } + } + }] + }, + "thenActions": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "source" + } + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + },{ + "type": "createUnitTargetedProjectile", + "source": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "source" + } + }, + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "onHit": [{ + "type": "runReuseActionWithArguments", + "name": { + "type": "rawString", + "value": "healEffect" + }, + "arguments": { + "buffCount": { + "type": "getStoredFloatByKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "buffCnt" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getProjectileSourceUnit", + "proj": { + "type": "getThisProjectile" + } + } + }] + } + }, + "unitCount": { + "type": "getStoredBooleanByKey", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "unitCnt" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "getProjectileSourceUnit", + "proj": { + "type": "getThisProjectile" + } + } + }] + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "fired" + }, + "valueToStore": { + "type": "i-", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "fired" + } + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + },{ + "type": "if", + "condition": { + "type": "i=0", + "value": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "fired" + } + } + }, + "thenActions": [{ + "type": "cleanUpCastInstance" + }] + }] + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "buffCnt" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "source" + } + } + }] + }, + "valueToStore": { + "type": "argumentFloat", + "name": { + "type": "rawString", + "value": "buffCnt" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "catStrings", + "stringList": [{ + "type": "rawString", + "value": "unitCnt" + },{ + "type": "getUnitHandleAsString", + "unit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "source" + } + } + }] + }, + "valueToStore": { + "type": "argumentBoolean", + "name": { + "type": "rawString", + "value": "unitCnt" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "fired" + }, + "valueToStore": { + "type": "i+", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "fired" + } + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + }] + }] + }], + "healEffect": [{ + "type": "heal", + "target": { + "type": "getCastingUnit" + }, + "amount": { + "type": "f*", + "value1": { + "type": "argumentFloat", + "name": { + "type": "rawString", + "value": "buffCount" + } + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + },{ + "type": "addMp", + "target": { + "type": "getCastingUnit" + }, + "amount": { + "type": "f*", + "value1": { + "type": "argumentFloat", + "name": { + "type": "rawString", + "value": "buffCount" + } + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + } + } + },{ + "type": "if", + "condition": { + "type": "argumentBoolean", + "name": { + "type": "rawString", + "value": "unitCount" + } + }, + "thenActions": [{ + "type": "heal", + "target": { + "type": "getCastingUnit" + }, + "amount": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "addMp", + "target": { + "type": "getCastingUnit" + }, + "amount": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }] + }] + }, + "onEndCasting": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "fired" + }, + "valueToStore": { + "type": "rawInteger", + "value": 0 + } + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "EFFECT" + },{ + "type": "createSoundEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + } + },{ + "type": "iterateUnitsInRangeOfLocationMatchingCondition", + "location": { + "type": "getTargetedLocation" + }, + "range": { + "type": "getAbilityArea" + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + }, + "iterationActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "buffCnt" + }, + "valueToStore": { + "type": "inlineConditionFloat", + "condition": { + "type": "and", + "conditions": [{ + "type": "isUnitSummoned", + "unit": { + "type": "getEnumUnit" + } + },{ + "type": "isUnitEnemy", + "unit": { + "type": "getEnumUnit" + } + }] + }, + "pass": { + "type": "rawFloat", + "value": 1 + }, + "fail": { + "type": "rawFloat", + "value": 0 + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "allyBuffCnt" + }, + "valueToStore": { + "type": "rawFloat", + "value": 0 + } + },{ + "type": "if", + "condition": { + "type": "isUnitEnemy", + "unit": { + "type": "getEnumUnit" + } + }, + "thenActions": [{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getEnumUnit" + }, + "onlyDamageSummons": { + "type": "rawBoolean", + "value": "true" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + } + }] + },{ + "type": "if", + "condition": { + "type": "isUnitAlive", + "unit": { + "type": "getEnumUnit" + } + }, + "thenActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "buffCnt" + }, + "valueToStore": { + "type": "f+", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "buffCnt" + } + }, + "value2": { + "type": "i2f", + "value": { + "type": "countBuffsOnUnitMatchingCondition", + "unit": { + "type": "getEnumUnit" + }, + "condition": { + "type": "and", + "conditions": [{ + "type": "isBuffMagic", + "buff": { + "type": "getMatchingBuff" + } + },{ + "type": "not", + "condition": { + "type": "isBuffAlly", + "buff": { + "type": "getMatchingBuff" + } + } + }] + } + } + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "allyBuffCnt" + }, + "valueToStore": { + "type": "i2f", + "value": { + "type": "countBuffsOnUnitMatchingCondition", + "unit": { + "type": "getEnumUnit" + }, + "condition": { + "type": "and", + "conditions": [{ + "type": "isBuffMagic", + "buff": { + "type": "getMatchingBuff" + } + },{ + "type": "isBuffAlly", + "buff": { + "type": "getMatchingBuff" + } + }] + } + } + } + },{ + "type": "dispelBuffs", + "unit": { + "type": "getEnumUnit" + }, + "filter": { + "type": "isBuffMagic", + "buff": { + "type": "enumBuff" + } + } + }] + },{ + "type": "runReuseActionWithArguments", + "name": { + "type": "rawString", + "value": "healProj" + }, + "arguments": { + "source": { + "type": "getEnumUnit" + }, + "buffCnt": { + "type": "inlineConditionFloat", + "condition": { + "type": "getAbilityDataAsBoolean", + "dataField": "F" + }, + "pass": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "buffCnt" + } + }, + "fail": { + "type": "f+", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "buffCnt" + } + }, + "value2": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "allyBuffCnt" + } + } + } + }, + "unitCnt": { + "type": "inlineConditionBoolean", + "condition": { + "type": "getAbilityDataAsBoolean", + "dataField": "F" + }, + "pass": { + "type": "f>0", + "value": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "buffCnt" + } + } + }, + "fail": { + "type": "f>0", + "value": { + "type": "f+", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "buffCnt" + } + }, + "value2": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "allyBuffCnt" + } + } + } + } + } + } + }] + },{ + "type": "iterateDestructablesInRangeOfLocation", + "location": { + "type": "getTargetedLocation" + }, + "range": { + "type": "getAbilityArea" + }, + "iterationActions": [{ + "type": "if", + "condition": { + "type": "isDestructableValidTarget", + "target": { + "type": "getEnumDestructable" + } + }, + "thenActions": [{ + "type": "dispelDestructableBuffs", + "dest": { + "type": "getEnumDestructable" + }, + "filter": { + "type": "isDestructableBuffMagic", + "buff": { + "type": "enumDestructableBuff" + } + } + }] + }] + },{ + "type": "if", + "condition": { + "type": "i=0", + "value": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "fired" + } + } + }, + "thenActions": [{ + "type": "cleanUpCastInstance" + }] + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/TerrainDeform.json b/core/assets/abilityBehaviors/TerrainDeform.json index be99e2e67..2d972e55b 100644 --- a/core/assets/abilityBehaviors/TerrainDeform.json +++ b/core/assets/abilityBehaviors/TerrainDeform.json @@ -1998,8 +1998,14 @@ }] }] },{ - "ids": [{"id":"AHtc", "castId": "thunderclap"}], + "ids": [{"id":"AHtc", "castId": "thunderclap"},{"id":"ACtc", "castId": "creepthunderclap"}], "type": "NORMAL_NOTARGET", + "overrideFields": { + "extraTargetsAllowed": [{ + "type": "rawTargetType", + "value": "ENEMIES" + }] + }, "reuseActions": { "setupBuffs": [{ "type": "createNonStackingStatBuff", @@ -2198,9 +2204,12 @@ "type": "getEnumUnit" } },{ - "type": "isUnitEnemy", - "unit": { - "type": "getEnumUnit" + "type": "not", + "condition": { + "type": "isUnitFriend", + "unit": { + "type": "getEnumUnit" + } } }] }, diff --git a/core/assets/abilityBehaviors/neutralHeroUnitActives.json b/core/assets/abilityBehaviors/neutralHeroUnitActives.json index 23067c979..124961f45 100644 --- a/core/assets/abilityBehaviors/neutralHeroUnitActives.json +++ b/core/assets/abilityBehaviors/neutralHeroUnitActives.json @@ -163,6 +163,12 @@ },{ "ids": [{"id":"ANsi", "castId": "silence"}], "type": "NORMAL_POINTTARGET", + "overrideFields": { + "extraTargetsAllowed": [{ + "type": "rawTargetType", + "value": "NOTSELF" + }] + }, "reuseActions": { "setupBuffs": [{ "type": "createNonStackingStatBuff", @@ -325,9 +331,6 @@ "valueToStore": { "type": "getLastCreatedStateModBuff" } - },{ - "type": "addTargetAllowed", - "targetType": "NOTSELF" }], "onEndCasting": [{ "type": "createTemporarySpellEffectAtLocation", @@ -635,16 +638,6 @@ "type": "getLastCreatedBuff" } }] - }], - "onLevelChange": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "setupBuffs" - } - },{ - "type": "addTargetAllowed", - "targetType": "NOTSELF" }] }] } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java index ec17327d3..c2b3fed07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java @@ -2514,7 +2514,8 @@ public CAbilityProjectile createProjectile(final CSimulation cSimulation, final AbilityUI spellDataUI = War3MapViewer.this.abilityDataUI.getUI(spellAlias); final EffectAttachmentUIMissile abilityMissileArt = spellDataUI.getMissileArt(0); final float projectileArc = abilityMissileArt == null ? 0 : abilityMissileArt.getArc(); - final float pSpeed = projectileSpeed == null ? abilityMissileArt.getSpeed() : projectileSpeed; + final float pSpeed = projectileSpeed == null ? abilityMissileArt.getSpeed() + : projectileSpeed; final boolean pHome = homing == null ? abilityMissileArt.isHoming() : homing; final String missileArt = abilityMissileArt == null ? "" : abilityMissileArt.getModelPath(); @@ -2671,7 +2672,8 @@ public CCollisionProjectile createCollisionProjectile(final CSimulation cSimulat final AbilityUI spellDataUI = War3MapViewer.this.abilityDataUI.getUI(spellAlias); final EffectAttachmentUIMissile abilityMissileArt = spellDataUI.getMissileArt(0); final float projectileArc = abilityMissileArt == null ? 0 : abilityMissileArt.getArc(); - final float pSpeed = projectileSpeed == null ? abilityMissileArt.getSpeed() : projectileSpeed; + final float pSpeed = projectileSpeed == null ? abilityMissileArt.getSpeed() + : projectileSpeed; final boolean pHome = homing == null ? abilityMissileArt.isHoming() : homing; final String missileArt = abilityMissileArt == null ? "" : abilityMissileArt.getModelPath(); @@ -2825,18 +2827,23 @@ public SimulationRenderComponentLightning createAbilityLightning( } @Override - public SimulationRenderComponent createStaticUberSplat(final float x, final float y, final War3ID uberId) { + public SimulationRenderComponent createStaticUberSplat(final float x, final float y, + final War3ID uberId) { if (uberId != null) { - final Element uberSplatInfo = War3MapViewer.this.terrain.uberSplatTable.get(uberId.asStringValue()); + final Element uberSplatInfo = War3MapViewer.this.terrain.uberSplatTable + .get(uberId.asStringValue()); if (uberSplatInfo != null) { - String uberSplatTexturePath = uberSplatInfo.getField("Dir") + "\\" + uberSplatInfo.getField("file") + ".blp"; + String uberSplatTexturePath = uberSplatInfo.getField("Dir") + "\\" + + uberSplatInfo.getField("file") + ".blp"; float uberSplatScaleValue = uberSplatInfo.getFieldFloatValue("Scale"); - final SplatMover buildingUberSplatDynamicIngame = War3MapViewer.this.terrain.addUberSplat(uberSplatTexturePath, x, y, - 1, uberSplatScaleValue, false, false, false, false); + final SplatMover buildingUberSplatDynamicIngame = War3MapViewer.this.terrain + .addUberSplat(uberSplatTexturePath, x, y, 1, uberSplatScaleValue, false, + false, false, false); return new SimulationRenderComponent() { @Override public void remove() { - buildingUberSplatDynamicIngame.destroy(Gdx.gl30, War3MapViewer.this.terrain.centerOffset); + buildingUberSplatDynamicIngame.destroy(Gdx.gl30, + War3MapViewer.this.terrain.centerOffset); } }; } @@ -3484,7 +3491,6 @@ public void remove() { @Override public void stopAbilitySoundEffect(final CUnit caster, final War3ID alias) { - final RenderUnit renderPeer = War3MapViewer.this.unitToRenderPeer.get(caster); final AbilityUI abilityUi = War3MapViewer.this.abilityDataUI.getUI(alias); if (abilityUi.getEffectSoundLooped() != null) { // TODO below this probably stops all instances of the sound, which is silly @@ -3493,6 +3499,30 @@ public void stopAbilitySoundEffect(final CUnit caster, final War3ID alias) { } } + @Override + public SimulationRenderComponent spawnAbilitySoundEffect(final float x, float y, + final War3ID alias, final boolean looping) { + final AbilityUI abilityUi = War3MapViewer.this.abilityDataUI.getUI(alias); + final String soundName = looping ? abilityUi.getEffectSoundLooped() + : abilityUi.getEffectSound(); + if ((abilityUi == null) || (soundName == null)) { + return SimulationRenderComponent.DO_NOTHING; + } + final long soundId = War3MapViewer.this.uiSounds.getSound(soundName).play( + War3MapViewer.this.worldScene.audioContext, x, y, + War3MapViewer.this.terrain.getGroundHeight(x, y)); + if (soundId == -1) { + return SimulationRenderComponent.DO_NOTHING; + } + return new SimulationRenderComponent() { + @Override + public void remove() { + War3MapViewer.this.uiSounds.getSound(soundName).stop(soundId); + ; + } + }; + } + @Override public void unitPreferredSelectionReplacement(final CUnit oldUnit, final CUnit newUnit) { final RenderUnit oldRenderPeer = War3MapViewer.this.unitToRenderPeer.get(oldUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java index ba59f314b..6a70e8ef0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java @@ -239,6 +239,10 @@ public void remove(final CSimulation simulation, final CDestructableBuff buff) { this.buffs.remove(buff); buff.onRemove(simulation, this); } + + public List getBuffs() { + return this.buffs; + } public void onRemove(CSimulation cSimulation) { if (this.pathingInstance != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java index 44e5a2d11..4f173f57a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CGameplayConstants.java @@ -42,6 +42,8 @@ public class CGameplayConstants { private final float frostAttackSpeedDecrease; private final float frostMoveSpeedDecrease; + private final boolean allowMultiBounce; + private final boolean abolishMagicSmartDispel; private final boolean invulnerableSummonsTakeDispelDamage; private final boolean magicImmuneResistsDamage; private final boolean magicImmuneResistsLeech; @@ -224,6 +226,8 @@ public CGameplayConstants(final DataTable parsedDataTable) { this.frostAttackSpeedDecrease = miscData.getFieldFloatValue("FrostAttackSpeedDecrease"); this.frostMoveSpeedDecrease = miscData.getFieldFloatValue("FrostMoveSpeedDecrease"); + this.allowMultiBounce = miscData.getFieldValue("AllowMultiBounce") != 0; + this.abolishMagicSmartDispel = miscData.getFieldValue("AbolishMagicDispelSmart") != 0; this.invulnerableSummonsTakeDispelDamage = miscData.getFieldValue("InvulnSummonDispelDamage") != 0; this.magicImmuneResistsDamage = miscData.getFieldValue("MagicImmunesResistDamage") != 0; this.magicImmuneResistsLeech = miscData.getFieldValue("MagicImmunesResistLeech") != 0; @@ -426,6 +430,14 @@ public float getFrostMoveSpeedDecrease() { return frostMoveSpeedDecrease; } + public boolean isAllowMultiBounce() { + return allowMultiBounce; + } + + public boolean isAbolishMagicSmartDispel() { + return abolishMagicSmartDispel; + } + public boolean isInvulnerableSummonsTakeDispelDamage() { return invulnerableSummonsTakeDispelDamage; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java index 7a30a7285..c4d869bea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java @@ -878,6 +878,10 @@ public void unitStopSoundEffectEvent(final CUnit caster, final War3ID alias) { this.simulationRenderController.stopAbilitySoundEffect(caster, alias); } + public SimulationRenderComponent locationSoundEffectEvent(final float x, final float y, final War3ID alias, final boolean looping) { + return this.simulationRenderController.spawnAbilitySoundEffect(x, y, alias, looping); + } + public void unitPreferredSelectionReplacement(final CUnit unit, final CUnit newUnit) { this.simulationRenderController.unitPreferredSelectionReplacement(unit, newUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index d508aa046..3eeb7ca20 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -162,7 +162,10 @@ public class CUnit extends CWidget { private float manaRegenBonus; private int baseMaximumMana; private int maximumMana; - private int speed; + private int maxSpeed; + private int minSpeed; + private int baseSpeed; + private int finalSpeed; private int agilityDefensePermanentBonus; private float agilityDefenseTemporaryBonus; private int permanentDefenseBonus; @@ -245,6 +248,7 @@ public class CUnit extends CWidget { private boolean acceptingOrders = true; private boolean invulnerable = false; private boolean magicImmune = false; + private boolean limitedMagicImmune = false; private boolean morphImmune = false; private boolean resistant = false; private boolean autoAttack = true; @@ -318,7 +322,7 @@ public class CUnit extends CWidget { public CUnit(final int handleId, final int playerIndex, final float x, final float y, final float life, final War3ID typeId, final float facing, final float mana, final int maximumLife, final float lifeRegen, - final int maximumMana, final int speed, final CUnitType unitType) { + final int maximumMana, final int speed, final int maxSpeed, final int minSpeed, final CUnitType unitType) { super(handleId, x, y, life); this.playerIndex = playerIndex; this.typeId = typeId; @@ -330,7 +334,9 @@ public CUnit(final int handleId, final int playerIndex, final float x, final flo this.manaRegen = unitType.getManaRegen(); this.baseMaximumMana = maximumMana; this.maximumMana = maximumMana; - this.speed = speed; + this.maxSpeed = maxSpeed; + this.minSpeed = minSpeed; + this.baseSpeed = speed; this.flyHeight = unitType.getDefaultFlyingHeight(); this.turnRate = unitType.getTurnRate(); this.propWindow = unitType.getPropWindow(); @@ -1084,7 +1090,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1103,7 +1110,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1131,7 +1139,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1150,7 +1159,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1169,7 +1179,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1195,7 +1206,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1214,7 +1226,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1234,7 +1247,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1259,7 +1273,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1278,16 +1293,18 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } if (buffForKey == null) { continue; } - totalNSMvSpdBuff += buffForKey * this.speed; + totalNSMvSpdBuff += buffForKey * this.baseSpeed; } this.speedBonus = Math.round(totalNSMvSpdBuff); + this.computeFinalSpeed(); break; case MELEEATK: case MELEEATKPCT: @@ -1341,7 +1358,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1367,7 +1385,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1395,7 +1414,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1423,7 +1443,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1452,7 +1473,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1471,7 +1493,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1502,7 +1525,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1521,7 +1545,8 @@ public void computeDerivedFields(final NonStackingStatBuffType type) { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1568,7 +1593,8 @@ public void computeDerivedHeroFields(final CSimulation game, final NonStackingSt if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1587,7 +1613,8 @@ public void computeDerivedHeroFields(final CSimulation game, final NonStackingSt if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1613,7 +1640,8 @@ public void computeDerivedHeroFields(final CSimulation game, final NonStackingSt if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1632,7 +1660,8 @@ public void computeDerivedHeroFields(final CSimulation game, final NonStackingSt if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1658,7 +1687,8 @@ public void computeDerivedHeroFields(final CSimulation game, final NonStackingSt if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -1677,7 +1707,8 @@ public void computeDerivedHeroFields(final CSimulation game, final NonStackingSt if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey + : buff.getValue(); } } } @@ -2070,7 +2101,15 @@ public void setTypeId(final CSimulation game, final War3ID typeId, final boolean } this.turnRate = this.unitType.getTurnRate(); this.propWindow = this.unitType.getPropWindow(); - this.speed = this.unitType.getSpeed(); + this.maxSpeed = this.unitType.getMaxSpeed(); + if (maxSpeed == 0) { + this.maxSpeed = (int) game.getGameplayConstants().getMaxUnitSpeed(); + } + this.minSpeed = this.unitType.getMinSpeed(); + if (minSpeed == 0) { + this.minSpeed = (int) game.getGameplayConstants().getMinUnitSpeed(); + } + this.baseSpeed = this.unitType.getSpeed(); this.classifications.removeAll(previousUnitType.getClassifications()); this.classifications.addAll(this.unitType.getClassifications()); this.targetedAs.removeAll(previousUnitType.getTargetedAs()); @@ -2104,7 +2143,7 @@ public void setTypeId(final CSimulation game, final War3ID typeId, final boolean } game.unitUpdatedType(this, typeId); game.getUnitData().addMissingDefaultAbilitiesToUnit(game, game.getHandleIdAllocator(), this.unitType, false, -1, - this.speed, this); + this.baseSpeed, this); { // Remove and add the persisted abilities, so that some stuff like move and // attack are "first" in the end resulting list. This is "dumb" and a better @@ -2177,12 +2216,16 @@ public void setMaximumMana(final int maximumMana) { } public void setSpeed(final int speed) { - this.speed = speed; + this.baseSpeed = speed; computeDerivedFields(NonStackingStatBuffType.MVSPD); } + private void computeFinalSpeed() { + this.finalSpeed = Math.max(Math.min(this.baseSpeed + this.speedBonus, this.maxSpeed), this.minSpeed); + } + public int getSpeed() { - return this.speed + this.speedBonus; + return this.moveDisabled ? 0 : this.finalSpeed; } /** @@ -2849,7 +2892,7 @@ public Boolean accept(final AbilityPointTarget target) { public Boolean acceptWidget(final CWidget target) { final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - ability.checkCanTarget(simulation, CUnit.this, orderId, false, target, + ability.checkCanTarget(simulation, CUnit.this, orderId, autoOrder, target, booleanTargetReceiver); final boolean widgetTargetable = booleanTargetReceiver.isTargetable(); if (widgetTargetable) { @@ -3237,7 +3280,7 @@ public boolean isImmuneToDamage(final CSimulation simulation, final CDamageFlags } if (simulation.getGameplayConstants().isMagicImmuneResistsDamage()) { if (attackType.isMagic() || damageType.isMagic()) { - if (this.isMagicImmune()) { + if (this.isMagicImmune() || (this.isLimitedMagicImmune() && !flags.isPassLimitedMagicImmune())) { return true; } } else if (attackType.isPhysical() || damageType.isPhysical()) { @@ -3246,7 +3289,8 @@ public boolean isImmuneToDamage(final CSimulation simulation, final CDamageFlags } } } else { - if (damageType.isOldMagic() && this.isMagicImmune()) { + if (damageType.isOldMagic() + && (this.isMagicImmune() || (this.isLimitedMagicImmune() && !flags.isPassLimitedMagicImmune()))) { return true; } } @@ -3272,10 +3316,9 @@ public float damage(final CSimulation simulation, final CUnit source, final CDam return 0; } float trueDamage = 0; - if (!this.invulnerable || flags.isIgnoreInvulnerable() - || (flags != null && flags.isOnlyDamageSummons() - && simulation.getGameplayConstants().isInvulnerableSummonsTakeDispelDamage() - && this.isUnitType(CUnitTypeJass.SUMMONED))) { + if (!this.invulnerable || (flags != null && (flags.isIgnoreInvulnerable() || (flags.isOnlyDamageSummons() + && simulation.getGameplayConstants().isInvulnerableSummonsTakeDispelDamage() + && this.isUnitType(CUnitTypeJass.SUMMONED))))) { final CUnitAttackDamageTakenModificationListenerDamageModResult result = new CUnitAttackDamageTakenModificationListenerDamageModResult( damage, bonusDamage); @@ -3682,6 +3725,11 @@ public boolean canBeTargetedBy(final CSimulation simulation, final CUnit source, receiver.targetCheckFailed(CommandStringErrorKeys.THAT_UNIT_IS_IMMUNE_TO_MAGIC); return false; } + if (isLimitedMagicImmune() && targetsAllowed.contains(CTargetType.NON_MAGIC_IMMUNE) + && !targetsAllowed.contains(CTargetType.LIMITED_MAGIC_IMMUNE)) { + receiver.targetCheckFailed(CommandStringErrorKeys.THAT_UNIT_IS_IMMUNE_TO_MAGIC); + return false; + } if (targeted && (!isVisible(simulation, source.getPlayerIndex()) || (this.untargetablePlayers & (1 << source.getPlayerIndex())) != 0)) { receiver.targetCheckFailed(CommandStringErrorKeys.MUST_TARGET_A_UNIT_WITH_THIS_ACTION); @@ -5094,7 +5142,7 @@ public boolean isUnitType(final CUnitTypeJass whichUnitType) { } return isEthereal; case MAGIC_IMMUNE: - return isMagicImmune(); + return isMagicImmune() || isLimitedMagicImmune(); } return false; } @@ -5986,6 +6034,14 @@ public boolean isMagicImmune() { return this.magicImmune; } + public void setLimitedMagicImmune(final boolean limitedMagicImmune) { + this.limitedMagicImmune = limitedMagicImmune; + } + + public boolean isLimitedMagicImmune() { + return this.limitedMagicImmune; + } + public boolean isFalseDeath() { return this.falseDeath; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitType.java index 5fd870cd3..f92d88c4a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitType.java @@ -33,6 +33,8 @@ public class CUnitType { private final int manaInitial; private final int manaMaximum; private final int speed; + private final int maxSpeed; + private final int minSpeed; private final int defense; private final War3ID defaultAutocastAbility; private final List abilityList; @@ -113,7 +115,7 @@ public class CUnitType { public CUnitType(final String name, final String legacyName, final War3ID typeId, final int maxLife, final float lifeRegen, final float manaRegen, final CRegenType lifeRegenType, final int manaInitial, - final int manaMaximum, final int speed, final int defense, final War3ID defaultAutocastAbility, + final int manaMaximum, final int speed, final int maxSpeed, final int minSpeed, final int defense, final War3ID defaultAutocastAbility, final List abilityList, final boolean isBldg, final MovementType movementType, final float defaultFlyingHeight, final float collisionSize, final EnumSet classifications, final List attacks, @@ -148,6 +150,8 @@ public CUnitType(final String name, final String legacyName, final War3ID typeId this.manaInitial = manaInitial; this.manaMaximum = manaMaximum; this.speed = speed; + this.maxSpeed = maxSpeed; + this.minSpeed = minSpeed; this.defense = defense; this.defaultAutocastAbility = defaultAutocastAbility; this.abilityList = abilityList; @@ -264,6 +268,14 @@ public int getSpeed() { return this.speed; } + public int getMaxSpeed() { + return this.maxSpeed; + } + + public int getMinSpeed() { + return this.minSpeed; + } + public int getDefense() { return this.defense; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java index d2170ef1b..78d09615d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/generic/CDestructableBuff.java @@ -25,6 +25,8 @@ public interface CDestructableBuff extends CHandle, Aliased { boolean isPositive(); boolean isHero(); + + boolean isMagic(); boolean isPhysical(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/inventory/CAbilityInventory.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/inventory/CAbilityInventory.java index eefebaae2..18c13522d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/inventory/CAbilityInventory.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/inventory/CAbilityInventory.java @@ -28,8 +28,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.ExternStringMsgAbilityActivationReceiver; public class CAbilityInventory extends AbstractGenericNoIconAbility { private final boolean canDropItems; @@ -79,8 +81,8 @@ public void onTick(final CSimulation game, final CUnit unit) { } @Override - public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - boolean autoOrder, final AbilityTarget target) { + public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, + final AbilityTarget target) { if ((orderId >= OrderIds.itemdrag00) && (orderId <= OrderIds.itemdrag05)) { for (int i = 0; i < this.itemsHeld.length; i++) { if (this.itemsHeld[i] == target) { @@ -94,8 +96,7 @@ public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, fina return false; } } - } - else if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { + } else if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { final int slot = orderId - OrderIds.itemuse00; final List itemsHeldAbilitiesForSlot = this.itemsHeldAbilities[slot]; if (!itemsHeldAbilitiesForSlot.isEmpty()) { @@ -157,7 +158,8 @@ public boolean isDropItemsOnDeath() { } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final CWidget target) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, + final CWidget target) { if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { final int slot = orderId - OrderIds.itemuse00; final List itemsHeldAbilitiesForSlot = this.itemsHeldAbilities[slot]; @@ -191,8 +193,8 @@ public CBehavior beginDropItem(final CSimulation game, final CUnit caster, final } @Override - public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, - boolean autoOrder, final AbilityPointTarget point) { + public CBehavior begin(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, + final AbilityPointTarget point) { if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { final int slot = orderId - OrderIds.itemuse00; final List itemsHeldAbilitiesForSlot = this.itemsHeldAbilities[slot]; @@ -240,57 +242,46 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o final CItem targetItem = (CItem) target; if (!targetItem.isHidden()) { receiver.targetOk(target); - } - else { + } else { receiver.orderIdNotAccepted(); } } else { receiver.targetCheckFailed(CommandStringErrorKeys.UNABLE_TO_PICK_UP_THIS_ITEM); } - } - else { + } else { receiver.orderIdNotAccepted(); } - } - else { + } else { if ((orderId >= OrderIds.itemdrag00) && (orderId <= OrderIds.itemdrag05)) { if (target instanceof CItem) { final int slot = getSlot((CItem) target); if (slot != -1) { receiver.targetOk(target); - } - else { + } else { receiver.orderIdNotAccepted(); } - } - else { + } else { receiver.orderIdNotAccepted(); } - } - else if (orderId == OrderIds.dropitem) { + } else if (orderId == OrderIds.dropitem) { if (target instanceof CUnit) { final CUnit hero = (CUnit) target; if (game.getPlayer(hero.getPlayerIndex()).hasAlliance(unit.getPlayerIndex(), CAllianceType.PASSIVE) && (hero != unit)) { if (hero.getInventoryData() != null) { receiver.targetOk(target); - } - else if (hero.getFirstAbilityOfType(CAbilityShopPurhaseItem.class) != null) { + } else if (hero.getFirstAbilityOfType(CAbilityShopPurhaseItem.class) != null) { receiver.targetOk(target); - } - else { + } else { receiver.orderIdNotAccepted(); } - } - else { + } else { receiver.orderIdNotAccepted(); } - } - else { + } else { receiver.orderIdNotAccepted(); } - } - else { + } else { if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { final int slot = orderId - OrderIds.itemuse00; final List itemsHeldAbilitiesForSlot = this.itemsHeldAbilities[slot]; @@ -301,12 +292,10 @@ else if (hero.getFirstAbilityOfType(CAbilityShopPurhaseItem.class) != null) { forwardedOrderId = ((SingleOrderAbility) ability).getBaseOrderId(); } ability.checkCanTarget(game, unit, forwardedOrderId, false, target, receiver); - } - else { + } else { receiver.orderIdNotAccepted(); } - } - else { + } else { receiver.orderIdNotAccepted(); } } @@ -324,8 +313,8 @@ public int getSlot(final CItem target) { } @Override - public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, - boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { if (orderId != OrderIds.dropitem) { if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { final int slot = orderId - OrderIds.itemuse00; @@ -337,23 +326,20 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o forwardedOrderId = ((SingleOrderAbility) ability).getBaseOrderId(); } ability.checkCanTarget(game, unit, forwardedOrderId, false, target, receiver); - } - else { + } else { receiver.orderIdNotAccepted(); } - } - else { + } else { receiver.orderIdNotAccepted(); } - } - else { + } else { receiver.targetOk(target); } } @Override - public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, - boolean autoOrder, final AbilityTargetCheckReceiver receiver) { + public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, + final AbilityTargetCheckReceiver receiver) { if ((orderId >= OrderIds.itemuse00) && (orderId <= OrderIds.itemuse05)) { final int slot = orderId - OrderIds.itemuse00; final List itemsHeldAbilitiesForSlot = this.itemsHeldAbilities[slot]; @@ -364,12 +350,10 @@ public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, fin forwardedOrderId = ((SingleOrderAbility) ability).getBaseOrderId(); } ability.checkCanTargetNoTarget(game, unit, forwardedOrderId, false, receiver); - } - else { + } else { receiver.orderIdNotAccepted(); } - } - else { + } else { receiver.orderIdNotAccepted(); } } @@ -382,8 +366,7 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final final int slot = orderId - OrderIds.itemuse00; if (this.itemsHeldAbilities[slot].size() < 1) { receiver.notAnActiveAbility(); - } - else { + } else { final List itemsHeldAbilitiesForSlot = this.itemsHeldAbilities[slot]; if (!itemsHeldAbilitiesForSlot.isEmpty()) { final CAbility ability = itemsHeldAbilitiesForSlot.get(0); @@ -392,17 +375,14 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final forwardedOrderId = ((SingleOrderAbility) ability).getBaseOrderId(); } ability.checkCanUse(game, unit, forwardedOrderId, false, receiver); - } - else { + } else { receiver.notAnActiveAbility(); } } - } - else { + } else { receiver.activationCheckFailed(CommandStringErrorKeys.UNABLE_TO_USE_THIS_ITEM); } - } - else if(orderId == OrderIds.dropitem && !this.canDropItems) { + } else if (orderId == OrderIds.dropitem && !this.canDropItems) { receiver.activationCheckFailed(CommandStringErrorKeys.UNABLE_TO_DROP_THIS_ITEM); } else { receiver.useOk(); @@ -427,7 +407,7 @@ public int giveItem(final CSimulation simulation, final CUnit hero, final CItem final CItemType itemType = item.getItemType(); if (this.canUseItems && itemType.isUseAutomaticallyWhenAcquired()) { if (itemType.isActivelyUsed()) { - item.setLife(simulation, 0); + // TODO when we give unit ability here, then use ability final List addedAbilities = new ArrayList<>(); for (final War3ID abilityId : item.getItemType().getAbilityList()) { @@ -441,24 +421,39 @@ public int giveItem(final CSimulation simulation, final CUnit hero, final CItem if (abilityFromItem instanceof SingleOrderAbility) { final int baseOrderId = ((SingleOrderAbility) abilityFromItem).getBaseOrderId(); - final BooleanAbilityTargetCheckReceiver booleanUnitTargetReceiver = BooleanAbilityTargetCheckReceiver - .getInstance().reset(); - abilityFromItem.checkCanTarget(simulation, hero, baseOrderId, false, hero, booleanUnitTargetReceiver); - if (booleanUnitTargetReceiver.isTargetable()) { - hero.order(simulation, - new COrderTargetWidget(abilityFromItem.getHandleId(), baseOrderId, hero.getHandleId(), false), false); - - } else { - final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver - .getInstance().reset(); - AbilityPointTarget tar = new AbilityPointTarget(hero.getX(), hero.getY()); - abilityFromItem.checkCanTarget(simulation, hero, baseOrderId, false, tar, booleanTargetReceiver); - - if (booleanTargetReceiver.isTargetable()) {hero.order(simulation, - new COrderTargetPoint(abilityFromItem.getHandleId(), baseOrderId, tar, false), false); + ExternStringMsgAbilityActivationReceiver act = ExternStringMsgAbilityActivationReceiver.INSTANCE; + act.reset(); + abilityFromItem.checkCanUse(simulation, hero, baseOrderId, false, act); + if (act.isUseOk()) { + item.setLife(simulation, 0); + final BooleanAbilityTargetCheckReceiver booleanUnitTargetReceiver = BooleanAbilityTargetCheckReceiver + .getInstance().reset(); + abilityFromItem.checkCanTarget(simulation, hero, baseOrderId, false, hero, + booleanUnitTargetReceiver); + if (booleanUnitTargetReceiver.isTargetable()) { + hero.order(simulation, new COrderTargetWidget(abilityFromItem.getHandleId(), + baseOrderId, hero.getHandleId(), false), false); + } else { - hero.order(simulation, - new COrderNoTarget(abilityFromItem.getHandleId(), baseOrderId, false), false); + final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver + .getInstance().reset(); + AbilityPointTarget tar = new AbilityPointTarget(hero.getX(), hero.getY()); + abilityFromItem.checkCanTarget(simulation, hero, baseOrderId, false, tar, + booleanTargetReceiver); + + if (booleanTargetReceiver.isTargetable()) { + hero.order(simulation, new COrderTargetPoint(abilityFromItem.getHandleId(), + baseOrderId, tar, false), false); + } else { + hero.order(simulation, new COrderNoTarget(abilityFromItem.getHandleId(), + baseOrderId, false), false); + } + } + } + else { + final String externStringKey = act.getExternStringKey(); + if ((externStringKey != null) && !externStringKey.isEmpty()) { + simulation.getCommandErrorListener().showInterfaceError(hero.getPlayerIndex(), externStringKey); } } } @@ -470,8 +465,7 @@ public int giveItem(final CSimulation simulation, final CUnit hero, final CItem hero.remove(simulation, ability); } } - } - else { + } else { for (int i = 0; i < this.itemsHeld.length; i++) { final int itemIndex = (i + slotPreference) % this.itemsHeld.length; if (this.itemsHeld[itemIndex] == null) { @@ -497,7 +491,8 @@ public int giveItem(final CSimulation simulation, final CUnit hero, final CItem } } if (playUserUISounds) { - simulation.getCommandErrorListener().showInterfaceError(hero.getPlayerIndex(), CommandStringErrorKeys.INVENTORY_IS_FULL); + simulation.getCommandErrorListener().showInterfaceError(hero.getPlayerIndex(), + CommandStringErrorKeys.INVENTORY_IS_FULL); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index 964ec4c6e..ca0a654be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -31,6 +31,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABTargetTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -89,6 +90,7 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri private War3ID onTooltipOverride = null; private War3ID offTooltipOverride = null; private EnumSet targetsAllowed; + private boolean dispel = false; private boolean physical = false; private boolean magic = true; private boolean universal = false; @@ -328,6 +330,9 @@ protected void setSpellFields(CSimulation game, CUnit unit) { if (this.config.getOverrideFields().getMagicSpell() != null) { this.magic = this.config.getOverrideFields().getMagicSpell().callback(game, unit, localStore, castId); } + if (this.config.getOverrideFields().getDispel() != null) { + this.dispel = this.config.getOverrideFields().getDispel().callback(game, unit, localStore, castId); + } if (this.config.getOverrideFields().getUniversalSpell() != null) { this.universal = this.config.getOverrideFields().getUniversalSpell().callback(game, unit, localStore, castId); @@ -340,11 +345,25 @@ protected void setSpellFields(CSimulation game, CUnit unit) { if ((requiredLevel < 6 || game.getGameplayConstants().isMagicImmuneResistsUltimates()) && !isPhysical() && !isUniversal()) { this.targetsAllowed.add(CTargetType.NON_MAGIC_IMMUNE); + if (isDispel()) { + this.targetsAllowed.add(CTargetType.LIMITED_MAGIC_IMMUNE); + } } if (isPhysical() && !isUniversal()) { this.targetsAllowed.add(CTargetType.NON_ETHEREAL); } + if (this.config.getOverrideFields() != null && this.config.getOverrideFields().getExtraTargetsAllowed() != null) { + for(ABTargetTypeCallback target : this.config.getOverrideFields().getExtraTargetsAllowed()) { + this.targetsAllowed.add(target.callback(game, unit, localStore, requiredLevel)); + } + } + if (this.config.getOverrideFields() != null && this.config.getOverrideFields().getExcludedTargetsAllowed() != null) { + for(ABTargetTypeCallback target : this.config.getOverrideFields().getExcludedTargetsAllowed()) { + this.targetsAllowed.remove(target.callback(game, unit, localStore, requiredLevel)); + } + } + if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getHideAreaCursor() != null) { this.hideAreaCursor = this.config.getDisplayFields().getHideAreaCursor().callback(game, unit, localStore, castId); @@ -1236,6 +1255,10 @@ public boolean isRequirementsMet(CSimulation game, CUnit unit) { return requirementsMet; } + public boolean isDispel() { + return dispel; + } + @Override public boolean isPhysical() { return physical; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABAbilityTargetStillTargetableVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABAbilityTargetStillTargetableVisitor.java index 235122f6e..cdc2f3530 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABAbilityTargetStillTargetableVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABAbilityTargetStillTargetableVisitor.java @@ -10,24 +10,27 @@ public final class ABAbilityTargetStillTargetableVisitor implements AbilityTarge private CSimulation simulation; private CUnit unit; private AbilityBuilderActiveAbility ability; + private boolean autoOrder; private boolean channeling; private int orderId; public ABAbilityTargetStillTargetableVisitor reset(final CSimulation simulation, final CUnit unit, - final AbilityBuilderActiveAbility ability, boolean channeling) { + final AbilityBuilderActiveAbility ability, boolean autoOrder, boolean channeling) { this.simulation = simulation; this.unit = unit; this.ability = ability; + this.autoOrder = autoOrder; this.channeling = channeling; this.orderId = this.ability.getBaseOrderId(); return this; } public ABAbilityTargetStillTargetableVisitor reset(final CSimulation simulation, final CUnit unit, - final AbilityBuilderActiveAbility ability, boolean channeling, int orderId) { + final AbilityBuilderActiveAbility ability, boolean autoOrder, boolean channeling, int orderId) { this.simulation = simulation; this.unit = unit; this.ability = ability; + this.autoOrder = autoOrder; this.channeling = channeling; this.orderId = orderId; return this; @@ -44,9 +47,8 @@ public Boolean accept(final CUnit target) { return !target.isHidden(); } BooleanAbilityTargetCheckReceiver receiver = new BooleanAbilityTargetCheckReceiver<>(); - ability.checkCanTarget(simulation, unit, this.orderId, false, target, receiver); - return !target.isHidden() - && receiver.isTargetable(); + ability.checkCanTarget(simulation, unit, this.orderId, this.autoOrder, target, receiver); + return !target.isHidden() && receiver.isTargetable(); } @Override @@ -55,7 +57,7 @@ public Boolean accept(final CDestructable target) { return !target.isDead(); } BooleanAbilityTargetCheckReceiver receiver = new BooleanAbilityTargetCheckReceiver<>(); - ability.checkCanTarget(simulation, unit, this.orderId, false, target, receiver); + ability.checkCanTarget(simulation, unit, this.orderId, this.autoOrder, target, receiver); return !target.isDead() && receiver.isTargetable(); } @@ -65,9 +67,8 @@ public Boolean accept(final CItem target) { return !target.isDead() && !target.isHidden(); } BooleanAbilityTargetCheckReceiver receiver = new BooleanAbilityTargetCheckReceiver<>(); - ability.checkCanTarget(simulation, unit, this.orderId, false, target, receiver); - return !target.isDead() && !target.isHidden() - && receiver.isTargetable(); + ability.checkCanTarget(simulation, unit, this.orderId, this.autoOrder, target, receiver); + return !target.isDead() && !target.isHidden() && receiver.isTargetable(); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java index 4b928bfd8..2665e8a91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java @@ -44,6 +44,7 @@ public class CBehaviorAbilityBuilderBase extends CAbstractRangedBehavior impleme private boolean instant = false; private CBehaviorCategory behaviorCategory = null; private EnumSet channelTags; + private boolean firstAnimation; public CBehaviorAbilityBuilderBase(final CUnit unit, final Map localStore, AbilityBuilderActiveAbility ability) { @@ -75,6 +76,7 @@ public CBehavior reset(final CSimulation game, final CWidget target, final boole this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = this.ability.getBaseOrderId(); this.preventReInterrupt = false; + this.firstAnimation = true; this.autoOrder = autoOrder; this.channelTags = this.ability.getCastingSecondaryTags().clone(); @@ -95,6 +97,7 @@ public CBehavior reset(final CSimulation game, final CWidget target, int orderId this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = orderId; this.preventReInterrupt = false; + this.firstAnimation = true; this.autoOrder = autoOrder; this.channelTags = this.ability.getCastingSecondaryTags().clone(); @@ -115,6 +118,7 @@ public CBehavior reset(final CSimulation game, final AbilityPointTarget target, this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = this.ability.getBaseOrderId(); this.preventReInterrupt = false; + this.firstAnimation = true; this.autoOrder = autoOrder; this.channelTags = this.ability.getCastingSecondaryTags().clone(); @@ -136,6 +140,7 @@ public CBehavior reset(final CSimulation game, final AbilityPointTarget target, this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = orderId; this.preventReInterrupt = false; + this.firstAnimation = true; this.autoOrder = autoOrder; this.channelTags = this.ability.getCastingSecondaryTags().clone(); @@ -160,7 +165,8 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { this.castStartTick = game.getGameTurnTick(); this.castBehaviorNotifyTick = (int) (this.castStartTick + 0.5 / WarsmashConstants.SIMULATION_STEP_TIME); - if (!this.target.visit(this.preCastTargetableVisitor.reset(game, this.unit, ability, false, orderId))) { + if (!this.target.visit( + this.preCastTargetableVisitor.reset(game, this.unit, ability, this.autoOrder, false, orderId))) { cleanupInputs(); return this.unit.pollNextOrderBehavior(game); } @@ -248,8 +254,9 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); if (!this.channeling) { - this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), - this.ability.getCastingSecondaryTags(), 1.0f, true); + this.unit.getUnitAnimationListener().playAnimation(this.firstAnimation, + this.ability.getCastingPrimaryTag(), this.ability.getCastingSecondaryTags(), 1.0f, true); + this.firstAnimation = false; this.unit.getUnitAnimationListener().queueAnimation(PrimaryTag.STAND, SequenceUtils.EMPTY, true); } this.doneCastTime = true; @@ -326,6 +333,35 @@ private CBehavior tryDoEffect(CSimulation game, boolean wasChanneling) { @Override public void begin(final CSimulation game) { + if (ability.getItem() != null && ability.getItem().getItemType().isActivelyUsed()) { + // This is for runes/glyphs that use on pickup. We will never see an update loop + // for these + + if (!this.unit.chargeMana(this.ability.getChargedManaCost())) { + cleanupInputs(); + this.unit.beginBehavior(game, this.unit.pollNextOrderBehavior(game)); + return; + } + this.ability.startCooldown(game, this.unit); + + this.ability.runBeginCastingActions(game, unit, orderId); + + CBehavior beh = tryDoEffect(game, false); + if (beh != null) { + cleanupInputs(); + this.unit.beginBehavior(game, beh); + return; + } + CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + if (newBehavior != null) { + localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); + this.unit.beginBehavior(game, newBehavior); + return; + } + + cleanupInputs(); + this.unit.beginBehavior(game, this.unit.pollNextOrderBehavior(game)); + } } public boolean doChannelTick(CSimulation game, CUnit caster, AbilityTarget target) { @@ -390,8 +426,8 @@ protected CBehavior updateOnInvalidTarget(CSimulation simulation) { @Override protected boolean checkTargetStillValid(CSimulation simulation) { - return this.doneEffect || this.target.visit( - this.preCastTargetableVisitor.reset(simulation, this.unit, this.ability, this.channeling, orderId)); + return this.doneEffect || this.target.visit(this.preCastTargetableVisitor.reset(simulation, this.unit, + this.ability, this.autoOrder, this.channeling, orderId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java index c1e2aebfe..8f47b1263 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java @@ -40,6 +40,7 @@ public class CBehaviorAbilityBuilderNoTarget implements ABBehavior { private CBehaviorCategory behaviorCategory = null; private int castId = 0; private EnumSet channelTags; + private boolean firstAnimation; public CBehaviorAbilityBuilderNoTarget(final CUnit unit, final Map localStore, AbilityBuilderActiveAbility ability) { @@ -89,6 +90,7 @@ public ABBehavior reset(final boolean autoOrder) { + (int) (this.unit.getUnitType().getCastBackswingPoint() / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = this.ability.getBaseOrderId(); + this.firstAnimation = true; this.autoOrder = autoOrder; this.channelTags = this.ability.getCastingSecondaryTags().clone(); @@ -109,6 +111,7 @@ public ABBehavior reset(int orderId, final boolean autoOrder) { + (int) (this.unit.getUnitType().getCastBackswingPoint() / WarsmashConstants.SIMULATION_STEP_TIME); this.localStore.put(ABLocalStoreKeys.CHANNELING, false); this.orderId = orderId; + this.firstAnimation = true; this.autoOrder = autoOrder; this.channelTags = this.ability.getCastingSecondaryTags().clone(); @@ -180,8 +183,9 @@ public CBehavior update(final CSimulation game) { this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); if (!this.channeling) { - this.unit.getUnitAnimationListener().playAnimation(false, this.ability.getCastingPrimaryTag(), + this.unit.getUnitAnimationListener().playAnimation(this.firstAnimation, this.ability.getCastingPrimaryTag(), this.ability.getCastingSecondaryTags(), 1.0f, true); + this.firstAnimation = false; this.unit.getUnitAnimationListener().queueAnimation(PrimaryTag.STAND, SequenceUtils.EMPTY, true); } this.doneCastTime = true; @@ -234,6 +238,35 @@ private CBehavior tryDoEffect(CSimulation game, boolean wasChanneling) { @Override public void begin(final CSimulation game) { + if (ability.getItem() != null && ability.getItem().getItemType().isActivelyUsed()) { + // This is for runes/glyphs that use on pickup. We will never see an update loop + // for these + + if (!this.unit.chargeMana(this.ability.getChargedManaCost())) { + cleanupInputs(); + this.unit.beginBehavior(game, this.unit.pollNextOrderBehavior(game)); + return; + } + this.ability.startCooldown(game, this.unit); + + this.ability.runBeginCastingActions(game, unit, orderId); + + CBehavior beh = tryDoEffect(game, false); + if (beh != null) { + cleanupInputs(); + this.unit.beginBehavior(game, beh); + return; + } + CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + if (newBehavior != null) { + localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); + this.unit.beginBehavior(game, newBehavior); + return; + } + + cleanupInputs(); + this.unit.beginBehavior(game, this.unit.pollNextOrderBehavior(game)); + } } public boolean doChannelTick(CSimulation game, CUnit caster) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java index bc88ab4d5..84f36bef8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; @@ -30,14 +31,16 @@ public void runAction(final CSimulation game, final CUnit caster, final Map booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - active.checkCanTarget(game, theCaster, orderId, false, theTarget, booleanTargetReceiver); + active.checkCanTarget(game, theCaster, orderId, + ((Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId))), + theTarget, booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { if (theCaster.chargeMana(active.getChargedManaCost())) { active.internalBegin(game, theCaster, orderId, false, theTarget); @@ -47,7 +50,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + CUnit theCaster = caster; + if (source != null) { + theCaster = source.callback(game, theCaster, localStore, castId); + } + CDestructable theTarget = dest.callback(game, theCaster, localStore, castId); + + if (theTarget != null && theTarget.getBuffs() != null) { + List toRemove = new ArrayList<>(); + for (CDestructableBuff buff : theTarget.getBuffs()) { + localStore.put(ABLocalStoreKeys.ENUMDESTBUFF, buff); + if (filter != null && filter.callback(game, theCaster, localStore, castId)) { + toRemove.add(buff); + } + } + localStore.remove(ABLocalStoreKeys.ENUMDESTBUFF); + + for (CDestructableBuff buff : toRemove) { + theTarget.remove(game, buff); + } + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java new file mode 100644 index 000000000..2c95d54d1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABActionCreateLoopingSoundEffectAtLocation implements ABAction { + + private ABLocationCallback location; + private ABIDCallback id; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + AbilityPointTarget loc = location.callback(game, caster, localStore, castId); + SimulationRenderComponent ret = game.locationSoundEffectEvent(loc.getX(), loc.getY(), + this.id.callback(game, caster, localStore, castId), true); + localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java new file mode 100644 index 000000000..2f3461f10 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABActionCreateSoundEffectAtLocation implements ABAction { + + private ABLocationCallback location; + private ABIDCallback id; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + AbilityPointTarget loc = location.callback(game, caster, localStore, castId); + SimulationRenderComponent ret = game.locationSoundEffectEvent(loc.getX(), loc.getY(), + this.id.callback(game, caster, localStore, castId), false); + localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java new file mode 100644 index 000000000..79713cfc8 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java @@ -0,0 +1,275 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.badlogic.gdx.math.Rectangle; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.ABAttackSettingsCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABNearestUnitComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; + +public class ABActionCreateUnitTargetedBouncingProjectile implements ABAction { + + private static final Rectangle recycleRect = new Rectangle(); + + private ABUnitCallback source; + private ABLocationCallback sourceLoc; + private ABUnitCallback target; + + private ABIDCallback id; + private ABFloatCallback speed; + private ABBooleanCallback homing; + private ABAttackSettingsCallback settings; + + private List onLaunch; + private List onHit; + + private ABCondition condition; + private ABIntegerCallback sort; + + private ABFloatCallback range; + private ABIntegerCallback bounces; + private ABFloatCallback bounceDelay; + + private ABBooleanCallback allowMultipleBouncesPerUnit; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final CUnit theSource = this.source.callback(game, caster, localStore, castId); + AbilityTarget sourceLocation = theSource; + + if (this.sourceLoc != null) { + sourceLocation = this.sourceLoc.callback(game, caster, localStore, castId); + } + + final CUnit theTarget = this.target.callback(game, caster, localStore, castId); + + final boolean multiBounce; + if (allowMultipleBouncesPerUnit != null) { + multiBounce = allowMultipleBouncesPerUnit.callback(game, caster, localStore, castId); + } else { + multiBounce = game.getGameplayConstants().isAllowMultiBounce(); + } + final Set hitUnits; + if (!multiBounce) { + hitUnits = new HashSet<>(); + hitUnits.add(theTarget); + } else { + hitUnits = null; + } + + final CAbilityProjectileListener listener = new CAbilityProjectileListener() { + + @Override + public void onLaunch(CSimulation game, CProjectile projectile, AbilityTarget target) { + if (onLaunch != null) { + localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); + for (ABAction action : onLaunch) { + action.runAction(game, caster, localStore, castId); + } + localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); + } + } + + @Override + public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target) { + if (onHit != null) { + CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); + CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); + localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); + localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT + castId, targetUnit); + localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST + castId, targetDest); + localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId, + new AbilityPointTarget(projectile.getX(), projectile.getY())); + for (ABAction action : onHit) { + action.runAction(game, caster, localStore, castId); + } + localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); + localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); + localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); + localStore.remove(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); + } + startPerformJump(game, caster, localStore, castId, theTarget, multiBounce, hitUnits, + bounces.callback(game, caster, localStore, castId)); + } + }; + + CProjectile proj = null; + if (id != null) { + Float theSpeed = null; + Boolean isHoming = null; + if (this.speed != null) { + theSpeed = this.speed.callback(game, caster, localStore, castId); + } + if (this.homing != null) { + isHoming = this.homing.callback(game, caster, localStore, castId); + } + proj = game.createProjectile(theSource, this.id.callback(game, caster, localStore, castId), + sourceLocation.getX(), sourceLocation.getY(), + (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, isHoming, theTarget, + listener); + } else if (settings != null) { + proj = game.createProjectile(theSource, this.settings.callback(game, caster, localStore, castId), + sourceLocation.getX(), sourceLocation.getY(), + (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theTarget, listener); + } + + localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); + } + + private void startPerformJump(final CSimulation game, final CUnit caster, final Map localStore, + final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, + final int remainingJumps) { + if (remainingJumps <= 0) { + return; + } + float delay = 0; + if (bounceDelay != null) { + delay = bounceDelay.callback(game, caster, localStore, castId); + } + if (delay > 0) { + CTimer runner = new CTimer() { + @Override + public void onFire(CSimulation simulation) { + performJump(game, originUnitTarget, localStore, castId, originUnitTarget, multiBounce, hitUnits, + remainingJumps); + } + }; + game.registerTimer(runner); + } else { + performJump(game, originUnitTarget, localStore, castId, originUnitTarget, multiBounce, hitUnits, + remainingJumps); + } + } + + private void performJump(final CSimulation game, final CUnit caster, final Map localStore, + final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, + final int remainingJumps) { + if (originUnitTarget == null) { + return; + } + + final Float rangeVal = this.range.callback(game, caster, localStore, castId); + + List foundUnits = new ArrayList<>(); + recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, + rangeVal * 2); + game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + if (originUnitTarget.canReach(enumUnit, rangeVal) && (multiBounce || !hitUnits.contains(enumUnit))) { + localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); + if (condition == null || condition.callback(game, caster, localStore, castId)) { + foundUnits.add(enumUnit); + } + } + return false; + } + }); + localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); + + final CUnit jumpUnit; + if (foundUnits.size() > 0) { + if (sort != null) { + ABUnitComparator comp = new ABUnitComparator(game, caster, localStore, castId, sort); + foundUnits.sort(comp); + } else { + foundUnits.sort(ABNearestUnitComparator.INSTANCE); + } + + jumpUnit = foundUnits.get(0); + } else { + jumpUnit = null; + } + + if (jumpUnit != null) { + + if (!multiBounce) { + hitUnits.add(jumpUnit); + } + + final CAbilityProjectileListener listener = new CAbilityProjectileListener() { + + @Override + public void onLaunch(CSimulation game, CProjectile projectile, AbilityTarget target) { + if (onLaunch != null) { + localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); + for (ABAction action : onLaunch) { + action.runAction(game, caster, localStore, castId); + } + localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); + } + } + + @Override + public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target) { + if (onHit != null) { + CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); + CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); + localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); + localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT + castId, targetUnit); + localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST + castId, targetDest); + localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId, + new AbilityPointTarget(projectile.getX(), projectile.getY())); + for (ABAction action : onHit) { + action.runAction(game, caster, localStore, castId); + } + localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); + localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); + localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); + localStore.remove(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); + } + startPerformJump(game, caster, localStore, castId, jumpUnit, multiBounce, hitUnits, + bounces.callback(game, caster, localStore, castId)); + } + }; + + CProjectile proj = null; + if (id != null) { + Float theSpeed = null; + Boolean isHoming = null; + if (this.speed != null) { + theSpeed = this.speed.callback(game, caster, localStore, castId); + } + if (this.homing != null) { + isHoming = this.homing.callback(game, caster, localStore, castId); + } + proj = game.createProjectile(originUnitTarget, this.id.callback(game, caster, localStore, castId), + originUnitTarget.getX(), originUnitTarget.getY(), + (float) AbilityTarget.angleBetween(originUnitTarget, jumpUnit), theSpeed, isHoming, jumpUnit, + listener); + } else if (settings != null) { + proj = game.createProjectile(originUnitTarget, this.settings.callback(game, caster, localStore, castId), + originUnitTarget.getX(), originUnitTarget.getY(), + (float) AbilityTarget.angleBetween(originUnitTarget, jumpUnit), jumpUnit, listener); + } + + localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); + } + + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java new file mode 100644 index 000000000..e5fe7fd33 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java @@ -0,0 +1,168 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import com.badlogic.gdx.math.Rectangle; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABNearestUnitComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; + +public class ABActionChainEffect implements ABAction { + + private static final Rectangle recycleRect = new Rectangle(); + private List actions; + private ABCondition condition; + private ABIntegerCallback sort; + + private ABUnitCallback target; + + private ABBooleanCallback lightningFromCaster; + private ABIDCallback lightningId; + private ABIntegerCallback lightningIndex; + + private ABFloatCallback range; + private ABIntegerCallback bounces; + private ABFloatCallback bounceDelay; + + private ABBooleanCallback allowMultipleBouncesPerUnit; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final CUnit originUnitTarget = this.target.callback(game, caster, localStore, castId); + boolean multiBounce = game.getGameplayConstants().isAllowMultiBounce(); + if (allowMultipleBouncesPerUnit != null) { + multiBounce = allowMultipleBouncesPerUnit.callback(game, caster, localStore, castId); + } + Set hitUnits = null; + if (!multiBounce) { + hitUnits = new HashSet<>(); + hitUnits.add(originUnitTarget); + } + + if (lightningFromCaster == null || lightningFromCaster.callback(game, caster, localStore, castId)) { + if (lightningId != null) { + int lidx = 0; + if (lightningIndex != null) { + lidx = lightningIndex.callback(game, caster, localStore, castId); + } + game.createAbilityLightning(caster, lightningId.callback(game, caster, localStore, castId), lidx, + originUnitTarget, 2f); + } + } + + localStore.put(ABLocalStoreKeys.CHAINUNIT + castId, originUnitTarget); + for (ABAction iterationAction : actions) { + iterationAction.runAction(game, caster, localStore, castId); + } + localStore.remove(ABLocalStoreKeys.CHAINUNIT + castId); + + startPerformJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, + bounces.callback(game, caster, localStore, castId)); + + } + + private void startPerformJump(final CSimulation game, final CUnit caster, final Map localStore, + final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, + final int remainingJumps) { + if (remainingJumps <= 0) { + return; + } + float delay = 0; + if (bounceDelay != null) { + delay = bounceDelay.callback(game, caster, localStore, castId); + } + if (delay > 0) { + CTimer runner = new CTimer() { + @Override + public void onFire(CSimulation simulation) { + performJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, + remainingJumps - 1); + } + }; + game.registerTimer(runner); + } else { + performJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, remainingJumps - 1); + } + } + + private void performJump(final CSimulation game, final CUnit caster, final Map localStore, + final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, + final int remainingJumps) { + if (originUnitTarget == null) { + return; + } + + final Float rangeVal = this.range.callback(game, caster, localStore, castId); + + List foundUnits = new ArrayList<>(); + recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, + rangeVal * 2); + game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + if (originUnitTarget != enumUnit && originUnitTarget.canReach(enumUnit, rangeVal) + && (multiBounce || !hitUnits.contains(enumUnit))) { + localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); + if (condition == null || condition.callback(game, caster, localStore, castId)) { + foundUnits.add(enumUnit); + } + } + return false; + } + }); + localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); + + CUnit jumpUnit = null; + if (foundUnits.size() > 0) { + if (sort != null) { + ABUnitComparator comp = new ABUnitComparator(game, caster, localStore, castId, sort); + foundUnits.sort(comp); + } else { + foundUnits.sort(ABNearestUnitComparator.INSTANCE); + } + + jumpUnit = foundUnits.get(0); + } + + if (jumpUnit != null) { + if (lightningId != null) { + int lidx = 0; + if (lightningIndex != null) { + lidx = lightningIndex.callback(game, caster, localStore, castId); + } + game.createAbilityLightning(originUnitTarget, lightningId.callback(game, caster, localStore, castId), + lidx, jumpUnit, 2f); + } + + if (!multiBounce) { + hitUnits.add(jumpUnit); + } + localStore.put(ABLocalStoreKeys.CHAINUNIT + castId, jumpUnit); + for (ABAction iterationAction : actions) { + iterationAction.runAction(game, caster, localStore, castId); + } + localStore.remove(ABLocalStoreKeys.CHAINUNIT + castId); + } + + if (remainingJumps > 0) { + startPerformJump(game, caster, localStore, castId, jumpUnit, multiBounce, hitUnits, remainingJumps); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java index c45828b2a..bba016c89 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java @@ -17,7 +17,7 @@ public class ABActionDispelBuffs implements ABAction { private ABUnitCallback source; - private ABUnitCallback target; + private ABUnitCallback unit; private ABCondition filter; @Override @@ -27,8 +27,8 @@ public void runAction(CSimulation game, CUnit caster, Map localS theCaster = source.callback(game, theCaster, localStore, castId); } CUnit theTarget = caster; - if (target != null) { - theTarget = target.callback(game, theCaster, localStore, castId); + if (unit != null) { + theTarget = unit.callback(game, theCaster, localStore, castId); } if (theTarget != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java new file mode 100644 index 000000000..a254b1fee --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetAbilityTargetedDestructable extends ABDestructableCallback { + + @Override + public CDestructable callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (CDestructable) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java new file mode 100644 index 000000000..e19bf5479 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackEnumDestructableBuff extends ABDestructableBuffCallback { + + @Override + public CDestructableBuff callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (CDestructableBuff) localStore.get(ABLocalStoreKeys.ENUMDESTBUFF); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java new file mode 100644 index 000000000..10919f7c8 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackMatchingDestructableBuff extends ABDestructableBuffCallback { + + @Override + public CDestructableBuff callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (CDestructableBuff) localStore.get(ABLocalStoreKeys.MATCHINGDESTBUFF); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java new file mode 100644 index 000000000..cd26a0353 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; + +public class ABCallbackGetStoredTargetTypeByKey extends ABTargetTypeCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public CTargetType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (CTargetType) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (CTargetType) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java new file mode 100644 index 000000000..143b7c166 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; + +public class ABCallbackGetTargetTypeFromString extends ABTargetTypeCallback { + + private ABStringCallback id; + + @Override + public CTargetType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return CTargetType.valueOf(this.id.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java new file mode 100644 index 000000000..9cf83190a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; + +public class ABCallbackRawTargetType extends ABTargetTypeCallback { + + private CTargetType value; + + @Override + public CTargetType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return value; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java index 639e7fd01..eb90188fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java @@ -8,11 +8,11 @@ public class ABCallbackRawWeaponType extends ABWeaponTypeCallback { - private CWeaponType type; + private CWeaponType value; @Override public CWeaponType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return type; + return value; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java new file mode 100644 index 000000000..3f6bc1c93 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java @@ -0,0 +1,13 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; + +public abstract class ABTargetTypeCallback implements ABCallback { + + abstract public CTargetType callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java new file mode 100644 index 000000000..2399a6046 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java @@ -0,0 +1,39 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackCountBuffsOnUnitMatchingCondition extends ABIntegerCallback { + + private ABUnitCallback unit; + private ABCondition condition; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit u = caster; + if (unit != null) { + u = unit.callback(game, caster, localStore, castId); + } + int c = 0; + for (CAbility ability : u.getAbilities()) { + if (ability.getAbilityCategory() == CAbilityCategory.BUFF) { + CBuff buff = (CBuff) ability; + localStore.put(ABLocalStoreKeys.MATCHINGBUFF, buff); + if (condition != null && condition.callback(game, caster, localStore, castId)) { + c++; + } + } + } + + return c; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java index edeee3449..3546af298 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java @@ -11,7 +11,7 @@ public class ABCallbackGetThisProjectile extends ABProjectileCallback { @Override public CProjectile callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (CProjectile) localStore.get(ABLocalStoreKeys.THISPROJECTILE); + return (CProjectile) localStore.get(ABLocalStoreKeys.THISPROJECTILE+castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java new file mode 100644 index 000000000..6c2823508 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetChainUnit extends ABUnitCallback { + + @Override + public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.CHAINUNIT + castId); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr( + "AB_LOCAL_STORE_KEY_CHAINUNIT + I2S(" + jassTextGenerator.getCastId() + ")", + JassTextGeneratorType.UnitHandle); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java index 62a789998..e3f93e188 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java @@ -19,7 +19,7 @@ public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CProjectile p = proj.callback(game, caster, localStore, castId); + return p.getSource(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java index f69ea3a4c..24fbf3819 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java @@ -20,7 +20,7 @@ public class ABConditionIsPassAllAbilityTargetChecks extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theCaster = casterUnit; - + if (caster != null) { theCaster = caster.callback(game, casterUnit, localStore, castId); } @@ -28,8 +28,10 @@ public Boolean callback(CSimulation game, CUnit casterUnit, Map AbilityBuilderActiveAbility abil = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - - abil.checkCanTarget(game, theCaster, abil.getBaseOrderId(), false, target.callback(game, casterUnit, localStore, castId), booleanTargetReceiver); + + abil.checkCanTarget(game, theCaster, abil.getBaseOrderId(), + ((Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId))), + target.callback(game, casterUnit, localStore, castId), booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java index 3296e1caa..a7de9688c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -32,7 +32,8 @@ public Boolean callback(CSimulation game, CUnit casterUnit, Map .getInstance().reset(); abil.checkCanTarget(game, theCaster, abil.getBaseOrderId(), - false, theTarget, booleanTargetReceiver); + ((Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId))), theTarget, + booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastOn.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastOn.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java index 3e4b35125..345b12d96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastOn.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABConditionIsAutoCastOn extends ABCondition { +public class ABConditionIsAutoCastCurrentlyActive extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java new file mode 100644 index 000000000..3b71a8f6b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABConditionWasAutoCast extends ABCondition { + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + System.err.println("Was ability Auto Cast " + localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId)) + " castId " + castId); + return (Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId)); + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ISAUTOCAST", JassTextGeneratorType.Boolean); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastOn.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastOn.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java index bf0a95a13..74fca989f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastOn.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -public class ABConditionWasAutoCastOn extends ABCondition { +public class ABConditionWasAutoCastPreviouslyActive extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java new file mode 100644 index 000000000..63ea9df8f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; + +public class ABConditionIsBuffAlly extends ABCondition { + + ABBuffCallback buff; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CBuff theBuff = buff.callback(game, caster, localStore, castId); + return game.getPlayer(caster.getPlayerIndex()).hasAlliance(theBuff.getSourceUnit().getPlayerIndex(), + CAllianceType.SHARED_SPELLS); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java new file mode 100644 index 000000000..df7d97fd7 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; + +public class ABConditionIsBuffEnemy extends ABCondition { + + ABBuffCallback buff; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CBuff theBuff = buff.callback(game, caster, localStore, castId); + return !game.getPlayer(caster.getPlayerIndex()).hasAlliance(theBuff.getSourceUnit().getPlayerIndex(), + CAllianceType.PASSIVE); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java new file mode 100644 index 000000000..f935c1096 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsBuffNegative extends ABCondition { + + ABBuffCallback buff; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CBuff theBuff = buff.callback(game, caster, localStore, castId); + return !theBuff.isPositive(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java new file mode 100644 index 000000000..0f04036f2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsBuffPositive extends ABCondition { + + ABBuffCallback buff; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CBuff theBuff = buff.callback(game, caster, localStore, castId); + return theBuff.isPositive(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java new file mode 100644 index 000000000..f03e2a6e5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionDoesDestructableHaveBuff extends ABCondition { + + private ABDestructableCallback dest; + private ABIDCallback id; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CDestructable theDestructable = dest.callback(game, caster, localStore, castId); + if (theDestructable != null) { + for (CDestructableBuff ability : theDestructable.getBuffs()) { + if ((ability).getAlias() == id.callback(game, caster, localStore, castId)) { + return true; + } + } + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java new file mode 100644 index 000000000..4cbaafa41 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABConditionDoesDestructableHaveBuffMatchingCondition extends ABCondition { + + private ABDestructableCallback dest; + private ABBooleanCallback condition; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CDestructable theDestructable = dest.callback(game, caster, localStore, castId); + if (theDestructable != null) { + for (CDestructableBuff ability : theDestructable.getBuffs()) { + localStore.put(ABLocalStoreKeys.MATCHINGDESTBUFF, ability); + if (condition.callback(game, caster, localStore, castId)) { + localStore.remove(ABLocalStoreKeys.MATCHINGDESTBUFF); + return true; + } + localStore.remove(ABLocalStoreKeys.MATCHINGDESTBUFF); + } + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java new file mode 100644 index 000000000..500d9a302 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructablebuff; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsDestructableBuffMagic extends ABCondition { + + ABDestructableBuffCallback buff; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CDestructableBuff theBuff = buff.callback(game, caster, localStore, castId); + return theBuff.isMagic(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java new file mode 100644 index 000000000..b2922c3c3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionGameplayConstantSmartAbolishMagic extends ABCondition { + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + System.err.println("Checking Abolish Constant " + game.getGameplayConstants().isAbolishMagicSmartDispel()); + return game.getGameplayConstants().isAbolishMagicSmartDispel(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java new file mode 100644 index 000000000..6adb49199 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionFloatGt0 extends ABCondition { + + private ABFloatCallback value; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + Float v = value.callback(game, caster, localStore, castId); + return v>0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java new file mode 100644 index 000000000..66b798ccd --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIntegerGt0 extends ABCondition { + + private ABIntegerCallback value; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + Integer v1 = value.callback(game, caster, localStore, castId); + return v1 > 0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java new file mode 100644 index 000000000..b1ef2be26 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsUnitAlive extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + return !theUnit.isDead(); + } + return true; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java new file mode 100644 index 000000000..03b082e56 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java @@ -0,0 +1,45 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; + +public class ABConditionIsUnitFriend extends ABCondition { + + private ABUnitCallback caster; + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); + CUnit theCaster = casterUnit; + if (this.caster != null) { + theCaster = this.caster.callback(game, casterUnit, localStore, castId); + } + + if (theUnit != null) { + return game.getPlayer(theUnit.getPlayerIndex()).hasAlliance(theCaster.getPlayerIndex(), + CAllianceType.SHARED_SPELLS); + } + return false; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + String casterExpr; + if (this.caster == null) { + casterExpr = jassTextGenerator.getCaster(); + } + else { + casterExpr = this.caster.generateJassEquivalent(jassTextGenerator); + } + return "IsUnitEnemy(" + this.unit.generateJassEquivalent(jassTextGenerator) + ", GetOwningPlayer(" + casterExpr + + "))"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java new file mode 100644 index 000000000..8179e5df4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; + +public class ABConditionIsUnitSleeping extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isUnitType(CUnitTypeJass.SLEEPING); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java new file mode 100644 index 000000000..e3ad2999b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java @@ -0,0 +1,43 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsUnitVisible extends ABCondition { + + private ABUnitCallback caster; + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); + CUnit theCaster = casterUnit; + if (this.caster != null) { + theCaster = this.caster.callback(game, casterUnit, localStore, castId); + } + + if (theUnit != null) { + return theUnit.isVisible(game, theCaster.getPlayerIndex()); + } + return false; + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + String casterExpr; + if (this.caster == null) { + casterExpr = jassTextGenerator.getCaster(); + } + else { + casterExpr = this.caster.generateJassEquivalent(jassTextGenerator); + } + return "IsUnitEnemy(" + this.unit.generateJassEquivalent(jassTextGenerator) + ", GetOwningPlayer(" + casterExpr + + "))"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java index fbd817743..279765793 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java @@ -17,8 +17,9 @@ public class ABDestructableBuff implements CDestructableBuff { protected static int NEGATIVE = 0b10; protected static int DISPELLABLE = 0b100; protected static int HERO = 0b1000; - protected static int PHYSICAL = 0b10000; - protected static int AURA = 0b100000; + protected static int MAGIC = 0b10000; + protected static int PHYSICAL = 0b100000; + protected static int AURA = 0b1000000; protected int flags = 0b0; private int handleId; @@ -137,6 +138,15 @@ public boolean isHero() { return ((this.flags & HERO) != 0); } + public void setMagic(boolean magic) { + this.flags = magic ? this.flags | MAGIC : this.flags & ~MAGIC; + } + + @Override + public boolean isMagic() { + return ((this.flags & MAGIC) != 0); + } + public void setPhysical(boolean physical) { this.flags = physical ? this.flags | PHYSICAL : this.flags & ~PHYSICAL; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java index 98b72085d..060b83f9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java @@ -33,7 +33,7 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) return false; ABGenericTimedBuff other = (ABGenericTimedBuff) obj; - return this.getAlias() == other.getAlias() && this.getLevel() == other.getLevel() && !this.isStacks(); + return this.getAlias() == other.getAlias() && this.getLevel() == other.getLevel() && !this.isStacks() && !other.isStacks(); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index 9e0675217..5f8cf5f65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -55,6 +55,7 @@ public class ABLocalStoreKeys { public static final String LASTCREATEDUNIT = "_lastCreatedUnit"; public static final String LASTADDEDUNIT = "_lastAddedUnit"; public static final String LASTREMOVEDDUNIT = "_lastRemovedUnit"; + public static final String CHAINUNIT = "_chainUnit#"; public static final String COMPUNIT1 = "_compUnit1"; public static final String COMPUNIT2 = "_compUnit2"; @@ -72,6 +73,8 @@ public class ABLocalStoreKeys { public static final String LASTCREATEDUNITQUEUE = "_lastCreatedUnitQueue"; public static final String LASTCREATEDDESTBUFF = "_lastCreatedDestBuff"; + public static final String ENUMDESTBUFF = "_enumDestBuff"; + public static final String MATCHINGDESTBUFF = "_matchingDestBuff"; // Buff Names public static final String LASTCREATEDBUFF = "_lastCreatedBuff"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index 05259bb3e..bfc153a26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -72,6 +72,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructablebuff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location.*; @@ -231,6 +233,7 @@ private static void registerDestructableCallbacks(RuntimeTypeAdapterFactory call .registerSubtype(ABCallbackInlineConditionDestructable.class, "inlineConditionDestructable") .registerSubtype(ABCallbackGetLastCreatedDestructable.class, "getLastCreatedDestructable") .registerSubtype(ABCallbackGetEnumDestructable.class, "getEnumDestructable") + .registerSubtype(ABCallbackGetAbilityTargetedDestructable.class, "getAbilityTargetedDestructable") .registerSubtype(ABCallbackGetAttackedDestructable.class, "getAttackedDestructable") .registerSubtype(ABCallbackGetProjectileHitDestructable.class, "getProjectileHitDestructable") @@ -245,6 +248,8 @@ private static void registerDestructableBuffCallbacks(RuntimeTypeAdapterFactory .registerSubtype(ABCallbackGetStoredDestructableBuffByKey.class, "getStoredDestructableBuffByKey") .registerSubtype(ABCallbackInlineConditionDestructableBuff.class, "inlineConditionDestructableBuff") + .registerSubtype(ABCallbackEnumDestructableBuff.class, "enumDestructableBuff") + .registerSubtype(ABCallbackMatchingDestructableBuff.class, "matchingDestructableBuff") .registerSubtype(ABCallbackArgumentDestructableBuff.class, "argumentDestructableBuff") .registerSubtype(ABCallbackReuseDestructableBuff.class, "reuseDestructableBuff") .registerSubtype(ABCallbackReuseDestructableBuffWithArguments.class, "reuseDestructableBuffWithArguments"); @@ -397,6 +402,8 @@ private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetUnitMaximumHp.class, "getUnitMaximumHp") .registerSubtype(ABCallbackGetUnitMaximumMp.class, "getUnitMaximumMp") + .registerSubtype(ABCallbackCountBuffsOnUnitMatchingCondition.class, "countBuffsOnUnitMatchingCondition") + .registerSubtype(ABCallbackGetUnitHandleAsInteger.class, "getUnitHandleAsInteger") .registerSubtype(ABCallbackGetAbilityHandleAsInteger.class, "getAbilityHandleAsInteger") .registerSubtype(ABCallbackGetBuffHandleAsInteger.class, "getBuffHandleAsInteger") @@ -684,7 +691,9 @@ private static void registerUnitCallbacks(RuntimeTypeAdapterFactory unitCallback .registerSubtype(ABCallbackGetStoredUnitByKey.class, "getStoredUnitByKey") .registerSubtype(ABCallbackInlineConditionUnit.class, "inlineConditionUnit") .registerSubtype(ABCallbackGetParentCastingUnit.class, "getParentCastingUnit") + .registerSubtype(ABCallbackGetProjectileSourceUnit.class, "getProjectileSourceUnit") .registerSubtype(ABCallbackGetProjectileHitUnit.class, "getProjectileHitUnit") + .registerSubtype(ABCallbackGetChainUnit.class, "getChainUnit") .registerSubtype(ABCallbackGetLastCreatedUnit.class, "getLastCreatedUnit") .registerSubtype(ABCallbackGetReactionAbilityCastingUnit.class, "getReactionAbilityCastingUnit") @@ -777,6 +786,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionFloatEq0.class, "f=0") .registerSubtype(ABConditionFloatGte.class, "f>=") .registerSubtype(ABConditionFloatGt.class, "f>") + .registerSubtype(ABConditionFloatGt0.class, "f>0") .registerSubtype(ABConditionFloatLte.class, "f<=") .registerSubtype(ABConditionFloatLt.class, "f<") .registerSubtype(ABConditionFloatNe.class, "f!=") @@ -785,6 +795,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIntegerEq.class, "i=") .registerSubtype(ABConditionIntegerNe.class, "i!=") .registerSubtype(ABConditionIntegerGt.class, "i>") + .registerSubtype(ABConditionIntegerGt0.class, "i>0") .registerSubtype(ABConditionIntegerGte.class, "i>=") .registerSubtype(ABConditionIntegerLt.class, "i<") .registerSubtype(ABConditionIntegerLte.class, "i<=") @@ -817,8 +828,8 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsOnCooldown.class, "isOnCooldown") .registerSubtype(ABConditionIsDisabled.class, "isDisabled") - .registerSubtype(ABConditionIsAutoCastOn.class, "isAutoCastOn") - .registerSubtype(ABConditionWasAutoCastOn.class, "wasAutoCastOn") + .registerSubtype(ABConditionIsAutoCastCurrentlyActive.class, "isAutoCastCurrentlyActive") + .registerSubtype(ABConditionWasAutoCastPreviouslyActive.class, "wasAutoCastPreviouslyActive") .registerSubtype(ABConditionDoesAbilityHaveUniqueFlag.class, "doesAbilityHaveUniqueFlag") .registerSubtype(ABConditionIsFlexAbilityTargeted.class, "isFlexAbilityTargeted") .registerSubtype(ABConditionIsFlexAbilityNonTargeted.class, "isFlexAbilityNonTargeted") @@ -826,6 +837,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsFlexAbilityNonPointTarget.class, "isFlexAbilityNonPointTarget") .registerSubtype(ABConditionIsToggleAbilityActive.class, "isToggleAbilityActive") .registerSubtype(ABConditionIsTransformingToAlternate.class, "isTransformingToAlternate") + .registerSubtype(ABConditionWasAutoCast.class, "wasAutoCast") .registerSubtype(ABConditionIsUnitType.class, "isUnitType") @@ -836,7 +848,10 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsUnitBuilding.class, "isUnitBuilding") .registerSubtype(ABConditionIsUnitHero.class, "isUnitHero") .registerSubtype(ABConditionIsUnitSummoned.class, "isUnitSummoned") + .registerSubtype(ABConditionIsUnitVisible.class, "isUnitVisible") .registerSubtype(ABConditionIsUnitEnemy.class, "isUnitEnemy") + .registerSubtype(ABConditionIsUnitFriend.class, "isUnitFriend") + .registerSubtype(ABConditionIsUnitAlive.class, "isUnitAlive") .registerSubtype(ABConditionIsUnitDead.class, "isUnitDead") .registerSubtype(ABConditionIsUnitHidden.class, "isUnitHidden") .registerSubtype(ABConditionUnitHasResearch.class, "unitHasResearch") @@ -845,12 +860,16 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsUnitUpgrading.class, "isUnitUpgrading") .registerSubtype(ABConditionIsUnitConstructingOrUpgrading.class, "isUnitConstructingOrUpgrading") .registerSubtype(ABConditionIsUnitMagicImmune.class, "isUnitMagicImmune") + .registerSubtype(ABConditionIsUnitSleeping.class, "isUnitSleeping") .registerSubtype(ABConditionIsUnitShareSpells.class, "isUnitShareSpells") .registerSubtype(ABConditionIsUnitHeroDuration.class, "isUnitHeroDuration") .registerSubtype(ABConditionIsItemAbility.class, "isItemAbility") .registerSubtype(ABConditionItemHasCharges.class, "itemHasCharges") + .registerSubtype(ABConditionDoesDestructableHaveBuff.class, "doesDestructableHaveBuff") + .registerSubtype(ABConditionDoesDestructableHaveBuffMatchingCondition.class, "doesDestructableHaveBuffMatchingCondition") + .registerSubtype(ABConditionIsTimerActive.class, "isTimerActive") .registerSubtype(ABConditionIsLocationDeepWater.class, "isLocationDeepWater") @@ -873,8 +892,15 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionDoesBuffHaveUniqueFlag.class, "doesBuffHaveUniqueFlag") .registerSubtype(ABConditionIsBuffMagic.class, "isBuffMagic") + .registerSubtype(ABConditionIsBuffPositive.class, "isBuffPositive") + .registerSubtype(ABConditionIsBuffNegative.class, "isBuffNegative") + .registerSubtype(ABConditionIsBuffAlly.class, "isBuffAlly") + .registerSubtype(ABConditionIsBuffEnemy.class, "isBuffEnemy") + + .registerSubtype(ABConditionIsDestructableBuffMagic.class, "isDestructableBuffMagic") + .registerSubtype(ABConditionGameplayConstantSmartAbolishMagic.class, "gameplayConstantSmartAbolishMagic") .registerSubtype(ABConditionGameplayConstantCanDisableDivineShield.class, "gameplayConstantCanDisableDivineShield") .registerSubtype(ABConditionIsTimeOfDayInRange.class, "isTimeOfDayInRange") .registerSubtype(ABConditionGameplayConstantIsRelativeUpgradeCosts.class, "gameplayConstantIsRelativeUpgradeCosts") @@ -912,12 +938,17 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionCreateTemporarySpellEffectAtPoint.class, "createTemporarySpellEffectAtPoint") .registerSubtype(ABActionCreateSoundEffectOnUnit.class, "createSoundEffectOnUnit") .registerSubtype(ABActionCreateLoopingSoundEffectOnUnit.class, "createLoopingSoundEffectOnUnit") + .registerSubtype(ABActionCreateSoundEffectAtLocation.class, "createSoundEffectAtLocation") + .registerSubtype(ABActionCreateLoopingSoundEffectAtLocation.class, "createLoopingSoundEffectAtLocation") .registerSubtype(ABActionCreateLightningEffect.class, "createLightningEffect") .registerSubtype(ABActionRemoveLightningEffect.class, "removeLightningEffect") .registerSubtype(ABActionCreateGroupEffectAtLocation.class, "createGroupEffectAtLocation") .registerSubtype(ABActionCreateUberSplat.class, "createUberSplat") + + .registerSubtype(ABActionChainEffect.class, "chainEffect") .registerSubtype(ABActionCreateUnitTargetedProjectile.class, "createUnitTargetedProjectile") + .registerSubtype(ABActionCreateUnitTargetedBouncingProjectile.class, "createUnitTargetedBouncingProjectile") .registerSubtype(ABActionCreateLocationTargetedProjectile.class, "createLocationTargetedProjectile") .registerSubtype(ABActionCreateUnitTargetedCollisionProjectile.class, "createUnitTargetedCollisionProjectile") .registerSubtype(ABActionCreateLocationTargetedCollisionProjectile.class, "createLocationTargetedCollisionProjectile") @@ -1145,11 +1176,12 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionDamageDestructable.class, "damageDestructable") .registerSubtype(ABActionKillDestructable.class, "killDestructable") .registerSubtype(ABActionRemoveDestructable.class, "removeDestructable") + .registerSubtype(ABActionIterateDestructablesInRangeOfLocation.class, "iterateDestructablesInRangeOfLocation") .registerSubtype(ABActionAddDestructableBuff.class, "addDestructableBuff") .registerSubtype(ABActionCreateDestructableBuff.class, "createDestructableBuff") .registerSubtype(ABActionRemoveDestructableBuff.class, "removeDestructableBuff") - .registerSubtype(ABActionIterateDestructablesInRangeOfLocation.class, "iterateDestructablesInRangeOfLocation") + .registerSubtype(ABActionDispelDestructableBuffs.class, "dispelDestructableBuffs") .registerSubtype(ABActionCreateFloatingTextOnUnit.class, "createFloatingTextOnUnit") .registerSubtype(ABActionCreateNumericFloatingTextOnUnit.class, "createNumericFloatingTextOnUnit") @@ -1564,6 +1596,13 @@ public static Gson create() { .registerSubtype(ABCallbackGetModifiedAttackWeaponType.class, "getModifiedAttackWeaponType"); gsonBuilder.registerTypeAdapterFactory(wtTypeFactory); + final RuntimeTypeAdapterFactory ttTypeFactory = RuntimeTypeAdapterFactory + .of(ABTargetTypeCallback.class, "type"); + ttTypeFactory.registerSubtype(ABCallbackGetTargetTypeFromString.class, "getTargetTypeFromString") + .registerSubtype(ABCallbackGetStoredTargetTypeByKey.class, "getStoredTargetTypeByKey") + .registerSubtype(ABCallbackRawTargetType.class, "rawTargetType"); + gsonBuilder.registerTypeAdapterFactory(ttTypeFactory); + final RuntimeTypeAdapterFactory pdlpTypeFactory = RuntimeTypeAdapterFactory .of(ABAttackPreDamageListenerPriorityCallback.class, "type"); pdlpTypeFactory.registerSubtype(ABCallbackRawPreDamageListenerPriority.class, "rawPriority"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABNearestUnitComparator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABNearestUnitComparator.java new file mode 100644 index 000000000..ebade5411 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABNearestUnitComparator.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs; + +import java.util.Comparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABNearestUnitComparator implements Comparator { + public static ABNearestUnitComparator INSTANCE = new ABNearestUnitComparator(); + + @Override + public int compare(CUnit o1, CUnit o2) { + return (int) (o1.distance(o2) * 10); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java index 7982b3fb5..82222e984 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java @@ -1,7 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +import java.util.List; + import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAutocastTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABTargetTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -24,6 +27,10 @@ public class AbilityBuilderOverrideFields { private ABBooleanCallback physicalSpell; private ABBooleanCallback magicSpell; private ABBooleanCallback universalSpell; + private ABBooleanCallback dispel; + + List extraTargetsAllowed; + List excludedTargetsAllowed; public void updateFromParent(AbilityBuilderOverrideFields parent) { if (this.areaOverride == null) @@ -128,5 +135,24 @@ public ABBooleanCallback getUniversalSpell() { public void setUniversalSpell(ABBooleanCallback universalSpell) { this.universalSpell = universalSpell; } + public ABBooleanCallback getDispel() { + return dispel; + } + public void setDispel(ABBooleanCallback dispel) { + this.dispel = dispel; + } + + public List getExtraTargetsAllowed() { + return extraTargetsAllowed; + } + public void setExtraTargetsAllowed(List extraTargetsAllowed) { + this.extraTargetsAllowed = extraTargetsAllowed; + } + public List getExcludedTargetsAllowed() { + return excludedTargetsAllowed; + } + public void setExcludedTargetsAllowed(List excludedTargetsAllowed) { + this.excludedTargetsAllowed = excludedTargetsAllowed; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java index a5c22b7f4..d45dd5fb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorMove.java @@ -46,6 +46,7 @@ public CBehaviorMove(final CUnit unit) { private boolean firstPathfindJob = false; private boolean pathfindingFailedGiveUp; private int giveUpUntilTurnTick; + private int prevSpeed = 0; public CBehaviorMove reset(final int highlightOrderId, final AbilityTarget target) { target.visit(this.targetVisitingResetter.reset(highlightOrderId)); @@ -187,6 +188,8 @@ else if ((this.followUnit != null) && (this.path.size() > 1) && (this.target.dis final float propulsionWindow = this.unit.getPropWindow(); final float turnRate = this.unit.getTurnRate(); final int speed = this.unit.getSpeed(); + final boolean speedChange = speed != prevSpeed; + this.prevSpeed = speed; if (delta < -180) { delta = 360 + delta; @@ -325,7 +328,12 @@ else if ((this.followUnit != null) && (this.path.size() > 1) && (this.target.dis return this; } } - this.unit.getUnitAnimationListener().playWalkAnimation(false, this.unit.getSpeed(), true); + if (speed > 0) { + this.unit.getUnitAnimationListener().playWalkAnimation(speedChange, speed, true); + } else { + this.unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.STAND, + SequenceUtils.EMPTY, 1.0f, true); + } this.wasWithinPropWindow = true; } while (continueDistance > 0); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java index 4ebc373cb..4c4ddddf1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java @@ -7,6 +7,7 @@ public abstract class CBaseDamageFlags implements CDamageFlags { private static int EXPLODE = 0b1000; private static int SUMMON = 0b10000; private static int NONLETHAL = 0b100000; + private static int PASSLIMITEDMAGICIMMUNE = 0b1000000; private int flags = 0; @@ -72,4 +73,15 @@ public boolean isNonlethal() { public void setNonlethal(boolean nonlethal) { this.flags = nonlethal ? this.flags | NONLETHAL : this.flags & ~NONLETHAL; } + + @Override + public boolean isPassLimitedMagicImmune() { + return (this.flags & PASSLIMITEDMAGICIMMUNE) != 0; + } + + @Override + public void setPassLimitedMagicImmune(boolean passLimitedMagicImmune) { + this.flags = passLimitedMagicImmune ? this.flags | PASSLIMITEDMAGICIMMUNE + : this.flags & ~PASSLIMITEDMAGICIMMUNE; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java index dac9b6763..f43ec9ff6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java @@ -26,4 +26,8 @@ public interface CDamageFlags { void setNonlethal(boolean callback); + boolean isPassLimitedMagicImmune(); + + void setPassLimitedMagicImmune(boolean limitedMagicImmune); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CTargetType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CTargetType.java index 2029880f3..4f6e09a84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CTargetType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CTargetType.java @@ -39,6 +39,7 @@ public enum CTargetType implements CHandle { DECORATION, // BELOW: internal values: NON_MAGIC_IMMUNE, + LIMITED_MAGIC_IMMUNE, NON_ETHEREAL, REPAIRABLE diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java index 6fdde05f6..62f7f7137 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java @@ -140,7 +140,7 @@ public void computeDerivedFields() { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey : buff.getValue(); } } totalNSAtkBuff += buffForKey; @@ -155,7 +155,7 @@ public void computeDerivedFields() { if (key.equals(NonStackingStatBuff.ALLOW_STACKING_KEY)) { buffForKey += buff.getValue(); } else { - buffForKey = Math.max(buffForKey, buff.getValue()); + buffForKey = Math.abs(buffForKey) > Math.abs(buff.getValue()) ? buffForKey : buff.getValue(); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java index e12814ee0..db0b7f4f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java @@ -142,8 +142,8 @@ private void registerCodes() { // ----Orc---- this.codeToAbilityTypeDefinition.put(War3ID.fromString("AOsf"), new CAbilityTypeDefinitionSpellBase((handleId, alias) -> new CAbilityFeralSpirit(handleId, alias))); - this.codeToAbilityTypeDefinition.put(War3ID.fromString("AOcl"), - new CAbilityTypeDefinitionSpellBase((handleId, alias) -> new CAbilityChainLightning(handleId, alias))); +// this.codeToAbilityTypeDefinition.put(War3ID.fromString("AOcl"), +// new CAbilityTypeDefinitionSpellBase((handleId, alias) -> new CAbilityChainLightning(handleId, alias))); // Tauren Chieftain // this.codeToAbilityTypeDefinition.put(War3ID.fromString("AOws"), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java index 95cb7a642..342f51838 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java @@ -71,6 +71,8 @@ public class CUnitData { private static final String HIT_POINT_REGEN = "regenHP"; // replaced from 'uhpr' private static final String HIT_POINT_REGEN_TYPE = "regenType"; // replaced from 'uhrt' private static final String MOVEMENT_SPEED_BASE = "spd"; // replaced from 'umvs' + private static final String MOVEMENT_SPEED_MAX = "maxSpd"; + private static final String MOVEMENT_SPEED_MIN = "minSpd"; private static final String PROPULSION_WINDOW = "propWin"; // replaced from 'uprw' private static final String TURN_RATE = "turnRate"; // replaced from 'umvr' private static final String IS_BLDG = "isbldg"; // replaced from 'ubdg' @@ -255,10 +257,18 @@ public CUnit create(final CSimulation simulation, final int playerIndex, final W final int manaInitial = unitTypeInstance.getManaInitial(); final int manaMaximum = unitTypeInstance.getManaMaximum(); final int speed = unitTypeInstance.getSpeed(); + int maxSpeed = unitTypeInstance.getMaxSpeed(); + if (maxSpeed == 0) { + maxSpeed = (int) simulation.getGameplayConstants().getMaxUnitSpeed(); + } + int minSpeed = unitTypeInstance.getMinSpeed(); + if (minSpeed == 0) { + minSpeed = (int) simulation.getGameplayConstants().getMinUnitSpeed(); + } final CUnit unit = new CUnit(handleId, playerIndex, x, y, life, typeId, facing, editorConfigManaAmount >= 0 ? editorConfigManaAmount : manaInitial, unitTypeInstance.getMaxLife(), - lifeRegen, manaMaximum, speed, unitTypeInstance); + lifeRegen, manaMaximum, speed, maxSpeed, minSpeed, unitTypeInstance); return unit; } @@ -531,6 +541,8 @@ private CUnitType getUnitTypeInstance(final War3ID typeId, final BufferedImage b final int manaMaximum = unitType.getFieldAsInteger(MANA_MAXIMUM, 0); final float manaRegen = unitType.getFieldAsFloat(MANA_REGEN, 0); final int speed = unitType.getFieldAsInteger(MOVEMENT_SPEED_BASE, 0); + final int maxSpeed = unitType.getFieldAsInteger(MOVEMENT_SPEED_MAX, 0); + final int minSpeed = unitType.getFieldAsInteger(MOVEMENT_SPEED_MIN, 0); final int defense = unitType.getFieldAsInteger(DEFENSE, 0); final String defaultAutocastAbility = unitType.getFieldAsString(ABILITIES_DEFAULT_AUTO, 0); final List abilityListString = unitType.getFieldAsList(ABILITIES_NORMAL); @@ -797,7 +809,7 @@ private CUnitType getUnitTypeInstance(final War3ID typeId, final BufferedImage b final boolean neutralBuildingShowMinimapIcon = unitType.getFieldAsBoolean(NEUTRAL_BUILDING_SHOW_ICON, 0); unitTypeInstance = new CUnitType(unitName, legacyName, typeId, life, lifeRegen, manaRegen, lifeRegenType, - manaInitial, manaMaximum, speed, defense, defaultAutocastAbilityId, abilityList, isBldg, + manaInitial, manaMaximum, speed, maxSpeed, minSpeed, defense, defaultAutocastAbilityId, abilityList, isBldg, movementType, moveHeight, collisionSize, classifications, attacks, attacksEnabled, armorType, raise, decay, defenseType, impactZ, buildingPathingPixelMap, deathTime, targetedAs, acquisitionRange, minimumAttackRange, structuresBuilt, unitsTrained, researchesAvailable, upgradesUsed, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java index e5ad6f3c7..4992a1511 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java @@ -185,4 +185,6 @@ SimulationRenderComponentModel createSpellEffectOverDestructable(CUnit source, C void changeUnitScale(CUnit unit, float scale, boolean multiplier); + SimulationRenderComponent spawnAbilitySoundEffect(float x, float y, War3ID alias, boolean looping); + } From 0e1c943e6a1e85990ee4826761b51eabb72c60bf Mon Sep 17 00:00:00 2001 From: Glasir Date: Thu, 19 Jun 2025 02:22:00 -0400 Subject: [PATCH 23/44] Test items to remove later --- core/assets/abilityBehaviors/test.json | 275 ++++++++++++++++++ .../etheller/warsmash/parsers/jass/Jass2.java | 20 ++ .../etheller/warsmash/util/RawcodeUtils.java | 6 + 3 files changed, 301 insertions(+) create mode 100644 core/assets/abilityBehaviors/test.json diff --git a/core/assets/abilityBehaviors/test.json b/core/assets/abilityBehaviors/test.json new file mode 100644 index 000000000..3c4912a97 --- /dev/null +++ b/core/assets/abilityBehaviors/test.json @@ -0,0 +1,275 @@ +{ + "abilityList": [{ + "ids": [{"id":"AOfs", "castId": "farsight"}], + "type": "NORMAL_POINTTARGET", + "onBeginCasting": [{ + "type": "modifyTerrainVertex", + "location": { + "type": "getTargetedLocation" + }, + "dz": { + "type": "rawFloat", + "value": 0 + } + }] + },{ + "ids": [{"id":"AOcl", "castId": "chainlightning"}], + "type": "NORMAL_UNITTARGET", + "displayFields": { + "hideAreaCursor": { + "type": "rawBoolean", + "value": "true" + } + }, + "reuseCallbacks": { + "jumpCondition": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + },{ + "type": "isUnitVisible", + "unit": { + "type": "getMatchingUnit" + } + },{ + "type": "not", + "condition": { + "type": "isUnitSleeping", + "unit": { + "type": "getMatchingUnit" + } + } + }] + } + }, + "reuseActions": { + "setup": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "amount" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }], + "onHit": [{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getChainUnit" + }, + "damage": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "amount" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "amount" + }, + "valueToStore": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "amount" + } + }, + "value2": { + "type": "f-", + "value1": { + "type": "rawFloat", + "value": 1 + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + } + }] + }, + "onEndCasting": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setup" + } + },{ + "type": "chainEffect", + "target": { + "type": "getAbilityTargetedUnit" + }, + "lightningId": { + "type": "getAlias" + }, + "bounces": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "range": { + "type": "getAbilityArea" + }, + "bounceDelay": { + "type": "rawFloat", + "value": 0.25 + }, + "allowMultipleBouncesPerUnit": { + "type": "rawBoolean", + "value": "false" + }, + "condition": { + "type": "reuseBoolean", + "name": { + "type": "rawString", + "value": "jumpCondition" + } + }, + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + }] + }] + },{ + "ids": [{"id":"AOhw", "castId": "itemlightningpurge"}], + "type": "INHERIT", + "parentId": "AOcl", + "reuseCallbacks": { + "jumpCondition": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + },{ + "type": "isUnitVisible", + "unit": { + "type": "getMatchingUnit" + } + }] + } + }, + "reuseActions": { + "onHit": [{ + "type": "heal", + "target": { + "type": "getChainUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "amount" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "amount" + }, + "valueToStore": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "amount" + } + }, + "value2": { + "type": "f-", + "value1": { + "type": "rawFloat", + "value": 1 + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + } + }] + } + },{ + "ids": [{"id":"AHwe", "castId": "waterelemental"}], + "type": "NORMAL_NOTARGET", + "onEndCasting": [{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "A" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "createLocationFromOffset", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "dist": { + "type": "getAbilityArea" + }, + "angle": { + "type": "getUnitFacing", + "unit": { + "type": "getCastingUnit" + } + }, + "angleInDegrees": { + "type": "rawBoolean", + "value": "true" + } + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getCastingUnit" + } + } + },{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }] +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index 2d84f8eb8..de7708816 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -95,6 +95,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.rendersim.RenderDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.rendersim.RenderSpellEffect; import com.etheller.warsmash.viewer5.handlers.w3x.rendersim.RenderUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.rendersim.RenderWidget; import com.etheller.warsmash.viewer5.handlers.w3x.rendersim.ability.AbilityDataUI; import com.etheller.warsmash.viewer5.handlers.w3x.rendersim.ability.IconUI; import com.etheller.warsmash.viewer5.handlers.w3x.rendersim.ability.ItemUI; @@ -983,6 +984,25 @@ public JassValue call(final List arguments, final GlobalScope globalS } return null; }); + jassProgramVisitor.getJassNativeManager().createNative("GroupEnumUnitsSelected", + (arguments, globalScope, triggerScope) -> { + // TODO BIG DESYNC WITH THIS, TESTING ONLY! + final List group = arguments.get(0) + .visit(ObjectJassValueVisitor.>getInstance()); + final CPlayerJass player = arguments.get(1) + .visit(ObjectJassValueVisitor.getInstance()); + final TriggerBooleanExpression filter = nullable(arguments, 2, + ObjectJassValueVisitor.getInstance()); + for (final RenderWidget render : war3MapViewer.selected) { + CUnit unit = render.getSimulationWidget().visit(AbilityTargetVisitor.UNIT); + if (unit != null && ((filter == null) || filter.evaluate(globalScope, + CommonTriggerExecutionScope.filterScope(triggerScope, unit)))) { + // TODO the trigger scope for evaluation here might need to be a clean one? + group.add(unit); + } + } + return null; + }); jassProgramVisitor.getJassNativeManager().createNative("IssuePointOrderLoc", (arguments, globalScope, triggerScope) -> { final CUnit whichUnit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); diff --git a/shared/src/com/etheller/warsmash/util/RawcodeUtils.java b/shared/src/com/etheller/warsmash/util/RawcodeUtils.java index 4a8563858..5b4d02771 100644 --- a/shared/src/com/etheller/warsmash/util/RawcodeUtils.java +++ b/shared/src/com/etheller/warsmash/util/RawcodeUtils.java @@ -59,4 +59,10 @@ public static String toString(final int id, final StringBuffer result) { return result.toString(); } + + public static void main(String[] args) { +// System.out.println(RawcodeUtils.toString(1098084457)); +// System.err.println("" + (1 << 2)); + System.out.println(RawcodeUtils.toInt("APdi")); + } } From cbfdc396c78c725eb946c41777d23062cf5ec6e1 Mon Sep 17 00:00:00 2001 From: Glasir Date: Thu, 19 Jun 2025 22:53:03 -0400 Subject: [PATCH 24/44] Minor gradle change to allow gradle builds from inside Eclipse --- desktop/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/build.gradle b/desktop/build.gradle index f428f8014..e6bf96656 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -14,7 +14,7 @@ import org.gradle.internal.os.OperatingSystem if(project.hasProperty("args")) { ext.cmdargs = project.getProperty("args") } else { - ext.cmdargs = "" + ext.cmdargs = myArgs } application { From b2c504ff4d4aa3d291d5e711196ab821c51ffbec Mon Sep 17 00:00:00 2001 From: Glasir Date: Thu, 19 Jun 2025 23:04:43 -0400 Subject: [PATCH 25/44] Revert unneeded change --- desktop/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/build.gradle b/desktop/build.gradle index e6bf96656..f428f8014 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -14,7 +14,7 @@ import org.gradle.internal.os.OperatingSystem if(project.hasProperty("args")) { ext.cmdargs = project.getProperty("args") } else { - ext.cmdargs = myArgs + ext.cmdargs = "" } application { From 50474151243156911450eefee7986c95f47e7431 Mon Sep 17 00:00:00 2001 From: Glasir Date: Mon, 7 Jul 2025 16:58:09 -0400 Subject: [PATCH 26/44] Summons, Chain Spells, and Polymorph! **Minor Improvements to Ability Builder** - Fixed Transforms and summons not showing a timed life bar when the buff id was missing - Added methods to allow Items to update their model - New state modes for Polymorph, Disable Minimap Icon, and False Ownership - Added flags to let units change model without changing portrait - Added function to change unit appearance without changing abilities - Created Enum callbacks for movement types, along with some related comparisons - Added functions to read ability data fields that hold lists of ids - Cleaned up some extra print statements **Minor Improvements to Core** - Added JASS functions for using items - Unit Type now loads tileset data and special flag - Units with shared control can now be ordered with right-click - Enemy heros now also show the player name - Critter race units owned by players will now only play voice lines for the owner **Spell Implementations** - Summons - Water Elemental/Watery Minion/Spirit of Vengeance/Summon Eagle/Summon Quillbeast/Summon Bear - Mechanical Critter - Feral Spirit/Spirit Troll - Phoenix - Place Mine - Healing Ward - Serpent Ward - Sentry Ward - Stasis Trap - Inferno - Dark Portal - Rain of Chaos - Tornado (though several of the tornado auras are still missing) - Spawn Spiders/Spawn Spiderlings/Spawn Skeletons - Chains - Chain Lightning - Healing Wave - Dispels - Item Chain Dispel (despite the name, it's a bouncing projectile) - Other - Polymorph/Hex - Random Item (cannot currently target items in an inventory) - Frenzy --- .../AttackReplacementActives.json | 6 +- .../AttackReplacementPassivesItems.json | 19 +- core/assets/abilityBehaviors/Chains.json | 272 +++ .../assets/abilityBehaviors/DeathSummons.json | 103 +- core/assets/abilityBehaviors/Dispels.json | 392 +++- .../abilityBehaviors/ItemAffecting.json | 24 + core/assets/abilityBehaviors/Polymorph.json | 231 +++ core/assets/abilityBehaviors/RaiseDead.json | 6 +- core/assets/abilityBehaviors/Summons.json | 1627 +++++++++++++++++ .../abilityBehaviors/Transformations.json | 106 +- core/assets/abilityBehaviors/activeBuffs.json | 142 +- core/assets/abilityBehaviors/itemSimple.json | 2 +- .../abilityBehaviors/nightElfUnitActives.json | 2 +- .../abilityBehaviors/undeadUnitActives.json | 4 +- .../etheller/warsmash/parsers/jass/Jass2.java | 99 + .../viewer5/handlers/w3x/War3MapViewer.java | 40 +- .../handlers/w3x/rendersim/RenderItem.java | 27 +- .../handlers/w3x/rendersim/RenderUnit.java | 73 +- .../CommandCardPopulatingAbilityVisitor.java | 6 +- .../handlers/w3x/simulation/CItem.java | 24 +- .../handlers/w3x/simulation/CItemType.java | 8 +- .../handlers/w3x/simulation/CSimulation.java | 22 +- .../handlers/w3x/simulation/CUnit.java | 133 +- .../handlers/w3x/simulation/CUnitType.java | 14 +- .../abilities/skills/util/CBuffTimedLife.java | 5 + .../CBehaviorAbilityBuilderNoTarget.java | 2 +- .../ABActionPrepUnownedAbilityForUse.java | 38 + .../ABActionAbilityRunEndCastingActions.java | 62 + .../action/item/ABActionTransformItem.java | 25 + ...nCreateUnitTargetedBouncingProjectile.java | 16 +- .../structural/ABActionChainEffect.java | 3 +- .../action/structural/ABActionFor.java | 9 +- .../timer/ABActionUpdateTimerTimeout.java | 1 - .../action/unit/ABActionCreateUnit.java | 14 +- .../ABActionForceBeginCreatedBehavior.java | 1 - .../action/unit/ABActionSetSpeed.java | 22 + .../unit/ABActionTransformUnitAppearance.java | 22 + .../ABCallbackGetBuffSourceAbility.java | 3 - .../ABCallbackGetMatchingAbility.java | 25 + .../ABCallbackGetMovementTypeFromString.java | 20 + .../ABCallbackGetStoredMovementTypeByKey.java | 30 + .../ABCallbackGetUnitMovementType.java | 20 + .../ABCallbackGetUnitTypeMovementType.java | 22 + .../enumcallbacks/ABMovementTypeCallback.java | 13 + .../ABCallbackGetAbilityDataAsIDFromList.java | 49 + ...lbackGetAbilityDataAsRandomIDFromList.java | 44 + .../ABCallbackGetBuffIdFromCode.java | 25 + .../idcallbacks/ABCallbackGetCode.java | 31 + .../idcallbacks/ABCallbackGetFirstBuffId.java | 5 + .../idcallbacks/ABCallbackRandomItemId.java | 18 + .../ABCallbackRandomMechanicalCritterId.java | 23 + .../ABCallbackGetNeutralHostilePlayerId.java | 16 + .../ABCallbackGetNeutralPassivePlayerId.java | 16 + .../ABCallbackGetUnitTypeSpeed.java | 18 + .../ABCallbackRandomInteger.java | 32 + .../ABCallbackGetAbilityTargetedItem.java | 17 + .../ABCallbackRandomLocationInRange.java | 26 + .../ABCallbackCreateDetectedData.java | 4 +- .../ABCallbackCreateOwnershipData.java | 21 + .../player/ABCallbackGetCastingPlayer.java | 16 + .../ABCallbackGetDamagedUnit.java | 16 + .../ABCallbackGetDamagingUnit.java | 16 + ...ditionMatchingUnitExistsInRangeOfUnit.java | 10 +- .../ability/ABConditionWasAutoCast.java | 1 - .../ABConditionIsMovementTypeEqual.java | 29 + .../destructable/ABConditionIsTree.java | 25 + ...tionGameplayConstantSmartAbolishMagic.java | 1 - ...nDoesUnitHaveAbilityMatchingCondition.java | 39 + .../unit/ABConditionIsUnitEnemy.java | 10 +- .../unit/ABConditionIsUnitFriend.java | 10 +- .../unit/ABConditionIsUnitMorphImmune.java | 25 + .../unit/ABConditionIsUnitPolymorphed.java | 26 + ...ditionIsCurrentBehaviorCategoryInList.java | 31 + .../abilitybuilder/buff/ABBuff.java | 18 +- .../abilitybuilder/core/ABLocalStoreKeys.java | 3 + .../core/AbilityBuilderGsonBuilder.java | 40 + .../handler/RandomTypeHandler.java | 90 + .../listener/ABDamageTakenListener.java | 8 +- .../ABDamageTakenModificationListener.java | 8 +- ...BFinalDamageTakenModificationListener.java | 8 +- .../abilitybuilder/timer/ABTimer.java | 3 +- .../w3x/simulation/combat/CDefenseType.java | 8 +- .../w3x/simulation/data/CItemData.java | 7 +- .../w3x/simulation/data/CUnitData.java | 334 +++- .../w3x/simulation/unit/StateModBuffType.java | 10 +- .../util/SimulationRenderController.java | 6 +- .../viewer5/handlers/w3x/ui/MeleeUI.java | 563 +++--- .../handlers/w3x/ui/MeleeUIMinimap.java | 28 +- 88 files changed, 4893 insertions(+), 576 deletions(-) create mode 100644 core/assets/abilityBehaviors/Chains.json create mode 100644 core/assets/abilityBehaviors/ItemAffecting.json create mode 100644 core/assets/abilityBehaviors/Polymorph.json create mode 100644 core/assets/abilityBehaviors/Summons.json create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/RandomTypeHandler.java diff --git a/core/assets/abilityBehaviors/AttackReplacementActives.json b/core/assets/abilityBehaviors/AttackReplacementActives.json index 42cbf63f7..69f140e40 100644 --- a/core/assets/abilityBehaviors/AttackReplacementActives.json +++ b/core/assets/abilityBehaviors/AttackReplacementActives.json @@ -246,7 +246,11 @@ },{ "type": "createTimedLifeBuff", "buffId": { - "type": "getSecondBuffId" + "type": "getSecondBuffId", + "defaultId": { + "type": "getWar3IDFromString", + "id": "BNdm" + } }, "duration": { "type": "getAbilityDataAsFloat", diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json index 37859d6cc..d2c823382 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json @@ -328,6 +328,12 @@ "modifier": { "type": "getLastCreatedAttackModifier" } + },{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "enable" + } }], "onLevelChange": [{ "type": "updateNonStackingStatBuff", @@ -427,8 +433,15 @@ "type": "runReuseAction", "name": { "type": "rawString", - "value": "cleanup" + "value": "disable" } + }], + "onRemoveDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "cleanup" + } }] },{ "ids": [{"id":"AIcb"}], @@ -739,7 +752,7 @@ "type": "getLastCreatedAbility" } }], - "setup": [{ + "enable": [{ "type": "runReuseAction", "name": { "type": "rawString", @@ -759,7 +772,7 @@ "value": "addAbility" } }], - "cleanup": [{ + "disable": [{ "type": "runReuseAction", "name": { "type": "rawString", diff --git a/core/assets/abilityBehaviors/Chains.json b/core/assets/abilityBehaviors/Chains.json new file mode 100644 index 000000000..0c4a0bfb8 --- /dev/null +++ b/core/assets/abilityBehaviors/Chains.json @@ -0,0 +1,272 @@ +{ + "abilityList": [{ + "ids": [{"id":"AOcl", "castId": "chainlightning"}], + "type": "NORMAL_UNITTARGET", + "displayFields": { + "hideAreaCursor": { + "type": "rawBoolean", + "value": "true" + } + }, + "reuseCallbacks": { + "jumpCondition": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + },{ + "type": "isUnitVisible", + "unit": { + "type": "getMatchingUnit" + } + },{ + "type": "not", + "condition": { + "type": "isUnitSleeping", + "unit": { + "type": "getMatchingUnit" + } + } + }] + } + }, + "reuseActions": { + "onCast": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "amount" + }, + "valueToStore": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }], + "onHit": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getChainUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + },{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getChainUnit" + }, + "damage": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "amount" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "amount" + }, + "valueToStore": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "amount" + } + }, + "value2": { + "type": "f-", + "value1": { + "type": "rawFloat", + "value": 1 + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + } + }] + }, + "onEndCasting": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onCast" + } + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "chainEffect", + "target": { + "type": "getAbilityTargetedUnit" + }, + "lightningId": { + "type": "getAlias" + }, + "bounces": { + "type": "i-", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "range": { + "type": "getAbilityArea" + }, + "bounceDelay": { + "type": "rawFloat", + "value": 0.25 + }, + "allowMultipleBouncesPerUnit": { + "type": "rawBoolean", + "value": "false" + }, + "condition": { + "type": "reuseBoolean", + "name": { + "type": "rawString", + "value": "jumpCondition" + } + }, + "actions": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + }] + }] + },{ + "ids": [{"id":"AOhw", "castId": "healingwave"}], + "type": "INHERIT", + "parentId": "AOcl", + "extraTargetConditions": [{ + "type": "reuseBooleanWithArguments", + "name": { + "type": "rawString", + "value": "targetCondition" + }, + "arguments": { + "checkUnit": { + "type": "getAbilityTargetedUnit" + } + } + }], + "reuseCallbacks": { + "targetCondition": { + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "not", + "condition": { + "type": "isUnitMaxHp", + "unit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "checkUnit" + } + } + } + }, + "reason": "ALREADY_AT_FULL_HEALTH" + }, + "jumpCondition": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + },{ + "type": "reuseBooleanWithArguments", + "name": { + "type": "rawString", + "value": "targetCondition" + }, + "arguments": { + "checkUnit": { + "type": "getMatchingUnit" + } + } + },{ + "type": "isUnitVisible", + "unit": { + "type": "getMatchingUnit" + } + }] + } + }, + "reuseActions": { + "onHit": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getChainUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + },{ + "type": "heal", + "target": { + "type": "getChainUnit" + }, + "amount": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "amount" + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "amount" + }, + "valueToStore": { + "type": "f*", + "value1": { + "type": "getStoredFloatByKey", + "key": { + "type": "rawString", + "value": "amount" + } + }, + "value2": { + "type": "f-", + "value1": { + "type": "rawFloat", + "value": 1 + }, + "value2": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + } + } + } + }] + } + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/DeathSummons.json b/core/assets/abilityBehaviors/DeathSummons.json index fc4d6b356..c4bb57163 100644 --- a/core/assets/abilityBehaviors/DeathSummons.json +++ b/core/assets/abilityBehaviors/DeathSummons.json @@ -85,7 +85,11 @@ },{ "type": "createTimedLifeBuff", "buffId": { - "type": "getSecondBuffId" + "type": "getSecondBuffId", + "defaultId": { + "type": "getWar3IDFromString", + "id": "BNdm" + } }, "duration": { "type": "getAbilityDataAsFloat", @@ -242,7 +246,11 @@ },{ "type": "createTimedLifeBuff", "buffId": { - "type": "getSecondBuffId" + "type": "getSecondBuffId", + "defaultId": { + "type": "getWar3IDFromString", + "id": "BNdi" + } }, "duration": { "type": "getAbilityDataAsFloat", @@ -627,7 +635,11 @@ },{ "type": "createTimedLifeBuff", "buffId": { - "type": "getSecondBuffId" + "type": "getSecondBuffId", + "defaultId": { + "type": "getWar3IDFromString", + "id": "BNpm" + } }, "duration": { "type": "getAbilityCastTime" @@ -668,5 +680,90 @@ "value": "levelChange" } }] + },{ + "ids": [{"id":"Asod"},{"id":"Assp"},{"id":"Aspd"}], + "type": "HIDDEN", + "onAddDisabledAbility": [{ + "type": "createDeathReplacementEffect", + "actions": [{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "A" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityDataAsID", + "dataField": "B" + }, + "loc": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + } + },{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getFirstBuffId", + "defaultId": { + "type": "getWar3IDFromString", + "id": "BFig" + } + }, + "duration": { + "type": "getAbilityDuration" + }, + "explode": { + "type": "rawBoolean", + "value": "true" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }] + }], + "onAddAbility": [{ + "type": "addDeathReplacementEffect", + "target": { + "type": "getCastingUnit" + }, + "priority": { + "type": "rawPriority", + "priority": "GENERALONDEATHACTIONS" + }, + "listener": { + "type": "getLastCreatedDeathReplacement" + } + }], + "onRemoveAbility": [{ + "type": "removeDeathReplacementEffect", + "target": { + "type": "getCastingUnit" + }, + "priority": { + "type": "rawPriority", + "priority": "GENERALONDEATHACTIONS" + }, + "listener": { + "type": "getLastCreatedDeathReplacement" + } + }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/Dispels.json b/core/assets/abilityBehaviors/Dispels.json index e48f30bc1..ee2e8102a 100644 --- a/core/assets/abilityBehaviors/Dispels.json +++ b/core/assets/abilityBehaviors/Dispels.json @@ -965,10 +965,18 @@ "type": "getAbilityTargetedUnit" }, "condition": { - "type": "isBuffNegative", - "buff": { - "type": "getMatchingBuff" - } + "type": "and", + "conditions": [{ + "type": "isBuffMagic", + "buff": { + "type": "getMatchingBuff" + } + },{ + "type": "isBuffNegative", + "buff": { + "type": "getMatchingBuff" + } + }] } }] },{ @@ -984,10 +992,18 @@ "type": "getAbilityTargetedUnit" }, "condition": { - "type": "isBuffPositive", - "buff": { - "type": "getMatchingBuff" - } + "type": "and", + "conditions": [{ + "type": "isBuffMagic", + "buff": { + "type": "getMatchingBuff" + } + },{ + "type": "isBuffPositive", + "buff": { + "type": "getMatchingBuff" + } + }] } }] }] @@ -1072,7 +1088,7 @@ },{ "type": "if", "condition": { - "type": "and", + "type": "or", "conditions": [{ "type": "wasAutoCast" },{ @@ -1822,5 +1838,363 @@ "type": "cleanUpCastInstance" }] }] + },{ + "ids": [{"id":"AIdc", "castId": "itemchaindispel"}], + "type": "NORMAL_UNITTARGET", + "displayFields": { + "hideAreaCursor": { + "type": "rawBoolean", + "value": "true" + } + }, + "extraTargetConditions": [{ + "type": "reuseBooleanWithArguments", + "name": { + "type": "rawString", + "value": "targetCondition" + }, + "arguments": { + "checkUnit": { + "type": "getAbilityTargetedUnit" + } + } + }], + "reuseCallbacks": { + "targetCondition": { + "type": "or", + "conditions": [{ + "type": "and", + "conditions": [{ + "type": "isUnitFriend", + "unit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "checkUnit" + } + } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "doesUnitHaveBuffMatchingCondition", + "unit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "checkUnit" + } + }, + "condition": { + "type": "and", + "conditions": [{ + "type": "isBuffMagic", + "buff": { + "type": "getMatchingBuff" + } + },{ + "type": "isBuffNegative", + "buff": { + "type": "getMatchingBuff" + } + }] + } + }, + "reason": "MUST_TARGET_A_FRIENDLY_UNIT_WITH_NEGATIVE_BUFFS" + }] + },{ + "type": "and", + "conditions": [{ + "type": "isUnitEnemy", + "unit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "checkUnit" + } + } + },{ + "type": "or", + "conditions": [{ + "type": "and", + "conditions": [{ + "type": "f>0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "or", + "conditions": [{ + "type": "isUnitSummoned", + "unit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "checkUnit" + } + } + },{ + "type": "doesUnitHaveBuffMatchingCondition", + "unit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "checkUnit" + } + }, + "condition": { + "type": "and", + "conditions": [{ + "type": "isBuffMagic", + "buff": { + "type": "getMatchingBuff" + } + },{ + "type": "isBuffPositive", + "buff": { + "type": "getMatchingBuff" + } + }] + } + }] + }, + "reason": "MUST_TARGET_AN_ENEMY_UNIT_WITH_POSITIVE_BUFFS_OR_A_SUMMONED_UNIT" + }] + },{ + "type": "and", + "conditions": [{ + "type": "not", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "doesUnitHaveBuffMatchingCondition", + "unit": { + "type": "argumentUnit", + "name": { + "type": "rawString", + "value": "checkUnit" + } + }, + "condition": { + "type": "and", + "conditions": [{ + "type": "isBuffMagic", + "buff": { + "type": "getMatchingBuff" + } + },{ + "type": "isBuffPositive", + "buff": { + "type": "getMatchingBuff" + } + }] + } + }, + "reason": "MUST_TARGET_AN_ENEMY_UNIT_WITH_POSITIVE_BUFFS" + }] + }] + }] + }] + }, + "jumpCondition": { + "type": "and", + "conditions": [{ + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + },{ + "type": "reuseBooleanWithArguments", + "name": { + "type": "rawString", + "value": "targetCondition" + }, + "arguments": { + "checkUnit": { + "type": "getMatchingUnit" + } + } + },{ + "type": "isUnitVisible", + "unit": { + "type": "getMatchingUnit" + } + }] + } + }, + "reuseActions": { + "onHit": [{ + "type": "if", + "condition": { + "type": "isUnitEnemy", + "unit": { + "type": "getProjectileHitUnit" + } + }, + "thenActions": [{ + "type": "damageTarget", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getProjectileHitUnit" + }, + "onlyDamageSummons": { + "type": "rawBoolean", + "value": "true" + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }] + },{ + "type": "if", + "condition": { + "type": "isUnitAlive", + "unit": { + "type": "getProjectileHitUnit" + } + }, + "thenActions": [{ + "type": "if", + "condition": { + "type": "not", + "condition": { + "type": "isUnitMagicImmune", + "unit": { + "type": "getProjectileHitUnit" + } + } + }, + "thenActions": [{ + "type": "subtractMp", + "unit": { + "type": "getProjectileHitUnit" + }, + "amount": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + }] + },{ + "type": "if", + "condition": { + "type": "isUnitEnemy", + "unit": { + "type": "getProjectileHitUnit" + } + }, + "thenActions": [{ + "type": "dispelBuffs", + "unit": { + "type": "getProjectileHitUnit" + }, + "filter": { + "type": "and", + "conditions": [{ + "type": "isBuffMagic", + "buff": { + "type": "enumBuff" + } + },{ + "type": "isBuffPositive", + "buff": { + "type": "enumBuff" + } + }] + } + }], + "elseActions": [{ + "type": "dispelBuffs", + "unit": { + "type": "getProjectileHitUnit" + }, + "filter": { + "type": "and", + "conditions": [{ + "type": "isBuffMagic", + "buff": { + "type": "enumBuff" + } + },{ + "type": "isBuffNegative", + "buff": { + "type": "enumBuff" + } + }] + } + }] + }] + }] + }, + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + },{ + "type": "createUnitTargetedBouncingProjectile", + "target": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getAlias" + }, + "bounces": { + "type": "i-", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + }, + "range": { + "type": "getAbilityArea" + }, + "allowMultipleBouncesPerUnit": { + "type": "rawBoolean", + "value": "false" + }, + "condition": { + "type": "reuseBoolean", + "name": { + "type": "rawString", + "value": "jumpCondition" + } + }, + "onHit": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "onHit" + } + }] + }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/ItemAffecting.json b/core/assets/abilityBehaviors/ItemAffecting.json new file mode 100644 index 000000000..0fb9a9b3d --- /dev/null +++ b/core/assets/abilityBehaviors/ItemAffecting.json @@ -0,0 +1,24 @@ +{ + "abilityList": [{ + "ids": [{"id":"AIri", "castId": "itemrandomitem"}], + "type": "NORMAL_UNITTARGET", + "onEndCasting": [{ + "type": "if", + "condition": { + "type": "notNull", + "value": { + "type": "getAbilityTargetedItem" + } + }, + "thenActions": [{ + "type": "transformItem", + "item": { + "type": "getAbilityTargetedItem" + }, + "newType": { + "type": "randomItemId" + } + }] + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/Polymorph.json b/core/assets/abilityBehaviors/Polymorph.json new file mode 100644 index 000000000..83a438564 --- /dev/null +++ b/core/assets/abilityBehaviors/Polymorph.json @@ -0,0 +1,231 @@ +{ + "abilityList": [{ + "ids": [{"id":"Aply", "castId": "polymorph"},{"id":"AOhx", "castId": "hex"}], + "type": "NORMAL_UNITTARGET", + "extraTargetConditions": [{ + "type": "not", + "condition": { + "type": "isUnitMorphImmune", + "unit": { + "type": "getAbilityTargetedUnit" + } + } + }], + "onAddDisabledAbility": [{ + "type": "createStateModBuff", + "buffType": "POLYMORPHED" + }], + "onEndCasting": [{ + "type": "checkAbilityEffectReaction", + "target": { + "type": "getAbilityTargetedUnit" + }, + "onHitActions": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + },{ + "type": "if", + "condition": { + "type": "isMovementTypeEqual", + "movementType1": { + "type": "getUnitMovementType", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "movementType2": { + "type": "getMovementTypeFromString", + "id": { + "type": "rawString", + "value": "FLY" + } + } + }, + "thenActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "unitType" + }, + "valueToStore": { + "type": "getAbilityDataAsRandomIDFromList", + "dataField": "C" + } + }], + "elseActions": [{ + "type": "if", + "condition": { + "type": "isMovementTypeEqual", + "movementType1": { + "type": "getUnitMovementType", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "movementType2": { + "type": "getMovementTypeFromString", + "id": { + "type": "rawString", + "value": "FLOAT" + } + } + }, + "thenActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "unitType" + }, + "valueToStore": { + "type": "getAbilityDataAsRandomIDFromList", + "dataField": "E" + } + }], + "elseActions": [{ + "type": "if", + "condition": { + "type": "isMovementTypeEqual", + "movementType1": { + "type": "getUnitMovementType", + "unit": { + "type": "getAbilityTargetedUnit" + } + }, + "movementType2": { + "type": "getMovementTypeFromString", + "id": { + "type": "rawString", + "value": "AMPHIBIOUS" + } + } + }, + "thenActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "unitType" + }, + "valueToStore": { + "type": "getAbilityDataAsRandomIDFromList", + "dataField": "D" + } + }], + "elseActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "unitType" + }, + "valueToStore": { + "type": "getAbilityDataAsRandomIDFromList", + "dataField": "B" + } + }] + }] + }] + },{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId", + "defaultId": { + "type": "getBuffIdFromCode" + } + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + }, + "showTimedLifeBar": { + "type": "rawBoolean", + "value": "true" + }, + "positive": { + "type": "rawBoolean", + "value": "false" + }, + "stateMods": [{ + "type": "getLastCreatedStateModBuff" + }], + "onAddActions": [{ + "type": "transformUnitAppearance", + "unit": { + "type": "getBuffedUnit" + }, + "id": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "unitType" + } + } + },{ + "type": "setSpeed", + "unit": { + "type": "getBuffedUnit" + }, + "value": { + "type": "getUnitTypeSpeed", + "id": { + "type": "getStoredIDByKey", + "key": { + "type": "rawString", + "value": "unitType" + } + } + } + }], + "onRemoveActions": [{ + "type": "transformUnitAppearance", + "unit": { + "type": "getBuffedUnit" + }, + "id": { + "type": "getUnitType", + "unit": { + "type": "getBuffedUnit" + } + } + },{ + "type": "setSpeed", + "unit": { + "type": "getBuffedUnit" + }, + "value": { + "type": "getUnitTypeSpeed", + "id": { + "type": "getUnitType", + "unit": { + "type": "getBuffedUnit" + } + } + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/RaiseDead.json b/core/assets/abilityBehaviors/RaiseDead.json index 9f8361829..c31ab8ffa 100644 --- a/core/assets/abilityBehaviors/RaiseDead.json +++ b/core/assets/abilityBehaviors/RaiseDead.json @@ -61,7 +61,11 @@ "onEndCasting": [{ "type": "createTimedLifeBuff", "buffId": { - "type": "getFirstBuffId" + "type": "getFirstBuffId", + "defaultId": { + "type": "getWar3IDFromString", + "id": "Brai" + } }, "duration": { "type": "getAbilityDuration" diff --git a/core/assets/abilityBehaviors/Summons.json b/core/assets/abilityBehaviors/Summons.json new file mode 100644 index 000000000..632433751 --- /dev/null +++ b/core/assets/abilityBehaviors/Summons.json @@ -0,0 +1,1627 @@ +{ + "abilityList": [{ + "ids": [{"id":"AHwe", "castId": "waterelemental"}, + {"id":"ANwm", "castId": "wateryminion"}, + {"id":"AEsv", "castId": "spiritofvengeance"}, + {"id":"AEst", "castId": "scout"}, + {"id":"ANsw", "castId": "summonwareagle"}, + {"id":"ANsq", "castId": "summonquillbeast"}, + {"id":"ANsg", "castId": "summongrizzly"}], + "type": "NORMAL_NOTARGET", + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "A" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "createLocationFromOffset", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "dist": { + "type": "getAbilityArea" + }, + "angle": { + "type": "getUnitFacing", + "unit": { + "type": "getCastingUnit" + } + }, + "angleInDegrees": { + "type": "rawBoolean", + "value": "true" + } + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getCastingUnit" + } + } + },{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getFirstBuffId", + "defaultId": { + "type": "getBuffIdFromCode" + } + }, + "duration": { + "type": "getAbilityDuration" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getLastCreatedUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + }] + }] + },{ + "ids": [{"id":"Amec", "castId": "mechanicalcritter"}], + "type": "NORMAL_NOTARGET", + "onAddDisabledAbility": [{ + "type": "createStateModBuff", + "buffType": "UNAUTOATTACKABLE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "unauto" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "HIDE_MINIMAP_ICON" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "minim" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "FALSE_OWNERSHIP", + "value": { + "type": "createOwnershipData", + "playerId": { + "type": "getNeutralPassivePlayerId" + }, + "priority": { + "type": "rawInteger", + "value": 15 + } + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "owner" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "A" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "randomMechanicalCritterId" + }, + "loc": { + "type": "createLocationFromOffset", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "dist": { + "type": "getAbilityArea" + }, + "angle": { + "type": "getUnitFacing", + "unit": { + "type": "getCastingUnit" + } + }, + "angleInDegrees": { + "type": "rawBoolean", + "value": "true" + } + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getCastingUnit" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "unauto" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "minim" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "owner" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getFirstBuffId", + "defaultId": { + "type": "getBuffIdFromCode" + } + }, + "duration": { + "type": "getAbilityDuration" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getLastCreatedUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + }] + }] + },{ + "ids": [{"id":"AOsf", "castId": "spiritwolf"},{"id":"AIsh", "castId": "spirittroll"}], + "type": "NORMAL_NOTARGET", + "onAddAbility": [{ + "type": "createUnitGroup", + "name": "summons" + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "iterateUnitsInGroup", + "unitGroup": { + "type": "getUnitGroupByName", + "name": "summons" + }, + "iterationActions": [{ + "type": "killUnit", + "unit": { + "type": "getEnumUnit" + } + }] + },{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "createLocationFromOffset", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "dist": { + "type": "getAbilityArea" + }, + "angle": { + "type": "getUnitFacing", + "unit": { + "type": "getCastingUnit" + } + }, + "angleInDegrees": { + "type": "rawBoolean", + "value": "true" + } + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getCastingUnit" + } + } + },{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getFirstBuffId", + "defaultId": { + "type": "getBuffIdFromCode" + } + }, + "duration": { + "type": "getAbilityDuration" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + },{ + "type": "addUnitToGroup", + "group": { + "type": "getUnitGroupByName", + "name": "summons" + }, + "unit": { + "type": "getLastCreatedUnit" + } + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getLastCreatedUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "SPECIAL" + }] + }] + },{ + "ids": [{"id":"AHpx", "castId": "summonphoenix"}], + "type": "NORMAL_NOTARGET", + "onAddDisabledAbility": [{ + "type": "createUnitGroup", + "name": "summons" + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "iterateUnitsInGroup", + "unitGroup": { + "type": "getUnitGroupByName", + "name": "summons" + }, + "iterationActions": [{ + "type": "if", + "condition": { + "type": "doesUnitHaveAbilityMatchingCondition", + "unit": { + "type": "getEnumUnit" + }, + "condition": { + "type": "isIdEqual", + "id1": { + "type": "getCode", + "ability": { + "type": "getMatchingAbility" + } + }, + "id2": { + "type": "getWar3IDFromString", + "id": "Aphx" + } + } + }, + "thenActions": [{ + "type": "removeAbility", + "unit": { + "type": "getEnumUnit" + }, + "ability": { + "type": "getAbilityById", + "unit": { + "type": "getEnumUnit" + }, + "id": { + "type": "getWar3IDFromString", + "id": "Aphx" + } + } + },{ + "type": "killUnit", + "unit": { + "type": "getEnumUnit" + } + }] + }] + },{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "A" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "createLocationFromOffset", + "origin": { + "type": "getUnitLocation", + "unit": { + "type": "getCastingUnit" + } + }, + "dist": { + "type": "getAbilityArea" + }, + "angle": { + "type": "getUnitFacing", + "unit": { + "type": "getCastingUnit" + } + }, + "angleInDegrees": { + "type": "rawBoolean", + "value": "true" + } + }, + "facing": { + "type": "getUnitFacing", + "unit": { + "type": "getCastingUnit" + } + } + },{ + "type": "setHp", + "target": { + "type": "getLastCreatedUnit" + }, + "amount": { + "type": "rawFloat", + "value": 100 + }, + "isPercent": { + "type": "rawBoolean", + "value": "true" + } + },{ + "type": "addUnitToGroup", + "group": { + "type": "getUnitGroupByName", + "name": "summons" + }, + "unit": { + "type": "getLastCreatedUnit" + } + },{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getLastCreatedUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "TARGET" + }] + }] + },{ + "ids": [{"id":"AIpm", "castId": "itemplacemine"}], + "type": "NORMAL_POINTTARGET", + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "EFFECT" + },{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "getTargetedLocation" + }, + "addSummonedTag": { + "type": "rawBoolean", + "value": "false" + }, + "removeFood": { + "type": "rawBoolean", + "value": "true" + } + }] + },{ + "ids": [{"id":"Ahwd", "castId": "healingward"}], + "type": "NORMAL_POINTTARGET", + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "EFFECT" + },{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "getTargetedLocation" + } + },{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getFirstBuffId", + "defaultId": { + "type": "getBuffIdFromCode" + } + }, + "duration": { + "type": "getAbilityDuration" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + },{ + "ids": [{"id":"AOwd", "castId": "ward"}], + "type": "NORMAL_POINTTARGET", + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "EFFECT" + },{ + "type": "for", + "times": { + "type": "getAbilityDataAsInteger", + "dataField": "A" + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "getTargetedLocation" + } + },{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getFirstBuffId", + "defaultId": { + "type": "getBuffIdFromCode" + } + }, + "duration": { + "type": "getAbilityDuration" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }] + },{ + "ids": [{"id":"Aeye", "castId": "evileye"}], + "type": "NORMAL_POINTTARGET", + "onAddDisabledAbility": [{ + "type": "createStateModBuff", + "buffType": "INVISIBLE" + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "EFFECT" + },{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "getTargetedLocation" + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getFirstBuffId", + "defaultId": { + "type": "getBuffIdFromCode" + } + }, + "duration": { + "type": "getAbilityDuration" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + },{ + "ids": [{"id":"Asta", "castId": "stasistrap"}], + "type": "NORMAL_POINTTARGET", + "onAddDisabledAbility": [{ + "type": "createStateModBuff", + "buffType": "INVISIBLE" + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "EFFECT" + },{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "getTargetedLocation" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "unit" + }, + "valueToStore": { + "type": "getLastCreatedUnit" + } + },{ + "type": "createTimer", + "timeout": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "actions": [{ + "type": "if", + "condition": { + "type": "isUnitAlive", + "unit": { + "type": "getStoredUnitByKey", + "key": { + "type": "rawString", + "value": "unit" + } + } + }, + "thenActions": [{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getStoredUnitByKey", + "key": { + "type": "rawString", + "value": "unit" + } + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createTimer", + "timeout": { + "type": "rawFloat", + "value": 1.0 + }, + "repeats": { + "type": "rawBoolean", + "value": "true" + }, + "actions": [{ + "type": "if", + "condition": { + "type": "isUnitAlive", + "unit": { + "type": "getStoredUnitByKey", + "key": { + "type": "rawString", + "value": "unit" + } + } + }, + "thenActions": [{ + "type": "if", + "condition": { + "type": "matchingUnitExistsInRangeOfUnit", + "originUnit": { + "type": "getStoredUnitByKey", + "key": { + "type": "rawString", + "value": "unit" + } + }, + "range": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + } + }, + "thenActions": [{ + "type": "removeStateModBuff", + "targetUnit": { + "type": "getStoredUnitByKey", + "key": { + "type": "rawString", + "value": "unit" + } + }, + "buff": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createTimer", + "timeout": { + "type": "rawFloat", + "value": 1.0 + }, + "actions": [{ + "type": "if", + "condition": { + "type": "isUnitAlive", + "unit": { + "type": "getStoredUnitByKey", + "key": { + "type": "rawString", + "value": "unit" + } + } + }, + "thenActions": [{ + "type": "killUnit", + "unit": { + "type": "getStoredUnitByKey", + "key": { + "type": "rawString", + "value": "unit" + } + } + },{ + "type": "iterateUnitsInRangeOfUnitMatchingCondition", + "originUnit": { + "type": "getStoredUnitByKey", + "key": { + "type": "rawString", + "value": "unit" + } + }, + "range": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + }, + "iterationActions": [{ + "type": "addStunBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "unit": { + "type": "getEnumUnit" + }, + "duration": { + "type": "inlineConditionFloat", + "condition": { + "type": "isUnitHero", + "unit": { + "type": "getEnumUnit" + } + }, + "pass": { + "type": "getAbilityDataAsFloat", + "dataField": "D" + }, + "fail": { + "type": "getAbilityHeroDuration" + } + } + }] + }] + },{ + "type": "cleanUpCastInstance" + }] + },{ + "type": "killTimer", + "timer": { + "type": "getFiringTimer" + } + }] + }], + "elseActions": [{ + "type": "killTimer", + "timer": { + "type": "getFiringTimer" + } + },{ + "type": "cleanUpCastInstance" + }] + }] + }], + "elseActions": [{ + "type": "cleanUpCastInstance" + }] + }] + },{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getWar3IDFromString", + "id": "Bstt" + }, + "duration": { + "type": "getAbilityDuration" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + },{ + "ids": [{"id":"ANin", "castId": "inferno"},{"id":"AUin", "castId": "dreadlordinferno"}], + "type": "NORMAL_POINTTARGET", + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "EFFECT" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "targetLoc" + }, + "valueToStore": { + "type": "getTargetedLocation" + } + },{ + "type": "createTimer", + "timeout": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, + "actions": [{ + "type": "iterateDestructablesInRangeOfLocation", + "location": { + "type": "getStoredLocationByKey", + "key": { + "type": "rawString", + "value": "targetLoc" + } + }, + "range": { + "type": "getAbilityArea" + }, + "iterationActions": [{ + "type": "if", + "condition": { + "type": "isTree", + "dest": { + "type": "getEnumDestructable" + } + }, + "thenActions": [{ + "type": "killDestructable", + "dest": { + "type": "getEnumDestructable" + } + }] + }] + },{ + "type": "damageArea", + "source": { + "type": "getCastingUnit" + }, + "target": { + "type": "getStoredLocationByKey", + "key": { + "type": "rawString", + "value": "targetLoc" + } + }, + "validTarget": { + "type": "isUnitValidTarget", + "target": { + "type": "getEnumUnit" + } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FORCE" + } + }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + }, + "radius": { + "type": "getAbilityArea" + }, + "extraActions": [{ + "type": "addStunBuff", + "unit": { + "type": "getEnumUnit" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getEnumUnit" + } + } + }] + },{ + "type": "iterateUnitsInRangeOfLocationMatchingCondition", + "location": { + "type": "getStoredLocationByKey", + "key": { + "type": "rawString", + "value": "targetLoc" + } + }, + "range": { + "type": "getAbilityArea" + }, + "condition": { + "type": "isUnitValidTarget", + "target": { + "type": "getMatchingUnit" + } + }, + "iterationActions": [] + },{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "getStoredLocationByKey", + "key": { + "type": "rawString", + "value": "targetLoc" + } + } + },{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + }, + "thenActions": [{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getFirstBuffId", + "defaultId": { + "type": "getWar3IDFromString", + "id": "BNin" + } + }, + "duration": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + }] + }] + },{ + "ids": [{"id":"ANdp", "castId": "darkportal"}], + "type": "NORMAL_POINTTARGET", + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "EFFECT" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "targetLoc" + }, + "valueToStore": { + "type": "getTargetedLocation" + } + },{ + "type": "createTimer", + "timeout": { + "type": "getAbilityDuration" + }, + "actions": [{ + "type": "for", + "times": { + "type": "randomInteger", + "lowerBound": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + }, + "upperBound": { + "type": "i+", + "value1": { + "type": "getAbilityDataAsInteger", + "dataField": "C" + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + }, + "actions": [{ + "type": "createUnit", + "id": { + "type": "getAbilityDataAsRandomIDFromList", + "dataField": "A" + }, + "loc": { + "type": "getStoredLocationByKey", + "key": { + "type": "rawString", + "value": "targetLoc" + } + } + }] + }] + }] + },{ + "ids": [{"id":"ANrc", "castId": "rainofchaos"}], + "type": "NORMAL_POINTTARGET", + "onAddDisabledAbility": [{ + "type": "createAbilityFromId", + "id": { + "type": "getAbilityDataAsID", + "dataField": "A" + } + },{ + "type": "prepUnownedAbilityForUse", + "ability": { + "type": "getLastCreatedAbility" + } + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "EFFECT" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "targetLoc" + }, + "valueToStore": { + "type": "getTargetedLocation" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "iter" + }, + "valueToStore": { + "type": "rawInteger", + "value": 0 + } + },{ + "type": "beginChanneling" + }], + "onChannelTick": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "iter" + }, + "valueToStore": { + "type": "i+", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "iter" + } + }, + "value2": { + "type": "rawInteger", + "value": 1 + } + } + },{ + "type": "if", + "condition": { + "type": "i>", + "value1": { + "type": "getStoredIntegerByKey", + "key": { + "type": "rawString", + "value": "iter" + } + }, + "value2": { + "type": "getAbilityDataAsInteger", + "dataField": "B" + } + }, + "thenActions": [{ + "type": "finishChanneling" + }], + "elseActions": [{ + "type": "abilityRunEndCastingActions", + "ability": { + "type": "getLastCreatedAbility" + }, + "targetLoc": { + "type": "randomLocationInRange", + "origin": { + "type": "getStoredLocationByKey", + "key": { + "type": "rawString", + "value": "targetLoc" + } + }, + "range": { + "type": "getAbilityArea" + } + } + }] + }], + "delaySeconds": { + "type": "getAbilityDuration" + }, + "initialTick": { + "type": "rawBoolean", + "value": "true" + } + }], + "onEndChannel": [{ + "type": "cleanUpCastInstance" + }] + },{ + "ids": [{"id":"ANto", "castId": "tornado"}], + "type": "NORMAL_POINTTARGET", + "onAddDisabledAbility": [{ + "type": "createStateModBuff", + "buffType": "INVULNERABLE" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "invuln" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "UNSELECTABLE", + "value": { + "type": "playerMaskExcludePlayers", + "players": [{ + "type": "getCastingPlayer" + }] + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "unsel" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + },{ + "type": "createStateModBuff", + "buffType": "UNTARGETABLE", + "value": { + "type": "playerMaskAllPlayers" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "untar" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedStateModBuff" + } + }], + "onEndCasting": [{ + "type": "createTemporarySpellEffectOnUnit", + "target": { + "type": "getCastingUnit" + }, + "id": { + "type": "getAlias" + }, + "effectType": "CASTER" + },{ + "type": "createTemporarySpellEffectAtLocation", + "location": { + "type": "getTargetedLocation" + }, + "id": { + "type": "getAlias" + }, + "effectType": "EFFECT" + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "targetLoc" + }, + "valueToStore": { + "type": "getTargetedLocation" + } + },{ + "type": "createUnit", + "id": { + "type": "getAbilityUnitId" + }, + "loc": { + "type": "getTargetedLocation" + } + },{ + "type": "if", + "condition": { + "type": "f>0", + "value": { + "type": "getAbilityDuration" + } + }, + "thenActions": [{ + "type": "createTimedLifeBuff", + "buffId": { + "type": "getFirstBuffId", + "defaultId": { + "type": "getBuffIdFromCode" + } + }, + "duration": { + "type": "getAbilityDuration" + }, + "explode": { + "type": "rawBoolean", + "value": "false" + } + },{ + "type": "addBuff", + "target": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }] + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "invuln" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "unsel" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "addStateModBuff", + "targetUnit": { + "type": "getLastCreatedUnit" + }, + "buff": { + "type": "getStoredStateModBuffByKey", + "key": { + "type": "rawString", + "value": "untar" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + } + } + },{ + "type": "beginChanneling" + }], + "onChannelTick": [{ + "type": "periodicExecute", + "periodicActions": [{ + "type": "finishChanneling" + }], + "delaySeconds": { + "type": "getAbilityDuration" + } + }], + "onEndChannel": [{ + "type": "killUnit", + "unit": { + "type": "getLastCreatedUnit" + } + },{ + "type": "cleanUpCastInstance" + }] + }] +} \ No newline at end of file diff --git a/core/assets/abilityBehaviors/Transformations.json b/core/assets/abilityBehaviors/Transformations.json index 026ed438a..6c47adcb6 100644 --- a/core/assets/abilityBehaviors/Transformations.json +++ b/core/assets/abilityBehaviors/Transformations.json @@ -223,6 +223,11 @@ } } }, + "reuseCallbacks": { + "defaultBuffId": { + "type": "null" + } + }, "reuseActions": { "storeBaseType": [{ "type": "if", @@ -469,7 +474,14 @@ "type": "getAbilityHeroDuration" }, "buffId": { - "type": "getFirstBuffId" + "type": "getFirstBuffId", + "defaultId": { + "type": "reuseID", + "name": { + "type": "rawString", + "value": "defaultBuffId" + } + } }, "onTransformActions": [{ "type": "runReuseAction", @@ -671,7 +683,14 @@ "type": "getAbilityHeroDuration" }, "buffId": { - "type": "getFirstBuffId" + "type": "getFirstBuffId", + "defaultId": { + "type": "reuseID", + "name": { + "type": "rawString", + "value": "defaultBuffId" + } + } }, "onTransformActions": [{ "type": "runReuseAction", @@ -971,7 +990,14 @@ "type": "getAbilityHeroDuration" }, "buffId": { - "type": "getFirstBuffId" + "type": "getFirstBuffId", + "defaultId": { + "type": "reuseID", + "name": { + "type": "rawString", + "value": "defaultBuffId" + } + } }, "onTransformActions": [{ "type": "runReuseAction", @@ -1102,6 +1128,12 @@ "ids": [{"id":"ANcr", "castId": "chemicalrage"}], "type": "INHERIT", "parentId": "Arav", + "reuseCallbacks": { + "defaultBuffId": { + "type": "getWar3IDFromString", + "id": "BNcr" + } + }, "reuseActions": { "onTransform": [{ "type": "disableAbility" @@ -1230,7 +1262,14 @@ "type": "getAbilityHeroDuration" }, "buffId": { - "type": "getFirstBuffId" + "type": "getFirstBuffId", + "defaultId": { + "type": "reuseID", + "name": { + "type": "rawString", + "value": "defaultBuffId" + } + } }, "instantTransformAtDurationEnd": { "type": "rawBoolean", @@ -1267,6 +1306,12 @@ "ids": [{"id":"AEme", "castId": "metamorphosis"}], "type": "INHERIT", "parentId": "Arav", + "reuseCallbacks": { + "defaultBuffId": { + "type": "getWar3IDFromString", + "id": "BEme" + } + }, "displayFields": { "toggleable": { "type": "rawBoolean", @@ -1432,7 +1477,14 @@ "type": "getAbilityHeroDuration" }, "buffId": { - "type": "getFirstBuffId" + "type": "getFirstBuffId", + "defaultId": { + "type": "reuseID", + "name": { + "type": "rawString", + "value": "defaultBuffId" + } + } }, "onTransformActions": [{ "type": "runReuseAction", @@ -2226,30 +2278,30 @@ }] }], "onAddAbility": [{ - "type": "addDeathReplacementEffect", - "target": { - "type": "getCastingUnit" - }, - "priority": { - "type": "rawPriority", - "priority": "PHOENIXREVIVE" - }, - "listener": { - "type": "getLastCreatedDeathReplacement" - } + "type": "addDeathReplacementEffect", + "target": { + "type": "getCastingUnit" + }, + "priority": { + "type": "rawPriority", + "priority": "PHOENIXREVIVE" + }, + "listener": { + "type": "getLastCreatedDeathReplacement" + } }], "onRemoveAbility": [{ - "type": "removeDeathReplacementEffect", - "target": { - "type": "getCastingUnit" - }, - "priority": { - "type": "rawPriority", - "priority": "PHOENIXREVIVE" - }, - "listener": { - "type": "getLastCreatedDeathReplacement" - } + "type": "removeDeathReplacementEffect", + "target": { + "type": "getCastingUnit" + }, + "priority": { + "type": "rawPriority", + "priority": "PHOENIXREVIVE" + }, + "listener": { + "type": "getLastCreatedDeathReplacement" + } }] }] } \ No newline at end of file diff --git a/core/assets/abilityBehaviors/activeBuffs.json b/core/assets/abilityBehaviors/activeBuffs.json index 5e854daa0..845dd65c0 100644 --- a/core/assets/abilityBehaviors/activeBuffs.json +++ b/core/assets/abilityBehaviors/activeBuffs.json @@ -672,7 +672,7 @@ "condition": { "type": "isUnitMagicImmune", "unit": { - "type": "getAttackingUnit" + "type": "getDamagingUnit" } } }] @@ -680,12 +680,12 @@ "thenActions": [{ "type": "addSlowBuff", "unit": { - "type": "getAttackingUnit" + "type": "getDamagingUnit" }, "duration": { "type": "getAbilityDuration", "target": { - "type": "getAttackingUnit" + "type": "getDamagingUnit" } } }] @@ -923,6 +923,142 @@ "value": "setupBuffs" } }] + },{ + "ids": [{"id":"Afzy", "castId": "frenzy", "autoCastOnId": "frenzyon", "autoCastOffId": "frenzyoff", "autoCastType": "NOTARGET"}], + "type": "NORMAL_NOTARGET", + "extraAutoNoTargetConditions": [{ + "type": "isCurrentBehaviorCategoryInList", + "list": ["ATTACK"] + },{ + "type": "not", + "condition": { + "type": "doesUnitHaveBuff", + "unit": { + "type": "getAbilityTargetedUnit" + }, + "id": { + "type": "getFirstBuffId" + } + } + }], + "reuseActions": { + "setupBuffs": [{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "ATKSPD" + } + }, + "stackingKey": { + "type": "rawString", + "value": "bloodlust" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "A" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "asbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + },{ + "type": "createNonStackingStatBuff", + "buffType": { + "type": "getNonStackingStatBuffTypeFromString", + "id": { + "type": "rawString", + "value": "MVSPDPCT" + } + }, + "stackingKey": { + "type": "rawString", + "value": "bloodlust" + }, + "value": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + } + },{ + "type": "storeValueLocally", + "key": { + "type": "rawString", + "value": "mvbuff" + }, + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "valueToStore": { + "type": "getLastCreatedNonStackingStatBuff" + } + }] + }, + "onAddDisabledAbility": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } + }], + "onEndCasting": [{ + "type": "createTimedBuff", + "buffId": { + "type": "getFirstBuffId" + }, + "duration": { + "type": "getAbilityDuration", + "target": { + "type": "getAbilityTargetedUnit" + } + }, + "statBuffs": [{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "asbuff" + } + },{ + "type": "getStoredNonStackingStatBuffByKey", + "instanceValue": { + "type": "rawBoolean", + "value": "false" + }, + "key": { + "type": "rawString", + "value": "mvbuff" + } + }] + },{ + "type": "addBuff", + "target": { + "type": "getAbilityTargetedUnit" + }, + "buff": { + "type": "getLastCreatedBuff" + } + }], + "onLevelChange": [{ + "type": "runReuseAction", + "name": { + "type": "rawString", + "value": "setupBuffs" + } + }] },{ "ids": [{"id":"AHds", "castId": "divineshield", "uncastId": "undivineshield"}], "type": "NORMAL_NOTARGET", diff --git a/core/assets/abilityBehaviors/itemSimple.json b/core/assets/abilityBehaviors/itemSimple.json index f987581f6..8a1de76d7 100644 --- a/core/assets/abilityBehaviors/itemSimple.json +++ b/core/assets/abilityBehaviors/itemSimple.json @@ -40,7 +40,7 @@ "dataField": "A" } }, - "player": { + "playerDetectedData": { "type": "playerToStateModValue", "player": { "type": "getOwnerOfUnit", diff --git a/core/assets/abilityBehaviors/nightElfUnitActives.json b/core/assets/abilityBehaviors/nightElfUnitActives.json index 7e88fb5ef..d4251f00c 100644 --- a/core/assets/abilityBehaviors/nightElfUnitActives.json +++ b/core/assets/abilityBehaviors/nightElfUnitActives.json @@ -646,7 +646,7 @@ "type": "rawInteger", "value": 127 }, - "player": { + "playerDetectedData": { "type": "playerToStateModValue", "player": { "type": "getOwnerOfUnit", diff --git a/core/assets/abilityBehaviors/undeadUnitActives.json b/core/assets/abilityBehaviors/undeadUnitActives.json index f3c8ac4ee..44d950e2c 100644 --- a/core/assets/abilityBehaviors/undeadUnitActives.json +++ b/core/assets/abilityBehaviors/undeadUnitActives.json @@ -353,7 +353,7 @@ "range": { "type": "getAbilityArea" }, - "conditions": [{ + "condition": { "type": "and", "conditions": [{ "type": "isUnitValidTarget", @@ -367,7 +367,7 @@ "value": "checkValidTarget" } }] - }] + } }], "onEndCasting": [{ "type": "createTemporarySpellEffectOnUnit", diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index de7708816..367317899 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -1194,6 +1194,105 @@ public JassValue call(final List arguments, final GlobalScope globalS orderId, false); return BooleanJassValue.of(abilityHandleId != 0); }); + + jassProgramVisitor.getJassNativeManager().createNative("UnitUseItem", + (arguments, globalScope, triggerScope) -> { + final CUnit whichUnit = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); + if (whichUnit == null) { + return BooleanJassValue.FALSE; + } + final CItem item = arguments.get(1).visit(ObjectJassValueVisitor.getInstance()); + final CPlayerUnitOrderExecutor defaultPlayerUnitOrderExecutor = CommonEnvironment.this.simulation + .getDefaultPlayerUnitOrderExecutor(whichUnit.getPlayerIndex()); + final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; + final int orderId = OrderIdUtils.getOrderId("itemuse" + String.format("%02d", item.getContainedInventory().getSlot(item))); + int abilityHandleId = 0; + for (final CAbility ability : whichUnit.getAbilities()) { + ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, false, + activationReceiver); + if (activationReceiver.isOk()) { + final BooleanAbilityTargetCheckReceiver targetReceiver = BooleanAbilityTargetCheckReceiver + .getInstance(); + ability.checkCanTargetNoTarget(CommonEnvironment.this.simulation, whichUnit, orderId, + false, targetReceiver.reset()); + if (targetReceiver.isTargetable()) { + abilityHandleId = ability.getHandleId(); + } + } + } + defaultPlayerUnitOrderExecutor.issueImmediateOrder(whichUnit.getHandleId(), abilityHandleId, + orderId, false); + return BooleanJassValue.of(abilityHandleId != 0); + }); + final JassFunction unitUseItemTarget = (arguments, globalScope, triggerScope) -> { + final CUnit whichUnit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + if (whichUnit == null) { + return BooleanJassValue.FALSE; + } + final CItem item = arguments.get(1).visit(ObjectJassValueVisitor.getInstance()); + CWidget whichTarget = arguments.get(2).visit(ObjectJassValueVisitor.getInstance()); + final CPlayerUnitOrderExecutor defaultPlayerUnitOrderExecutor = CommonEnvironment.this.simulation + .getDefaultPlayerUnitOrderExecutor(whichUnit.getPlayerIndex()); + final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; + final int orderId = OrderIdUtils.getOrderId("itemuse" + String.format("%02d", item.getContainedInventory().getSlot(item))); + int abilityHandleId = 0; + for (final CAbility ability : whichUnit.getAbilities()) { + ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, false, + activationReceiver); + if (activationReceiver.isOk()) { + final CWidgetAbilityTargetCheckReceiver targetReceiver = CWidgetAbilityTargetCheckReceiver.INSTANCE; + ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, false, + whichTarget, targetReceiver.reset()); + if (targetReceiver.getTarget() != null) { + whichTarget = targetReceiver.getTarget(); + abilityHandleId = ability.getHandleId(); + } + } + } + if (abilityHandleId != 0) { + defaultPlayerUnitOrderExecutor.issueTargetOrder(whichUnit.getHandleId(), abilityHandleId, + orderId, whichTarget.getHandleId(), false); + } + return BooleanJassValue.of(abilityHandleId != 0); + }; + jassProgramVisitor.getJassNativeManager().createNative("UnitUseItemTarget", unitUseItemTarget); + jassProgramVisitor.getJassNativeManager().createNative("UnitUseItemDestructable", unitUseItemTarget); + jassProgramVisitor.getJassNativeManager().createNative("UnitUseItemPointLoc", + (arguments, globalScope, triggerScope) -> { + final CUnit whichUnit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + if (whichUnit == null) { + return BooleanJassValue.FALSE; + } + final CItem item = arguments.get(1).visit(ObjectJassValueVisitor.getInstance()); + final AbilityPointTarget whichLocation = arguments.get(2) + .visit(ObjectJassValueVisitor.getInstance()); + final CPlayerUnitOrderExecutor defaultPlayerUnitOrderExecutor = CommonEnvironment.this.simulation + .getDefaultPlayerUnitOrderExecutor(whichUnit.getPlayerIndex()); + final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; + final int orderId = OrderIdUtils.getOrderId("itemuse" + String.format("%02d", item.getContainedInventory().getSlot(item))); + int abilityHandleId = 0; + AbilityPointTarget targetAsPoint = new AbilityPointTarget(whichLocation.x, whichLocation.y); + for (final CAbility ability : whichUnit.getAbilities()) { + ability.checkCanUse(CommonEnvironment.this.simulation, whichUnit, orderId, false, + activationReceiver); + if (activationReceiver.isOk()) { + final PointAbilityTargetCheckReceiver targetReceiver = PointAbilityTargetCheckReceiver.INSTANCE; + ability.checkCanTarget(CommonEnvironment.this.simulation, whichUnit, orderId, false, + targetAsPoint, targetReceiver.reset()); + if (targetReceiver.getTarget() != null) { + targetAsPoint = targetReceiver.getTarget(); + abilityHandleId = ability.getHandleId(); + } + } + } + if (abilityHandleId != 0) { + defaultPlayerUnitOrderExecutor.issuePointOrder(whichUnit.getHandleId(), abilityHandleId, + orderId, targetAsPoint.x, targetAsPoint.y, false); + } + return BooleanJassValue.of(abilityHandleId != 0); + }); + + jassProgramVisitor.getJassNativeManager().createNative("UnitDamageTarget", (arguments, globalScope, triggerScope) -> { final CUnit whichUnit = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java index c2b3fed07..226c5b41d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java @@ -1288,11 +1288,13 @@ public void doSelectUnit(final List units) { path += ".blp"; } if (unit instanceof RenderUnit) { - final int selectedUnitPlayerIndex = ((RenderUnit) unit).getSimulationUnit().getPlayerIndex(); + final int selectedUnitPlayerIndex = ((RenderUnit) unit).getSimulationUnit().getFakePlayerIndex(); final CPlayer localPlayer = this.simulation.getPlayer(this.localPlayerIndex); if (!localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.PASSIVE)) { allyKey = "e:"; - } else if (localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.SHARED_CONTROL)) { + } else if (localPlayer.hasAlliance(((RenderUnit) unit).getSimulationUnit().getPlayerIndex(), + CAllianceType.SHARED_CONTROL) + || localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.SHARED_CONTROL)) { allyKey = "f:"; } } @@ -1406,11 +1408,12 @@ public void showUnitMouseOverHighlight(final RenderWidget unit) { } if (unit instanceof RenderUnit) { final CUnit simulationUnit = ((RenderUnit) unit).getSimulationUnit(); - final int selectedUnitPlayerIndex = simulationUnit.getPlayerIndex(); + final int selectedUnitPlayerIndex = simulationUnit.getFakePlayerIndex(); final CPlayer localPlayer = this.simulation.getPlayer(this.localPlayerIndex); if (!localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.PASSIVE)) { allyKey = "e:"; - } else if (localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.SHARED_CONTROL)) { + } else if (localPlayer.hasAlliance(simulationUnit.getPlayerIndex(), CAllianceType.SHARED_CONTROL) + || localPlayer.hasAlliance(selectedUnitPlayerIndex, CAllianceType.SHARED_CONTROL)) { allyKey = "f:"; } } @@ -2448,6 +2451,11 @@ private MapLoader(final War3Map war3Map, final War3MapW3i w3iFile, final int loc new SimulationRenderController() { private final Map keyToCombatSound = new HashMap<>(); + @Override + public char getTileset() { + return War3MapViewer.this.solverParams.tileset; + } + @Override public CAttackProjectile createAttackProjectile(final CSimulation simulation, final float launchX, final float launchY, final float launchFacing, @@ -3036,6 +3044,15 @@ public CItem createItem(final CSimulation simulation, final War3ID typeId, final .getBuildingAngle())); } + @Override + public void updateItemModel(CItem item) { + RenderItem ri = War3MapViewer.this.getRenderPeer(item); + RenderItemType rit = War3MapViewer.this.renderItemTypeData.get(item.getTypeId()); + if (ri != null && rit != null) { + ri.updateItemModel(War3MapViewer.this, rit); + } + } + @Override public void spawnDeathExplodeEffect(final CUnit source, final War3ID explodesOnDeathBuffId) { @@ -3253,7 +3270,8 @@ public void unitRepositioned(final CUnit cUnit) { } @Override - public void unitUpdatedType(final CUnit simulationUnit, final War3ID typeId) { + public void unitUpdatedType(final CUnit simulationUnit, final War3ID typeId, + final boolean updatePortrait) { final RenderUnit renderPeer = War3MapViewer.this.unitToRenderPeer.get(simulationUnit); final RenderUnitType typeData = getUnitTypeData(typeId); @@ -3280,9 +3298,9 @@ public void unitUpdatedType(final CUnit simulationUnit, final War3ID typeId) { renderPeer.resetRenderUnit(War3MapViewer.this, unitX, unitY, unitZ, customTeamColor /* renderPeer.playerIndex */, simulationUnit, typeData, - buildingShadowInstance, War3MapViewer.this.selectionCircleScaleFactor, - typeData.getAnimationWalkSpeed(), typeData.getAnimationRunSpeed(), - typeData.getScalingValue()); + updatePortrait, buildingShadowInstance, + War3MapViewer.this.selectionCircleScaleFactor, typeData.getAnimationWalkSpeed(), + typeData.getAnimationRunSpeed(), typeData.getScalingValue()); } @Override @@ -3445,7 +3463,8 @@ public SimulationRenderComponent spawnAbilitySoundEffect(final CUnit caster, final War3ID alias) { final RenderUnit renderPeer = War3MapViewer.this.unitToRenderPeer.get(caster); final AbilityUI abilityUi = War3MapViewer.this.abilityDataUI.getUI(alias); - if ((abilityUi == null) || (abilityUi.getEffectSound() == null)) { + if ((renderPeer == null) || (abilityUi == null) + || (abilityUi.getEffectSound() == null)) { return SimulationRenderComponent.DO_NOTHING; } final long soundId = War3MapViewer.this.uiSounds.getSound(abilityUi.getEffectSound()) @@ -3469,7 +3488,8 @@ public SimulationRenderComponent loopAbilitySoundEffect(final CUnit caster, final War3ID alias) { final RenderUnit renderPeer = War3MapViewer.this.unitToRenderPeer.get(caster); final AbilityUI abilityUi = War3MapViewer.this.abilityDataUI.getUI(alias); - if ((abilityUi == null) || (abilityUi.getEffectSound() == null)) { + if ((renderPeer == null) || (abilityUi == null) + || (abilityUi.getEffectSound() == null)) { return SimulationRenderComponent.DO_NOTHING; } final long soundId = War3MapViewer.this.uiSounds diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderItem.java index b0c4eaa1c..02249662b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderItem.java @@ -16,10 +16,11 @@ public class RenderItem implements RenderWidget { private final CItem simulationItem; - public final MdxComplexInstance instance; + public MdxComplexInstance instance; public final float[] location = new float[3]; + public final float angle; public float radius; - public final MdxModel portraitModel; + public MdxModel portraitModel; public SplatMover shadow; public SplatMover selectionCircle; public SplatMover selectionPreviewHighlight; @@ -32,6 +33,7 @@ public RenderItem(final War3MapViewer map, RenderItemType itemType, final float this.simulationItem = simulationItem; final MdxComplexInstance instance = (MdxComplexInstance) itemType.getModel().addInstance(); + this.angle = angle; this.location[0] = x; this.location[1] = y; this.location[2] = z; @@ -50,6 +52,27 @@ public RenderItem(final War3MapViewer map, RenderItemType itemType, final float this.instance = instance; } + + public void updateItemModel(final War3MapViewer map, RenderItemType itemType) { + this.instance.detach(); + this.portraitModel.detach(); + + this.portraitModel = itemType.getPortraitModel(); + final MdxComplexInstance instance = (MdxComplexInstance) itemType.getModel().addInstance(); + instance.move(this.location); + instance.rotate(new Quaternion().setFromAxisRad(RenderMathUtils.VEC3_UNIT_Z, this.angle)); + instance.setScene(map.worldScene); + + if (itemType != null) { + final Vector3 tintingColor = itemType.getTintingColor(); + instance.setVertexColor(new float[] { tintingColor.x, tintingColor.y, tintingColor.z }); + instance.uniformScale(itemType.getModelScale()); + + this.radius = 1 * 36; + } + + this.instance = instance; + } @Override public MdxComplexInstance getInstance() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java index 8be8188ef..f9a033d63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderUnit.java @@ -77,16 +77,18 @@ public RenderUnit(final War3MapViewer map, final float x, final float y, final f final float selectionCircleScaleFactor, final float animationWalkSpeed, final float animationRunSpeed, final float scalingValue) { this.simulationUnit = simulationUnit; - resetRenderUnit(map, x, y, z, playerIndex, simulationUnit, typeData, buildingShadow, selectionCircleScaleFactor, - animationWalkSpeed, animationRunSpeed, scalingValue); + resetRenderUnit(map, x, y, z, playerIndex, simulationUnit, typeData, true, buildingShadow, + selectionCircleScaleFactor, animationWalkSpeed, animationRunSpeed, scalingValue); } public void resetRenderUnit(final War3MapViewer map, final float x, final float y, final float z, - final int playerIndex, final CUnit simulationUnit, final RenderUnitType typeData, + final int playerIndex, final CUnit simulationUnit, final RenderUnitType typeData, boolean updatePortrait, final BuildingShadow buildingShadow, final float selectionCircleScaleFactor, final float animationWalkSpeed, final float animationRunSpeed, final float scalingValue) { - this.portraitModel = typeData.getPortraitModel(); + if (updatePortrait) { + this.portraitModel = typeData.getPortraitModel(); + } this.typeData = typeData; this.specialArtModel = typeData.getSpecialArtModel(); if (this.buildingShadowInstance != null) { @@ -184,8 +186,7 @@ public void updateAnimations(final War3MapViewer map) { } this.instance.hide(); return; - } - else { + } else { this.instance.show(); if (wasHidden) { if (this.selectionCircle != null) { @@ -215,8 +216,7 @@ public void updateAnimations(final War3MapViewer map) { // where they actually are this.location[0] += (speedDelta * simDx) / distanceToSimulation; this.location[1] += (speedDelta * simDy) / distanceToSimulation; - } - else { + } else { this.location[0] = simulationX; this.location[1] = simulationY; } @@ -238,8 +238,7 @@ public void updateAnimations(final War3MapViewer map) { if (standingOnWater) { groundHeightTerrainAndWater = Math.max(groundHeightTerrain, map.terrain.getWaterHeight(this.location[0], this.location[1])); - } - else { + } else { // land units will have their feet pass under the surface of the water groundHeightTerrainAndWater = groundHeightTerrain; } @@ -247,8 +246,7 @@ public void updateAnimations(final War3MapViewer map) { // boats cant go on bridges groundHeight = groundHeightTerrainAndWater; currentWalkableUnder = null; - } - else { + } else { currentWalkableUnder = map.getHighestWalkableUnder(this.location[0], this.location[1]); War3MapViewer.gdxRayHeap.set(this.location[0], this.location[1], 4096, 0, 0, -8192); if ((currentWalkableUnder != null) @@ -257,8 +255,7 @@ public void updateAnimations(final War3MapViewer map) { && (War3MapViewer.intersectionHeap.z > groundHeightTerrainAndWater)) { groundHeight = War3MapViewer.intersectionHeap.z; swimming = false; // Naga Royal Guard should slither across a bridge, not swim in rock - } - else { + } else { groundHeight = groundHeightTerrainAndWater; currentWalkableUnder = null; } @@ -268,8 +265,7 @@ public void updateAnimations(final War3MapViewer map) { if (this.unitAnimationListenerImpl.addSecondaryTag(AnimationTokens.SecondaryTag.SWIM)) { changedAnimationProperties = true; } - } - else if (!swimming && this.swimming) { + } else if (!swimming && this.swimming) { if (this.unitAnimationListenerImpl.removeSecondaryTag(AnimationTokens.SecondaryTag.SWIM)) { changedAnimationProperties = true; } @@ -278,8 +274,7 @@ else if (!swimming && this.swimming) { if (this.unitAnimationListenerImpl.addSecondaryTag(AnimationTokens.SecondaryTag.WORK)) { changedAnimationProperties = true; } - } - else if (!working && this.working) { + } else if (!working && this.working) { if (this.unitAnimationListenerImpl.removeSecondaryTag(AnimationTokens.SecondaryTag.WORK)) { changedAnimationProperties = true; } @@ -291,12 +286,10 @@ else if (!working && this.working) { if (invisible && !this.invisible) { // turn invisible instantly colorNeedsUpdate = true; - } - else if (!invisible && this.invisible) { + } else if (!invisible && this.invisible) { // show instantly colorNeedsUpdate = true; - } - else if ((this.simulationUnit.getFadeTimer() != null) && this.simulationUnit.getFadeTimer().isRunning()) { + } else if ((this.simulationUnit.getFadeTimer() != null) && this.simulationUnit.getFadeTimer().isRunning()) { colorNeedsUpdate = true; } this.invisible = invisible; @@ -314,15 +307,13 @@ else if ((this.simulationUnit.getFadeTimer() != null) && this.simulationUnit.get this.unitAnimationListenerImpl.playAnimation(true, PrimaryTag.DEATH, SequenceUtils.EMPTY, 1.0f, true); removeSplats(map); } - } - else if (building != this.building) { + } else if (building != this.building) { if (building) { if (this.shadow != null) { this.shadow.hide(); } createBuildingDecalSplats(map); - } - else { + } else { if (this.shadow != null) { this.shadow.show(map.terrain.centerOffset); } @@ -334,13 +325,11 @@ else if (building != this.building) { if (this.simulationUnit.getUnitType().isHero()) { this.unitAnimationListenerImpl.playAnimationWithDuration(true, PrimaryTag.DISSIPATE, SequenceUtils.EMPTY, this.simulationUnit.getEndingDecayTime(map.simulation), true); - } - else { + } else { this.unitAnimationListenerImpl.playAnimationWithDuration(true, PrimaryTag.DECAY, SequenceUtils.BONE, this.simulationUnit.getEndingDecayTime(map.simulation), true); } - } - else if (corpse && !this.corpse) { + } else if (corpse && !this.corpse) { this.unitAnimationListenerImpl.playAnimationWithDuration(true, PrimaryTag.DECAY, SequenceUtils.FLESH, map.simulation.getGameplayConstants().getDecayTime(), true); } @@ -377,8 +366,7 @@ else if (corpse && !this.corpse) { - ((this.orientationInterpolation.getEndingAccelCutoff() - absoluteFacingDeltaRadians) / this.orientationInterpolation.getEndingAccelCutoff())) * (this.orientationInterpolation.getMaxVelocity()) * turningSign; - } - else { + } else { acceleration = this.orientationInterpolation.getStartingAcceleration() * turningSign; this.currentTurnVelocity = this.currentTurnVelocity + acceleration; } @@ -421,8 +409,7 @@ else if (corpse && !this.corpse) { rollSampleBackwardY); rollSampleGroundHeight2 = getGroundHeightSample(groundHeight, currentWalkableUnder, rollSampleForwardX, rollSampleForwardY); - } - else { + } else { final float pitchGroundHeight1 = map.terrain.getGroundHeight(pitchSampleBackwardX, pitchSampleBackwardY); final float pitchGroundHeight2 = map.terrain.getGroundHeight(pitchSampleForwardX, pitchSampleForwardY); final float rollGroundHeight1 = map.terrain.getGroundHeight(rollSampleBackwardX, rollSampleBackwardY); @@ -436,8 +423,7 @@ else if (corpse && !this.corpse) { map.terrain.getWaterHeight(rollSampleBackwardX, rollSampleBackwardY)); rollSampleGroundHeight2 = Math.max(rollGroundHeight2, map.terrain.getWaterHeight(rollSampleForwardX, rollSampleForwardY)); - } - else { + } else { pitchSampleGroundHeight1 = pitchGroundHeight1; pitchSampleGroundHeight2 = pitchGroundHeight2; rollSampleGroundHeight1 = rollGroundHeight1; @@ -530,8 +516,7 @@ private float getGroundHeightSample(final float groundHeight, final MdxComplexIn if (currentWalkableUnder.intersectRayWithCollision(War3MapViewer.gdxRayHeap, War3MapViewer.intersectionHeap, true, true)) { sampleGroundHeight = War3MapViewer.intersectionHeap.z; - } - else { + } else { sampleGroundHeight = groundHeight; } return sampleGroundHeight; @@ -622,7 +607,8 @@ public void assignSelectionPreviewHighlight(final SplatMover t) { @Override public boolean isSelectable(final CSimulation simulation, final int byPlayer) { - return this.simulationUnit.isVisible(simulation, byPlayer) && this.simulationUnit.isSelectable(simulation, byPlayer); + return this.simulationUnit.isVisible(simulation, byPlayer) + && this.simulationUnit.isSelectable(simulation, byPlayer); } @Override @@ -695,8 +681,7 @@ private void updateColor(final War3MapViewer map) { float finalAlpha = this.currentColor[3]; if (this.invisible) { finalAlpha *= 0.5f; - } - else { + } else { final CTimer fadeTimer = this.simulationUnit.getFadeTimer(); if ((fadeTimer != null) && fadeTimer.isRunning()) { final float fadeAmount = map.getRemainingSecondsForRender(fadeTimer) / fadeTimer.getTimeoutTime(); @@ -753,8 +738,7 @@ public void addAnimationProperties(final String properties, final boolean add) { changedAnimProps = true; } } - } - else { + } else { for (final AnimationTokens.SecondaryTag tag : secondaryTags) { if (this.unitAnimationListenerImpl.removeSecondaryTag(tag)) { changedAnimProps = true; @@ -772,8 +756,7 @@ public void lockTargetFacing(final String boneNameString, final RenderUnit rende if ("head".equals(boneNameString.toLowerCase())) { this.unitAnimationListenerImpl.lockHeadFacing(renderPeerTarget.instance, new Vector3(offsetX, offsetY, offsetZ)); - } - else if ("turret".equals(boneNameString.toLowerCase())) { + } else if ("turret".equals(boneNameString.toLowerCase())) { this.unitAnimationListenerImpl.lockTurretFacing(renderPeerTarget.instance, new Vector3(offsetX, offsetY, offsetZ)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java index c25b41a70..746250cfd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java @@ -426,8 +426,10 @@ private void addBuffIcon(final CBuff buff, final IconUI iconUI) { if (group != null && this.buffVisibleGroups.contains(group)) { return; } - this.commandButtonListener.buff(iconUI.getIcon(), buff.getLevel(), iconUI.getToolTip(), - iconUI.getUberTip(), buff.isPositive(), buff.isLeveled()); + if (iconUI != null) { + this.commandButtonListener.buff(iconUI.getIcon(), buff.getLevel(), iconUI.getToolTip(), + iconUI.getUberTip(), buff.isPositive(), buff.isLeveled()); + } this.buffVisibleGroups.add(group); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java index 9908ebfc9..146f982a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java @@ -17,8 +17,8 @@ public class CItem extends CWidget { private final static int COLLISION_SIZE = 16; - private final War3ID typeId; - private final CItemType itemType; + private War3ID typeId; + private CItemType itemType; private boolean hidden; private boolean invulnerable; private int charges; @@ -41,6 +41,26 @@ public CItem(final int handleId, final float x, final float y, final float life, this.droppable = itemTypeInstance.isCanBeDropped(); this.pawnable = itemTypeInstance.isPawnable(); } + + public void setTypeId(CSimulation game, War3ID typeId) { + int slot = 0; + if (this.containedInventory != null) { + slot = this.getContainedInventory().getSlot(this); + this.forceDropIfHeld(game); + } + this.typeId = typeId; + this.itemType = game.getItemData().getItemType(typeId); + this.charges = this.itemType.getNumberOfCharges(); + this.dropOnDeath = this.itemType.isDroppedWhenCarrierDies(); + this.droppable = this.itemType.isCanBeDropped(); + this.pawnable = this.itemType.isPawnable(); + + game.updateItemModel(this); + if (this.containedInventory != null) { + this.containedInventory.giveItem(game, this.containedUnit, this, slot, false); + } + + } @Override public float getFlyHeight() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItemType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItemType.java index 3201256f2..bd95de460 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItemType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItemType.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.item.CItemTypeJass; public class CItemType { + private final War3ID typeId; private final List abilityList; private final War3ID cooldownGroup; private final boolean ignoreCooldown; @@ -31,7 +32,7 @@ public class CItemType { private final boolean includeAsRandomChoice; private final CItemTypeJass itemClass; - public CItemType(final List abilityList, final War3ID cooldownGroup, final boolean ignoreCooldown, + public CItemType(final War3ID typeId, final List abilityList, final War3ID cooldownGroup, final boolean ignoreCooldown, final int numberOfCharges, final boolean activelyUsed, final boolean perishable, final boolean useAutomaticallyWhenAcquired, final int goldCost, final int lumberCost, final int stockMax, final int stockReplenishInterval, final int stockStartDelay, final int maxLife, final String armorType, @@ -39,6 +40,7 @@ public CItemType(final List abilityList, final War3ID cooldownGroup, fin final boolean pawnable, final boolean droppedWhenCarrierDies, final boolean canBeDropped, final boolean validTargetForTransformation, final boolean includeAsRandomChoice, final CItemTypeJass itemClass) { + this.typeId = typeId; this.abilityList = abilityList; this.cooldownGroup = cooldownGroup; this.ignoreCooldown = ignoreCooldown; @@ -65,6 +67,10 @@ public CItemType(final List abilityList, final War3ID cooldownGroup, fin this.itemClass = itemClass; } + public War3ID getTypeId() { + return this.typeId; + } + public List getAbilityList() { return this.abilityList; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java index c4d869bea..e6293498a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java @@ -31,7 +31,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.TextTag; -import com.etheller.warsmash.viewer5.handlers.w3x.War3MapViewer; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.RemovablePathingMapInstance; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; @@ -153,6 +152,7 @@ public CSimulation(final War3MapConfig config, final int mapVersion, final DataT this.upgradeData = new CUpgradeData(this.gameplayConstants, parsedUpgradeData, standardUpgradeEffectMeta); this.unitData = new CUnitData(this.gameplayConstants, parsedUnitData, this.abilityData, this.upgradeData, this.simulationRenderController); + this.unitData.getAllUnitTypesLightweight(); // Quick hack to avoid lag on first cast of Mech Critter this.destructableData = new CDestructableData(parsedDestructableData, simulationRenderController); this.itemData = new CItemData(parsedItemData); this.units = new ArrayList<>(); @@ -233,6 +233,10 @@ public void onFire(final CSimulation simulation) { fogUpdateTimer.setTimeoutTime(1.0f); fogUpdateTimer.start(this); } + + public char getTileset() { + return this.simulationRenderController.getTileset(); + } public CUnitData getUnitData() { return this.unitData; @@ -323,6 +327,10 @@ public CItem createItem(final War3ID alias, final float unitX, final float unitY return this.simulationRenderController.createItem(this, alias, unitX, unitY); } + public void updateItemModel(CItem item) { + this.simulationRenderController.updateItemModel(item); + } + public CUnit createUnit(final War3ID typeId, final int playerIndex, final float x, final float y, final float facing) { return this.createUnit(typeId, playerIndex, x, y, facing, false); @@ -351,12 +359,8 @@ public CUnit createUnitSimple(final War3ID typeId, final int playerIndex, final if (newUnit != null) { final CPlayer player = getPlayer(playerIndex); final CUnitType newUnitType = newUnit.getUnitType(); - final int foodUsed = newUnitType.getFoodUsed(); - newUnit.setFoodUsed(foodUsed); - player.setFoodUsed(player.getFoodUsed() + foodUsed); - if (newUnitType.getFoodMade() != 0) { - player.setFoodCap(player.getFoodCap() + newUnitType.getFoodMade()); - } + player.setUnitFoodUsed(newUnit, newUnitType.getFoodUsed()); + player.setUnitFoodMade(newUnit, newUnitType.getFoodMade()); player.addTechtreeUnlocked(this, typeId); // nudge unit newUnit.setPointAndCheckUnstuck(x, y, this); @@ -1121,8 +1125,8 @@ public void setBlight(final float x, final float y, final float radius, final bo this.simulationRenderController.setBlight(x, y, radius, blighted); } - public void unitUpdatedType(final CUnit unit, final War3ID typeId) { - this.simulationRenderController.unitUpdatedType(unit, typeId); + public void unitUpdatedType(final CUnit unit, final War3ID typeId, final boolean updatePortrait) { + this.simulationRenderController.unitUpdatedType(unit, typeId, updatePortrait); } private void setupCreatedUnit(final CUnit unit) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index 3eeb7ca20..be5609c9f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -195,6 +195,7 @@ public class CUnit extends CWidget { private float turnRate; private float propWindow; private int playerIndex; + private int fakePlayerIndex; private final List abilities = new ArrayList<>(); private final List disabledAbilities = new ArrayList<>(); @@ -253,6 +254,7 @@ public class CUnit extends CWidget { private boolean resistant = false; private boolean autoAttack = true; private boolean autoCast = true; + private boolean autoTargetable = true; private boolean assistAlly = true; private boolean moveDisabled = false; private boolean noUnitCollision = false; @@ -307,6 +309,8 @@ public class CUnit extends CWidget { private final List detectorLevels = new ArrayList<>(1); private long detections = 0; + private boolean hideMinimapIcon; + private long unselectablePlayers = 0; private long untargetablePlayers = 0; @@ -320,11 +324,13 @@ public class CUnit extends CWidget { private List uniqueFlags = null; + public CUnit(final int handleId, final int playerIndex, final float x, final float y, final float life, final War3ID typeId, final float facing, final float mana, final int maximumLife, final float lifeRegen, final int maximumMana, final int speed, final int maxSpeed, final int minSpeed, final CUnitType unitType) { super(handleId, x, y, life); this.playerIndex = playerIndex; + this.fakePlayerIndex = playerIndex; this.typeId = typeId; this.facing = facing; this.mana = mana; @@ -614,6 +620,7 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type case DISABLE_SPECIAL_ATTACK: case DISABLE_SPELLS: case ETHEREAL: + case POLYMORPHED: byte extraEnabledAttacks = 0; boolean isDisableAll = false; boolean isDisableMove = false; @@ -623,6 +630,7 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type boolean isDisableSpecialAttack = false; boolean isDisableSpells = false; boolean isEthereal = false; + boolean isPolymorphed = false; for (final StateModBuff buff : this.stateModBuffs) { if (buff.getBuffType() == StateModBuffType.ENABLE_ATTACK) { if (buff.getValue() != 0) { @@ -669,6 +677,11 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type isEthereal = true; } } + if (buff.getBuffType() == StateModBuffType.POLYMORPHED) { + if (buff.getValue() != 0) { + isPolymorphed = true; + } + } } if (isDisableAll) { isDisableMove = true; @@ -686,7 +699,12 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type && ability.isMagic()) || (isEthereal && ability.isPhysical() && ((ability.getAbilityCategory() == CAbilityCategory.SPELL) - || (ability.getAbilityCategory() == CAbilityCategory.CORE)))) { + || (ability.getAbilityCategory() == CAbilityCategory.CORE))) + || (isPolymorphed && ((ability.getAbilityCategory() == CAbilityCategory.SPELL) + || (ability.getAbilityCategory() == CAbilityCategory.PASSIVE + || ability.getAbilityCategory() == CAbilityCategory.ATTACK + || (ability.getAbilityCategory() == CAbilityCategory.CORE + && ability.isPhysical()))))) { ability.setDisabled(true, CAbilityDisableType.DISABLED_EFFECT); } else { ability.setDisabled(false, CAbilityDisableType.DISABLED_EFFECT); @@ -735,6 +753,9 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type case ETHEREAL: checkDisabledAbilities(game, isEthereal); break; + case POLYMORPHED: + checkDisabledAbilities(game, isPolymorphed); + break; default: break; } @@ -966,6 +987,37 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type setInvulnerable(isInvuln); this.stateNotifier.abilitiesChanged(); break; + case HIDE_MINIMAP_ICON: + boolean hideMini = false; + for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.HIDE_MINIMAP_ICON) { + if (buff.getValue() != 0) { + hideMini = true; + } + } + } + this.hideMinimapIcon = hideMini; + break; + case FALSE_OWNERSHIP: + int fakePlayerId = -1; + int prio = -1; + for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.FALSE_OWNERSHIP) { + if (buff.getValue() != 0) { + int pr = (int) (buff.getValue() & 0b1111); + if (pr > prio) { + prio = pr; + fakePlayerId = (int) (buff.getValue() >> 4); + } + } + } + } + if (fakePlayerId >= 0) { + this.fakePlayerIndex = fakePlayerId; + } else { + this.fakePlayerIndex = this.playerIndex; + } + break; case DETECTOR: this.detectorLevels.clear(); for (final StateModBuff buff : this.stateModBuffs) { @@ -1033,6 +1085,17 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type } this.unenumerable = isUnenumerable; break; + case UNAUTOATTACKABLE: + boolean isUnAutoAttackable = false; + for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.UNAUTOATTACKABLE) { + if (buff.getValue() != 0) { + isUnAutoAttackable = true; + } + } + } + this.autoTargetable = !isUnAutoAttackable; + break; case BLOCK_REPAIR: boolean isRepairBlocked = false; for (final StateModBuff buff : this.stateModBuffs) { @@ -1855,6 +1918,8 @@ private void computeAllDerivedFields() { } private void computeAllUnitStates(final CSimulation game) { + computeUnitState(game, StateModBuffType.FALSE_OWNERSHIP); + computeUnitState(game, StateModBuffType.HIDE_MINIMAP_ICON); computeUnitState(game, StateModBuffType.DETECTOR); computeUnitState(game, StateModBuffType.INVISIBLE); computeUnitState(game, StateModBuffType.INVULNERABLE); @@ -1872,6 +1937,7 @@ private void computeAllUnitStates(final CSimulation game) { computeUnitState(game, StateModBuffType.UNSELECTABLE); computeUnitState(game, StateModBuffType.UNTARGETABLE); computeUnitState(game, StateModBuffType.UNENUMERABLE); + computeUnitState(game, StateModBuffType.UNAUTOATTACKABLE); computeUnitState(game, StateModBuffType.BLOCK_REPAIR); computeUnitState(game, StateModBuffType.BLOCK_TRAINING); computeUnitState(game, StateModBuffType.BLOCK_CONSTRUCTION); @@ -2015,7 +2081,7 @@ public void remove(final CSimulation simulation, final CBuff ability) { public void checkDisabledAbilities(final CSimulation simulation, final boolean disable) { if (disable) { - for (final CAbility ability : this.abilities) { + for (final CAbility ability : new ArrayList<>(this.abilities)) { if (!ability.isRequirementsMet(simulation, this)) { ability.setDisabled(true, CAbilityDisableType.REQUIREMENTS); } @@ -2041,8 +2107,8 @@ public void checkDisabledAbilities(final CSimulation simulation, final boolean d ability.setDisabled(false, CAbilityDisableType.PLAYER); } if (!ability.isDisabled()) { - ability.onAdd(simulation, this); this.disabledAbilities.remove(ability); + ability.onAdd(simulation, this); } } } @@ -2141,7 +2207,7 @@ public void setTypeId(final CSimulation game, final War3ID typeId, final boolean for (final CAbility removed : removedAbilities) { this.abilities.remove(removed); // TODO remove inefficient O(N) search } - game.unitUpdatedType(this, typeId); + game.unitUpdatedType(this, typeId, true); game.getUnitData().addMissingDefaultAbilitiesToUnit(game, game.getHandleIdAllocator(), this.unitType, false, -1, this.baseSpeed, this); { @@ -3006,6 +3072,11 @@ public void setPlayerIndex(final CSimulation simulation, final int playerIndex, if (changeColor) { simulation.changeUnitColor(this, playerIndex); } + this.computeUnitState(simulation, StateModBuffType.FALSE_OWNERSHIP); + } + + public int getFakePlayerIndex() { + return this.fakePlayerIndex; } public CUnitType getUnitType() { @@ -3750,24 +3821,24 @@ public boolean canBeTargetedBy(final CSimulation simulation, final CUnit source, final int sourcePlayerIndex = source.getPlayerIndex(); final CPlayer sourcePlayer = simulation.getPlayer(sourcePlayerIndex); if (!targetsAllowed.contains(CTargetType.ENEMIES) - || !sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.PASSIVE) + || !sourcePlayer.hasAlliance(this.fakePlayerIndex, CAllianceType.PASSIVE) || (targetsAllowed.contains(CTargetType.FRIEND) - && sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.SHARED_SPELLS)) + && sourcePlayer.hasAlliance(this.fakePlayerIndex, CAllianceType.SHARED_SPELLS)) || (targetsAllowed.contains(CTargetType.NEUTRAL) - && !sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.SHARED_SPELLS))) { + && !sourcePlayer.hasAlliance(this.fakePlayerIndex, CAllianceType.SHARED_SPELLS))) { if (!targetsAllowed.contains(CTargetType.FRIEND) - || sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.SHARED_SPELLS) + || sourcePlayer.hasAlliance(this.fakePlayerIndex, CAllianceType.SHARED_SPELLS) || (targetsAllowed.contains(CTargetType.ENEMIES) - && !sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.PASSIVE)) + && !sourcePlayer.hasAlliance(this.fakePlayerIndex, CAllianceType.PASSIVE)) || (targetsAllowed.contains(CTargetType.NEUTRAL) - && sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.PASSIVE))) { + && sourcePlayer.hasAlliance(this.fakePlayerIndex, CAllianceType.PASSIVE))) { if (!targetsAllowed.contains(CTargetType.NEUTRAL) - || (sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.PASSIVE) - && !sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.SHARED_SPELLS)) + || (sourcePlayer.hasAlliance(this.fakePlayerIndex, CAllianceType.PASSIVE) + && !sourcePlayer.hasAlliance(this.fakePlayerIndex, CAllianceType.SHARED_SPELLS)) || (targetsAllowed.contains(CTargetType.ENEMIES) - && !sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.PASSIVE)) + && !sourcePlayer.hasAlliance(this.fakePlayerIndex, CAllianceType.PASSIVE)) || (targetsAllowed.contains(CTargetType.FRIEND) - && sourcePlayer.hasAlliance(this.playerIndex, CAllianceType.SHARED_SPELLS))) { + && sourcePlayer.hasAlliance(this.fakePlayerIndex, CAllianceType.SHARED_SPELLS))) { if (!targetsAllowed.contains(CTargetType.MECHANICAL) || this.classifications.contains(CUnitClassification.MECHANICAL)) { if (!targetsAllowed.contains(CTargetType.ORGANIC) @@ -3924,7 +3995,7 @@ public void resurrect(final CSimulation simulation) { this.explodesOnDeathBuffId = null; setLife(simulation, getMaximumLife()); simulation.getWorldCollision().addUnit(this); - simulation.unitUpdatedType(this, this.typeId); // clear out some state + simulation.unitUpdatedType(this, this.typeId, true); // clear out some state this.unitAnimationListener.playAnimation(true, PrimaryTag.STAND, SequenceUtils.EMPTY, 0.0f, true); } @@ -3955,7 +4026,7 @@ private AutocastTargetFinderEnum reset(final CSimulation game, final CUnit sourc @Override public boolean call(final CUnit unit) { - if (this.type != AutocastType.NONE) { + if (unit.isAutoTargetable() && this.type != AutocastType.NONE) { switch (this.type) { case ATTACKINGALLY: case ATTACKINGENEMY: @@ -4137,7 +4208,7 @@ private AutoAttackTargetFinderEnum reset(final CSimulation game, final CUnit sou @Override public boolean call(final CUnit unit) { - if ((this.source.getAttackBehavior() != null) + if (unit.isAutoTargetable() && (this.source.getAttackBehavior() != null) && !this.source.getFirstAbilityOfType(CAbilityAttack.class).isDisabled()) { // TODO this "attack behavior null" check was added for some weird Root edge // case with NE, maybe @@ -4323,6 +4394,10 @@ public boolean isInvulnerable() { return this.invulnerable; } + public boolean isAutoTargetable() { + return this.autoTargetable; + } + public void setWorker(final CUnit unit, final boolean inside) { this.worker = unit; this.workerInside = inside; @@ -5117,8 +5192,15 @@ public boolean isUnitType(final CUnitTypeJass whichUnitType) { throw new UnsupportedOperationException( "cannot ask engine if unit is poisoned: poison is not yet implemented"); case POLYMORPHED: - throw new UnsupportedOperationException( - "cannot ask engine if unit is POLYMORPHED: POLYMORPHED is not yet implemented"); + boolean isPolymorphed = false; + for (final StateModBuff buff : this.stateModBuffs) { + if (buff.getBuffType() == StateModBuffType.POLYMORPHED) { + if (buff.getValue() != 0) { + isPolymorphed = true; + } + } + } + return isPolymorphed; case SLEEPING: boolean isSleeping = false; for (final StateModBuff buff : this.stateModBuffs) { @@ -6042,6 +6124,10 @@ public boolean isLimitedMagicImmune() { return this.limitedMagicImmune; } + public boolean isMorphImmune() { + return this.morphImmune; + } + public boolean isFalseDeath() { return this.falseDeath; } @@ -6059,9 +6145,10 @@ public void setAutocastAbility(final CSimulation simulation, final CAutocastAbil public boolean isVisible(final CSimulation simulation, final int toPlayerIndex) { final CPlayer toPlayer = simulation.getPlayer(toPlayerIndex); - if (((toPlayerIndex == this.playerIndex) || toPlayer.hasAlliance(this.playerIndex, CAllianceType.SHARED_VISION)) + if (this.isDead() || (((toPlayerIndex == this.playerIndex) + || toPlayer.hasAlliance(this.playerIndex, CAllianceType.SHARED_VISION)) && ((simulation.isDay() ? this.unitType.getSightRadiusDay() - : this.unitType.getSightRadiusNight()) > 0)) { + : this.unitType.getSightRadiusNight()) > 0))) { return true; } if ((this.invisLevels > 0) && ((this.detections & (1 << toPlayerIndex)) == 0)) { @@ -6099,6 +6186,10 @@ public boolean isUnenumerable() { return this.unenumerable; } + public boolean isHideMinimapIcon() { + return hideMinimapIcon; + } + private final class CTimerUnitFade extends CTimer { private final StateModBuff stateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitType.java index f92d88c4a..6f6d9302d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnitType.java @@ -112,6 +112,8 @@ public class CUnitType { private final int lumberBountyAwardedDice; private final int lumberBountyAwardedSides; private final boolean neutralBuildingShowMinimapIcon; + private final String tilesets; + private boolean special; public CUnitType(final String name, final String legacyName, final War3ID typeId, final int maxLife, final float lifeRegen, final float manaRegen, final CRegenType lifeRegenType, final int manaInitial, @@ -139,7 +141,7 @@ public CUnitType(final String name, final String legacyName, final War3ID typeId final int sightRadiusDay, final int sightRadiusNight, final boolean extendedLineOfSight, final int goldBountyAwardedBase, final int goldBountyAwardedDice, final int goldBountyAwardedSides, final int lumberBountyAwardedBase, final int lumberBountyAwardedDice, final int lumberBountyAwardedSides, - boolean neutralBuildingShowMinimapIcon) { + boolean neutralBuildingShowMinimapIcon, final String tilesets, final boolean special) { this.name = name; this.legacyName = legacyName; this.typeId = typeId; @@ -226,6 +228,8 @@ public CUnitType(final String name, final String legacyName, final War3ID typeId this.lumberBountyAwardedDice = lumberBountyAwardedDice; this.lumberBountyAwardedSides = lumberBountyAwardedSides; this.neutralBuildingShowMinimapIcon = neutralBuildingShowMinimapIcon; + this.tilesets = tilesets; + this.special = special; } public String getName() { @@ -584,4 +588,12 @@ public int getCargoCapacity() { public boolean isNeutralBuildingShowMinimapIcon() { return this.neutralBuildingShowMinimapIcon; } + + public String getTilesets() { + return this.tilesets; + } + + public boolean isSpecial() { + return this.special; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffTimedLife.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffTimedLife.java index cf741f3a4..001852fae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffTimedLife.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/skills/util/CBuffTimedLife.java @@ -3,6 +3,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class CBuffTimedLife extends CBuffTimed { @@ -19,6 +20,10 @@ protected void onBuffAdd(final CSimulation game, final CUnit unit) { unit.setExplodesOnDeath(true); unit.setExplodesOnDeathBuffId(getAlias()); } + + final CPlayer player = game.getPlayer(unit.getPlayerIndex()); + player.setUnitFoodMade(unit, 0); + player.setUnitFoodUsed(unit, 0); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java index 8f47b1263..c4bbe9b4e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java @@ -265,7 +265,7 @@ public void begin(final CSimulation game) { } cleanupInputs(); - this.unit.beginBehavior(game, this.unit.pollNextOrderBehavior(game)); + //this.unit.beginBehavior(game, this.unit.pollNextOrderBehavior(game)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java new file mode 100644 index 000000000..086c280a5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java @@ -0,0 +1,38 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionPrepUnownedAbilityForUse implements ABSingleAction { + + private ABUnitCallback unit; + private ABAbilityCallback ability; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theAbility != null) { + theAbility.onAddDisabled(game, theUnit); + theAbility.onAdd(game, theUnit); + } + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return "AddUnitAbilityAU(" + jassTextGenerator.getTriggerLocalStore() + ", " + + this.unit.generateJassEquivalent(jassTextGenerator) + ", " + + this.ability.generateJassEquivalent(jassTextGenerator) + ")"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java new file mode 100644 index 000000000..f6a4dca81 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java @@ -0,0 +1,62 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; + +public class ABActionAbilityRunEndCastingActions implements ABSingleAction { + + private ABAbilityCallback ability; + private ABUnitCallback caster; + + private ABLocationCallback targetLoc; + private ABUnitCallback targetUnit; + private ABItemCallback targetItem; + private ABDestructableCallback targetDest; + + @Override + public void runAction(final CSimulation game, final CUnit originalCaster, final Map localStore, + final int castId) { + CUnit theCaster = originalCaster; + if (caster != null) { + theCaster = caster.callback(game, originalCaster, localStore, castId); + } + + AbilityTarget tar = null; + if (targetLoc != null) { + tar = targetLoc.callback(game, originalCaster, localStore, castId); + } else if (targetUnit != null) { + tar = targetUnit.callback(game, originalCaster, localStore, castId); + } else if (targetItem != null) { + tar = targetItem.callback(game, originalCaster, localStore, castId); + } else if (targetDest != null) { + tar = targetDest.callback(game, originalCaster, localStore, castId); + } + + final CAbility theAbility = this.ability.callback(game, originalCaster, localStore, castId); + if (theAbility instanceof AbilityBuilderActiveAbility) { + AbilityBuilderActiveAbility active = ((AbilityBuilderActiveAbility) theAbility); + int orderId = active.getBaseOrderId(); + + active.internalBegin(game, theCaster, orderId, false, tar); + active.runEndCastingActions(game, theCaster, orderId); + active.cleanupInputs(); + } + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "JASSTODO"; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java new file mode 100644 index 000000000..0a3d80f68 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.item; + +import java.util.Map; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionTransformItem implements ABAction { + + private ABItemCallback item; + private ABIDCallback newType; + + @Override + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CItem it = this.item.callback(game, caster, localStore, castId); + War3ID type = newType.callback(game, caster, localStore, castId); + it.setTypeId(game, type); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java index 79713cfc8..0705d9bb0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java @@ -58,7 +58,10 @@ public class ABActionCreateUnitTargetedBouncingProjectile implements ABAction { @Override public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - final CUnit theSource = this.source.callback(game, caster, localStore, castId); + CUnit theSource = caster; + if (source != null) { + theSource = this.source.callback(game, caster, localStore, castId); + } AbilityTarget sourceLocation = theSource; if (this.sourceLoc != null) { @@ -154,13 +157,14 @@ private void startPerformJump(final CSimulation game, final CUnit caster, final CTimer runner = new CTimer() { @Override public void onFire(CSimulation simulation) { - performJump(game, originUnitTarget, localStore, castId, originUnitTarget, multiBounce, hitUnits, + performJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, remainingJumps); } }; - game.registerTimer(runner); + runner.setTimeoutTime(delay); + runner.start(game); } else { - performJump(game, originUnitTarget, localStore, castId, originUnitTarget, multiBounce, hitUnits, + performJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, remainingJumps); } } @@ -257,12 +261,12 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target if (this.homing != null) { isHoming = this.homing.callback(game, caster, localStore, castId); } - proj = game.createProjectile(originUnitTarget, this.id.callback(game, caster, localStore, castId), + proj = game.createProjectile(caster, this.id.callback(game, caster, localStore, castId), originUnitTarget.getX(), originUnitTarget.getY(), (float) AbilityTarget.angleBetween(originUnitTarget, jumpUnit), theSpeed, isHoming, jumpUnit, listener); } else if (settings != null) { - proj = game.createProjectile(originUnitTarget, this.settings.callback(game, caster, localStore, castId), + proj = game.createProjectile(caster, this.settings.callback(game, caster, localStore, castId), originUnitTarget.getX(), originUnitTarget.getY(), (float) AbilityTarget.angleBetween(originUnitTarget, jumpUnit), jumpUnit, listener); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java index e5fe7fd33..d4c4b47a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java @@ -95,7 +95,8 @@ public void onFire(CSimulation simulation) { remainingJumps - 1); } }; - game.registerTimer(runner); + runner.setTimeoutTime(delay); + runner.start(game); } else { performJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, remainingJumps - 1); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java index bd54b4d8e..fa6c4863f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java @@ -16,7 +16,7 @@ public class ABActionFor implements ABAction { private ABIntegerCallback times; private List actions; - + private ABCallback unique; @Override @@ -25,9 +25,10 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + War3ID theId = id.callback(game, caster, localStore, castId); + if (theId == null) { + return; + } + CPlayer thePlayer = null; float theFacing = 0; if (this.owner != null) { @@ -38,12 +45,17 @@ public void runAction(CSimulation game, CUnit caster, Map localS theFacing = this.facing.callback(game, caster, localStore, castId); } final AbilityPointTarget location = this.loc.callback(game, caster, localStore, castId); - final CUnit createdUnit = game.createUnitSimple(this.id.callback(game, caster, localStore, castId), thePlayer.getId(), + final CUnit createdUnit = game.createUnitSimple(theId, thePlayer.getId(), location.getX(), location.getY(), theFacing); if (addSummonedTag == null || addSummonedTag.callback(game, caster, localStore, castId)) { createdUnit.addClassification(CUnitClassification.SUMMONED); } + + if (removeFood != null && removeFood.callback(game, caster, localStore, castId)) { + thePlayer.setUnitFoodUsed(createdUnit, 0); + thePlayer.setUnitFoodMade(createdUnit, 0); + } localStore.put(ABLocalStoreKeys.LASTCREATEDUNIT, createdUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java index 09534ba45..71812366b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java @@ -21,7 +21,6 @@ public void runAction(CSimulation game, CUnit caster, Map localS } CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); if (newBehavior != null) { - System.err.println("Forcing start of new behavior"); localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); targetUnit.beginBehavior(game, newBehavior, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java new file mode 100644 index 000000000..994bca0ac --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionSetSpeed implements ABAction { + + private ABUnitCallback unit; + private ABIntegerCallback value; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + targetUnit.setSpeed(value.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java new file mode 100644 index 000000000..75ca4892d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; + +public class ABActionTransformUnitAppearance implements ABAction { + + private ABUnitCallback unit; + private ABIDCallback id; + + @Override + public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + game.unitUpdatedType(targetUnit, id.callback(game, caster, localStore, castId), false); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java index a0c4587e8..e68a9e9c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java @@ -2,13 +2,10 @@ import java.util.Map; -import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; public class ABCallbackGetBuffSourceAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java new file mode 100644 index 000000000..f4ae61d1e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetMatchingAbility extends ABAbilityCallback { + + @Override + public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (CAbility) localStore.get(ABLocalStoreKeys.MATCHINGABILITY); + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_MATCHINGABILITY", + JassTextGeneratorType.AbilityHandle); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java new file mode 100644 index 000000000..2f93fb38c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; + +public class ABCallbackGetMovementTypeFromString extends ABMovementTypeCallback { + + private ABStringCallback id; + + @Override + public MovementType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return MovementType.valueOf(this.id.callback(game, caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java new file mode 100644 index 000000000..837c1a705 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetStoredMovementTypeByKey extends ABMovementTypeCallback { + + private ABStringCallback key; + private ABBooleanCallback instanceValue; + + @Override + public MovementType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + return (MovementType) localStore.get(ABLocalStoreKeys + .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + } + else { + return (MovementType) localStore + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java new file mode 100644 index 000000000..2097fdb34 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; + +public class ABCallbackGetUnitMovementType extends ABMovementTypeCallback { + + private ABUnitCallback unit; + + @Override + public MovementType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return unit.callback(game, caster, localStore, castId).getMovementType(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java new file mode 100644 index 000000000..57e72098b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; + +public class ABCallbackGetUnitTypeMovementType extends ABMovementTypeCallback { + + private ABIDCallback type; + + @Override + public MovementType callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + War3ID theType = type.callback(game, caster, localStore, castId); + return game.getUnitData().getUnitType(theType).getMovementType(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java new file mode 100644 index 000000000..dc0cce81b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java @@ -0,0 +1,13 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; + +public abstract class ABMovementTypeCallback implements ABCallback { + + abstract public MovementType callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java new file mode 100644 index 000000000..4f9dc7cb0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java @@ -0,0 +1,49 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; + +public class ABCallbackGetAbilityDataAsIDFromList extends ABIDCallback { + + private DataFieldLetter dataField; + private ABIntegerCallback index; + + @SuppressWarnings("unchecked") + @Override + public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + final List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); + + final String data = levelData.get(level - 1).getData().get(this.dataField.getIndex()); + if ((data == null) || "-".equals(data) || data.isBlank() || "_".equals(data)) { + return War3ID.NONE; + } + String[] ids = data.split(","); + int i = 0; + if (index != null) { + i = index.callback(game, caster, localStore, castId); + } + String tar = ids[Math.min(Math.max(i, 0), ids.length - 1)]; + if ((tar == null) || "-".equals(tar) || tar.isBlank() || "_".equals(tar)) { + return War3ID.NONE; + } + return War3ID.fromString(tar); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "GetAbilityDataAsIDAU(" + jassTextGenerator.getTriggerLocalStore() + ", DATA_FIELD_LETTER_" + + this.dataField.name() + ")"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java new file mode 100644 index 000000000..3178b500c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java @@ -0,0 +1,44 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; + +public class ABCallbackGetAbilityDataAsRandomIDFromList extends ABIDCallback { + + private DataFieldLetter dataField; + + @SuppressWarnings("unchecked") + @Override + public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + final List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); + + final String data = levelData.get(level - 1).getData().get(this.dataField.getIndex()); + if ((data == null) || "-".equals(data) || data.isBlank() || "_".equals(data)) { + return War3ID.NONE; + } + String[] ids = data.split(","); + int i = game.getSeededRandom().nextInt(ids.length); + String tar = ids[i]; + if ((tar == null) || "-".equals(tar) || tar.isBlank() || "_".equals(tar)) { + return War3ID.NONE; + } + return War3ID.fromString(tar); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return "GetAbilityDataAsIDAU(" + jassTextGenerator.getTriggerLocalStore() + ", DATA_FIELD_LETTER_" + + this.dataField.name() + ")"; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java new file mode 100644 index 000000000..4cae9c102 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetBuffIdFromCode extends ABIDCallback { + + @Override + public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return ((War3ID) localStore.get(ABLocalStoreKeys.CODE)).set(0, 'B'); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ALIAS", JassTextGeneratorType.Integer); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java new file mode 100644 index 000000000..67ae37b96 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java @@ -0,0 +1,31 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetCode extends ABIDCallback { + + private ABAbilityCallback ability; + + @Override + public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + if (ability != null) { + return ability.callback(game, caster, localStore, castId).getCode(); + } + return (War3ID) localStore.get(ABLocalStoreKeys.CODE); + } + + @Override + public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ALIAS", JassTextGeneratorType.Integer); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java index 49da8617f..5a4bcf7cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java @@ -12,6 +12,8 @@ public class ABCallbackGetFirstBuffId extends ABIDCallback { + private ABIDCallback defaultId; + @SuppressWarnings("unchecked") @Override public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, @@ -22,6 +24,9 @@ public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + return RandomTypeHandler.getRandomItemType(game).getTypeId(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java new file mode 100644 index 000000000..17c0adcda --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.RandomTypeHandler; + +public class ABCallbackRandomMechanicalCritterId extends ABIDCallback { + + @Override + public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CUnitType id = RandomTypeHandler.getRandomMechanicalCritterType(game); + if (id == null) { + return null; + } + return id.getTypeId(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java new file mode 100644 index 000000000..a43a68d38 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.util.WarsmashConstants; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABCallbackGetNeutralHostilePlayerId extends ABIntegerCallback { + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return WarsmashConstants.MAX_PLAYERS - 4; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java new file mode 100644 index 000000000..d0a99489d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.util.WarsmashConstants; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABCallbackGetNeutralPassivePlayerId extends ABIntegerCallback { + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return WarsmashConstants.MAX_PLAYERS - 1; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java new file mode 100644 index 000000000..7e0761912 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; + +public class ABCallbackGetUnitTypeSpeed extends ABIntegerCallback { + + private ABIDCallback id; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return game.getUnitData().getUnitType(id.callback(game, caster, localStore, castId)).getSpeed(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java new file mode 100644 index 000000000..5766d4679 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java @@ -0,0 +1,32 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; + +public class ABCallbackRandomInteger extends ABIntegerCallback { + + private ABIntegerCallback lowerBound; + private ABIntegerCallback upperBound; + + private ABIntegerCallback bound; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + if (bound != null) { + return game.getSeededRandom().nextInt(bound.callback(game, caster, localStore, castId)); + } + int low = Integer.MIN_VALUE; + int high = Integer.MAX_VALUE; + if (upperBound != null) { + low = 0; + high = upperBound.callback(game, caster, localStore, castId); + } + if (lowerBound != null) { + low = lowerBound.callback(game, caster, localStore, castId); + } + return game.getSeededRandom().nextInt(low,high); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java new file mode 100644 index 000000000..6a3e1d357 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetAbilityTargetedItem extends ABItemCallback { + + @Override + public CItem callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (CItem) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDITEM+castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java new file mode 100644 index 000000000..acc570a0e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; + +public class ABCallbackRandomLocationInRange extends ABLocationCallback { + + private ABLocationCallback origin; + private ABFloatCallback range; + + @Override + public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, + final int castId) { + final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); + final float d = this.range.callback(game, caster, localStore, castId) * game.getSeededRandom().nextFloat(); + final float a = (float) (Math.PI * 2 * game.getSeededRandom().nextFloat()); + + orig.add((float)(d * Math.cos(a)), (float)(d * Math.sin(a))); + return orig; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java index 961b465dd..374715bd5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java @@ -9,11 +9,11 @@ public class ABCallbackCreateDetectedData extends ABLongCallback { private ABIntegerCallback detectionLevel; - private ABIntegerCallback player; + private ABIntegerCallback playerDetectedData; @Override public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - long ply = player.callback(game, caster, localStore, castId); + long ply = playerDetectedData.callback(game, caster, localStore, castId); byte val = detectionLevel.callback(game, caster, localStore, castId).byteValue(); return val + (ply<<8); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java new file mode 100644 index 000000000..37ad032bf --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; + +public class ABCallbackCreateOwnershipData extends ABLongCallback { + + private ABIntegerCallback priority; + private ABIntegerCallback playerId; + + @Override + public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + long ply = playerId.callback(game, caster, localStore, castId); + int val = Math.min(priority.callback(game, caster, localStore, castId), 15) & 0b1111; + return val + (ply<<4); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java new file mode 100644 index 000000000..44f69a557 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; + +public class ABCallbackGetCastingPlayer extends ABPlayerCallback { + + @Override + public CPlayer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return game.getPlayer(caster.getPlayerIndex()); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java new file mode 100644 index 000000000..11d99c9fb --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetDamagedUnit extends ABUnitCallback { + + @Override + public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGEDUNIT+castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java new file mode 100644 index 000000000..2953ed615 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetDamagingUnit extends ABUnitCallback { + + @Override + public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGINGUNIT+castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java index 0204b5b62..8dd637b9a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import java.util.List; import java.util.Map; import com.badlogic.gdx.math.Rectangle; @@ -18,7 +17,7 @@ public class ABConditionMatchingUnitExistsInRangeOfUnit extends ABCondition { private ABUnitCallback originUnit; private ABFloatCallback range; - private List conditions; + private ABCondition condition; @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { @@ -34,12 +33,9 @@ public Boolean callback(CSimulation game, CUnit caster, Map loca public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { if (ur.getUnit() == null) { - if (conditions != null) { - boolean result = true; + if (condition != null) { localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); - for (ABCondition condition : conditions) { - result = result && condition.callback(game, caster, localStore, castId); - } + boolean result = condition.callback(game, caster, localStore, castId); localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); if (result) { ur.setUnit(enumUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java index 3b71a8f6b..3e5f2e720 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java @@ -13,7 +13,6 @@ public class ABConditionWasAutoCast extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - System.err.println("Was ability Auto Cast " + localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId)) + " castId " + castId); return (Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java new file mode 100644 index 000000000..5e56d79e5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java @@ -0,0 +1,29 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABMovementTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsMovementTypeEqual extends ABCondition { + + private ABMovementTypeCallback movementType1; + private ABMovementTypeCallback movementType2; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + MovementType lD = movementType1.callback(game, caster, localStore, castId); + MovementType rD = movementType2.callback(game, caster, localStore, castId); + if (lD == null) { + if (rD == null) { + return true; + } + return false; + } + return lD.equals(rD); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java new file mode 100644 index 000000000..5c61d4237 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable; + +import java.util.EnumSet; +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; + +public class ABConditionIsTree extends ABCondition { + + private ABDestructableCallback dest; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CDestructable theDestructable = dest.callback(game, caster, localStore, castId); + if (theDestructable != null) { + return theDestructable.canBeTargetedBy(game, caster, EnumSet.of(CTargetType.TREE)); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java index b2922c3c3..19aa10b63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java @@ -9,7 +9,6 @@ public class ABConditionGameplayConstantSmartAbolishMagic extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - System.err.println("Checking Abolish Constant " + game.getGameplayConstants().isAbolishMagicSmartDispel()); return game.getGameplayConstants().isAbolishMagicSmartDispel(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java new file mode 100644 index 000000000..99cae1da5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java @@ -0,0 +1,39 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABConditionDoesUnitHaveAbilityMatchingCondition extends ABCondition { + + private ABUnitCallback unit; + private ABBooleanCallback condition; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + for (CAbility ability : theUnit.getAbilities()) { + if (CAbilityCategory.BUFF != ability.getAbilityCategory()) { + localStore.put(ABLocalStoreKeys.MATCHINGABILITY, ability); + if (condition.callback(game, caster, localStore, castId)) { + localStore.remove(ABLocalStoreKeys.MATCHINGABILITY); + return true; + } + } + } + } + localStore.remove(ABLocalStoreKeys.MATCHINGABILITY); + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java index 63e448b2d..1dfc55df9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java @@ -11,15 +11,15 @@ public class ABConditionIsUnitEnemy extends ABCondition { - private ABUnitCallback caster; + private ABUnitCallback self; private ABUnitCallback unit; @Override public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); CUnit theCaster = casterUnit; - if (this.caster != null) { - theCaster = this.caster.callback(game, casterUnit, localStore, castId); + if (this.self != null) { + theCaster = this.self.callback(game, casterUnit, localStore, castId); } if (theUnit != null) { @@ -32,11 +32,11 @@ public Boolean callback(CSimulation game, CUnit casterUnit, Map @Override public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String casterExpr; - if (this.caster == null) { + if (this.self == null) { casterExpr = jassTextGenerator.getCaster(); } else { - casterExpr = this.caster.generateJassEquivalent(jassTextGenerator); + casterExpr = this.self.generateJassEquivalent(jassTextGenerator); } return "IsUnitEnemy(" + this.unit.generateJassEquivalent(jassTextGenerator) + ", GetOwningPlayer(" + casterExpr + "))"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java index 03b082e56..7d3a684e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java @@ -11,15 +11,15 @@ public class ABConditionIsUnitFriend extends ABCondition { - private ABUnitCallback caster; + private ABUnitCallback self; private ABUnitCallback unit; @Override public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); CUnit theCaster = casterUnit; - if (this.caster != null) { - theCaster = this.caster.callback(game, casterUnit, localStore, castId); + if (this.self != null) { + theCaster = this.self.callback(game, casterUnit, localStore, castId); } if (theUnit != null) { @@ -32,11 +32,11 @@ public Boolean callback(CSimulation game, CUnit casterUnit, Map @Override public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String casterExpr; - if (this.caster == null) { + if (this.self == null) { casterExpr = jassTextGenerator.getCaster(); } else { - casterExpr = this.caster.generateJassEquivalent(jassTextGenerator); + casterExpr = this.self.generateJassEquivalent(jassTextGenerator); } return "IsUnitEnemy(" + this.unit.generateJassEquivalent(jassTextGenerator) + ", GetOwningPlayer(" + casterExpr + "))"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java new file mode 100644 index 000000000..51ec0e4c7 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; + +public class ABConditionIsUnitMorphImmune extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isMorphImmune(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java new file mode 100644 index 000000000..14117391f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; + +import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; + +public class ABConditionIsUnitPolymorphed extends ABCondition { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isUnitType(CUnitTypeJass.POLYMORPHED); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java new file mode 100644 index 000000000..f2ee469f0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java @@ -0,0 +1,31 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.behavior; + +import java.util.List; +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; + +public class ABConditionIsCurrentBehaviorCategoryInList extends ABCondition { + + private ABUnitCallback unit; + private List list; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(game, caster, localStore, castId); + } + CBehavior beh = theUnit.getCurrentBehavior(); + CBehaviorCategory cat = CBehaviorCategory.IDLE; + if (beh != null) { + cat = beh.getBehaviorCategory(); + } + return list.contains(cat); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java index 30c4ad635..8c2dad3a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java @@ -20,15 +20,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; public abstract class ABBuff extends AbstractCBuff { - protected static int TIMEDLIFE = 0b1; - protected static int NEGATIVE = 0b10; - protected static int DISPELLABLE = 0b100; - protected static int LEVELED = 0b1000; - protected static int HERO = 0b10000; - protected static int PHYSICAL = 0b100000; - protected static int MAGIC = 0b1000000; - protected static int AURA = 0b10000000; - protected static int STACKS = 0b100000000; + protected final static int TIMEDLIFE = 0b1; + protected final static int NEGATIVE = 0b10; + protected final static int DISPELLABLE = 0b100; + protected final static int LEVELED = 0b1000; + protected final static int HERO = 0b10000; + protected final static int PHYSICAL = 0b100000; + protected final static int MAGIC = 0b1000000; + protected final static int AURA = 0b10000000; + protected final static int STACKS = 0b100000000; protected int flags = DISPELLABLE; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index 5f8cf5f65..60578af03 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -68,6 +68,7 @@ public class ABLocalStoreKeys { // Ability Names public static final String LASTCREATEDABILITY = "_lastCreatedAbility"; public static final String LASTADDEDABILITY = "_lastAddedAbility"; + public static final String MATCHINGABILITY = "_matchingAbility"; public static final String LASTCREATEDUNITGROUP = "_lastCreatedUnitGroup"; public static final String LASTCREATEDUNITQUEUE = "_lastCreatedUnitQueue"; @@ -86,6 +87,8 @@ public class ABLocalStoreKeys { //Generic Targeting public static final String ATTACKINGUNIT = "_attackingUnit#"; public static final String ATTACKTARGET = "_attackTarget#"; + public static final String DAMAGINGUNIT = "_damagingUnit#"; + public static final String DAMAGEDUNIT = "_damagedUnit#"; public static final String ATTACKIMPACTLOCATION = "_attackImpactLocation#"; public static final String ABILITYTARGETEDUNIT = "_abilityTargetedUnit#"; public static final String ABILITYTARGETEDDESTRUCTABLE = "_abilityTargetedDestructable#"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index bfc153a26..d84c39deb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -82,6 +82,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.projectile.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.timer.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.behavior.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unittype.*; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -96,6 +97,7 @@ private static void registerAbilityCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetPartnerAbility.class, "getPartnerAbility") .registerSubtype(ABCallbackGetReactionAbility.class, "getReactionAbility") .registerSubtype(ABCallbackGetLastCreatedAbility.class, "getLastCreatedAbility") + .registerSubtype(ABCallbackGetMatchingAbility.class, "getMatchingAbility") .registerSubtype(ABCallbackGetThisAbility.class, "getThisAbility") .registerSubtype(ABCallbackGetAbilityById.class, "getAbilityById") @@ -364,9 +366,13 @@ private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFa .registerSubtype(ABCallbackInlineConditionID.class, "inlineConditionID") .registerSubtype(ABCallbackGetAbilityUniqueValueId.class, "getAbilityUniqueValueId") .registerSubtype(ABCallbackGetAbilityDataAsID.class, "getAbilityDataAsID") + .registerSubtype(ABCallbackGetAbilityDataAsIDFromList.class, "getAbilityDataAsIDFromList") + .registerSubtype(ABCallbackGetAbilityDataAsRandomIDFromList.class, "getAbilityDataAsRandomIDFromList") .registerSubtype(ABCallbackGetAbilityUnitId.class, "getAbilityUnitId") .registerSubtype(ABCallbackGetWar3IDFromString.class, "getWar3IDFromString") .registerSubtype(ABCallbackGetAlias.class, "getAlias") + .registerSubtype(ABCallbackGetCode.class, "getCode") + .registerSubtype(ABCallbackGetBuffIdFromCode.class, "getBuffIdFromCode") .registerSubtype(ABCallbackGetParentAlias.class, "getParentAlias") .registerSubtype(ABCallbackGetFirstBuffId.class, "getFirstBuffId") .registerSubtype(ABCallbackGetSecondBuffId.class, "getSecondBuffId") @@ -376,6 +382,9 @@ private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFa .registerSubtype(ABCallbackGetUnitType.class, "getUnitType") .registerSubtype(ABCallbackGetNonCurrentTransformType.class, "getNonCurrentTransformType") + + .registerSubtype(ABCallbackRandomMechanicalCritterId.class, "randomMechanicalCritterId") + .registerSubtype(ABCallbackRandomItemId.class, "randomItemId") .registerSubtype(ABCallbackNullIfFalse.class, "nullIfFalse") @@ -417,8 +426,11 @@ private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetUnitTypeGoldCost.class, "getUnitTypeGoldCost") .registerSubtype(ABCallbackGetUnitTypeLumberCost.class, "getUnitTypeLumberCost") .registerSubtype(ABCallbackGetUnitTypeFoodCost.class, "getUnitTypeFoodCost") + .registerSubtype(ABCallbackGetUnitTypeSpeed.class, "getUnitTypeSpeed") .registerSubtype(ABCallbackGetAttackMaximumSplashRadius.class, "getAttackMaximumSplashRadius") + + .registerSubtype(ABCallbackRandomInteger.class, "randomInteger") .registerSubtype(ABCallbackAddInteger.class, "i+") .registerSubtype(ABCallbackSubtractInteger.class, "i-") @@ -443,6 +455,8 @@ private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetUnitQueueSize.class, "getUnitQueueSize") .registerSubtype(ABCallbackGetPlayerId.class, "getPlayerId") + .registerSubtype(ABCallbackGetNeutralHostilePlayerId.class, "getNeutralHostilePlayerId") + .registerSubtype(ABCallbackGetNeutralPassivePlayerId.class, "getNeutralPassivePlayerId") .registerSubtype(ABCallbackGetItemSlot.class, "getItemSlot") @@ -461,6 +475,7 @@ private static void registerItemCallbacks(RuntimeTypeAdapterFactory callbackType .registerSubtype(ABCallbackReuseItem.class, "reuseItem") .registerSubtype(ABCallbackReuseItemWithArguments.class, "reuseItemWithArguments") .registerSubtype(ABCallbackGetStoredItemByKey.class, "getStoredItemByKey") + .registerSubtype(ABCallbackGetAbilityTargetedItem.class, "getAbilityTargetedItem") .registerSubtype(ABCallbackGetLastCreatedItem.class, "getLastCreatedItem") .registerSubtype(ABCallbackGetAttackedItem.class, "getAttackedItem"); } @@ -502,6 +517,7 @@ private static void registerLocationCallbacks(RuntimeTypeAdapterFactory callback .registerSubtype(ABCallbackCreateLocationFromXYOffset.class, "createLocationFromXYOffset") .registerSubtype(ABCallbackModifyLocationWithOffset.class, "modifyLocationWithOffset") .registerSubtype(ABCallbackModifyLocationWithXYOffset.class, "modifyLocationWithXYOffset") + .registerSubtype(ABCallbackRandomLocationInRange.class, "randomLocationInRange") .registerSubtype(ABCallbackGetStoredLocationByKey.class, "getStoredLocationByKey") .registerSubtype(ABCallbackInlineConditionLocation.class, "inlineConditionLocation") .registerSubtype(ABCallbackGetTargetedLocation.class, "getTargetedLocation") @@ -538,6 +554,8 @@ private static void registerLongCallbacks(RuntimeTypeAdapterFactory callbackType .registerSubtype(ABCallbackCreateDetectorData.class, "createDetectorData") .registerSubtype(ABCallbackCreateDetectedData.class, "createDetectedData") + .registerSubtype(ABCallbackCreateOwnershipData.class, "createOwnershipData") + .registerSubtype(ABCallbackPlayerMaskIncludePlayers.class, "playerMaskIncludePlayers") .registerSubtype(ABCallbackPlayerMaskExcludePlayers.class, "playerMaskExcludePlayers") .registerSubtype(ABCallbackPlayerMaskAllPlayers.class, "playerMaskAllPlayers") @@ -560,6 +578,7 @@ private static void registerOrderIdCallbacks(RuntimeTypeAdapterFactory callbackT private static void registerPlayerCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetPlayerById.class, "getPlayerById") + .registerSubtype(ABCallbackGetCastingPlayer.class, "getCastingPlayer") .registerSubtype(ABCallbackGetStoredPlayerByKey.class, "getStoredPlayerByKey") .registerSubtype(ABCallbackInlineConditionPlayer.class, "inlineConditionPlayer") .registerSubtype(ABCallbackGetOwnerOfUnit.class, "getOwnerOfUnit") @@ -684,6 +703,8 @@ private static void registerUnitCallbacks(RuntimeTypeAdapterFactory unitCallback .registerSubtype(ABCallbackGetMatchingUnit.class, "getMatchingUnit") .registerSubtype(ABCallbackGetAttackedUnit.class, "getAttackedUnit") .registerSubtype(ABCallbackGetAttackingUnit.class, "getAttackingUnit") + .registerSubtype(ABCallbackGetDamagedUnit.class, "getDamagedUnit") + .registerSubtype(ABCallbackGetDamagingUnit.class, "getDamagingUnit") .registerSubtype(ABCallbackGetDyingUnit.class, "getDyingUnit") .registerSubtype(ABCallbackGetKillingUnit.class, "getKillingUnit") .registerSubtype(ABCallbackGetAbilityTargetedUnit.class, "getAbilityTargetedUnit") @@ -822,6 +843,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsAttackTypeEqual.class, "isAttackTypeEqual") .registerSubtype(ABConditionIsDamageTypeEqual.class, "isDamageTypeEqual") .registerSubtype(ABConditionIsWeaponTypeEqual.class, "isWeaponTypeEqual") + .registerSubtype(ABConditionIsMovementTypeEqual.class, "isMovementTypeEqual") .registerSubtype(ABConditionIsIdEqual.class, "isIdEqual") .registerSubtype(ABConditionIsDefenseTypeEqual.class, "isDefenseTypeEqual") .registerSubtype(ABConditionIsDefenseTypeInList.class, "isDefenseTypeInList") @@ -841,6 +863,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsUnitType.class, "isUnitType") + .registerSubtype(ABConditionDoesUnitHaveAbilityMatchingCondition.class, "doesUnitHaveAbilityMatchingCondition") .registerSubtype(ABConditionDoesUnitHaveBuff.class, "doesUnitHaveBuff") .registerSubtype(ABConditionDoesUnitHaveBuffMatchingCondition.class, "doesUnitHaveBuffMatchingCondition") .registerSubtype(ABConditionIsUnitMaxHp.class, "isUnitMaxHp") @@ -861,12 +884,16 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsUnitConstructingOrUpgrading.class, "isUnitConstructingOrUpgrading") .registerSubtype(ABConditionIsUnitMagicImmune.class, "isUnitMagicImmune") .registerSubtype(ABConditionIsUnitSleeping.class, "isUnitSleeping") + .registerSubtype(ABConditionIsUnitMorphImmune.class, "isUnitMorphImmune") + .registerSubtype(ABConditionIsUnitPolymorphed.class, "isUnitPolymorphed") .registerSubtype(ABConditionIsUnitShareSpells.class, "isUnitShareSpells") .registerSubtype(ABConditionIsUnitHeroDuration.class, "isUnitHeroDuration") + .registerSubtype(ABConditionIsCurrentBehaviorCategoryInList.class, "isCurrentBehaviorCategoryInList") .registerSubtype(ABConditionIsItemAbility.class, "isItemAbility") .registerSubtype(ABConditionItemHasCharges.class, "itemHasCharges") + .registerSubtype(ABConditionIsTree.class, "isTree") .registerSubtype(ABConditionDoesDestructableHaveBuff.class, "doesDestructableHaveBuff") .registerSubtype(ABConditionDoesDestructableHaveBuffMatchingCondition.class, "doesDestructableHaveBuffMatchingCondition") @@ -968,6 +995,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionDeleteStoredKey.class, "deleteStoredKey") .registerSubtype(ABActionRemoveEffect.class, "removeEffect") .registerSubtype(ABActionCreateAbilityFromId.class, "createAbilityFromId") + .registerSubtype(ABActionPrepUnownedAbilityForUse.class, "prepUnownedAbilityForUse") .registerSubtype(ABActionAddDefenseBonus.class, "addDefenseBonus") .registerSubtype(ABActionRemoveDefenseBonus.class, "removeDefenseBonus") .registerSubtype(ABActionAddRallyAbility.class, "addRallyAbility") @@ -994,6 +1022,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionSetMp.class, "setMp") .registerSubtype(ABActionAddMp.class, "addMp") .registerSubtype(ABActionSubtractMp.class, "subtractMp") + .registerSubtype(ABActionSetSpeed.class, "setSpeed") .registerSubtype(ABActionMultiplyUnitScale.class, "multiplyUnitScale") .registerSubtype(ABActionAddStunBuff.class, "addStunBuff") .registerSubtype(ABActionAddSlowBuff.class, "addSlowBuff") @@ -1006,6 +1035,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionTransformUnitInstant.class, "transformUnitInstant") .registerSubtype(ABActionTransformedUnitAbilityAdd.class, "transformedUnitAbilityAdd") .registerSubtype(ABActionTransformedUnitAbilityRemove.class, "transformedUnitAbilityRemove") + .registerSubtype(ABActionTransformUnitAppearance.class, "transformUnitAppearance") .registerSubtype(ABActionSetExplodesOnDeath.class, "setExplodesOnDeath") .registerSubtype(ABActionIssueStopOrder.class, "issueStopOrder") .registerSubtype(ABActionSendUnitBackToWork.class, "sendUnitBackToWork") @@ -1050,6 +1080,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionAddTargetAllowed.class, "addTargetAllowed") .registerSubtype(ABActionRemoveTargetAllowed.class, "removeTargetAllowed") .registerSubtype(ABActionAbilityAttemptToApplyEffect.class, "abilityAttemptToApplyEffect") + .registerSubtype(ABActionAbilityRunEndCastingActions.class, "abilityRunEndCastingActions") .registerSubtype(ABActionSendStartCastingEvents.class, "sendStartCastingEvents") .registerSubtype(ABActionSetPreventEndEvents.class, "setPreventEndEvents") @@ -1192,6 +1223,7 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionChargeItem.class, "chargeItem") + .registerSubtype(ABActionTransformItem.class, "transformItem") @@ -1603,6 +1635,14 @@ public static Gson create() { .registerSubtype(ABCallbackRawTargetType.class, "rawTargetType"); gsonBuilder.registerTypeAdapterFactory(ttTypeFactory); + final RuntimeTypeAdapterFactory moveTypeFactory = RuntimeTypeAdapterFactory + .of(ABMovementTypeCallback.class, "type"); + moveTypeFactory.registerSubtype(ABCallbackGetMovementTypeFromString.class, "getMovementTypeFromString") + .registerSubtype(ABCallbackGetStoredMovementTypeByKey.class, "getStoredMovementTypeByKey") + .registerSubtype(ABCallbackGetUnitMovementType.class, "getUnitMovementType") + .registerSubtype(ABCallbackGetUnitTypeMovementType.class, "getUnitTypeMovementType"); + gsonBuilder.registerTypeAdapterFactory(moveTypeFactory); + final RuntimeTypeAdapterFactory pdlpTypeFactory = RuntimeTypeAdapterFactory .of(ABAttackPreDamageListenerPriorityCallback.class, "type"); pdlpTypeFactory.registerSubtype(ABCallbackRawPreDamageListenerPriority.class, "rawPriority"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/RandomTypeHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/RandomTypeHandler.java new file mode 100644 index 000000000..205daeffc --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/RandomTypeHandler.java @@ -0,0 +1,90 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItemType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.data.CUnitRace; + +public class RandomTypeHandler { + private static List landCritters = null; + private static List airCritters = null; + private static List seaCritters = null; + + private static List randomItems = null; + + private static void loadCritterLists(CSimulation game) { + landCritters = new ArrayList<>(); + airCritters = new ArrayList<>(); + seaCritters = new ArrayList<>(); + Collection types = game.getUnitData().getAllUnitTypesLightweight(); + String tileset = ("" + game.getTileset()).toUpperCase(); + + for (CUnitType type : types) { + if (type.getRace() == CUnitRace.CRITTERS + && ("*".equals(type.getTilesets()) || type.getTilesets().indexOf(tileset) >= 0) + && !type.isSpecial()) { + switch (type.getMovementType()) { + case AMPHIBIOUS: + seaCritters.add(type); + break; + case FLY: + airCritters.add(type); + break; + case FOOT: + case FOOT_NO_COLLISION: + case HORSE: + case HOVER: + landCritters.add(type); + break; + case FLOAT: + case DISABLED: + default: + break; + + } + } + } + } + + private static void loadItemLists(CSimulation game) { + randomItems = new ArrayList<>(); + Collection types = game.getItemData().getAllItemTypes(); + + for (CItemType type : types) { + if (type.isIncludeAsRandomChoice()) { + randomItems.add(type); + } + } + } + + public static CUnitType getRandomMechanicalCritterType(CSimulation game) { + if (landCritters == null) { + loadCritterLists(game); + } + if (landCritters.size() > 0 || seaCritters.size() > 0) { + int i = game.getSeededRandom().nextInt(landCritters.size() + seaCritters.size()); + if (i >= landCritters.size()) { + return seaCritters.get(i - landCritters.size()); + } else { + return landCritters.get(i); + } + } else if (airCritters.size() > 0) { + int i = game.getSeededRandom().nextInt(airCritters.size()); + return airCritters.get(i); + } + return null; + } + + public static CItemType getRandomItemType(CSimulation game) { + if (randomItems == null) { + loadItemLists(game); + } + int i = game.getSeededRandom().nextInt(randomItems.size()); + return randomItems.get(i); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java index f462002d6..390944153 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java @@ -31,8 +31,8 @@ public ABDamageTakenListener(Map localStore, List acti @Override public void onDamage(CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CDamageType damageType, float damage, float bonusDamage, float trueDamage) { - localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); - localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); + localStore.put(ABLocalStoreKeys.DAMAGINGUNIT+triggerId, attacker); + localStore.put(ABLocalStoreKeys.DAMAGEDUNIT+triggerId, target); localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, flags.isAttack()); localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, flags.isRanged()); localStore.put(ABLocalStoreKeys.DAMAGETYPE+triggerId, damageType); @@ -44,8 +44,8 @@ public void onDamage(CSimulation simulation, CUnit attacker, CUnit target, final action.runAction(simulation, target, localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISATTACK+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISRANGED+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGETYPE+triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java index 55de3458a..cc07ea160 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java @@ -34,8 +34,8 @@ public ABDamageTakenModificationListener(Map localStore, List localStore, Li public float onDamage(CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, float previousDamage) { - localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); - localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); + localStore.put(ABLocalStoreKeys.DAMAGINGUNIT+triggerId, attacker); + localStore.put(ABLocalStoreKeys.DAMAGEDUNIT+triggerId, target); localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, flags.isAttack()); localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, flags.isRanged()); localStore.put(ABLocalStoreKeys.ATTACKTYPE+triggerId, attackType); @@ -47,8 +47,8 @@ public float onDamage(CSimulation simulation, CUnit attacker, } } float finalDamage = (float) localStore.get(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISATTACK+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEISRANGED+triggerId); localStore.remove(ABLocalStoreKeys.ATTACKTYPE+triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java index c1586dbe4..41196f97b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java @@ -41,7 +41,8 @@ public void onFire(CSimulation simulation) { action.runAction(simulation, caster, localStore, castId); } } - localStore.remove(ABLocalStoreKeys.FIRINGTIMER); + if (localStore != null) + localStore.remove(ABLocalStoreKeys.FIRINGTIMER); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDefenseType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDefenseType.java index 5b430da50..b8d328779 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDefenseType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDefenseType.java @@ -30,7 +30,13 @@ public static CDefenseType parseDefenseType(final String typeString) { if (upperCaseTypeString.equals("HEAVY")) { return LARGE; } - return valueOf(upperCaseTypeString); + try { + return valueOf(upperCaseTypeString); + } + catch (final Exception exc) { + exc.printStackTrace(); + return NONE; + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CItemData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CItemData.java index dd3408a83..85786f39d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CItemData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CItemData.java @@ -1,6 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.data; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -132,7 +133,7 @@ private CItemType getItemTypeInstance(final War3ID typeId, final GameObject item // do not bother to log this, means it didn't match constant (it's a user input) } - itemTypeInstance = new CItemType(abilityList, cooldownGroup, ignoreCooldown, numberOfCharges, activelyUsed, + itemTypeInstance = new CItemType(typeId, abilityList, cooldownGroup, ignoreCooldown, numberOfCharges, activelyUsed, perishable, useAutomaticallyWhenAcquired, goldCost, lumberCost, stockMax, stockReplenishInterval, stockStartDelay, hitPoints, armorType, level, levelUnclassified, priority, sellable, pawnable, droppedWhenCarrierDies, canBeDropped, validTargetForTransformation, includeAsRandomChoice, @@ -189,4 +190,8 @@ private static final class RandomItemSet { private final List unclassifiedItems = new ArrayList<>(); private final Map> classificationToItems = new HashMap<>(); } + + public Collection getAllItemTypes() { + return this.itemIdToItemType.values(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java index 342f51838..717e815fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java @@ -3,6 +3,7 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.EnumMap; import java.util.EnumSet; @@ -226,10 +227,14 @@ public class CUnitData { private static final String LUMBER_BOUNTY_AWARDED_SIDES = "lumberbountysides"; // replaced from 'ulbs' private static final String NEUTRAL_BUILDING_SHOW_ICON = "nbmmIcon"; + + private static final String TILESETS = "tilesets"; + private static final String SPECIAL = "special"; private final CGameplayConstants gameplayConstants; private final ObjectData unitData; private final Map unitIdToUnitType = new HashMap<>(); + private final Map unitIdToUnitTypeLightweight = new HashMap<>(); private final Map jassLegacyNameToUnitId = new HashMap<>(); private final CAbilityData abilityData; private final CUpgradeData upgradeData; @@ -807,6 +812,9 @@ private CUnitType getUnitTypeInstance(final War3ID typeId, final BufferedImage b final List heroProperNames = Arrays.asList(properNames.split(",")); final boolean neutralBuildingShowMinimapIcon = unitType.getFieldAsBoolean(NEUTRAL_BUILDING_SHOW_ICON, 0); + + final String tilesets = unitType.getFieldAsString(TILESETS, 0); + final boolean special = unitType.getFieldAsBoolean(SPECIAL, 0); unitTypeInstance = new CUnitType(unitName, legacyName, typeId, life, lifeRegen, manaRegen, lifeRegenType, manaInitial, manaMaximum, speed, maxSpeed, minSpeed, defense, defaultAutocastAbilityId, abilityList, isBldg, @@ -821,8 +829,9 @@ private CUnitType getUnitTypeInstance(final War3ID typeId, final BufferedImage b castPoint, canBeBuiltOnThem, canBuildOnMe, defenseUpgradeBonus, sightRadiusDay, sightRadiusNight, extendedLineOfSight, goldBountyAwardedBase, goldBountyAwardedDice, goldBountyAwardedSides, lumberBountyAwardedBase, lumberBountyAwardedDice, lumberBountyAwardedSides, - neutralBuildingShowMinimapIcon); + neutralBuildingShowMinimapIcon, tilesets, special); this.unitIdToUnitType.put(typeId, unitTypeInstance); + this.unitIdToUnitTypeLightweight.put(typeId, unitTypeInstance); this.jassLegacyNameToUnitId.put(legacyName, typeId); } return unitTypeInstance; @@ -1092,4 +1101,327 @@ public CUnitType getUnitTypeByJassLegacyName(final String jassLegacyName) { } return getUnitType(typeId); } + private CUnitType getUnitTypeInstanceLightweight(final War3ID typeId, + final GameObject unitType) { + CUnitType unitTypeInstance = this.unitIdToUnitType.get(typeId); + if (unitTypeInstance == null) { + final String legacyName = getLegacyName(unitType); + final int life = unitType.getFieldAsInteger(HIT_POINT_MAXIMUM, 0); + final float lifeRegen = unitType.getFieldAsFloat(HIT_POINT_REGEN, 0); + final CRegenType lifeRegenType = CRegenType + .parseRegenType(unitType.getFieldAsString(HIT_POINT_REGEN_TYPE, 0)); + final int manaInitial = unitType.getFieldAsInteger(MANA_INITIAL_AMOUNT, 0); + final int manaMaximum = unitType.getFieldAsInteger(MANA_MAXIMUM, 0); + final float manaRegen = unitType.getFieldAsFloat(MANA_REGEN, 0); + final int speed = unitType.getFieldAsInteger(MOVEMENT_SPEED_BASE, 0); + final int maxSpeed = unitType.getFieldAsInteger(MOVEMENT_SPEED_MAX, 0); + final int minSpeed = unitType.getFieldAsInteger(MOVEMENT_SPEED_MIN, 0); + final int defense = unitType.getFieldAsInteger(DEFENSE, 0); + final String defaultAutocastAbility = unitType.getFieldAsString(ABILITIES_DEFAULT_AUTO, 0); + final List abilityListString = unitType.getFieldAsList(ABILITIES_NORMAL); + final List heroAbilityListString = unitType.getFieldAsList(ABILITIES_HERO); + final int unitLevel = unitType.getFieldAsInteger(UNIT_LEVEL, 0); + final int priority = unitType.getFieldAsInteger(PRIORITY, 0); + final int defenseUpgradeBonus = unitType.getFieldAsInteger(DEFENSE_UPGRADE_BONUS, 0); + + final float moveHeight = unitType.getFieldAsFloat(MOVE_HEIGHT, 0); + final String movetp = unitType.getFieldAsString(MOVE_TYPE, 0); + final float collisionSize = unitType.getFieldAsFloat(COLLISION_SIZE, 0); + final float propWindow = unitType.getFieldAsFloat(PROPULSION_WINDOW, 0); + final float turnRate = unitType.getFieldAsFloat(TURN_RATE, 0); + + final boolean canFlee = unitType.getFieldAsBoolean(CAN_FLEE, 0); + + final boolean canBeBuiltOnThem = unitType.getFieldAsBoolean(CAN_BE_BUILT_ON_THEM, 0); + final boolean canBuildOnMe = unitType.getFieldAsBoolean(CAN_BUILD_ON_ME, 0); + + final float strPlus = unitType.getFieldAsFloat(STR_PLUS, 0); + final float agiPlus = unitType.getFieldAsFloat(AGI_PLUS, 0); + final float intPlus = unitType.getFieldAsFloat(INT_PLUS, 0); + + final int strength = unitType.getFieldAsInteger(STR, 0); + final int agility = unitType.getFieldAsInteger(AGI, 0); + final int intelligence = unitType.getFieldAsInteger(INT, 0); + final CPrimaryAttribute primaryAttribute = CPrimaryAttribute + .parsePrimaryAttribute(unitType.getFieldAsString(PRIMARY_ATTRIBUTE, 0)); + + final String properNames = unitType.getField(PROPER_NAMES); + final int properNamesCount = unitType.getFieldAsInteger(PROPER_NAMES_COUNT, 0); + + final boolean isBldg = unitType.getFieldAsBoolean(IS_BLDG, 0); + PathingGrid.MovementType movementType = PathingGrid.getMovementType(movetp); + if (movementType == null) { + movementType = MovementType.DISABLED; + } + final String unitName = unitType.getFieldAsString(NAME, 0); + final float acquisitionRange = unitType.getFieldAsFloat(ACQUISITION_RANGE, 0); + // note: uamn expected type int below, not exactly sure why that decision was + // made but I'll support it + final float minimumAttackRange = unitType.getFieldAsInteger(MINIMUM_ATTACK_RANGE, 0); + final EnumSet targetedAs = CTargetType + .parseTargetTypeSet(unitType.getFieldAsList(TARGETED_AS)); + final List classificationStringList = unitType.getFieldAsList(CLASSIFICATION); + final EnumSet classifications = EnumSet.noneOf(CUnitClassification.class); + if (!classificationStringList.isEmpty()) { + for (final String unitEditorKey : classificationStringList) { + final CUnitClassification unitClassification = CUnitClassification + .parseUnitClassification(unitEditorKey); + if (unitClassification != null) { + classifications.add(unitClassification); + } + } + } + final List attacks = new ArrayList<>(); + final int attacksEnabled = unitType.getFieldAsInteger(ATTACKS_ENABLED, 0); + try { + // attack one + final float animationBackswingPoint = unitType.getFieldAsFloat(ATTACK1_BACKSWING_POINT, 0); + final float animationDamagePoint = unitType.getFieldAsFloat(ATTACK1_DAMAGE_POINT, 0); + final int areaOfEffectFullDamage = unitType.getFieldAsInteger(ATTACK1_AREA_OF_EFFECT_FULL_DMG, 0); + final int areaOfEffectMediumDamage = unitType.getFieldAsInteger(ATTACK1_AREA_OF_EFFECT_HALF_DMG, 0); + final int areaOfEffectSmallDamage = unitType.getFieldAsInteger(ATTACK1_AREA_OF_EFFECT_QUARTER_DMG, 0); + final EnumSet areaOfEffectTargets = CTargetType + .parseTargetTypeSet(unitType.getFieldAsList(ATTACK1_AREA_OF_EFFECT_TARGETS)); + final CAttackType attackType = CAttackType + .parseAttackType(unitType.getFieldAsString(ATTACK1_ATTACK_TYPE, 0)); + final float cooldownTime = unitType.getFieldAsFloat(ATTACK1_COOLDOWN, 0); + final int damageBase = unitType.getFieldAsInteger(ATTACK1_DMG_BASE, 0); + final float damageFactorMedium = unitType.getFieldAsFloat(ATTACK1_DAMAGE_FACTOR_HALF, 0); + final float damageFactorSmall = unitType.getFieldAsFloat(ATTACK1_DAMAGE_FACTOR_QUARTER, 0); + final float damageLossFactor = unitType.getFieldAsFloat(ATTACK1_DAMAGE_LOSS_FACTOR, 0); + final int damageDice = unitType.getFieldAsInteger(ATTACK1_DMG_DICE, 0); + final int damageSidesPerDie = unitType.getFieldAsInteger(ATTACK1_DMG_SIDES_PER_DIE, 0); + final float damageSpillDistance = unitType.getFieldAsFloat(ATTACK1_DMG_SPILL_DIST, 0); + final float damageSpillRadius = unitType.getFieldAsFloat(ATTACK1_DMG_SPILL_RADIUS, 0); + final int damageUpgradeAmount = unitType.getFieldAsInteger(ATTACK1_DMG_UPGRADE_AMT, 0); + final int maximumNumberOfTargets = unitType.getFieldAsInteger(ATTACK1_TARGET_COUNT, 0); + final float projectileArc = unitType.getFieldAsFloat(ATTACK1_PROJECTILE_ARC, 0); + final String projectileArt = unitType.getFieldAsString(ATTACK1_MISSILE_ART, 0); + final boolean projectileHomingEnabled = unitType.getFieldAsBoolean(ATTACK1_PROJECTILE_HOMING_ENABLED, + 0); + final int projectileSpeed = unitType.getFieldAsInteger(ATTACK1_PROJECTILE_SPEED, 0); + final int range = unitType.getFieldAsInteger(ATTACK1_RANGE, 0); + final float rangeMotionBuffer = unitType.getFieldAsFloat(ATTACK1_RANGE_MOTION_BUFFER, 0); + final boolean showUI = unitType.getFieldAsBoolean(ATTACK1_SHOW_UI, 0); + final EnumSet targetsAllowed = CTargetType + .parseTargetTypeSet(unitType.getFieldAsList(ATTACK1_TARGETS_ALLOWED)); + final String weaponSound = unitType.getFieldAsString(ATTACK1_WEAPON_SOUND, 0); + final String weapon_type_temp = unitType.getFieldAsString(ATTACK1_WEAPON_TYPE, 0); + CWeaponType weaponType = CWeaponType.NONE; + if (!"_".equals(weapon_type_temp)) { + weaponType = CWeaponType.parseWeaponType(weapon_type_temp); + } + attacks.add(createAttack(animationBackswingPoint, animationDamagePoint, areaOfEffectFullDamage, + areaOfEffectMediumDamage, areaOfEffectSmallDamage, areaOfEffectTargets, attackType, + cooldownTime, damageBase, damageFactorMedium, damageFactorSmall, damageLossFactor, damageDice, + damageSidesPerDie, damageSpillDistance, damageSpillRadius, damageUpgradeAmount, + maximumNumberOfTargets, projectileArc, projectileArt, projectileHomingEnabled, projectileSpeed, + range, rangeMotionBuffer, showUI, targetsAllowed, weaponSound, weaponType)); + } catch (final Exception exc) { + System.err.println("Attack 1 failed to parse with: " + exc.getClass() + ":" + exc.getMessage()); + } + try { + // attack two + final float animationBackswingPoint = unitType.getFieldAsFloat(ATTACK2_BACKSWING_POINT, 0); + final float animationDamagePoint = unitType.getFieldAsFloat(ATTACK2_DAMAGE_POINT, 0); + final int areaOfEffectFullDamage = unitType.getFieldAsInteger(ATTACK2_AREA_OF_EFFECT_FULL_DMG, 0); + final int areaOfEffectMediumDamage = unitType.getFieldAsInteger(ATTACK2_AREA_OF_EFFECT_HALF_DMG, 0); + final int areaOfEffectSmallDamage = unitType.getFieldAsInteger(ATTACK2_AREA_OF_EFFECT_QUARTER_DMG, 0); + final EnumSet areaOfEffectTargets = CTargetType + .parseTargetTypeSet(unitType.getFieldAsList(ATTACK2_AREA_OF_EFFECT_TARGETS)); + final CAttackType attackType = CAttackType + .parseAttackType(unitType.getFieldAsString(ATTACK2_ATTACK_TYPE, 0)); + final float cooldownTime = unitType.getFieldAsFloat(ATTACK2_COOLDOWN, 0); + final int damageBase = unitType.getFieldAsInteger(ATTACK2_DMG_BASE, 0); + final float damageFactorMedium = unitType.getFieldAsFloat(ATTACK2_DAMAGE_FACTOR_HALF, 0); + final float damageFactorSmall = unitType.getFieldAsFloat(ATTACK2_DAMAGE_FACTOR_QUARTER, 0); + final float damageLossFactor = unitType.getFieldAsFloat(ATTACK2_DAMAGE_LOSS_FACTOR, 0); + final int damageDice = unitType.getFieldAsInteger(ATTACK2_DMG_DICE, 0); + final int damageSidesPerDie = unitType.getFieldAsInteger(ATTACK2_DMG_SIDES_PER_DIE, 0); + final float damageSpillDistance = unitType.getFieldAsFloat(ATTACK2_DMG_SPILL_DIST, 0); + final float damageSpillRadius = unitType.getFieldAsFloat(ATTACK2_DMG_SPILL_RADIUS, 0); + final int damageUpgradeAmount = unitType.getFieldAsInteger(ATTACK2_DMG_UPGRADE_AMT, 0); + final int maximumNumberOfTargets = unitType.getFieldAsInteger(ATTACK2_TARGET_COUNT, 0); + float projectileArc = unitType.getFieldAsFloat(ATTACK2_PROJECTILE_ARC, 0); + String projectileArt = unitType.getFieldAsString(ATTACK2_MISSILE_ART, 0); + int projectileSpeed = unitType.getFieldAsInteger(ATTACK2_PROJECTILE_SPEED, 0); + if ("_".equals(projectileArt) || projectileArt.isEmpty()) { + projectileArt = unitType.getFieldAsString(ATTACK1_MISSILE_ART, 0); + projectileSpeed = unitType.getFieldAsInteger(ATTACK1_PROJECTILE_SPEED, 0); + projectileArc = unitType.getFieldAsFloat(ATTACK1_PROJECTILE_ARC, 0); + } + final boolean projectileHomingEnabled = unitType.getFieldAsBoolean(ATTACK2_PROJECTILE_HOMING_ENABLED, + 0); + final int range = unitType.getFieldAsInteger(ATTACK2_RANGE, 0); + final float rangeMotionBuffer = unitType.getFieldAsFloat(ATTACK2_RANGE_MOTION_BUFFER, 0); + boolean showUI = unitType.getFieldAsBoolean(ATTACK2_SHOW_UI, 0); + final EnumSet targetsAllowed = CTargetType + .parseTargetTypeSet(unitType.getFieldAsList(ATTACK2_TARGETS_ALLOWED)); + final String weaponSound = unitType.getFieldAsString(ATTACK2_WEAPON_SOUND, 0); + final String weapon_type_temp = unitType.getFieldAsString(ATTACK2_WEAPON_TYPE, 0); + CWeaponType weaponType = CWeaponType.NONE; + if (!"_".equals(weapon_type_temp)) { + weaponType = CWeaponType.parseWeaponType(weapon_type_temp); + } + if (!attacks.isEmpty()) { + final CUnitAttack otherAttack = attacks.get(0); + if ((otherAttack.getAttackType() == attackType) && (targetsAllowed.size() == 1) + && (targetsAllowed.contains(CTargetType.TREE) + || (targetsAllowed.contains(CTargetType.STRUCTURE) + && (otherAttack.getDamageBase() == damageBase) + && (otherAttack.getDamageSidesPerDie() == damageSidesPerDie) + && (otherAttack.getDamageDice() == damageDice)))) { + showUI = false; + } + } + attacks.add(createAttack(animationBackswingPoint, animationDamagePoint, areaOfEffectFullDamage, + areaOfEffectMediumDamage, areaOfEffectSmallDamage, areaOfEffectTargets, attackType, + cooldownTime, damageBase, damageFactorMedium, damageFactorSmall, damageLossFactor, damageDice, + damageSidesPerDie, damageSpillDistance, damageSpillRadius, damageUpgradeAmount, + maximumNumberOfTargets, projectileArc, projectileArt, projectileHomingEnabled, projectileSpeed, + range, rangeMotionBuffer, showUI, targetsAllowed, weaponSound, weaponType)); + } catch (final Exception exc) { + System.err.println("Attack 2 failed to parse with: " + exc.getClass() + ":" + exc.getMessage()); + } + final List enabledAttacks = getEnabledAttacks(attacks, attacksEnabled); + final int deathType = unitType.getFieldAsInteger(DEATH_TYPE, 0); + final boolean raise = (deathType & 0x1) != 0; + final boolean decay = (deathType & 0x2) != 0; + final String armorType = unitType.getFieldAsString(ARMOR_TYPE, 0); + final float impactZ = unitType.getFieldAsFloat(PROJECTILE_IMPACT_Z, 0); + final CDefenseType defenseType = CDefenseType.parseDefenseType(unitType.getFieldAsString(DEFENSE_TYPE, 0)); + final float deathTime = unitType.getFieldAsFloat(DEATH_TIME, 0); + final int goldCost = unitType.getFieldAsInteger(GOLD_COST, 0); + final int lumberCost = unitType.getFieldAsInteger(LUMBER_COST, 0); + final int buildTime = (int) Math + .ceil(unitType.getFieldAsInteger(BUILD_TIME, 0) * WarsmashConstants.GAME_SPEED_TIME_FACTOR); + final int goldRepairCost = unitType.getFieldAsInteger(GOLD_REPAIR_COST, 0); + final int lumberRepairCost = unitType.getFieldAsInteger(LUMBER_REPAIR_COST, 0); + final int repairTime = (int) Math + .ceil(unitType.getFieldAsInteger(REPAIR_TIME, 0) * WarsmashConstants.GAME_SPEED_TIME_FACTOR); + final int foodUsed = unitType.getFieldAsInteger(FOOD_USED, 0); + final int foodMade = unitType.getFieldAsInteger(FOOD_MADE, 0); + + final float castBackswingPoint = unitType.getFieldAsFloat(CAST_BACKSWING_POINT, 0); + final float castPoint = unitType.getFieldAsFloat(CAST_POINT, 0); + + final int pointValue = unitType.getFieldAsInteger(POINT_VALUE, 0); + + final int sightRadiusDay = unitType.getFieldAsInteger(SIGHT_RADIUS_DAY, 0); + final int sightRadiusNight = unitType.getFieldAsInteger(SIGHT_RADIUS_NIGHT, 0); + final boolean extendedLineOfSight = unitType.getFieldAsBoolean(EXTENDED_LOS, 0); + + final int goldBountyAwardedBase = unitType.getFieldAsInteger(GOLD_BOUNTY_AWARDED_BASE, 0); + final int goldBountyAwardedDice = unitType.getFieldAsInteger(GOLD_BOUNTY_AWARDED_DICE, 0); + final int goldBountyAwardedSides = unitType.getFieldAsInteger(GOLD_BOUNTY_AWARDED_SIDES, 0); + + final int lumberBountyAwardedBase = unitType.getFieldAsInteger(LUMBER_BOUNTY_AWARDED_BASE, 0); + final int lumberBountyAwardedDice = unitType.getFieldAsInteger(LUMBER_BOUNTY_AWARDED_DICE, 0); + final int lumberBountyAwardedSides = unitType.getFieldAsInteger(LUMBER_BOUNTY_AWARDED_SIDES, 0); + + final boolean revivesHeroes = unitType.getFieldAsBoolean(REVIVES_HEROES, 0); + + final List unitsTrained = parseIDList(unitType.getFieldAsList(UNITS_TRAINED)); + + final List upgradesTo = parseIDList(unitType.getFieldAsList(UPGRADES_TO)); + + final List researchesAvailable = parseIDList(unitType.getFieldAsList(RESEARCHES_AVAILABLE)); + + final List upgradesUsed = parseIDList(unitType.getFieldAsList(UPGRADES_USED)); + final EnumMap upgradeClassToType = new EnumMap<>(CUpgradeClass.class); + for (final War3ID upgradeUsed : upgradesUsed) { + final CUpgradeType upgradeType = this.upgradeData.getType(upgradeUsed); + if (upgradeType != null) { + final CUpgradeClass upgradeClass = upgradeType.getUpgradeClass(); + if (upgradeClass != null) { + upgradeClassToType.put(upgradeClass, upgradeUsed); + } + } + } + + final List structuresBuilt = parseIDList(unitType.getFieldAsList(STRUCTURES_BUILT)); + + final List itemsSold = parseIDList(unitType.getFieldAsList(ITEMS_SOLD)); + final List itemsMade = parseIDList(unitType.getFieldAsList(ITEMS_MADE)); + + final War3ID defaultAutocastAbilityId; + if ((defaultAutocastAbility != null) && !defaultAutocastAbility.isEmpty() + && !defaultAutocastAbility.equals("_")) { + defaultAutocastAbilityId = War3ID.fromString(defaultAutocastAbility); + } else { + defaultAutocastAbilityId = null; + } + final List heroAbilityList = parseIDList(heroAbilityListString); + final List abilityList = parseIDList(abilityListString); + + final List requirementsString = unitType.getFieldAsList(REQUIRES); + final List requirementsLevelsString = unitType.getFieldAsList(REQUIRES_AMOUNT); + final List requirements = parseRequirements(requirementsString, + requirementsLevelsString); + final int requirementsTiersCount = unitType.getFieldAsInteger(REQUIRES_TIER_COUNT, 0); + final List> requirementTiers = new ArrayList<>(); + for (int i = 1; i <= requirementsTiersCount; i++) { + final List requirementsTierString = unitType.getFieldAsList(REQUIRES_TIER_X[i - 1]); + final List tierRequirements = parseRequirements(requirementsTierString, + Collections.emptyList()); + requirementTiers.add(tierRequirements); + } + + final EnumSet preventedPathingTypes = CBuildingPathingType + .parsePathingTypeListSet(unitType.getFieldAsString(PREVENT_PLACE, 0)); + final EnumSet requiredPathingTypes = CBuildingPathingType + .parsePathingTypeListSet(unitType.getFieldAsString(REQUIRE_PLACE, 0)); + + final String raceString = unitType.getFieldAsString(UNIT_RACE, 0); + final CUnitRace unitRace = CUnitRace.parseRace(raceString); + + final boolean hero = Character.isUpperCase(typeId.charAt(0)); + + final List heroProperNames = Arrays.asList(properNames.split(",")); + + final boolean neutralBuildingShowMinimapIcon = unitType.getFieldAsBoolean(NEUTRAL_BUILDING_SHOW_ICON, 0); + + final String tilesets = unitType.getField(TILESETS); + final boolean special = unitType.getFieldAsBoolean(SPECIAL, 0); + + unitTypeInstance = new CUnitType(unitName, legacyName, typeId, life, lifeRegen, manaRegen, lifeRegenType, + manaInitial, manaMaximum, speed, maxSpeed, minSpeed, defense, defaultAutocastAbilityId, abilityList, isBldg, + movementType, moveHeight, collisionSize, classifications, attacks, attacksEnabled, armorType, raise, + decay, defenseType, impactZ, null, deathTime, targetedAs, acquisitionRange, + minimumAttackRange, structuresBuilt, unitsTrained, researchesAvailable, upgradesUsed, + upgradeClassToType, upgradesTo, itemsSold, itemsMade, unitRace, goldCost, lumberCost, foodUsed, + foodMade, buildTime, goldRepairCost, lumberRepairCost, repairTime, preventedPathingTypes, + requiredPathingTypes, propWindow, turnRate, requirements, requirementTiers, unitLevel, hero, + strength, strPlus, agility, agiPlus, intelligence, intPlus, primaryAttribute, heroAbilityList, + heroProperNames, properNamesCount, canFlee, priority, revivesHeroes, pointValue, castBackswingPoint, + castPoint, canBeBuiltOnThem, canBuildOnMe, defenseUpgradeBonus, sightRadiusDay, sightRadiusNight, + extendedLineOfSight, goldBountyAwardedBase, goldBountyAwardedDice, goldBountyAwardedSides, + lumberBountyAwardedBase, lumberBountyAwardedDice, lumberBountyAwardedSides, + neutralBuildingShowMinimapIcon, tilesets, special); + this.unitIdToUnitTypeLightweight.put(typeId, unitTypeInstance); + } + return unitTypeInstance; + } + + public CUnitType getUnitTypeLightweight(final War3ID rawcode) { + final CUnitType unitTypeInstance = this.unitIdToUnitType.get(rawcode); + if (unitTypeInstance != null) { + return unitTypeInstance; + } + final GameObject unitType = this.unitData.get(rawcode.asStringValue()); + if (unitType == null) { + return null; + } + return getUnitTypeInstanceLightweight(rawcode, unitType); + } + + public Collection getAllUnitTypesLightweight() { + Set keys = this.unitData.keySet(); + if (this.unitIdToUnitTypeLightweight.size() < keys.size()) { + for (String key : keys) { + this.getUnitTypeLightweight(War3ID.fromString(key)); + } + } + return this.unitIdToUnitTypeLightweight.values(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/StateModBuffType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/StateModBuffType.java index b4eebc7e1..95007fe47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/StateModBuffType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/StateModBuffType.java @@ -11,6 +11,7 @@ public enum StateModBuffType implements CHandle { MAGIC_IMMUNE, MORPH_IMMUNE, SNARED, + POLYMORPHED, ENABLE_ATTACK, DISABLE_AUTO_ATTACK, DISABLE_AUTO_CAST, @@ -25,12 +26,15 @@ public enum StateModBuffType implements CHandle { DISABLE_UNIT_COLLISION, DISABLE_BUILDING_COLLISION, INVULNERABLE, + HIDE_MINIMAP_ICON, + FALSE_OWNERSHIP, INVISIBLE, DETECTOR, - DETECTED, - UNSELECTABLE, - UNTARGETABLE, + DETECTED, + UNSELECTABLE, + UNTARGETABLE, UNENUMERABLE, + UNAUTOATTACKABLE, BLOCK_REPAIR, BLOCK_TRAINING, BLOCK_CONSTRUCTION; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java index 4992a1511..80fc24013 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/SimulationRenderController.java @@ -25,6 +25,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public interface SimulationRenderController { + char getTileset(); + CAttackProjectile createAttackProjectile(CSimulation simulation, float launchX, float launchY, float launchFacing, CUnit source, CUnitAttackMissile attack, AbilityTarget target, float damage, int bounceIndex, CUnitAttackListener attackListener, CUnitAttackSettings settings); @@ -70,6 +72,8 @@ CUnit createUnit(CSimulation simulation, final War3ID typeId, final int playerIn CItem createItem(CSimulation simulation, final War3ID typeId, final float x, final float y); + void updateItemModel(CItem item); + CDestructable createDestructable(War3ID typeId, float x, float y, float facing, float scale, int variation); CDestructable createDestructableZ(War3ID typeId, float x, float y, float z, float facing, float scale, @@ -151,7 +155,7 @@ SimulationRenderComponentModel createSpellEffectOverDestructable(CUnit source, C void setBlight(float x, float y, float radius, boolean blighted); - void unitUpdatedType(CUnit unit, War3ID typeId); + void unitUpdatedType(CUnit unit, War3ID typeId, boolean updatePortrait); void changeUnitColor(CUnit unit, int playerIndex); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java index 77d866a47..934ce2394 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java @@ -471,16 +471,14 @@ public MeleeUI(final DataSource dataSource, final ExtendViewport uiViewport, fin if (war3MapViewer.dataSource.has(musicSLKPath)) { try (InputStream miscDataTxtStream = war3MapViewer.dataSource.getResourceAsStream(musicSLKPath)) { this.musicSLK.readSLK(miscDataTxtStream); - } - catch (final IOException e) { + } catch (final IOException e) { e.printStackTrace(); } } if (WarsmashConstants.ENABLE_MUSIC) { this.musicPlayer = new MusicPlayerLibGDX(dataSource, this.musicSLK); - } - else { + } else { this.musicPlayer = MusicPlayer.DO_NOTHING; } } @@ -494,13 +492,11 @@ private MeleeUIMinimap createMinimap(final War3MapViewer war3MapViewer) { try { minimapTexture = ImageUtils.getTextureNoColorCorrection(TgaFile.readTGA("war3mapMap.tga", war3MapViewer.dataSource.getResourceAsStream("war3mapMap.tga"))); - } - catch (final IOException e) { + } catch (final IOException e) { System.err.println("Could not load minimap TGA file"); e.printStackTrace(); } - } - else if (war3MapViewer.dataSource.has("war3mapMap.blp")) { + } else if (war3MapViewer.dataSource.has("war3mapMap.blp")) { minimapTexture = ImageUtils.getAnyExtensionTexture(war3MapViewer.dataSource, "war3mapMap.blp"); } final Texture[] teamColors = new Texture[WarsmashConstants.MAX_PLAYERS]; @@ -540,14 +536,12 @@ public void main() { this.rootFrameListener.onCreate(this.rootFrame); try { this.rootFrame.loadTOCFile("UI\\FrameDef\\FrameDef.toc"); - } - catch (final IOException exc) { + } catch (final IOException exc) { throw new IllegalStateException("Unable to load FrameDef.toc", exc); } try { this.rootFrame.loadTOCFile("UI\\FrameDef\\SmashFrameDef.toc"); - } - catch (final IOException exc) { + } catch (final IOException exc) { throw new IllegalStateException("Unable to load SmashFrameDef.toc", exc); } this.damageBackdrops = new InfoPanelIconBackdrops(CAttackType.values(), this.rootFrame, "Damage", ""); @@ -941,11 +935,12 @@ public void multiSelectIconClicked(final int index) { if ((index >= 0) && (index < cargoData.getCargoCount())) { final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; final CSimulation simulation = MeleeUI.this.war3MapViewer.simulation; - cargoData.checkCanUse(simulation, simulationUnit, OrderIds.unload, false, activationReceiver); + cargoData.checkCanUse(simulation, simulationUnit, OrderIds.unload, false, + activationReceiver); if (activationReceiver.isOk()) { final CWidgetAbilityTargetCheckReceiver targetCheckReceiver = CWidgetAbilityTargetCheckReceiver.INSTANCE; - cargoData.checkCanTarget(simulation, simulationUnit, OrderIds.unload, false, - unitInside, targetCheckReceiver.reset()); + cargoData.checkCanTarget(simulation, simulationUnit, OrderIds.unload, false, unitInside, + targetCheckReceiver.reset()); if (targetCheckReceiver.getTarget() != null) { final CPlayer player = simulation.getPlayer(simulationUnit.getPlayerIndex()); MeleeUI.this.unitOrderListener.issueTargetOrder(simulationUnit.getHandleId(), @@ -965,13 +960,11 @@ public void multiSelectIconClicked(final int index) { final RenderUnit clickUnit = MeleeUI.this.selectedUnits.get(index); if (MeleeUI.this.activeCommand != null) { useActiveCommandOnUnit(isShiftDown(), clickUnit); - } - else if (clickUnit == MeleeUI.this.selectedUnit) { + } else if (clickUnit == MeleeUI.this.selectedUnit) { final List newSelection = Arrays.asList(MeleeUI.this.selectedUnit); selectWidgets(newSelection); MeleeUI.this.war3MapViewer.doSelectUnit(newSelection); - } - else { + } else { selectUnit(clickUnit); } } @@ -1196,8 +1189,7 @@ public void multiSelectIconRelease(final int index) { try { this.consoleInventoryNoCapacityTexture = ImageUtils.getAnyExtensionTexture(this.dataSource, this.rootFrame.getSkinField("ConsoleInventoryNoCapacity")); - } - catch (final Exception exc) { + } catch (final Exception exc) { exc.printStackTrace(); } @@ -1424,7 +1416,8 @@ public void onClick(final int abilityHandleId, final int orderId, final boolean final BooleanAbilityTargetCheckReceiver receiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); ability.checkCanTargetNoTarget(this.war3MapViewer.simulation, - otherSelectedUnit.getSimulationUnit(), this.activeCommandOrderId, false, receiver); + otherSelectedUnit.getSimulationUnit(), this.activeCommandOrderId, false, + receiver); if (receiver.isTargetable()) { abilityToUse = ability; } @@ -1437,16 +1430,14 @@ public void onClick(final int abilityHandleId, final int orderId, final boolean } } } - } - else { + } else { this.activeCommand = abilityToUse; this.activeCommandOrderId = orderId; this.activeCommandUnit = this.selectedUnit; clearAndRepopulateCommandCard(); } } - } - else { + } else { this.unitOrderListener.issueImmediateOrder(this.selectedUnit.getSimulationUnit().getHandleId(), abilityHandleId, orderId, isShiftDown()); if (this.selectedUnits.size() > 1) { @@ -1470,8 +1461,7 @@ public void openMenu(final int orderId) { this.activeCommandUnit = null; this.activeCommand = null; this.activeCommandOrderId = -1; - } - else { + } else { this.subMenuOrderIdStack.add(orderId); } clearAndRepopulateCommandCard(); @@ -1574,12 +1564,10 @@ public void showUpgradeCompleteAlert(final int playerIndex, final War3ID queuedR final UpgradeLevel upgradeLevel = upgradeType.getLevel(level - 1); if (upgradeLevel != null) { upgradeName = upgradeLevel.getName(); - } - else { + } else { upgradeName = "NOTEXTERN Unknown Level " + level + " for '" + queuedRawcode + "'"; } - } - else { + } else { upgradeName = "NOTEXTERN Unknown ('" + queuedRawcode + "')"; } innerShowLocalCommandErrorString(playerIndex, @@ -1653,12 +1641,10 @@ public void update(final float deltaTime) { // mines even though they are invulnerable simpleStatusBarFrame.setVisible(false); } - } - else { + } else { this.hovertipFrame.setVisible(false); } - } - else if (this.draggingMouseButton == Input.Buttons.LEFT) { + } else if (this.draggingMouseButton == Input.Buttons.LEFT) { final float minDragX = Math.min(this.lastMouseClickLocation.x, this.lastMouseDragStart.x); final float minDragY = Math.min(this.lastMouseClickLocation.y, this.lastMouseDragStart.y); final float maxDragX = Math.max(this.lastMouseClickLocation.x, this.lastMouseDragStart.x); @@ -1718,13 +1704,11 @@ public boolean call(final CUnit unit) { if (this.activeCommand != null) { if (this.draggingItem != null) { setCursorState(MenuCursorState.HOLD_ITEM); - } - else { + } else { setCursorState(MenuCursorState.TARGET_CURSOR); this.activeCommand.visit(this.cursorTargetSetupVisitor.reset(baseMouseX, baseMouseY)); } - } - else { + } else { if (this.cursorModelInstance != null) { this.cursorModelInstance.detach(); this.cursorModelInstance = null; @@ -1742,50 +1726,40 @@ public boolean call(final CUnit unit) { if (down) { if (left) { setCursorState(MenuCursorState.SCROLL_DOWN_LEFT); - } - else if (right) { + } else if (right) { setCursorState(MenuCursorState.SCROLL_DOWN_RIGHT); - } - else { + } else { setCursorState(MenuCursorState.SCROLL_DOWN); } - } - else if (up) { + } else if (up) { if (left) { setCursorState(MenuCursorState.SCROLL_UP_LEFT); - } - else if (right) { + } else if (right) { setCursorState(MenuCursorState.SCROLL_UP_RIGHT); - } - else { + } else { setCursorState(MenuCursorState.SCROLL_UP); } - } - else if (left) { + } else if (left) { setCursorState(MenuCursorState.SCROLL_LEFT); - } - else if (right) { + } else if (right) { setCursorState(MenuCursorState.SCROLL_RIGHT); - } - else if (this.mouseOverUnit != null) { + } else if (this.mouseOverUnit != null) { if (this.mouseOverUnit instanceof RenderUnit) { final RenderUnit mouseOverUnitUnit = (RenderUnit) this.mouseOverUnit; - final int playerIndex = mouseOverUnitUnit.getSimulationUnit().getPlayerIndex(); + final int playerIndex = mouseOverUnitUnit.getSimulationUnit().getFakePlayerIndex(); if (!this.localPlayer.hasAlliance(playerIndex, CAllianceType.PASSIVE)) { setCursorState(MenuCursorState.SELECT, Color.RED); - } - else if (this.localPlayer.hasAlliance(playerIndex, CAllianceType.SHARED_CONTROL)) { + } else if (this.localPlayer.hasAlliance(playerIndex, CAllianceType.SHARED_CONTROL) + || this.localPlayer.hasAlliance(mouseOverUnitUnit.getSimulationUnit().getPlayerIndex(), + CAllianceType.SHARED_CONTROL)) { setCursorState(MenuCursorState.SELECT, Color.GREEN); - } - else { + } else { setCursorState(MenuCursorState.SELECT, Color.YELLOW); } - } - else { + } else { setCursorState(MenuCursorState.SELECT, Color.YELLOW); } - } - else { + } else { setCursorState(MenuCursorState.NORMAL); } } @@ -1807,8 +1781,7 @@ else if (this.localPlayer.hasAlliance(playerIndex, CAllianceType.SHARED_CONTROL) final long currentMillis = TimeUtils.millis(); if (currentMillis > this.lastErrorMessageExpireTime) { this.errorMessageFrame.setVisible(false); - } - else if (currentMillis > this.lastErrorMessageFadeTime) { + } else if (currentMillis > this.lastErrorMessageFadeTime) { final float fadeAlpha = (this.lastErrorMessageExpireTime - currentMillis) / (float) WORLD_FRAME_MESSAGE_FADE_DURATION; this.errorMessageFrame.setAlpha(fadeAlpha); @@ -1819,8 +1792,7 @@ else if (currentMillis > this.lastErrorMessageFadeTime) { if (currentMillis > gameMessage.lastGameMessageExpireTime) { this.rootFrame.remove(gameMessage.stringFrame); iterator.remove(); - } - else if (currentMillis > gameMessage.lastGameMessageFadeTime) { + } else if (currentMillis > gameMessage.lastGameMessageFadeTime) { final float fadeAlpha = (gameMessage.lastGameMessageExpireTime - currentMillis) / (float) (gameMessage.lastGameMessageExpireTime - gameMessage.lastGameMessageFadeTime); gameMessage.stringFrame.setAlpha(fadeAlpha); @@ -1857,71 +1829,67 @@ private String getWorldFrameHoverTipText(final CSimulation game, final RenderWid final RenderUnit renderUnit = (RenderUnit) whichUnit; final CUnit simulationUnit = renderUnit.getSimulationUnit(); final CAbilityHero heroData = simulationUnit.getHeroData(); - if (heroData != null) { - final String level = this.rootFrame.getTemplates().getDecoratedString("LEVEL"); - return heroData.getProperName() + "|n" + level + " " + heroData.getHeroLevel(); - } - else { - final int simulationUnitPlayerIndex = simulationUnit.getPlayerIndex(); - final boolean neutralHostile = simulationUnitPlayerIndex == (WarsmashConstants.MAX_PLAYERS - 4); - final boolean neutralPassive = simulationUnitPlayerIndex == (WarsmashConstants.MAX_PLAYERS - 1); - String returnValue = ""; - if ((simulationUnitPlayerIndex != this.localPlayer.getId()) - && (simulationUnitPlayerIndex < (WarsmashConstants.MAX_PLAYERS - 4))) { - final boolean ally = simulationUnit.isUnitAlly(this.localPlayer); - final CPlayer unitPlayer = game.getPlayer(simulationUnitPlayerIndex); - final String name = unitPlayer.getName(); - if (name != null) { - if (ally) { - if (unitPlayer.hasAlliance(this.localPlayer.getId(), CAllianceType.SHARED_CONTROL)) { - returnValue = "|CFF00FF00" + name; - } - else { - returnValue = "|CFFFFFF00" + name; - } - } - else { - returnValue = "|CFFFF0000" + name; + final int simulationUnitPlayerIndex = simulationUnit.getFakePlayerIndex(); + final boolean neutralHostile = simulationUnitPlayerIndex == (WarsmashConstants.MAX_PLAYERS - 4); + final boolean neutralPassive = simulationUnitPlayerIndex == (WarsmashConstants.MAX_PLAYERS - 1); + String returnValue = ""; + if ((simulationUnitPlayerIndex != this.localPlayer.getId()) + && (!this.localPlayer.hasAlliance(simulationUnitPlayerIndex, CAllianceType.SHARED_CONTROL)) + && (simulationUnitPlayerIndex < (WarsmashConstants.MAX_PLAYERS - 4))) { + final CPlayer unitPlayer = game.getPlayer(simulationUnitPlayerIndex); + final String name = unitPlayer.getName(); + if (name != null) { + if (unitPlayer.hasAlliance(this.localPlayer.getId(), CAllianceType.PASSIVE)) { + if (unitPlayer.hasAlliance(this.localPlayer.getId(), CAllianceType.SHARED_SPELLS)) { + returnValue = "|CFF00FF00" + name; + } else { + returnValue = "|CFFFFFF00" + name; } + } else { + returnValue = "|CFFFF0000" + name; } } - final CAbilityGoldMinable goldMineData = simulationUnit.getGoldMineData(); - final CAbilityOverlayedMine blightedGoldMineData = simulationUnit.getOverlayedGoldMineData(); - final boolean neutral = (neutralPassive && simulationUnit.isBuilding()) || neutralHostile - || (goldMineData != null) || (blightedGoldMineData != null); - if (neutral) { - if (!returnValue.isEmpty()) { - returnValue += "|n"; - } - returnValue += simulationUnit.getUnitType().getName(); - if (goldMineData != null) { + } + if (heroData != null) { + if (!returnValue.isEmpty()) { + returnValue += "|r|n"; + } + final String level = this.rootFrame.getTemplates().getDecoratedString("LEVEL"); + return returnValue + heroData.getProperName() + "|n" + level + " " + heroData.getHeroLevel(); + } + final CAbilityGoldMinable goldMineData = simulationUnit.getGoldMineData(); + final CAbilityOverlayedMine blightedGoldMineData = simulationUnit.getOverlayedGoldMineData(); + final boolean neutral = (neutralPassive && simulationUnit.isBuilding()) || neutralHostile + || (goldMineData != null) || (blightedGoldMineData != null); + if (neutral) { + if (!returnValue.isEmpty()) { + returnValue += "|n"; + } + returnValue += simulationUnit.getUnitType().getName(); + if (goldMineData != null) { + final String colonGold = this.rootFrame.getTemplates().getDecoratedString("COLON_GOLD"); + returnValue += "|n" + colonGold + " " + goldMineData.getGold(); + } else { + if (blightedGoldMineData != null) { final String colonGold = this.rootFrame.getTemplates().getDecoratedString("COLON_GOLD"); - returnValue += "|n" + colonGold + " " + goldMineData.getGold(); - } - else { - if (blightedGoldMineData != null) { - final String colonGold = this.rootFrame.getTemplates().getDecoratedString("COLON_GOLD"); - returnValue += "|n" + colonGold + " " + blightedGoldMineData.getGold(); - } - } - final int creepLevel = simulationUnit.getUnitType().getLevel(); - if (neutralHostile && (creepLevel > 0)) { - final String level = this.rootFrame.getTemplates().getDecoratedString("LEVEL"); - returnValue += "|n" + level + " " + creepLevel; + returnValue += "|n" + colonGold + " " + blightedGoldMineData.getGold(); } } - if (!returnValue.isEmpty()) { - return returnValue; + final int creepLevel = simulationUnit.getUnitType().getLevel(); + if (neutralHostile && (creepLevel > 0)) { + final String level = this.rootFrame.getTemplates().getDecoratedString("LEVEL"); + returnValue += "|n" + level + " " + creepLevel; } } - } - else if (whichUnit instanceof RenderItem) { + if (!returnValue.isEmpty()) { + return returnValue; + } + } else if (whichUnit instanceof RenderItem) { final RenderItem renderItem = (RenderItem) whichUnit; final ItemUI itemUI = this.war3MapViewer.getAbilityDataUI() .getItemUI(renderItem.getSimulationItem().getTypeId()); return itemUI.getName(); - } - else if (whichUnit instanceof RenderDestructable) { + } else if (whichUnit instanceof RenderDestructable) { final RenderDestructable renderDest = (RenderDestructable) whichUnit; final String name = renderDest.getSimulationDestructable().getDestType().getName(); return name; @@ -1993,8 +1961,7 @@ private SimpleStatusBarFrame getHpBar() { true, 3.0f); this.rootFrame.add(simpleStatusBarFrame); this.hpBarFrames.add(simpleStatusBarFrame); - } - else { + } else { simpleStatusBarFrame = this.hpBarFrames.get(this.hpBarFrameIndex); } this.hpBarFrameIndex++; @@ -2017,14 +1984,12 @@ private UIFrame getHoveredFrame(final AbstractUIFrame startFrame, final float sc if (found) { outFrame = renderFrame; } - } - else { + } else { outFrame = getHoveredFrame((AbstractUIFrame) child, screenX, screenY, includeParent, ignoreFrame); found = outFrame != null; } - } - else { + } else { final AbstractRenderableFrame renderFrame = (AbstractRenderableFrame) child; found = renderFrame.getRenderBounds().contains(screenX, screenY) && renderFrame.isVisible(); if (found) { @@ -2043,8 +2008,7 @@ private UIFrame getHoveredFrame(final AbstractUIFrame startFrame, final float sc private boolean checkFrameInArray(final UIFrame frame, final String[] targetFrames) { if ((targetFrames == null) || (frame == null)) { return false; - } - else { + } else { if (frame.getName() == null) { return false; } @@ -2116,8 +2080,7 @@ public void render(final SpriteBatch batch, final GlyphLayout glyphLayout) { glyphLayout.setText(myTextTagFont, textTag.getText()); x -= (glyphLayout.width / 2); y += (glyphLayout.height / 2); - } - else { + } else { y += glyphLayout.height; } myTextTagFont.draw(batch, textTag.getText(), x + 3, (y - 1)); @@ -2190,8 +2153,7 @@ public Void accept(final CAbilityAttack ability) { final int areaOfEffectSmallDamage = ((CUnitAttackMissileSplash) attack) .getAreaOfEffectSmallDamage(); radius = areaOfEffectSmallDamage; - } - else if (attack instanceof CUnitAttackMissileLine) { + } else if (attack instanceof CUnitAttackMissileLine) { final float areaOfEffectSmallDamage = ((CUnitAttackMissileLine) attack) .getDamageSpillRadius(); radius = areaOfEffectSmallDamage; @@ -2199,8 +2161,7 @@ else if (attack instanceof CUnitAttackMissileLine) { } } handlePlacementCursor(ability, radius); - } - else { + } else { handleTargetCursor(ability); } return null; @@ -2301,8 +2262,7 @@ public Void accept(final AbilityBuilderActiveAbility ability) { final float uiAreaOfEffect = ability.getUIAreaOfEffect(); if (Float.isNaN(uiAreaOfEffect)) { handleTargetCursor(ability); - } - else { + } else { handlePlacementCursor(ability, uiAreaOfEffect); } return null; @@ -2313,8 +2273,7 @@ public Void accept(final GenericSingleIconActiveAbility ability) { final float uiAreaOfEffect = ability.getUIAreaOfEffect(); if (Float.isNaN(uiAreaOfEffect)) { handleTargetCursor(ability); - } - else { + } else { handlePlacementCursor(ability, uiAreaOfEffect); } return null; @@ -2375,11 +2334,9 @@ public Void accept(final CAbilityJass ability) { .getRenderPeer(orderCommandCardIcon); if (renderPeer.getMouseTargetRadius() > 0) { handlePlacementCursor(ability, renderPeer.getMouseTargetRadius()); - } - else if (renderPeer.getPreviewBuildUnitId() != null) { + } else if (renderPeer.getPreviewBuildUnitId() != null) { handleBuildCursor(null, renderPeer.getPreviewBuildUnitId().getValue()); - } - else { + } else { handleTargetCursor(ability); } return null; @@ -2478,8 +2435,7 @@ private void handleBuildCursor(final AbstractCAbilityBuild ability, final int pr Color.rgba8888(1, 0, 0, 1.0f)); } } - } - else if (!canBeBuiltOnThem) { + } else if (!canBeBuiltOnThem) { for (int i = 0; i < MeleeUI.this.cursorModelUnderneathPathingRedGreenPixmap.getWidth(); i++) { for (int j = 0; j < MeleeUI.this.cursorModelUnderneathPathingRedGreenPixmap.getHeight(); j++) { boolean blocked = false; @@ -2503,8 +2459,7 @@ else if (!canBeBuiltOnThem) { MeleeUI.this.cursorModelUnderneathPathingRedGreenPixmap.getHeight() - 1 - j, color); } } - } - else { + } else { for (int i = 0; i < MeleeUI.this.cursorModelUnderneathPathingRedGreenPixmap.getWidth(); i++) { for (int j = 0; j < MeleeUI.this.cursorModelUnderneathPathingRedGreenPixmap.getHeight(); j++) { MeleeUI.this.cursorModelUnderneathPathingRedGreenPixmap.drawPixel(i, @@ -2602,8 +2557,7 @@ public Void accept(final CUnit target) { final MdxNode attachment = renderUnit.instance.getAttachment(index); this.rallyPointInstance.setParent(attachment); this.rallyPointInstance.setLocation(0, 0, 0); - } - else { + } else { this.rallyPointInstance.setParent(null); final float rallyPointX = target.getX(); final float rallyPointY = target.getY(); @@ -2642,8 +2596,8 @@ public boolean call(final CWidget unit) { final ExternStringMsgTargetCheckReceiver targetReceiver = ExternStringMsgTargetCheckReceiver .getInstance().reset(); MeleeUI.this.activeCommand.checkCanTarget(MeleeUI.this.war3MapViewer.simulation, - MeleeUI.this.activeCommandUnit.getSimulationUnit(), MeleeUI.this.activeCommandOrderId, false, - unit, targetReceiver); + MeleeUI.this.activeCommandUnit.getSimulationUnit(), MeleeUI.this.activeCommandOrderId, false, unit, + targetReceiver); this.lastFailureMessage = targetReceiver.getExternStringKey(); return targetReceiver.getTarget() != null; } @@ -2690,8 +2644,7 @@ public void update(final float dt) { if (this.portraitTargetDuration != 0) { if (this.portraitCurrentDuration < this.portraitTargetDuration) { this.modelInstance.sequenceLoopMode = SequenceLoopMode.ALWAYS_LOOP; - } - else { + } else { this.modelInstance.sequenceEnded = true; this.modelInstance.sequenceLoopMode = SequenceLoopMode.NEVER_LOOP; this.portraitTargetDuration = 0; @@ -2729,8 +2682,7 @@ private void innerTalk(final UnitSound us, float extraDuration) { this.recycleSet.add(SecondaryTag.TALK); if (us != null) { this.portraitTargetDuration = (long) (1000 * Extensions.audio.getDuration(us.getLastPlayedSound())); - } - else { + } else { this.portraitTargetDuration = 0; } this.portraitTargetDuration += (long) (1000 * extraDuration); @@ -2755,8 +2707,7 @@ public void setSelectedUnit(final RenderUnit unit) { } this.modelInstance = null; this.portraitCameraManager.setModelInstance(null, null); - } - else { + } else { this.secondaryTags = unit.getSecondaryAnimationTags(); final MdxModel portraitModel = unit.portraitModel; if (portraitModel != null) { @@ -2788,8 +2739,7 @@ public void setSelectedItem(final RenderItem unit) { } this.modelInstance = null; this.portraitCameraManager.setModelInstance(null, null); - } - else { + } else { final MdxModel portraitModel = unit.portraitModel; if (portraitModel != null) { if (this.modelInstance != null) { @@ -2819,8 +2769,7 @@ public void setSelectedDestructable(final RenderDestructable unit) { } this.modelInstance = null; this.portraitCameraManager.setModelInstance(null, null); - } - else { + } else { final MdxModel portraitModel = unit.getPortraitModel(); if (portraitModel != null) { if (this.modelInstance != null) { @@ -2882,14 +2831,12 @@ public void endCinematicSequence() { public void update(final float dt) { if (isResetNeeded()) { endCinematicSequence(); - } - else { + } else { this.portraitCurrentDuration += (dt * 1000); if (this.portraitTargetDuration != 0) { if (this.portraitCurrentDuration < this.portraitTargetDuration) { this.cinematicPortrait.setSequenceLoopMode(SequenceLoopMode.ALWAYS_LOOP); - } - else { + } else { this.cinematicPortrait.setSequenceEnded(true); this.cinematicPortrait.setSequenceLoopMode(SequenceLoopMode.NEVER_LOOP); this.portraitTargetDuration = 0; @@ -2918,8 +2865,7 @@ public void talk(final UnitSound us, float extraDuration) { this.recycleSet.add(SecondaryTag.TALK); if (us != null) { this.portraitTargetDuration = (long) (1000 * Extensions.audio.getDuration(us.getLastPlayedSound())); - } - else { + } else { this.portraitTargetDuration = 0; } this.portraitTargetDuration += (long) (1000 * extraDuration); @@ -2962,8 +2908,7 @@ public void setDraggingItem(final CItem itemInSlot) { index++; } } - } - else { + } else { if (this.selectedUnit != null) { final CAbilityInventory inventory = this.selectedUnit.getSimulationUnit().getInventoryData(); if (inventory != null) { @@ -3035,8 +2980,7 @@ public void selectUnit(RenderUnit unit) { frame.setVisible(false); } repositionWaypointFlags(null); - } - else { + } else { unit.getSimulationUnit().addStateListener(this); reloadSelectedUnitUI(unit); } @@ -3059,8 +3003,7 @@ private void repositionRallyPoint(final CUnit simulationUnit) { this.rallyPointInstance.detach(); rallyPoint.visit(this.rallyPositioningVisitor.reset(this.rallyPointInstance)); this.rallyPointInstance.setScene(this.war3MapViewer.worldScene); - } - else { + } else { this.rallyPointInstance.hide(); this.rallyPointInstance.detach(); } @@ -3071,8 +3014,7 @@ public void waypointsChanged() { if (this.selectedUnit != null) { final CUnit simulationUnit = this.selectedUnit.getSimulationUnit(); repositionWaypointFlags(simulationUnit); - } - else { + } else { repositionWaypointFlags(null); } } @@ -3092,15 +3034,13 @@ private void repositionWaypointFlags(final CUnit simulationUnit) { waypointModelInstance.detach(); target.visit(this.rallyPositioningVisitor.reset(waypointModelInstance)); waypointModelInstance.setScene(this.war3MapViewer.worldScene); - } - else { + } else { waypointModelInstance.hide(); waypointModelInstance.detach(); } orderIndex++; } - } - else { + } else { iterator = Collections.emptyIterator(); } for (; (orderIndex < this.waypointModelInstances.size()) || iterator.hasNext(); orderIndex++) { @@ -3114,18 +3054,15 @@ private void repositionWaypointFlags(final CUnit simulationUnit) { waypointModelInstance.detach(); target.visit(this.rallyPositioningVisitor.reset(waypointModelInstance)); waypointModelInstance.setScene(this.war3MapViewer.worldScene); - } - else { + } else { waypointModelInstance.hide(); waypointModelInstance.detach(); } - } - else { + } else { waypointModelInstance.hide(); waypointModelInstance.detach(); } - } - else { + } else { waypointModelInstance.hide(); waypointModelInstance.detach(); } @@ -3159,8 +3096,7 @@ private void reloadSelectedUnitUI(final RenderUnit unit) { if (maximumMana > 0) { this.rootFrame.setText(this.unitManaText, FastNumberFormat.formatWholeNumber(simulationUnit.getMana()) + " / " + maximumMana); - } - else { + } else { this.rootFrame.setText(this.unitManaText, ""); } final boolean multiSelect = this.selectedUnits.size() > 1; @@ -3184,8 +3120,7 @@ private void reloadSelectedUnitUI(final RenderUnit unit) { if ((queueItemType == null) || ((i > 0) && QueueItemType.SACRIFICE.equals(simulationUnit.getBuildQueueTypes()[0]))) { this.queueIconFrames[i].setVisible(false); - } - else { + } else { this.queueIconFrames[i].setVisible(true); switch (queueItemType) { case RESEARCH: @@ -3233,17 +3168,14 @@ private void reloadSelectedUnitUI(final RenderUnit unit) { if (simulationUnit.getBuildQueueTypes()[0] == QueueItemType.UNIT) { this.rootFrame.setText(this.simpleBuildingBuildingActionLabel, this.rootFrame.getTemplates().getDecoratedString("TRAINING")); - } - else if (simulationUnit.getBuildQueueTypes()[0] == QueueItemType.SACRIFICE) { + } else if (simulationUnit.getBuildQueueTypes()[0] == QueueItemType.SACRIFICE) { this.rootFrame.setText(this.simpleBuildingBuildingActionLabel, this.rootFrame.getTemplates().getDecoratedString("TRAINING")); this.simpleBuildQueueBackdrop.setVisible(false); - } - else if (simulationUnit.getBuildQueueTypes()[0] == QueueItemType.HERO_REVIVE) { + } else if (simulationUnit.getBuildQueueTypes()[0] == QueueItemType.HERO_REVIVE) { this.rootFrame.setText(this.simpleBuildingBuildingActionLabel, this.rootFrame.getTemplates().getDecoratedString("REVIVING")); - } - else { + } else { this.rootFrame.setText(this.simpleBuildingBuildingActionLabel, this.rootFrame.getTemplates().getDecoratedString("RESEARCHING")); } @@ -3253,8 +3185,7 @@ else if (simulationUnit.getBuildQueueTypes()[0] == QueueItemType.HERO_REVIVE) { this.heroInfoPanel.setVisible(false); this.selectWorkerInsideFrame.setVisible(false); this.smashBuffStatusBar.setVisible(false); - } - else if (multiSelect) { + } else if (multiSelect) { for (int i = 0; i < this.queueIconFrames.length; i++) { this.queueIconFrames[i].setVisible(false); } @@ -3282,13 +3213,11 @@ else if (multiSelect) { this.selectedUnitFrames[i].showFocused(this.rootFrame, this.uiViewport); if (useManaBar) { this.selectedUnitHighlightBackdrop[i].setHeight(this.frontQueueIconWidth * 1.75f); - } - else { + } else { this.selectedUnitHighlightBackdrop[i].setHeight(this.frontQueueIconWidth * 1.55f); } this.selectedUnitHighlightBackdrop[i].positionBounds(this.rootFrame, this.uiViewport); - } - else { + } else { this.selectedUnitFrames[i].showUnFocused(this.rootFrame, this.uiViewport); } } @@ -3306,8 +3235,7 @@ else if (multiSelect) { this.heroInfoPanel.setVisible(false); this.selectWorkerInsideFrame.setVisible(false); this.smashBuffStatusBar.setVisible(false); - } - else { + } else { for (final QueueIcon queueIconFrame : this.queueIconFrames) { queueIconFrame.setVisible(false); } @@ -3347,8 +3275,7 @@ else if (multiSelect) { this.cargoUnitFrames[i].setToolTip(cargoContainedUnit.getHeroData().getProperName()); this.cargoUnitFrames[i] .setUberTip("Level " + cargoContainedUnit.getHeroData().getHeroLevel()); - } - else { + } else { this.cargoUnitFrames[i].setToolTip(cargoContainedUnit.getUnitType().getName()); this.cargoUnitFrames[i].setUberTip(unitUI.getUberTip()); } @@ -3361,13 +3288,11 @@ else if (multiSelect) { this.cargoUnitFrames[i].setManaRatioRemaining( cargoContainedUnit.getMana() / cargoContainedUnit.getMaximumMana()); } - } - else { + } else { this.cargoUnitFrames[i].setTexture(null); } } - } - else { + } else { for (int i = 0; i < this.cargoUnitFrames.length; i++) { this.cargoUnitFrames[i].setVisible(false); } @@ -3426,8 +3351,7 @@ else if (multiSelect) { this.war3MapViewer.simulation.getPlayer(simulationUnit.getPlayerIndex()) .getTechtreeUnlocked(weaponUpgradeId))); } - } - else { + } else { this.attack2Icon.setVisible(false); } @@ -3436,8 +3360,7 @@ else if (multiSelect) { GameUI.convertX(this.uiViewport, 0f), GameUI.convertY(this.uiViewport, -0.0705f))); this.smashArmorIconWrapper.positionBounds(this.rootFrame, this.uiViewport); this.armorIcon.positionBounds(this.rootFrame, this.uiViewport); - } - else { + } else { this.attack1Icon.setVisible(false); this.attack2Icon.setVisible(false); @@ -3483,8 +3406,7 @@ else if (multiSelect) { this.simpleHeroLevelBar .setValue((heroData.getXp() - gameplayConstants.getNeedHeroXPSum(heroLevel - 1)) / (float) gameplayConstants.getNeedHeroXP(heroLevel)); - } - else { + } else { this.simpleClassValue.setVisible(!simulationUnit.isBuilding()); this.rootFrame.setText(this.simpleNameValue, unitTypeName); String classText = null; @@ -3495,8 +3417,7 @@ else if (multiSelect) { } if (classText != null) { this.rootFrame.setText(this.simpleClassValue, classText); - } - else { + } else { this.rootFrame.setText(this.simpleClassValue, ""); } this.simpleHeroLevelBar.setVisible(false); @@ -3524,12 +3445,10 @@ else if (multiSelect) { this.selectWorkerInsideFrame.setVisible(true); this.selectWorkerInsideFrame.setTexture(this.war3MapViewer.getAbilityDataUI() .getUnitUI(simulationUnit.getWorker().getTypeId()).getIcon()); - } - else { + } else { this.selectWorkerInsideFrame.setVisible(false); } - } - else { + } else { this.rootFrame.setText(this.simpleBuildingActionLabel, ""); this.selectWorkerInsideFrame.setVisible(false); } @@ -3545,15 +3464,13 @@ else if (multiSelect) { String defenseDisplayString; if (simulationUnit.isInvulnerable()) { defenseDisplayString = this.rootFrame.getTemplates().getDecoratedString("INVULNERABLE"); - } - else { + } else { defenseDisplayString = Integer.toString(simulationUnit.getCurrentDefenseDisplay()); final float temporaryDefenseBonus = simulationUnit.getTotalTemporaryDefenseBonus(); if (temporaryDefenseBonus != 0) { if (temporaryDefenseBonus > 0) { defenseDisplayString += "|cFF00FF00 +" + String.format("%.1f", temporaryDefenseBonus) + ""; - } - else { + } else { defenseDisplayString += "|cFFFF0000 " + String.format("%.1f", temporaryDefenseBonus) + ""; } } @@ -3621,18 +3538,15 @@ else if (multiSelect) { this.activationReceiverPreviewCallback.getCooldownRemaining(), this.activationReceiverPreviewCallback.getCooldownMax(), item.getCharges() > 0 ? item.getCharges() : -1); - } - else { + } else { if (index >= inventory.getItemCapacity()) { inventoryIcon.setCommandButtonData(this.consoleInventoryNoCapacityTexture, 0, 0, 0, false, false, false, null, null, '\0', 0, 0, 0, 0, false, 0, 0, -1); - } - else { + } else { if (this.draggingItem != null) { inventoryIcon.setCommandButtonData(null, 0, 0, index + 1, true, false, false, null, null, '\0', 0, 0, 0, 0, false, 0, 0, -1); - } - else { + } else { inventoryIcon.clear(); } } @@ -3700,7 +3614,8 @@ public void commandButton(final int buttonPositionX, final int buttonPositionY, } @Override - public void buff(final Texture icon, final int level, final String tip, final String uberTip, final boolean positive, final boolean leveled) { + public void buff(final Texture icon, final int level, final String tip, final String uberTip, + final boolean positive, final boolean leveled) { if ((this.selectedUnit == null) || !this.selectedUnit.getSimulationUnit().isBuilding()) { if (this.currentBuffBarIconIndex < this.buffBarIcons.length) { this.buffBarIcons[this.currentBuffBarIconIndex++].set(icon, tip, uberTip, positive, leveled, level); @@ -3741,8 +3656,7 @@ private Rectangle setupWorldFrameViewport(final int width, final int height) { public void positionPortrait() { if (this.cinematicPanel.isVisible()) { this.portrait.portraitScene.show = false; - } - else { + } else { this.portrait.portraitScene.show = true; this.projectionTemp1.x = 422 * this.widthRatioCorrection; this.projectionTemp1.y = 57 * this.heightRatioCorrection; @@ -3774,8 +3688,7 @@ public InfoPanelIconBackdrops(final CodeKeyType[] attackTypes, final GameUI game final Texture suffixTexture = gameUI.loadTexture(gameUI.getSkinField(skinLookupKey)); if (suffixTexture != null) { this.damageBackdropTextures[index] = suffixTexture; - } - else { + } else { skinLookupKey = "InfoPanelIcon" + prefix + attackType.getCodeKey(); if (!gameUI.hasSkinField(skinLookupKey) && (attackType == CAttackType.SPELLS)) { skinLookupKey = "InfoPanelIcon" + prefix + CAttackType.MAGIC.getCodeKey(); @@ -3803,8 +3716,7 @@ public void lifeChanged() { } if (this.selectedUnit.getSimulationUnit().isDead()) { removeSubGroupHighlightSelectedUnitFromSelection(); - } - else { + } else { final float lifeRatioRemaining = this.selectedUnit.getSimulationUnit().getLife() / this.selectedUnit.getSimulationUnit().getMaxLife(); this.rootFrame.setText(this.unitLifeText, @@ -3853,8 +3765,7 @@ public void manaChanged() { this.rootFrame.setText(this.unitManaText, FastNumberFormat.formatWholeNumber(this.selectedUnit.getSimulationUnit().getMana()) + " / " + maximumMana); - } - else { + } else { this.rootFrame.setText(this.unitManaText, ""); } } @@ -3875,8 +3786,7 @@ public void foodChanged() { if (foodCap == 0) { this.rootFrame.setText(this.resourceBarSupplyText, Integer.toString(this.localPlayer.getFoodUsed())); this.resourceBarSupplyText.setColor(Color.WHITE); - } - else { + } else { this.rootFrame.setText(this.resourceBarSupplyText, this.localPlayer.getFoodUsed() + "/" + foodCap); this.resourceBarSupplyText.setColor(this.localPlayer.getFoodUsed() > foodCap ? Color.RED : Color.WHITE); } @@ -3949,8 +3859,7 @@ private void clearAndRepopulateCommandCard() { commandButton(cancelUI.getButtonPositionX(), cancelUI.getButtonPositionY(), cancelUI.getIcon(), 0, menuOrderId, 0, false, false, true, cancelUI.getToolTip(), cancelUI.getUberTip(), cancelUI.getHotkey(), 0, 0, 0, 0, 0, 0, -1); - } - else { + } else { if (menuOrderId != 0) { final int exitOrderId = this.subMenuOrderIdStack.size() > 1 ? this.subMenuOrderIdStack.get(this.subMenuOrderIdStack.size() - 2) @@ -4061,8 +3970,7 @@ public boolean touchDown(final int screenX, final int screenY, final float world 0, 0); } return false; - } - else if (button == Input.Buttons.BACK) { + } else if (button == Input.Buttons.BACK) { if (this.selectedUnits.size() > 1) { advanceSelectedSubGroupReverse(); this.war3MapViewer.getUiSounds().getSound("SubGroupSelectionChange").play(this.uiScene.audioContext, 0, @@ -4091,16 +3999,14 @@ else if (button == Input.Buttons.BACK) { setDraggingItem(null); } clearAndRepopulateCommandCard(); - } - else if (button == Input.Buttons.LEFT) { + } else if (button == Input.Buttons.LEFT) { final boolean shiftDown = isShiftDown(); this.activeCommandUnitTargetFilter.reset(); final RenderWidget rayPickUnit = this.war3MapViewer.rayPickUnit(screenX, worldScreenY, this.activeCommandUnitTargetFilter); if (rayPickUnit != null) { useActiveCommandOnUnit(shiftDown, rayPickUnit); - } - else { + } else { this.war3MapViewer.getClickLocation(clickLocationTemp, screenX, (int) worldScreenY, this.activeCommandUnit.getSimulationUnit().isMovementOnWaterAllowed(), true); clickLocationTemp2.set(clickLocationTemp.x, clickLocationTemp.y); @@ -4122,21 +4028,19 @@ else if (button == Input.Buttons.LEFT) { this.activeCommandOrderId = -1; setDraggingItem(null); clearAndRepopulateCommandCard(); - } - else { + } else { final ExternStringMsgTargetCheckReceiver pointTargetReceiver = ExternStringMsgTargetCheckReceiver .getInstance(); pointTargetReceiver.reset(); this.activeCommand.checkCanTarget(this.war3MapViewer.simulation, - this.activeCommandUnit.getSimulationUnit(), this.activeCommandOrderId, - false, clickLocationTemp2, pointTargetReceiver); + this.activeCommandUnit.getSimulationUnit(), this.activeCommandOrderId, false, + clickLocationTemp2, pointTargetReceiver); final Vector2 target = pointTargetReceiver.getTarget(); if (target != null) { if ((this.activeCommand instanceof CAbilityAttack) && (this.activeCommandOrderId == OrderIds.attack)) { this.war3MapViewer.showConfirmation(clickLocationTemp, 1, 0, 0); - } - else { + } else { this.war3MapViewer.showConfirmation(clickLocationTemp, 0, 1, 0); } this.unitOrderListener.issuePointOrder( @@ -4177,8 +4081,7 @@ this.war3MapViewer.worldScene.audioContext, getSelectedUnit())) { if (this.activeCommand instanceof AbstractCAbilityBuild) { this.war3MapViewer.getUiSounds().getSound("PlaceBuildingDefault") .play(this.uiScene.audioContext, 0, 0, 0); - } - else if (this.activeCommand instanceof CAbilityRally) { + } else if (this.activeCommand instanceof CAbilityRally) { this.war3MapViewer.getUiSounds().getSound("RallyPointPlace") .play(this.uiScene.audioContext, 0, 0, 0); } @@ -4190,20 +4093,17 @@ else if (this.activeCommand instanceof CAbilityRally) { clearAndRepopulateCommandCard(); } - } - else { + } else { if ((this.activeCommandUnitTargetFilter.lastFailureMessage != null) && !this.activeCommandUnitTargetFilter.lastFailureMessage.isEmpty()) { showInterfaceError(this.activeCommandUnit.getSimulationUnit().getPlayerIndex(), this.activeCommandUnitTargetFilter.lastFailureMessage); - } - else { + } else { final String externStringKey = pointTargetReceiver.getExternStringKey(); if ((externStringKey != null) && !externStringKey.isEmpty()) { showInterfaceError(this.activeCommandUnit.getSimulationUnit().getPlayerIndex(), externStringKey); - } - else { + } else { showInterfaceError(this.activeCommandUnit.getSimulationUnit().getPlayerIndex(), CommandStringErrorKeys.MUST_TARGET_A_UNIT_WITH_THIS_ACTION); } @@ -4213,11 +4113,13 @@ else if (this.activeCommand instanceof CAbilityRally) { } } - } - else { + } else { if (button == Input.Buttons.RIGHT) { if ((getSelectedUnit() != null) && (getSelectedUnit().getSimulationUnit() - .getPlayerIndex() == this.war3MapViewer.getLocalPlayerIndex())) { + .getPlayerIndex() == this.war3MapViewer.getLocalPlayerIndex() + || this.war3MapViewer.simulation.getPlayer(this.war3MapViewer.getLocalPlayerIndex()) + .hasAlliance(getSelectedUnit().getSimulationUnit().getPlayerIndex(), + CAllianceType.SHARED_CONTROL))) { RenderWidget rayPickUnit = this.war3MapViewer.rayPickUnit(screenX, worldScreenY, this.anyClickableUnitFilter); if (rayPickUnit == null) { @@ -4233,8 +4135,8 @@ else if (this.activeCommand instanceof CAbilityRally) { CWidget targetToUse = null; for (final CAbility ability : unit.getSimulationUnit().getAbilities()) { ability.checkCanTarget(this.war3MapViewer.simulation, unit.getSimulationUnit(), - OrderIds.smart, false, - rayPickUnit.getSimulationWidget(), CWidgetAbilityTargetCheckReceiver.INSTANCE); + OrderIds.smart, false, rayPickUnit.getSimulationWidget(), + CWidgetAbilityTargetCheckReceiver.INSTANCE); final CWidget targetWidget = CWidgetAbilityTargetCheckReceiver.INSTANCE.getTarget(); if (targetWidget != null) { abilityToUse = ability; @@ -4262,17 +4164,14 @@ else if (this.activeCommand instanceof CAbilityRally) { .play(this.uiScene.audioContext, 0, 0, 0); } this.selectedSoundCount = 0; - } - else { + } else { rightClickMove(screenX, worldScreenY); } - } - else { + } else { rightClickMove(screenX, worldScreenY); } } - } - else { + } else { if (getHoveredFrame(this.rootFrame, screenCoordsVector.x, screenCoordsVector.y, this.includeFrames, this.ignoreFrames) != null) { return false; @@ -4286,8 +4185,7 @@ else if (this.activeCommand instanceof CAbilityRally) { this.draggingMouseButton = button; } } - } - else { + } else { if (clickedUIFrame instanceof ClickableFrame) { this.mouseDownUIFrame = (ClickableFrame) clickedUIFrame; this.mouseDownUIFrame.mouseDown(this.rootFrame, this.uiViewport); @@ -4304,8 +4202,7 @@ private void advanceSelectedSubGroup() { selectUnit(unit); return; } - } - else if (unit == this.selectedUnit) { + } else if (unit == this.selectedUnit) { foundSubSelection = true; } } @@ -4323,8 +4220,7 @@ private void advanceSelectedSubGroupReverse() { selectUnit(unit); return; } - } - else if (unit == this.selectedUnit) { + } else if (unit == this.selectedUnit) { foundSubSelection = true; } } @@ -4339,8 +4235,7 @@ private void useActiveCommandOnUnit(final boolean shiftDown, final RenderWidget this.activeCommand.getHandleId(), this.activeCommandOrderId, this.draggingItem.getHandleId(), rayPickUnit.getSimulationWidget().getHandleId(), shiftDown); setDraggingItem(null); - } - else { + } else { this.unitOrderListener.issueTargetOrder(this.activeCommandUnit.getSimulationUnit().getHandleId(), this.activeCommand.getHandleId(), this.activeCommandOrderId, rayPickUnit.getSimulationWidget().getHandleId(), shiftDown); @@ -4395,10 +4290,12 @@ private void rightClickMove(final int screenX, final float worldScreenY) { boolean ordered = false; boolean rallied = false; for (final RenderUnit unit : this.selectedUnits) { - if (unit.getSimulationUnit().getPlayerIndex() == this.war3MapViewer.getLocalPlayerIndex()) { + if (unit.getSimulationUnit().getPlayerIndex() == this.war3MapViewer.getLocalPlayerIndex() + || this.war3MapViewer.simulation.getPlayer(this.war3MapViewer.getLocalPlayerIndex()) + .hasAlliance(unit.getSimulationUnit().getPlayerIndex(), CAllianceType.SHARED_CONTROL)) { for (final CAbility ability : unit.getSimulationUnit().getAbilities()) { - ability.checkCanUse(this.war3MapViewer.simulation, unit.getSimulationUnit(), OrderIds.smart, - false, BooleanAbilityActivationReceiver.INSTANCE); + ability.checkCanUse(this.war3MapViewer.simulation, unit.getSimulationUnit(), OrderIds.smart, false, + BooleanAbilityActivationReceiver.INSTANCE); if (BooleanAbilityActivationReceiver.INSTANCE.isOk()) { ability.checkCanTarget(this.war3MapViewer.simulation, unit.getSimulationUnit(), OrderIds.smart, false, clickLocationTemp2, PointAbilityTargetCheckReceiver.INSTANCE); @@ -4450,12 +4347,10 @@ public int compare(final RenderWidget widget1, final RenderWidget widget2) { final int levelSort = unitType1.getLevel() - unitType2.getLevel(); if (levelSort == 0) { return unitType1.getTypeId().getValue() - unitType2.getTypeId().getValue(); - } - else { + } else { return levelSort; } - } - else { + } else { return prioSort; } } @@ -4504,8 +4399,8 @@ private void selectUnits(final List selectedUnits) { } UnitSound USAudio = null; if ((unit.getSimulationUnit().getPlayerIndex() == this.war3MapViewer.getLocalPlayerIndex()) - || (unit.getSimulationUnit().getUnitType().getRace() == CUnitRace.CRITTERS) - || ((unit.getSimulationUnit().getUnitType().getRace() == CUnitRace.OTHER) + || (((unit.getSimulationUnit().getUnitType().getRace() == CUnitRace.CRITTERS) + || (unit.getSimulationUnit().getUnitType().getRace() == CUnitRace.OTHER)) && (unit.getSimulationUnit().getPlayerIndex() == (WarsmashConstants.MAX_PLAYERS - 1)))) { if (unit.soundset != null) { UnitSound ackSoundToPlay = unit.soundset.what; @@ -4515,13 +4410,11 @@ private void selectUnits(final List selectedUnits) { ackSoundToPlay = this.war3MapViewer.getUiSounds() .getSound(this.rootFrame.getSkinField("ConstructingBuilding")); soundIndex = (int) (Math.random() * ackSoundToPlay.getSoundCount()); - } - else { + } else { if ((this.selectedSoundCount >= 3) && (pissedSoundCount > 0)) { soundIndex = this.selectedSoundCount - 3; ackSoundToPlay = unit.soundset.pissed; - } - else { + } else { soundIndex = (int) (Math.random() * ackSoundToPlay.getSoundCount()); } } @@ -4535,8 +4428,7 @@ private void selectUnits(final List selectedUnits) { playedNewSound = true; } } - } - else { + } else { this.war3MapViewer.getUiSounds().getSound("InterfaceClick").play(this.uiScene.audioContext, 0, 0, 0); } if (selectionChanged) { @@ -4561,8 +4453,7 @@ private void selectUnits(final List selectedUnits) { if (playedNewSound) { portraitTalk(USAudio); } - } - else { + } else { selectUnit(null); } } @@ -4571,8 +4462,7 @@ private void selectUnits(final List selectedUnits) { public boolean touchUp(final int screenX, final int screenY, final float worldScreenY, final int button) { if (button == Input.Buttons.FORWARD) { return false; - } - else if (button == Input.Buttons.BACK) { + } else if (button == Input.Buttons.BACK) { return false; } if (!this.userControlEnabled) { @@ -4591,8 +4481,7 @@ else if (button == Input.Buttons.BACK) { } } this.mouseDownUIFrame.mouseUp(this.rootFrame, this.uiViewport); - } - else { + } else { if (this.draggingMouseButton == Input.Buttons.LEFT) { if (!this.dragSelectPreviewUnits.isEmpty()) { if (this.allowDrag) { @@ -4623,8 +4512,7 @@ else if (button == Input.Buttons.BACK) { selectWidgets(selectedWidgets); } this.dragSelectPreviewUnits.clear(); - } - else { + } else { if (this.allowDrag) { if (button == Input.Buttons.LEFT) { updateMouseOverUnit(screenX, worldScreenY); @@ -4640,8 +4528,7 @@ else if (button == Input.Buttons.BACK) { } if ((this.mouseOverUnit instanceof RenderUnit) && controlDown) { processSelectNearbyUnits(unitList, shiftDown, (RenderUnit) this.mouseOverUnit); - } - else { + } else { processClickSelect(unitList, shiftDown, this.mouseOverUnit); } this.war3MapViewer.doSelectUnit(unitList); @@ -4681,12 +4568,10 @@ private void processClickSelect(final List unitList, final boolean if (shiftDown) { if (this.selectedUnits.contains(mouseOverUnit)) { unitList.remove(mouseOverUnit); - } - else { + } else { unitList.add(mouseOverUnit); } - } - else { + } else { unitList.add(mouseOverUnit); } } @@ -4712,8 +4597,7 @@ public boolean touchDragged(final int screenX, final int screenY, final float wo screenCoordsVector.y); this.cameraManager.target.x = worldPoint.x; this.cameraManager.target.y = worldPoint.y; - } - else { + } else { if (this.allowDrag) { if (null != this.mouseOverUnit) { this.war3MapViewer.clearUnitMouseOverHighlight(); @@ -4727,13 +4611,11 @@ public boolean touchDragged(final int screenX, final int screenY, final float wo if (this.draggingMouseButton == Input.Buttons.MIDDLE) { this.cameraManager.target.set(clickLocationTemp.sub(this.lastMouseDragStart).scl(-1) .add(this.lastMouseDragCameraTargetStart)); - } - else if (this.draggingMouseButton == Input.Buttons.LEFT) { + } else if (this.draggingMouseButton == Input.Buttons.LEFT) { // update mouseover } this.lastMouseClickLocation.set(clickLocationTemp); - } - else { + } else { if (this.mouseDownUIFrame != null) { this.mouseDownUIFrame.mouseDragged(this.rootFrame, this.uiViewport, screenCoordsVector.x, screenCoordsVector.y); @@ -4761,8 +4643,7 @@ public boolean mouseMoved(final int screenX, final int screenY, final float worl if (mousedUIFrame instanceof ClickableActionFrame) { loadTooltip((ClickableActionFrame) mousedUIFrame); } - } - else { + } else { this.mouseOverUIFrame = null; this.tooltipFrame.setVisible(false); } @@ -4771,8 +4652,7 @@ public boolean mouseMoved(final int screenX, final int screenY, final float worl this.includeFrames, this.ignoreFrames); if (hover == null) { updateMouseOverUnit(screenX, worldScreenY); - } - else { + } else { this.war3MapViewer.clearUnitMouseOverHighlight(); this.mouseOverUnit = null; } @@ -4783,8 +4663,7 @@ private void updateMouseOverUnit(final int screenX, final float worldScreenY) { final RenderWidget newMouseOverUnit; if (this.userControlEnabled) { newMouseOverUnit = this.war3MapViewer.rayPickUnit(screenX, worldScreenY, this.anyClickableUnitFilter); - } - else { + } else { newMouseOverUnit = null; } if (newMouseOverUnit != this.mouseOverUnit) { @@ -4806,8 +4685,7 @@ private void loadTooltip(final ClickableActionFrame mousedUIFrame) { final String uberTip = mousedUIFrame.getUberTip(); if ((toolTip == null) || (uberTip == null)) { this.tooltipFrame.setVisible(false); - } - else { + } else { this.rootFrame.setText(this.tooltipUberTipText, uberTip); int resourceIndex = 0; if (goldCost != 0) { @@ -4841,8 +4719,7 @@ private void loadTooltip(final ClickableActionFrame mousedUIFrame) { if (resourceIndex != 0) { this.tooltipUberTipText.addSetPoint(this.uberTipWithResourcesSetPoint); resourcesHeight = 0.014f; - } - else { + } else { this.tooltipUberTipText.addSetPoint(this.uberTipNoResourcesSetPoint); resourcesHeight = 0.004f; } @@ -4867,8 +4744,8 @@ public void queueIconClicked(final int index) { switch (index) { case 0: for (final CAbility ability : simulationUnit.getAbilities()) { - ability.checkCanUse(this.war3MapViewer.simulation, simulationUnit, OrderIds.cancel, - false, BooleanAbilityActivationReceiver.INSTANCE); + ability.checkCanUse(this.war3MapViewer.simulation, simulationUnit, OrderIds.cancel, false, + BooleanAbilityActivationReceiver.INSTANCE); if (BooleanAbilityActivationReceiver.INSTANCE.isOk()) { final BooleanAbilityTargetCheckReceiver targetCheckReceiver = BooleanAbilityTargetCheckReceiver @@ -4889,8 +4766,7 @@ public void queueIconClicked(final int index) { selectWidgets(unitList); break; } - } - else { + } else { this.unitOrderListener.unitCancelTrainingItem(simulationUnit.getHandleId(), index); } } @@ -4922,8 +4798,7 @@ public void onClick(final int abilityHandleId, final int orderId, final boolean setDraggingItem(null); MeleeUI.this.activeCommand = null; MeleeUI.this.activeCommandUnit = null; - } - else { + } else { if (itemInSlot != null) { setDraggingItem(itemInSlot); MeleeUI.this.activeCommand = inventoryData; @@ -4931,8 +4806,7 @@ public void onClick(final int abilityHandleId, final int orderId, final boolean MeleeUI.this.activeCommandOrderId = OrderIds.dropitem; } } - } - else { + } else { final CSimulation game = MeleeUI.this.war3MapViewer.simulation; final ExternStringMsgAbilityActivationReceiver receiver = ExternStringMsgAbilityActivationReceiver.INSTANCE; receiver.reset(); @@ -4945,15 +4819,13 @@ public void onClick(final int abilityHandleId, final int orderId, final boolean if (targetReceiver.isTargetable()) { MeleeUI.this.unitOrderListener.issueImmediateOrder(simulationUnit.getHandleId(), inventoryData.getHandleId(), orderId, isShiftDown()); - } - else { + } else { MeleeUI.this.activeCommand = inventoryData; MeleeUI.this.activeCommandOrderId = orderId; MeleeUI.this.activeCommandUnit = selectedUnit2; clearAndRepopulateCommandCard(); } - } - else { + } else { final String externStringKey = receiver.getExternStringKey(); if ((externStringKey != null) && !externStringKey.isEmpty()) { showInterfaceError(simulationUnit.getPlayerIndex(), externStringKey); @@ -4991,8 +4863,7 @@ public void lifeChanged() { } if (this.sourceUnit.getSimulationUnit().isDead()) { removeSourceUnitFromSelection(); - } - else { + } else { MeleeUI.this.selectedUnitFrames[this.index] .setLifeRatioRemaining(this.sourceUnit.getSimulationUnit().getLife() / this.sourceUnit.getSimulationUnit().getMaximumLife()); @@ -5229,8 +5100,7 @@ public void removedUnit(final CUnit whichUnit) { final List newSelectedUnits = new ArrayList<>(this.selectedUnits); newSelectedUnits.remove(renderUnit); selectUnits(newSelectedUnits); - } - else if (this.selectedUnit == renderUnit) { + } else if (this.selectedUnit == renderUnit) { selectUnit(null); } } @@ -5338,8 +5208,7 @@ public void setCinematicScene(int portraitUnitId, CPlayerColor color, String spe unitTypeData == null ? null : unitTypeData.getPortraitModel(), color.getHandleId(), unitTypeData.getRequiredAnimationNames(), sceneDuration); this.cinematicPortrait.talk(null, voiceoverDuration); - } - else { + } else { if (unitTypeData != null) { this.portrait.setCinematicTalkingHead(unitTypeData.getPortraitModel(), color.getHandleId(), unitTypeData.getRequiredAnimationNames(), sceneDuration, null, voiceoverDuration); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUIMinimap.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUIMinimap.java index cd241f2d8..dd0556a86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUIMinimap.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUIMinimap.java @@ -68,8 +68,7 @@ public void render(final CSimulation game, final SpriteBatch batch, final Iterab batch.setColor(0f, 0f, 0f, 0.5f); batch.draw(this.teamColors[0], this.minimapFilledArea.x + (x * mapXMod), this.minimapFilledArea.y + (y * mapYMod), mapXMod, mapYMod); - } - else if (CFogState.MASKED.equals(state)) { + } else if (CFogState.MASKED.equals(state)) { batch.setColor(0f, 0f, 0f, 1f); batch.draw(this.teamColors[0], this.minimapFilledArea.x + (x * mapXMod), this.minimapFilledArea.y + (y * mapYMod), mapXMod, mapYMod); @@ -85,43 +84,38 @@ else if (CFogState.MASKED.equals(state)) { for (final RenderUnit unit : units) { final CUnit simUnit = unit.getSimulationUnit(); int dimensions = 4; - if (!simUnit.isHidden() && !simUnit.isDead() && simUnit.isVisible(game, player.getId())) { + if (!(simUnit.isHidden() || simUnit.isHideMinimapIcon() || simUnit.isDead()) + && simUnit.isVisible(game, player.getId())) { batch.setColor(1, 1, 1, 1); final Texture minimapIcon; if (simUnit.getGoldMineData() != null) { minimapIcon = this.specialIcons[0]; dimensions = 21; - } - else if (simUnit.getOverlayedGoldMineData() != null) { + } else if (simUnit.getOverlayedGoldMineData() != null) { final CAbilityOverlayedMine overlayedGoldMineData = simUnit.getOverlayedGoldMineData(); if (overlayedGoldMineData instanceof CAbilityEntangledMine) { minimapIcon = this.specialIcons[3]; - } - else { + } else { minimapIcon = this.specialIcons[4]; } dimensions = 21; - } - else if (simUnit.getUnitType().isNeutralBuildingShowMinimapIcon()) { + } else if (simUnit.getUnitType().isNeutralBuildingShowMinimapIcon()) { minimapIcon = this.specialIcons[1]; dimensions = 21; - } - else if (simUnit.isHero()) { - if (player.hasAlliance(simUnit.getPlayerIndex(), CAllianceType.PASSIVE)) { + } else if (simUnit.isHero()) { + if (player.hasAlliance(simUnit.getFakePlayerIndex(), CAllianceType.PASSIVE)) { batch.setColor(1f, 1f, 1f, this.heroAlpha); - } - else { + } else { // Color pc = new Color(game.getPlayer(simUnit.getPlayerIndex()).getColor()); batch.setColor(1f, 0.2f, 0.2f, this.heroAlpha); } minimapIcon = this.specialIcons[2]; dimensions = 28; - } - else { + } else { if (simUnit.isBuilding()) { dimensions = 10; } - minimapIcon = this.teamColors[unit.getSimulationUnit().getPlayerIndex()]; + minimapIcon = this.teamColors[unit.getSimulationUnit().getFakePlayerIndex()]; } final int offset = dimensions / 2; batch.draw(minimapIcon, From d7510fe6db63dc00a8377cac7869c11fce689df6 Mon Sep 17 00:00:00 2001 From: Glasir Date: Tue, 8 Jul 2025 12:24:23 -0400 Subject: [PATCH 27/44] Remove testing functions --- core/assets/abilityBehaviors/test.json | 275 ------------------ .../etheller/warsmash/parsers/jass/Jass2.java | 19 -- .../etheller/warsmash/util/RawcodeUtils.java | 6 - 3 files changed, 300 deletions(-) delete mode 100644 core/assets/abilityBehaviors/test.json diff --git a/core/assets/abilityBehaviors/test.json b/core/assets/abilityBehaviors/test.json deleted file mode 100644 index 3c4912a97..000000000 --- a/core/assets/abilityBehaviors/test.json +++ /dev/null @@ -1,275 +0,0 @@ -{ - "abilityList": [{ - "ids": [{"id":"AOfs", "castId": "farsight"}], - "type": "NORMAL_POINTTARGET", - "onBeginCasting": [{ - "type": "modifyTerrainVertex", - "location": { - "type": "getTargetedLocation" - }, - "dz": { - "type": "rawFloat", - "value": 0 - } - }] - },{ - "ids": [{"id":"AOcl", "castId": "chainlightning"}], - "type": "NORMAL_UNITTARGET", - "displayFields": { - "hideAreaCursor": { - "type": "rawBoolean", - "value": "true" - } - }, - "reuseCallbacks": { - "jumpCondition": { - "type": "and", - "conditions": [{ - "type": "isUnitValidTarget", - "target": { - "type": "getMatchingUnit" - } - },{ - "type": "isUnitVisible", - "unit": { - "type": "getMatchingUnit" - } - },{ - "type": "not", - "condition": { - "type": "isUnitSleeping", - "unit": { - "type": "getMatchingUnit" - } - } - }] - } - }, - "reuseActions": { - "setup": [{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "amount" - }, - "valueToStore": { - "type": "getAbilityDataAsFloat", - "dataField": "A" - } - }], - "onHit": [{ - "type": "damageTarget", - "source": { - "type": "getCastingUnit" - }, - "target": { - "type": "getChainUnit" - }, - "damage": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "amount" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "amount" - }, - "valueToStore": { - "type": "f*", - "value1": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "amount" - } - }, - "value2": { - "type": "f-", - "value1": { - "type": "rawFloat", - "value": 1 - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - } - } - }] - }, - "onEndCasting": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "setup" - } - },{ - "type": "chainEffect", - "target": { - "type": "getAbilityTargetedUnit" - }, - "lightningId": { - "type": "getAlias" - }, - "bounces": { - "type": "getAbilityDataAsInteger", - "dataField": "B" - }, - "range": { - "type": "getAbilityArea" - }, - "bounceDelay": { - "type": "rawFloat", - "value": 0.25 - }, - "allowMultipleBouncesPerUnit": { - "type": "rawBoolean", - "value": "false" - }, - "condition": { - "type": "reuseBoolean", - "name": { - "type": "rawString", - "value": "jumpCondition" - } - }, - "actions": [{ - "type": "runReuseAction", - "name": { - "type": "rawString", - "value": "onHit" - } - }] - }] - },{ - "ids": [{"id":"AOhw", "castId": "itemlightningpurge"}], - "type": "INHERIT", - "parentId": "AOcl", - "reuseCallbacks": { - "jumpCondition": { - "type": "and", - "conditions": [{ - "type": "isUnitValidTarget", - "target": { - "type": "getMatchingUnit" - } - },{ - "type": "isUnitVisible", - "unit": { - "type": "getMatchingUnit" - } - }] - } - }, - "reuseActions": { - "onHit": [{ - "type": "heal", - "target": { - "type": "getChainUnit" - }, - "amount": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "amount" - } - } - },{ - "type": "storeValueLocally", - "key": { - "type": "rawString", - "value": "amount" - }, - "valueToStore": { - "type": "f*", - "value1": { - "type": "getStoredFloatByKey", - "key": { - "type": "rawString", - "value": "amount" - } - }, - "value2": { - "type": "f-", - "value1": { - "type": "rawFloat", - "value": 1 - }, - "value2": { - "type": "getAbilityDataAsFloat", - "dataField": "C" - } - } - } - }] - } - },{ - "ids": [{"id":"AHwe", "castId": "waterelemental"}], - "type": "NORMAL_NOTARGET", - "onEndCasting": [{ - "type": "for", - "times": { - "type": "getAbilityDataAsInteger", - "dataField": "A" - }, - "actions": [{ - "type": "createUnit", - "id": { - "type": "getAbilityUnitId" - }, - "loc": { - "type": "createLocationFromOffset", - "origin": { - "type": "getUnitLocation", - "unit": { - "type": "getCastingUnit" - } - }, - "dist": { - "type": "getAbilityArea" - }, - "angle": { - "type": "getUnitFacing", - "unit": { - "type": "getCastingUnit" - } - }, - "angleInDegrees": { - "type": "rawBoolean", - "value": "true" - } - }, - "facing": { - "type": "getUnitFacing", - "unit": { - "type": "getCastingUnit" - } - } - },{ - "type": "createTimedLifeBuff", - "buffId": { - "type": "getFirstBuffId" - }, - "duration": { - "type": "getAbilityDuration" - }, - "explode": { - "type": "rawBoolean", - "value": "false" - } - },{ - "type": "addBuff", - "target": { - "type": "getLastCreatedUnit" - }, - "buff": { - "type": "getLastCreatedBuff" - } - }] - }] - }] -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index 367317899..b53e4f3fa 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -984,25 +984,6 @@ public JassValue call(final List arguments, final GlobalScope globalS } return null; }); - jassProgramVisitor.getJassNativeManager().createNative("GroupEnumUnitsSelected", - (arguments, globalScope, triggerScope) -> { - // TODO BIG DESYNC WITH THIS, TESTING ONLY! - final List group = arguments.get(0) - .visit(ObjectJassValueVisitor.>getInstance()); - final CPlayerJass player = arguments.get(1) - .visit(ObjectJassValueVisitor.getInstance()); - final TriggerBooleanExpression filter = nullable(arguments, 2, - ObjectJassValueVisitor.getInstance()); - for (final RenderWidget render : war3MapViewer.selected) { - CUnit unit = render.getSimulationWidget().visit(AbilityTargetVisitor.UNIT); - if (unit != null && ((filter == null) || filter.evaluate(globalScope, - CommonTriggerExecutionScope.filterScope(triggerScope, unit)))) { - // TODO the trigger scope for evaluation here might need to be a clean one? - group.add(unit); - } - } - return null; - }); jassProgramVisitor.getJassNativeManager().createNative("IssuePointOrderLoc", (arguments, globalScope, triggerScope) -> { final CUnit whichUnit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); diff --git a/shared/src/com/etheller/warsmash/util/RawcodeUtils.java b/shared/src/com/etheller/warsmash/util/RawcodeUtils.java index 5b4d02771..4a8563858 100644 --- a/shared/src/com/etheller/warsmash/util/RawcodeUtils.java +++ b/shared/src/com/etheller/warsmash/util/RawcodeUtils.java @@ -59,10 +59,4 @@ public static String toString(final int id, final StringBuffer result) { return result.toString(); } - - public static void main(String[] args) { -// System.out.println(RawcodeUtils.toString(1098084457)); -// System.err.println("" + (1 << 2)); - System.out.println(RawcodeUtils.toInt("APdi")); - } } From 570cfc3697cf13f165775aa8e48dc7117f147f35 Mon Sep 17 00:00:00 2001 From: Glasir Date: Sat, 12 Jul 2025 20:13:22 -0400 Subject: [PATCH 28/44] Quick update to make RandomItem work like War3 (added targeting restrictions and added proper limits on result items) --- .../abilityBehaviors/ItemAffecting.json | 96 ++++++++++++++++++- .../idcallbacks/ABCallbackGetItemType.java | 19 ++++ .../idcallbacks/ABCallbackRandomItemId.java | 34 ++++++- .../ABCallbackGetItemCharges.java | 35 +++++++ .../ABCallbackGetItemLevel.java | 35 +++++++ .../ABCallbackGetItemMaxCharges.java | 35 +++++++ .../item/ABConditionItemIsCharged.java | 27 ++++++ .../core/AbilityBuilderGsonBuilder.java | 6 ++ .../handler/RandomTypeHandler.java | 18 ++++ 9 files changed, 303 insertions(+), 2 deletions(-) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java diff --git a/core/assets/abilityBehaviors/ItemAffecting.json b/core/assets/abilityBehaviors/ItemAffecting.json index 0fb9a9b3d..3132711c2 100644 --- a/core/assets/abilityBehaviors/ItemAffecting.json +++ b/core/assets/abilityBehaviors/ItemAffecting.json @@ -2,6 +2,80 @@ "abilityList": [{ "ids": [{"id":"AIri", "castId": "itemrandomitem"}], "type": "NORMAL_UNITTARGET", + "extraTargetConditions": [{ + "type": "and", + "conditions": [{ + "type": "notNull", + "value": { + "type": "getAbilityTargetedItem" + } + },{ + "type": "setCantUseReasonOnFailure", + "condition": { + "type": "and", + "conditions": [{ + "type": "i!=0", + "value": { + "type": "getItemLevel", + "item": { + "type": "getAbilityTargetedItem" + } + } + },{ + "type": "or", + "conditions": [{ + "type": "not", + "condition": { + "type": "itemIsCharged", + "item": { + "type": "getAbilityTargetedItem" + } + } + },{ + "type": "i=", + "value1": { + "type": "getItemCharges", + "item": { + "type": "getAbilityTargetedItem" + } + }, + "value2": { + "type": "getItemMaxCharges", + "item": { + "type": "getAbilityTargetedItem" + } + } + }] + },{ + "type": "notNull", + "value": { + "type": "randomItemId", + "previousId": { + "type": "getItemType", + "item": { + "type": "getAbilityTargetedItem" + } + }, + "level": { + "type": "getItemLevel", + "item": { + "type": "getAbilityTargetedItem" + } + }, + "ignoreValidFlag": { + "type": "rawBoolean", + "value": "false" + }, + "ignoreRandomFlag": { + "type": "rawBoolean", + "value": "true" + } + } + }] + }, + "reason": "UNABLE_TO_TRANSFORM_THIS_ITEM" + }] + }], "onEndCasting": [{ "type": "if", "condition": { @@ -16,7 +90,27 @@ "type": "getAbilityTargetedItem" }, "newType": { - "type": "randomItemId" + "type": "randomItemId", + "previousId": { + "type": "getItemType", + "item": { + "type": "getAbilityTargetedItem" + } + }, + "level": { + "type": "getItemLevel", + "item": { + "type": "getAbilityTargetedItem" + } + }, + "ignoreValidFlag": { + "type": "rawBoolean", + "value": "false" + }, + "ignoreRandomFlag": { + "type": "rawBoolean", + "value": "true" + } } }] }] diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java new file mode 100644 index 000000000..0d8001fe9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; + +import java.util.Map; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; + +public class ABCallbackGetItemType extends ABIDCallback { + + private ABItemCallback item; + + @Override + public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return item.callback(game, caster, localStore, castId).getTypeId(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java index e68bdeaf6..d723097ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java @@ -3,16 +3,48 @@ import java.util.Map; import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItemType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.RandomTypeHandler; public class ABCallbackRandomItemId extends ABIDCallback { + private ABIDCallback previousId; + private ABIntegerCallback level; + private ABBooleanCallback ignoreValidFlag; + private ABBooleanCallback ignoreRandomFlag; + @Override public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - return RandomTypeHandler.getRandomItemType(game).getTypeId(); + if (previousId == null && level == null && ignoreValidFlag == null && ignoreRandomFlag == null) { + return RandomTypeHandler.getRandomItemType(game).getTypeId(); + } + + War3ID id = null; + int lv = -1; + boolean valid = true; + boolean random = false; + if (previousId != null) { + id = previousId.callback(game, caster, localStore, castId); + } + if (level != null) { + lv = level.callback(game, caster, localStore, castId); + } + if (ignoreValidFlag != null) { + valid = ignoreValidFlag.callback(game, caster, localStore, castId); + } + if (ignoreRandomFlag != null) { + random = ignoreRandomFlag.callback(game, caster, localStore, castId); + } + CItemType type = RandomTypeHandler.getRandomItemType(game, id, lv, valid, random); + if (type == null) { + return null; + } + return type.getTypeId(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java new file mode 100644 index 000000000..6fb5e7dd0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetItemCharges extends ABIntegerCallback { + + private ABItemCallback item; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); + if (slot != null) { + return slot; + } + + CItem theItem; + if (item != null) { + theItem = item.callback(game, caster, localStore, castId); + } else { + theItem = (CItem)localStore.get(ABLocalStoreKeys.ITEM); + } + + if (theItem == null) { + return null; + } + return theItem.getCharges(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java new file mode 100644 index 000000000..43a1ad1db --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetItemLevel extends ABIntegerCallback { + + private ABItemCallback item; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); + if (slot != null) { + return slot; + } + + CItem theItem; + if (item != null) { + theItem = item.callback(game, caster, localStore, castId); + } else { + theItem = (CItem)localStore.get(ABLocalStoreKeys.ITEM); + } + + if (theItem == null) { + return null; + } + return theItem.getItemType().getLevel(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java new file mode 100644 index 000000000..e7baf5109 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java @@ -0,0 +1,35 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABCallbackGetItemMaxCharges extends ABIntegerCallback { + + private ABItemCallback item; + + @Override + public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); + if (slot != null) { + return slot; + } + + CItem theItem; + if (item != null) { + theItem = item.callback(game, caster, localStore, castId); + } else { + theItem = (CItem)localStore.get(ABLocalStoreKeys.ITEM); + } + + if (theItem == null) { + return null; + } + return theItem.getItemType().getNumberOfCharges(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java new file mode 100644 index 000000000..70aee6c1b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java @@ -0,0 +1,27 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; + +public class ABConditionItemIsCharged extends ABCondition { + + private ABItemCallback item; + + @Override + public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + if (item == null) { + AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + + return ability.getItem().getItemType().getNumberOfCharges() > 0; + } else { + return item.callback(game, caster, localStore, castId).getItemType().getNumberOfCharges() > 0; + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index d84c39deb..dc767791c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -383,6 +383,8 @@ private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFa .registerSubtype(ABCallbackGetUnitType.class, "getUnitType") .registerSubtype(ABCallbackGetNonCurrentTransformType.class, "getNonCurrentTransformType") + .registerSubtype(ABCallbackGetItemType.class, "getItemType") + .registerSubtype(ABCallbackRandomMechanicalCritterId.class, "randomMechanicalCritterId") .registerSubtype(ABCallbackRandomItemId.class, "randomItemId") @@ -459,6 +461,9 @@ private static void registerIntegerCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetNeutralPassivePlayerId.class, "getNeutralPassivePlayerId") .registerSubtype(ABCallbackGetItemSlot.class, "getItemSlot") + .registerSubtype(ABCallbackGetItemLevel.class, "getItemLevel") + .registerSubtype(ABCallbackGetItemCharges.class, "getItemCharges") + .registerSubtype(ABCallbackGetItemMaxCharges.class, "getItemMaxCharges") .registerSubtype(ABCallbackPlayerToStateModValue.class, "playerToStateModValue") .registerSubtype(ABCallbackDetectionDropdownConversion.class, "detectionDropdownConversion") @@ -892,6 +897,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsItemAbility.class, "isItemAbility") .registerSubtype(ABConditionItemHasCharges.class, "itemHasCharges") + .registerSubtype(ABConditionItemIsCharged.class, "itemIsCharged") .registerSubtype(ABConditionIsTree.class, "isTree") .registerSubtype(ABConditionDoesDestructableHaveBuff.class, "doesDestructableHaveBuff") diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/RandomTypeHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/RandomTypeHandler.java index 205daeffc..0cdd3acd7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/RandomTypeHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/RandomTypeHandler.java @@ -4,6 +4,7 @@ import java.util.Collection; import java.util.List; +import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItemType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; @@ -87,4 +88,21 @@ public static CItemType getRandomItemType(CSimulation game) { return randomItems.get(i); } + public static CItemType getRandomItemType(CSimulation game, War3ID previousType, int level, + boolean ignoreValidTargetField, boolean ignoreRandomPoolField) { + List filtered = new ArrayList<>(); + for (CItemType type : game.getItemData().getAllItemTypes()) { + if (!type.getTypeId().equals(previousType) && (level == -1 || level == type.getLevel()) + && (ignoreValidTargetField || type.isValidTargetForTransformation()) + && (ignoreRandomPoolField || type.isIncludeAsRandomChoice())) { + filtered.add(type); + } + } + if (filtered.size() == 0) { + return null; + } + int i = game.getSeededRandom().nextInt(filtered.size()); + return filtered.get(i); + } + } From 307dbb5c1d99b1c7d52a14dbbb339d649247a48e Mon Sep 17 00:00:00 2001 From: Glasir Date: Thu, 27 Nov 2025 19:11:27 -0500 Subject: [PATCH 29/44] WIP Commit of Damage Refactor. * Aims to replace damage with a single object that tracks changes and modifications to damage --- .../w3x/simulation/CDestructable.java | 8 +- .../handlers/w3x/simulation/CItem.java | 14 +- .../handlers/w3x/simulation/CUnit.java | 206 ++++++---- .../handlers/w3x/simulation/CWidget.java | 6 +- ...dFinalDamageTakenModificationListener.java | 22 -- .../ABActionCreateDamageTakenListener.java | 4 +- ...CreateDamageTakenModificationListener.java | 8 +- ...eFinalDamageTakenModificationListener.java | 28 -- ...eFinalDamageTakenModificationListener.java | 22 -- ...nModificationMultiplyDamageMultiplier.java | 9 +- ...eTakenModificationSetDamageMultiplier.java | 11 +- ...ActionPreDamageListenerAddBonusDamage.java | 61 ++- ...nPreDamageListenerAddDamageMultiplier.java | 10 +- ...DamageListenerLockDamageModifications.java | 10 +- .../ABActionPreDamageListenerSetMiss.java | 14 +- .../ABActionSetPreDamageStacking.java | 18 +- .../ABActionSubtractTotalDamageDealt.java | 11 +- .../ABCallbackGetTotalDamageDealt.java | 3 +- .../ABCallbackGetTriggeringAttackType.java | 3 +- .../ABCallbackGetTriggeringDamageType.java | 3 +- ...ABConditionIsTriggeringDamageAnAttack.java | 3 +- .../ABConditionIsTriggeringDamageRanged.java | 3 +- ...dFinalDamageTakenModificationListener.java | 17 - ...lDamageTakenModificationListenerByKey.java | 25 -- ...mageTakenModificationListenerCallback.java | 14 - .../abilitybuilder/core/ABLocalStoreKeys.java | 13 +- .../core/AbilityBuilderGsonBuilder.java | 20 - .../ABAbilityEffectReactionListener.java | 12 +- .../ABAbilityProjReactionListener.java | 12 +- .../listener/ABAttackEvasionListener.java | 21 +- .../listener/ABAttackModifier.java | 3 + .../listener/ABAttackPostDamageListener.java | 18 +- .../listener/ABAttackPreDamageListener.java | 25 +- .../listener/ABDamageTakenListener.java | 43 ++- .../ABDamageTakenModificationListener.java | 61 +-- ...BFinalDamageTakenModificationListener.java | 64 ---- .../simulation/combat/CAttackDamageFlags.java | 9 + .../simulation/combat/CBaseDamageFlags.java | 4 + .../w3x/simulation/combat/CBonusDamage.java | 93 +++++ .../simulation/combat/CDamageCalculation.java | 361 ++++++++++++++++++ .../w3x/simulation/combat/CDamageFlags.java | 2 + .../combat/CGenericDamageFlags.java | 9 + .../simulation/combat/CSpellDamageFlags.java | 9 + .../combat/attacks/CUnitAttack.java | 132 ++++--- .../combat/attacks/CUnitAttackInstant.java | 15 +- .../combat/attacks/CUnitAttackMissile.java | 14 +- .../attacks/CUnitAttackMissileSplash.java | 51 +-- .../combat/attacks/CUnitAttackNormal.java | 15 +- .../CUnitAttackDamageTakenListener.java | 7 +- ...AttackDamageTakenModificationListener.java | 8 +- ...enModificationListenerDamageModResult.java | 50 --- .../CUnitAttackEffectListenerStacking.java | 38 -- .../listeners/CUnitAttackEvasionListener.java | 4 +- ...kFinalDamageTakenModificationListener.java | 11 - .../CUnitAttackPostDamageListener.java | 6 +- .../CUnitAttackPreDamageListener.java | 8 +- ...ttackPreDamageListenerDamageModResult.java | 83 ---- .../CUnitDefaultAccuracyCheckListener.java | 17 +- ...CUnitDefaultEtherealDamageModListener.java | 26 +- .../CUnitDefaultLifestealListener.java | 14 +- ...itDefaultMagicImmuneDamageModListener.java | 23 -- .../listeners/CUnitDefaultSleepListener.java | 13 +- .../listeners/CUnitDefaultThornsListener.java | 21 +- .../w3x/simulation/data/CUnitData.java | 3 + 64 files changed, 1029 insertions(+), 842 deletions(-) delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddFinalDamageTakenModificationListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateFinalDamageTakenModificationListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveFinalDamageTakenModificationListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedFinalDamageTakenModificationListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredFinalDamageTakenModificationListenerByKey.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABFinalDamageTakenModificationListenerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABFinalDamageTakenModificationListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBonusDamage.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListenerDamageModResult.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackEffectListenerStacking.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackFinalDamageTakenModificationListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListenerDamageModResult.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java index 6a70e8ef0..ebe414bdb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CDestructable.java @@ -12,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.pathing.CBuildingPathingType; @@ -87,10 +88,9 @@ public float damage(final CSimulation simulation, final CUnit source, final CDam } @Override - public float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, - final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, - final float damage, final float bonusDamage) { - return this.damage(simulation, source, flags, attackType, damageType, weaponSoundType, damage + bonusDamage); + public float damage(CSimulation simulation, CDamageCalculation damage) { + return this.damage(simulation, damage.getSource(), damage.getPrimaryDamageFlags(), damage.getAttackType(), + damage.getPrimaryDamageType(), damage.getWeaponSoundType(), damage.computeRawTotalDamage()); } private void kill(final CSimulation simulation) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java index 146f982a9..de4604eda 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CItem.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.inventory.CAbilityInventory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -41,7 +42,7 @@ public CItem(final int handleId, final float x, final float y, final float life, this.droppable = itemTypeInstance.isCanBeDropped(); this.pawnable = itemTypeInstance.isPawnable(); } - + public void setTypeId(CSimulation game, War3ID typeId) { int slot = 0; if (this.containedInventory != null) { @@ -54,12 +55,12 @@ public void setTypeId(CSimulation game, War3ID typeId) { this.dropOnDeath = this.itemType.isDroppedWhenCarrierDies(); this.droppable = this.itemType.isCanBeDropped(); this.pawnable = this.itemType.isPawnable(); - + game.updateItemModel(this); if (this.containedInventory != null) { this.containedInventory.giveItem(game, this.containedUnit, this, slot, false); } - + } @Override @@ -91,10 +92,9 @@ public float damage(final CSimulation simulation, final CUnit source, final CDam } @Override - public float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, - final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, - final float damage, final float bonusDamage) { - return this.damage(simulation, source, flags, attackType, damageType, weaponSoundType, damage + bonusDamage); + public float damage(CSimulation simulation, CDamageCalculation damage) { + return this.damage(simulation, damage.getSource(), damage.getPrimaryDamageFlags(), damage.getAttackType(), + damage.getPrimaryDamageType(), damage.getWeaponSoundType(), damage.computeRawTotalDamage()); } public void forceDropIfHeld(final CSimulation simulation) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index be5609c9f..e1672e8d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -73,6 +73,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.build.AbilityDisableWhileUpgradingVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.harvest.CBehaviorReturnResources; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CRegenType; @@ -81,9 +82,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListenerDamageModResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackEvasionListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackFinalDamageTakenModificationListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPostDamageListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerPriority; @@ -94,7 +93,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDefaultAccuracyCheckListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDefaultEtherealDamageModListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDefaultLifestealListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDefaultMagicImmuneDamageModListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDefaultSleepListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDefaultThornsListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackModifier; @@ -284,7 +282,6 @@ public class CUnit extends CWidget { private final Map> preDamageListeners = new HashMap<>(); private final List postDamageListeners = new ArrayList<>(); private final List damageTakenModificationListeners = new ArrayList<>(); - private final List finalDamageTakenModificationListeners = new ArrayList<>(); private final List damageTakenListeners = new ArrayList<>(); private final Map> deathReplacementEffects = new HashMap<>(); private final List evasionListeners = new ArrayList<>(); @@ -324,7 +321,6 @@ public class CUnit extends CWidget { private List uniqueFlags = null; - public CUnit(final int handleId, final int playerIndex, final float x, final float y, final float life, final War3ID typeId, final float facing, final float mana, final int maximumLife, final float lifeRegen, final int maximumMana, final int speed, final int maxSpeed, final int minSpeed, final CUnitType unitType) { @@ -815,17 +811,6 @@ public void computeUnitState(final CSimulation game, final StateModBuffType type } } setMagicImmune(isMagicImmune); - if (isMagicImmune) { - if (!this.finalDamageTakenModificationListeners - .contains(CUnitDefaultMagicImmuneDamageModListener.INSTANCE)) { - addFinalDamageTakenModificationListener(CUnitDefaultMagicImmuneDamageModListener.INSTANCE); - } - } else { - if (this.finalDamageTakenModificationListeners - .contains(CUnitDefaultMagicImmuneDamageModListener.INSTANCE)) { - removeFinalDamageTakenModificationListener(CUnitDefaultMagicImmuneDamageModListener.INSTANCE); - } - } break; case MORPH_IMMUNE: boolean isMorphImmune = false; @@ -3242,13 +3227,11 @@ public double distance(final double x, final double y) { return groundDistance; } - public boolean checkForMiss(final CSimulation simulation, final CUnit source, final boolean isAttack, - final boolean isRanged, final CAttackType attackType, final CDamageType damageType, final float damage, - final float bonusDamage) { + public boolean checkForMiss(final CSimulation simulation, final CDamageCalculation damage) { boolean miss = false; - if (isAttack) { + if (damage.getPrimaryDamageFlags().isAttack()) { for (final CUnitAttackEvasionListener listener : new ArrayList<>(this.evasionListeners)) { - miss = miss || listener.onAttack(simulation, source, this, isAttack, isRanged, damageType); + miss = miss || listener.onAttack(simulation, this, damage); } } return miss; @@ -3372,13 +3355,10 @@ public boolean isImmuneToDamage(final CSimulation simulation, final CDamageFlags public float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, final float damage) { - return this.damage(simulation, source, flags, attackType, damageType, weaponSoundType, damage, 0); - } - - @Override - public float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, - final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, - final float damage, final float bonusDamage) { + if (!(this.damageTakenModificationListeners.isEmpty() && this.damageTakenListeners.isEmpty())) { + return this.damage(simulation, + new CDamageCalculation(source, damage, attackType, damageType, flags, weaponSoundType)); + } final boolean wasDead = isDead(); if (wasDead) { return 0; @@ -3391,60 +3371,128 @@ public float damage(final CSimulation simulation, final CUnit source, final CDam && simulation.getGameplayConstants().isInvulnerableSummonsTakeDispelDamage() && this.isUnitType(CUnitTypeJass.SUMMONED))))) { - final CUnitAttackDamageTakenModificationListenerDamageModResult result = new CUnitAttackDamageTakenModificationListenerDamageModResult( - damage, bonusDamage); - for (final CUnitAttackDamageTakenModificationListener listener : this.damageTakenModificationListeners) { - listener.onDamage(simulation, source, this, flags, attackType, damageType, result); - } - - final float damageRatioFromArmorClass = simulation.getGameplayConstants().getDamageRatioAgainst(attackType, - (this.isBuilding() && this.isConstructing()) ? CDefenseType.NORMAL : getDefenseType()); - final float damageRatioFromDefense; - final float defense = this.currentDefense; - if (damageType != CDamageType.NORMAL || (this.isBuilding() && this.isConstructing())) { - damageRatioFromDefense = 1.0f; - } else if (defense >= 0) { - damageRatioFromDefense = 1f - ((defense * simulation.getGameplayConstants().getDefenseArmor()) - / (1 + (simulation.getGameplayConstants().getDefenseArmor() * defense))); - } else { - damageRatioFromDefense = 2f - - (float) StrictMath.pow(1f - simulation.getGameplayConstants().getDefenseArmor(), -defense); - } - trueDamage = damageRatioFromArmorClass * damageRatioFromDefense * result.computeFinalDamage(); + trueDamage = CDamageCalculation.calculateDamageByArmor(simulation, this, attackType, damageType, damage, + flags); - for (final CUnitAttackFinalDamageTakenModificationListener listener : new ArrayList<>( - this.finalDamageTakenModificationListeners)) { - trueDamage = listener.onDamage(simulation, source, this, flags, attackType, damageType, trueDamage); - } + this.callPreDamageEvents(source, trueDamage); + + this.damageModifyHp(trueDamage, flags.isNonlethal()); + } + this.callPostDamageEvents(simulation, wasDead, source, flags.isExplode(), weaponSoundType); + return trueDamage; + } - final List eventList = getEventList(JassGameEventsWar3.EVENT_UNIT_DAMAGED); - if (eventList != null) { - for (final CWidgetEvent event : eventList) { - event.fire(this, CommonTriggerExecutionScope.unitDamageTakenScope( - JassGameEventsWar3.EVENT_UNIT_DAMAGED, event.getTrigger(), this, source, trueDamage)); + @Override + public float damage(final CSimulation simulation, final CDamageCalculation damage) { + final boolean wasDead = isDead(); + if (wasDead) { + return 0; + } + if (damage.isImmuneToDamage(simulation, this)) { + return 0; + } + float trueDamage = 0; + + damage.resetLoop(); + int maxPriority = 0; + int priorityMask = 0; + int i = 0; + boolean firstLoop = true; + while (i <= maxPriority) { + if (i == 0 || (priorityMask & (1 << (i < 31 ? i : 31))) != 0) { + damage.startLoop(i); + for (int j = this.damageTakenModificationListeners.size() - 1; j >= 0; j--) { + CUnitAttackDamageTakenModificationListener listener = this.damageTakenModificationListeners.get(j); + int prio = listener.getPriority(simulation, this, damage); + if (firstLoop) { + if (prio > maxPriority) { + maxPriority = prio; + } + priorityMask |= 1 << (prio < 31 ? prio : 31); + } + if (prio == i && !damage.isSkipCurrentLevel()) { + listener.onDamage(simulation, this, damage); + } + } + if (damage.isEndLoop()) { + break; } } + i++; + firstLoop = false; + } + + trueDamage = damage.computeFinalDamage(simulation, this); - final boolean wasAboveMax = this.life > this.maximumLife; - this.life -= trueDamage; - if ((result.computeFinalDamage() < 0) && !wasAboveMax && (this.life > this.maximumLife)) { - // NOTE wasAboveMax is for that weird life drain power to drain above max... to - // be honest that's a crazy mechanic anyway so I didn't test whether it works - // yet - this.life = this.maximumLife; + this.callPreDamageEvents(damage.getSource(), trueDamage); + + this.damageModifyHp(trueDamage, false); + + damage.resetLoop(); + maxPriority = 0; + priorityMask = 0; + i = 0; + firstLoop = true; + while (i <= maxPriority) { + if (i == 0 || (priorityMask & (1 << (i < 31 ? i : 31))) != 0) { + damage.startLoop(i); + for (int j = this.damageTakenListeners.size() - 1; j >= 0; j--) { + CUnitAttackDamageTakenListener listener = this.damageTakenListeners.get(j); + int prio = listener.getPriority(simulation, this, damage); + if (firstLoop) { + if (prio > maxPriority) { + maxPriority = prio; + } + priorityMask |= 1 << (prio < 31 ? prio : 31); + } + if (prio == i && !damage.isSkipCurrentLevel()) { + listener.onDamage(simulation, this, damage); + } + } + if (damage.isEndLoop()) { + break; + } } - if (flags.isNonlethal() && this.life < 1) { - this.life = 1; + i++; + firstLoop = false; + } + + this.callPostDamageEvents(simulation, wasDead, damage.getSource(), damage.isExplode(), + damage.getWeaponSoundType()); + return trueDamage; + } + + private void callPreDamageEvents(CUnit source, float damage) { + final List eventList = getEventList(JassGameEventsWar3.EVENT_UNIT_DAMAGED); + if (eventList != null) { + for (final CWidgetEvent event : eventList) { + event.fire(this, CommonTriggerExecutionScope.unitDamageTakenScope(JassGameEventsWar3.EVENT_UNIT_DAMAGED, + event.getTrigger(), this, source, damage)); } - this.stateNotifier.lifeChanged(); } - for (final CUnitAttackDamageTakenListener listener : new ArrayList<>(this.damageTakenListeners)) { - listener.onDamage(simulation, source, this, flags, damageType, damage, bonusDamage, trueDamage); + } + + private void damageModifyHp(float trueDamage, boolean isNonLethal) { + final boolean wasAboveMax = this.life > this.maximumLife; + this.life -= trueDamage; + if ((trueDamage < 0) && !wasAboveMax && (this.life > this.maximumLife)) { + // NOTE wasAboveMax is for that weird life drain power to drain above max... to + // be honest that's a crazy mechanic anyway so I didn't test whether it works + // yet + this.life = this.maximumLife; } + if (isNonLethal && this.life < 1) { + this.life = 1; + } + this.stateNotifier.lifeChanged(); + } + + private void callPostDamageEvents(CSimulation simulation, boolean wasDead, CUnit source, final boolean isExplode, + String weaponSoundType) { simulation.unitDamageEvent(this, weaponSoundType, this.unitType.getArmorType()); if (isDead()) { if (!wasDead) { - if (flags.isExplode()) { + if (isExplode) { this.setExplodesOnDeath(true); } kill(simulation, source); @@ -3480,7 +3528,6 @@ public float damage(final CSimulation simulation, final CUnit source, final CDam } } } - return trueDamage; } private void kill(final CSimulation simulation, final CUnit source) { @@ -5117,9 +5164,12 @@ public boolean isUnitType(final CUnitTypeJass whichUnitType) { return isBuilding(); case FLYING: - return this.targetedAs.contains(CTargetType.AIR); + return this.unitType.getMovementType() == PathingGrid.MovementType.FLY; case GROUND: - return this.targetedAs.contains(CTargetType.GROUND); + return this.unitType.getMovementType() == PathingGrid.MovementType.FOOT + || this.unitType.getMovementType() == PathingGrid.MovementType.FOOT_NO_COLLISION + || this.unitType.getMovementType() == PathingGrid.MovementType.HORSE + || this.unitType.getMovementType() == PathingGrid.MovementType.HOVER; case ATTACKS_FLYING: for (final CUnitAttack attack : getCurrentAttacks()) { @@ -5966,16 +6016,6 @@ public void removeDamageTakenModificationListener(final CUnitAttackDamageTakenMo this.damageTakenModificationListeners.remove(listener); } - public void addFinalDamageTakenModificationListener( - final CUnitAttackFinalDamageTakenModificationListener listener) { - this.finalDamageTakenModificationListeners.add(0, listener); - } - - public void removeFinalDamageTakenModificationListener( - final CUnitAttackFinalDamageTakenModificationListener listener) { - this.finalDamageTakenModificationListeners.remove(listener); - } - public void addDamageTakenListener(final CUnitAttackDamageTakenListener listener) { this.damageTakenListeners.add(0, listener); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java index ef712d72c..a415fccd4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java @@ -14,6 +14,7 @@ import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; @@ -75,9 +76,7 @@ public abstract float damage(final CSimulation simulation, final CUnit source, f final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, final float damage); - public abstract float damage(final CSimulation simulation, final CUnit source, final CDamageFlags flags, - final CAttackType attackType, final CDamageType damageType, final String weaponSoundType, - final float damage, final float bonusDamage); + public abstract float damage(CSimulation simulation, CDamageCalculation damage); public abstract float getFlyHeight(); @@ -163,4 +162,5 @@ public RemovableTriggerEvent addDeathEvent(final GlobalScope globalScope, final } public abstract double distance(float x, float y); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddFinalDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddFinalDamageTakenModificationListener.java deleted file mode 100644 index 9b5cfb7d6..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddFinalDamageTakenModificationListener.java +++ /dev/null @@ -1,22 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; - -import java.util.Map; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABFinalDamageTakenModificationListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; - -public class ABActionAddFinalDamageTakenModificationListener implements ABAction { - - private ABUnitCallback target; - private ABFinalDamageTakenModificationListenerCallback listener; - - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnit targetUnit = target.callback(game, caster, localStore, castId); - - targetUnit.addFinalDamageTakenModificationListener(listener.callback(game, caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java index 94dbf02d2..472112e61 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java @@ -7,12 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public class ABActionCreateDamageTakenListener implements ABAction { + private ABIntegerCallback priority; private List actions; private ABBooleanCallback useCastId; @@ -21,7 +23,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(game, caster, localStore, castId); } - ABDamageTakenModificationListener listener = new ABDamageTakenModificationListener(localStore, actions, castId, ucid); + ABDamageTakenModificationListener listener = new ABDamageTakenModificationListener(localStore, priority, + actions, castId, ucid); localStore.put(ABLocalStoreKeys.LASTCREATEDDTML, listener); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateFinalDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateFinalDamageTakenModificationListener.java deleted file mode 100644 index 1095d6496..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateFinalDamageTakenModificationListener.java +++ /dev/null @@ -1,28 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; - -import java.util.List; -import java.util.Map; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABFinalDamageTakenModificationListener; - -public class ABActionCreateFinalDamageTakenModificationListener implements ABAction { - - private List actions; - private ABBooleanCallback useCastId; - - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - boolean ucid = true; - if (useCastId != null) { - ucid = useCastId.callback(game, caster, localStore, castId); - } - ABFinalDamageTakenModificationListener listener = new ABFinalDamageTakenModificationListener(localStore, actions, castId, ucid); - - localStore.put(ABLocalStoreKeys.LASTCREATEDFDTML, listener); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveFinalDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveFinalDamageTakenModificationListener.java deleted file mode 100644 index 1befac130..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveFinalDamageTakenModificationListener.java +++ /dev/null @@ -1,22 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; - -import java.util.Map; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABFinalDamageTakenModificationListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; - -public class ABActionRemoveFinalDamageTakenModificationListener implements ABAction { - - private ABUnitCallback target; - private ABFinalDamageTakenModificationListenerCallback listener; - - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnit targetUnit = target.callback(game, caster, localStore, castId); - - targetUnit.removeFinalDamageTakenModificationListener(listener.callback(game, caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java index e12bfb2b7..cef6a5b29 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java @@ -8,14 +8,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListenerDamageModResult; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionDamageTakenModificationMultiplyDamageMultiplier implements ABAction { private ABFloatCallback multiplier; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnitAttackDamageTakenModificationListenerDamageModResult result = (CUnitAttackDamageTakenModificationListenerDamageModResult) localStore.get(ABLocalStoreKeys.DAMAGEMODRESULT+castId); - result.addDamageMultiplier(multiplier.callback(game, caster, localStore, castId)); + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + damage.addDamageMultiplier(multiplier.callback(game, caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java index 024400226..9bb14b8e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java @@ -8,15 +8,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListenerDamageModResult; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionDamageTakenModificationSetDamageMultiplier implements ABAction { private ABFloatCallback multiplier; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnitAttackDamageTakenModificationListenerDamageModResult result = (CUnitAttackDamageTakenModificationListenerDamageModResult) localStore.get(ABLocalStoreKeys.DAMAGEMODRESULT+castId); - - result.setDamageMultiplier(multiplier.callback(game, caster, localStore, castId)); + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + + damage.setDamageMultiplier(multiplier.callback(game, caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java index ca67781b8..57112a89f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java @@ -5,18 +5,69 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABActionPreDamageListenerAddBonusDamage implements ABAction { private ABFloatCallback value; + private ABDamageTypeCallback damageType; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnitAttackPreDamageListenerDamageModResult result = (CUnitAttackPreDamageListenerDamageModResult) localStore - .get(ABLocalStoreKeys.PREDAMAGERESULT+castId); - result.addBonusDamage(value.callback(game, caster, localStore, castId)); + private ABBooleanCallback inheritFlags; + private ABBooleanCallback isRanged; + + private ABBooleanCallback isIgnoreInvulnerable; + private ABBooleanCallback isExplode; + private ABBooleanCallback isOnlyDamageSummons; + private ABBooleanCallback isNonlethal; + private ABBooleanCallback isPassLimitedMagicImmune; + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CDamageType theDamageType = null; + if (damageType != null) { + theDamageType = damageType.callback(game, caster, localStore, castId); + } + + CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + + CDamageFlags theFlags = null; + if (inheritFlags == null || inheritFlags.callback(game, caster, localStore, castId)) { + theFlags = damage.getPrimaryDamageFlags().copy(); + } else if (isRanged != null || isIgnoreInvulnerable != null || isExplode != null || isOnlyDamageSummons != null + || isNonlethal != null || isPassLimitedMagicImmune != null) { + boolean ranged; + if (isRanged == null) { + ranged = damage.getPrimaryDamageFlags().isRanged(); + } else { + ranged = isRanged.callback(game, caster, localStore, castId); + } + theFlags = new CAttackDamageFlags(ranged); + } + + if (isIgnoreInvulnerable != null) { + theFlags.setIgnoreInvulnerable(isIgnoreInvulnerable.callback(game, caster, localStore, castId)); + } + if (isExplode != null) { + theFlags.setExplode(isExplode.callback(game, caster, localStore, castId)); + } + if (isOnlyDamageSummons != null) { + theFlags.setOnlyDamageSummons(isOnlyDamageSummons.callback(game, caster, localStore, castId)); + } + if (isNonlethal != null) { + theFlags.setNonlethal(isNonlethal.callback(game, caster, localStore, castId)); + } + if (isPassLimitedMagicImmune != null) { + theFlags.setPassLimitedMagicImmune(isPassLimitedMagicImmune.callback(game, caster, localStore, castId)); + } + + damage.addBonusDamage(value.callback(game, caster, localStore, castId), theDamageType, theFlags); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java index 47ced68d6..fe674c0fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java @@ -8,15 +8,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerAddDamageMultiplier implements ABAction { private ABFloatCallback value; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnitAttackPreDamageListenerDamageModResult result = (CUnitAttackPreDamageListenerDamageModResult) localStore - .get(ABLocalStoreKeys.PREDAMAGERESULT+castId); - result.addDamageMultiplier(value.callback(game, caster, localStore, castId)); + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + damage.addDamageMultiplier(value.callback(game, caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java index f4f5cf094..e90a451c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerLockDamageModifications implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnitAttackPreDamageListenerDamageModResult result = (CUnitAttackPreDamageListenerDamageModResult) localStore - .get(ABLocalStoreKeys.PREDAMAGERESULT+castId); - result.lock(); + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + damage.lock(); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java index 9cf5703e5..9c900ee19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java @@ -8,19 +8,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerSetMiss implements ABAction { private ABBooleanCallback miss; - - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnitAttackPreDamageListenerDamageModResult result = (CUnitAttackPreDamageListenerDamageModResult) localStore - .get(ABLocalStoreKeys.PREDAMAGERESULT+castId); + + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); if (miss != null) { - result.setMiss(miss.callback(game, caster, localStore, castId)); + damage.setMiss(miss.callback(game, caster, localStore, castId)); } else { - result.setMiss(true); + damage.setMiss(true); } } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java index 9cf1766d4..89f99538f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java @@ -8,17 +8,23 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackEffectListenerStacking; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionSetPreDamageStacking implements ABAction { private ABBooleanCallback allowStacking; private ABBooleanCallback allowSamePriorityStacking; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - CUnitAttackEffectListenerStacking stacking = (CUnitAttackEffectListenerStacking) localStore.get(ABLocalStoreKeys.PREDAMAGESTACKING+castId); - - stacking.setAllowStacking(allowStacking.callback(game, caster, localStore, castId)); - stacking.setAllowSamePriorityStacking(allowSamePriorityStacking.callback(game, caster, localStore, castId)); + public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + + if (allowStacking != null && !allowStacking.callback(game, caster, localStore, castId)) { + damage.preventAllOtherModifications(); + } + if (allowSamePriorityStacking != null + && !allowSamePriorityStacking.callback(game, caster, localStore, castId)) { + damage.preventOtherModificationsWithSamePriority(); + } } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java index 6d29c99c0..71f670104 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java @@ -8,14 +8,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionSubtractTotalDamageDealt implements ABAction { private ABFloatCallback amount; + private ABFloatCallback minimum; public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { - float damage = (float) localStore.get(ABLocalStoreKeys.TOTALDAMAGEDEALT+castId); - damage-= amount.callback(game, caster, localStore, castId); - localStore.put(ABLocalStoreKeys.TOTALDAMAGEDEALT+castId, damage); + float theMin = 0; + if (minimum != null) { + theMin = minimum.callback(game, caster, localStore, castId); + } + CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + damage.subtractTotalDamageDealt(amount.callback(game, caster, localStore, castId), theMin); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTotalDamageDealt.java index e8dbe6beb..71dff83f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTotalDamageDealt.java @@ -6,12 +6,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABCallbackGetTotalDamageDealt extends ABFloatCallback { @Override public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (Float) localStore.get(ABLocalStoreKeys.TOTALDAMAGEDEALT+castId); + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).computeFinalDamage(game, caster); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java index 94f4e1bb7..032a3dca4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java @@ -7,12 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABCallbackGetTriggeringAttackType extends ABAttackTypeCallback { @Override public CAttackType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (CAttackType) localStore.get(ABLocalStoreKeys.ATTACKTYPE+castId); + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getAttackType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java index c73196b51..6e7b4cd90 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java @@ -6,13 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetTriggeringDamageType extends ABDamageTypeCallback { @Override public CDamageType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (CDamageType) localStore.get(ABLocalStoreKeys.DAMAGETYPE+castId); + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getPrimaryDamageType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java index 38d92c42b..49cb18394 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java @@ -6,12 +6,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABConditionIsTriggeringDamageAnAttack extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (boolean) localStore.get(ABLocalStoreKeys.DAMAGEISATTACK+castId); + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getPrimaryDamageFlags().isAttack(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java index 305a121d5..eac51f0ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java @@ -6,12 +6,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABConditionIsTriggeringDamageRanged extends ABCondition { @Override public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (boolean) localStore.get(ABLocalStoreKeys.DAMAGEISRANGED+castId); + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getPrimaryDamageFlags().isRanged(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedFinalDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedFinalDamageTakenModificationListener.java deleted file mode 100644 index 9e2c0d03f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedFinalDamageTakenModificationListener.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; - -import java.util.Map; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABFinalDamageTakenModificationListener; - -public class ABCallbackGetLastCreatedFinalDamageTakenModificationListener extends ABFinalDamageTakenModificationListenerCallback { - - @Override - public ABFinalDamageTakenModificationListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (ABFinalDamageTakenModificationListener) localStore.get(ABLocalStoreKeys.LASTCREATEDFDTML); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredFinalDamageTakenModificationListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredFinalDamageTakenModificationListenerByKey.java deleted file mode 100644 index 731f503f3..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredFinalDamageTakenModificationListenerByKey.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; - -import java.util.Map; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABFinalDamageTakenModificationListener; - -public class ABCallbackGetStoredFinalDamageTakenModificationListenerByKey extends ABFinalDamageTakenModificationListenerCallback { - private ABStringCallback key; - private ABBooleanCallback instanceValue; - - @Override - public ABFinalDamageTakenModificationListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABFinalDamageTakenModificationListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); - } else { - return (ABFinalDamageTakenModificationListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); - } - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABFinalDamageTakenModificationListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABFinalDamageTakenModificationListenerCallback.java deleted file mode 100644 index 404c61373..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABFinalDamageTakenModificationListenerCallback.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; - -import java.util.Map; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABFinalDamageTakenModificationListener; - -public abstract class ABFinalDamageTakenModificationListenerCallback implements ABCallback { - - abstract public ABFinalDamageTakenModificationListener callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index 60578af03..343462f96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -105,12 +105,7 @@ public class ABLocalStoreKeys { public static final String EVENTTARGETEDLOCATION = "_eventTargetedLocation#"; //Generic Attacks - public static final String BASEDAMAGEDEALT = "_baseDamageDealt#"; - public static final String BONUSDAMAGEDEALT = "_bonusDamageDealt#"; - public static final String TOTALDAMAGEDEALT = "_totalDamageDealt#"; - public static final String WEAPONTYPE = "_weaponType#"; - public static final String ATTACKTYPE = "_attackType#"; - public static final String DAMAGETYPE = "_damageType#"; + public static final String DAMAGECALC = "_damageCalc#"; //Timers public static final String LASTCREATEDTIMER = "_lastCreatedTimer"; @@ -157,24 +152,18 @@ public class ABLocalStoreKeys { // AttackEvasionListener Names public static final String LASTCREATEDAEL = "_lastCreatedAEL"; - public static final String DAMAGEISATTACK = "_damageIsAttack#"; - public static final String DAMAGEISRANGED = "_damageIsRanged#"; // AttackPostDamageListener Names public static final String LASTCREATEDAPoDL = "_lastCreatedAPoDL"; - public static final String LISTENERLOOP = "_listenerLoop#"; // AttackPreDamageListener Names public static final String LASTCREATEDAPrDL = "_lastCreatedAPrDL"; - public static final String PREDAMAGERESULT = "_preDamageResult#"; - public static final String PREDAMAGESTACKING = "_preDamageStacking#"; // DamageTakenListener Names public static final String LASTCREATEDDTL = "_lastCreatedDTL"; // DamageTakenModificationListener Names public static final String LASTCREATEDDTML = "_lastCreatedDTML"; - public static final String DAMAGEMODRESULT = "_damageModResult#"; // DamageTakenModificationListener Names public static final String LASTCREATEDFDTML = "_lastCreatedFDTML"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index dc767791c..694f2d669 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -263,15 +263,6 @@ private static void registerEvasionListenerCallbacks(RuntimeTypeAdapterFactory c .registerSubtype(ABCallbackGetStoredEvasionListenerByKey.class, "getStoredEvasionListenerByKey"); } - private static void registerFinalDamageTakenModificationListenerCallbacks( - RuntimeTypeAdapterFactory callbackTypeFactory) { - callbackTypeFactory - .registerSubtype(ABCallbackGetLastCreatedFinalDamageTakenModificationListener.class, - "getLastCreatedFinalDamageTakenModificationListener") - .registerSubtype(ABCallbackGetStoredFinalDamageTakenModificationListenerByKey.class, - "getStoredFinalDamageTakenModificationListenerByKey"); - } - private static void registerFloatCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetAbilityArea.class, "getAbilityArea") .registerSubtype(ABCallbackGetAbilityDuration.class, "getAbilityDuration") @@ -1147,11 +1138,6 @@ private static void registerActions(RuntimeTypeAdapterFactory factory) .registerSubtype(ABActionAddDamageTakenModificationListener.class, "addDamageTakenModificationListener") .registerSubtype(ABActionRemoveDamageTakenModificationListener.class, "removeDamageTakenModificationListener") - .registerSubtype(ABActionCreateFinalDamageTakenModificationListener.class, - "createFinalDamageTakenModificationListener") - .registerSubtype(ABActionAddFinalDamageTakenModificationListener.class, "addFinalDamageTakenModificationListener") - .registerSubtype(ABActionRemoveFinalDamageTakenModificationListener.class, - "removeFinalDamageTakenModificationListener") .registerSubtype(ABActionCreateEvasionListener.class, "createEvasionListener") .registerSubtype(ABActionAddEvasionListener.class, "addEvasionListener") .registerSubtype(ABActionRemoveEvasionListener.class, "removeEvasionListener") @@ -1311,7 +1297,6 @@ public static Gson create() { registerDestructableCallbacks(callbackTypeFactory); registerDestructableBuffCallbacks(callbackTypeFactory); registerEvasionListenerCallbacks(callbackTypeFactory); - registerFinalDamageTakenModificationListenerCallbacks(callbackTypeFactory); registerFloatCallbacks(callbackTypeFactory); registerGenericFloatCallbacks(callbackTypeFactory); registerFxCallbacks(callbackTypeFactory); @@ -1432,11 +1417,6 @@ public static Gson create() { registerEvasionListenerCallbacks(evasionListenerCallbackTypeFactory); gsonBuilder.registerTypeAdapterFactory(evasionListenerCallbackTypeFactory); - final RuntimeTypeAdapterFactory finalDamageTakenModificationListenerCallbackTypeFactory = RuntimeTypeAdapterFactory - .of(ABFinalDamageTakenModificationListenerCallback.class, "type"); - registerFinalDamageTakenModificationListenerCallbacks(finalDamageTakenModificationListenerCallbackTypeFactory); - gsonBuilder.registerTypeAdapterFactory(finalDamageTakenModificationListenerCallbackTypeFactory); - final RuntimeTypeAdapterFactory floatCallbackTypeFactory = RuntimeTypeAdapterFactory .of(ABFloatCallback.class, "type"); registerFloatCallbacks(floatCallbackTypeFactory); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java index 0431a81ea..c908db6cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java @@ -33,17 +33,17 @@ public boolean onHit(final CSimulation simulation, CUnit source, CUnit target, C this.triggerId++; } localStore.put(ABLocalStoreKeys.REACTIONALLOWHIT+triggerId, true); - localStore.put(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId, source); - localStore.put(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId, target); - localStore.put(ABLocalStoreKeys.REACTIONABILITY+triggerId, ability); if (actions != null) { + localStore.put(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId, source); + localStore.put(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId, target); + localStore.put(ABLocalStoreKeys.REACTIONABILITY+triggerId, ability); for (ABAction action : actions) { action.runAction(simulation, target, localStore, triggerId); } + localStore.remove(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId); + localStore.remove(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId); + localStore.remove(ABLocalStoreKeys.REACTIONABILITY+triggerId); } - localStore.remove(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId); - localStore.remove(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId); - localStore.remove(ABLocalStoreKeys.REACTIONABILITY+triggerId); return (boolean) localStore.remove(ABLocalStoreKeys.REACTIONALLOWHIT+triggerId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java index 1a240262b..da41fbf69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java @@ -33,17 +33,17 @@ public boolean onHit(final CSimulation simulation, CUnit source, CUnit target, C this.triggerId++; } localStore.put(ABLocalStoreKeys.REACTIONALLOWHIT+triggerId, true); - localStore.put(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId, source); - localStore.put(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId, target); - localStore.put(ABLocalStoreKeys.ABILITYPROJ+triggerId, projectile); if (actions != null) { + localStore.put(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId, source); + localStore.put(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId, target); + localStore.put(ABLocalStoreKeys.ABILITYPROJ+triggerId, projectile); for (ABAction action : actions) { action.runAction(simulation, target, localStore, triggerId); } + localStore.remove(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId); + localStore.remove(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId); + localStore.remove(ABLocalStoreKeys.ABILITYPROJ+triggerId); } - localStore.remove(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId); - localStore.remove(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId); - localStore.remove(ABLocalStoreKeys.ABILITYPROJ+triggerId); return (boolean) localStore.remove(ABLocalStoreKeys.REACTIONALLOWHIT+triggerId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java index f86ff5dac..9dbbf82f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackEvasionListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABAttackEvasionListener implements CUnitAttackEvasionListener { @@ -28,24 +28,19 @@ public ABAttackEvasionListener(Map localStore, List } @Override - public boolean onAttack(CSimulation simulation, CUnit attacker, CUnit target, boolean isAttack, boolean isRanged, - CDamageType damageType) { + public boolean onAttack(CSimulation simulation, CUnit target, CDamageCalculation damage) { boolean evade = false; - localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); - localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, isAttack); - localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, isRanged); - localStore.put(ABLocalStoreKeys.DAMAGETYPE+triggerId, damageType); if (conditions != null) { + localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, damage.getSource()); + localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); + localStore.put(ABLocalStoreKeys.DAMAGECALC+triggerId, damage); for (ABCondition condition : conditions) { evade = evade || condition.callback(simulation, target, localStore, triggerId); } + localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); + localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGECALC+triggerId); } - localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEISATTACK+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEISRANGED+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGETYPE+triggerId); if (!this.useCastId) { this.triggerId++; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java index e934d62ec..1de30fe7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java @@ -43,6 +43,9 @@ public ABAttackModifier(Map localStore, int castId, ABIntegerCal @Override public int getPriority(CSimulation simulation, CUnit source, AbilityTarget target, CUnitAttack attack) { + if (this.priority == null) { + return 0; + } if (!this.useCastId) { this.castId--; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java index 6a4a70154..91c2be28e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java @@ -9,9 +9,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPostDamageListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public class ABAttackPostDamageListener implements CUnitAttackPostDamageListener { @@ -33,22 +33,21 @@ public ABAttackPostDamageListener(Map localStore, ABIntegerCallb } @Override - public void onHit(CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack attack, float damage, CUnitPriorityLoopData loop) { - localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, attacker); + public void onHit(CSimulation simulation, AbilityTarget target, CUnitAttack attack, + CDamageCalculation damage) { + localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, damage.getSource()); localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); - localStore.put(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId, damage); + localStore.put(ABLocalStoreKeys.DAMAGECALC+triggerId, damage); localStore.put(ABLocalStoreKeys.THEATTACK + this.triggerId, attack); - localStore.put(ABLocalStoreKeys.LISTENERLOOP + this.triggerId, loop); if (actions != null) { for (ABAction action : actions) { - action.runAction(simulation, attacker, localStore, triggerId); + action.runAction(simulation, damage.getSource(), localStore, triggerId); } } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); - localStore.remove(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGECALC+triggerId); localStore.remove(ABLocalStoreKeys.THEATTACK + this.triggerId); - localStore.remove(ABLocalStoreKeys.LISTENERLOOP + this.triggerId); if (!this.useCastId) { this.triggerId++; } @@ -56,6 +55,9 @@ public void onHit(CSimulation simulation, CUnit attacker, AbilityTarget target, @Override public int getPriority(CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack attack) { + if (priority == null) { + return 0; + } localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.triggerId, attacker); localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.triggerId, target); localStore.put(ABLocalStoreKeys.THEATTACK + this.triggerId, attack); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java index dc70a3cc4..1edd5b2dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java @@ -4,15 +4,13 @@ import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackEffectListenerStacking; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABAttackPreDamageListener implements CUnitAttackPreDamageListener { @@ -34,22 +32,17 @@ public ABAttackPreDamageListener(Map localStore, List } @Override - public CUnitAttackEffectListenerStacking onAttack(CSimulation simulation, CUnit attacker, AbilityTarget target, - AbilityPointTarget attackImpactLocation, CUnitAttack attack, CUnitAttackSettings settings, - CUnitAttackPreDamageListenerDamageModResult damageResult) { - localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + triggerId, attacker); + public void onAttack(CSimulation simulation, AbilityTarget target, AbilityPointTarget attackImpactLocation, + CUnitAttack attack, CUnitAttackSettings settings, CDamageCalculation calc) { + localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + triggerId, calc.getSource()); localStore.put(ABLocalStoreKeys.ATTACKTARGET + triggerId, target); localStore.put(ABLocalStoreKeys.ATTACKIMPACTLOCATION + triggerId, attackImpactLocation); localStore.put(ABLocalStoreKeys.THEATTACK + triggerId, attack); localStore.put(ABLocalStoreKeys.ATTACKSETTINGS + triggerId, settings); - localStore.put(ABLocalStoreKeys.BASEDAMAGEDEALT + triggerId, damageResult.getBaseDamage()); - localStore.put(ABLocalStoreKeys.BONUSDAMAGEDEALT + triggerId, damageResult.getBonusDamage()); - localStore.put(ABLocalStoreKeys.PREDAMAGERESULT + triggerId, damageResult); - CUnitAttackEffectListenerStacking stacking = new CUnitAttackEffectListenerStacking(); - localStore.put(ABLocalStoreKeys.PREDAMAGESTACKING + triggerId, stacking); + localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, calc); if (actions != null) { for (ABAction action : actions) { - action.runAction(simulation, attacker, localStore, triggerId); + action.runAction(simulation, calc.getSource(), localStore, triggerId); } } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + triggerId); @@ -57,14 +50,10 @@ public CUnitAttackEffectListenerStacking onAttack(CSimulation simulation, CUnit localStore.remove(ABLocalStoreKeys.ATTACKIMPACTLOCATION + triggerId); localStore.remove(ABLocalStoreKeys.THEATTACK + triggerId); localStore.remove(ABLocalStoreKeys.ATTACKSETTINGS + triggerId); - localStore.remove(ABLocalStoreKeys.BASEDAMAGEDEALT + triggerId); - localStore.remove(ABLocalStoreKeys.BONUSDAMAGEDEALT + triggerId); - localStore.remove(ABLocalStoreKeys.PREDAMAGERESULT + triggerId); - localStore.remove(ABLocalStoreKeys.PREDAMAGESTACKING + triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); if (!this.useCastId) { this.triggerId++; } - return stacking; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java index 390944153..e3c4390a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java @@ -5,40 +5,52 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABDamageTakenListener implements CUnitAttackDamageTakenListener { private Map localStore; + private ABIntegerCallback priority; private List actions; private int triggerId = 0; private boolean useCastId; - public ABDamageTakenListener(Map localStore, List actions, int castId, boolean useCastId) { + public ABDamageTakenListener(Map localStore, + ABIntegerCallback priority, List actions, int castId, boolean useCastId) { this.localStore = localStore; + this.priority = priority; this.actions = actions; this.useCastId = useCastId; if (useCastId) { this.triggerId = castId; } } + + @Override + public int getPriority(CSimulation simulation, CUnit target, CDamageCalculation damage) { + if (priority == null) { + return 0; + } + localStore.put(ABLocalStoreKeys.DAMAGINGUNIT+triggerId, damage.getSource()); + localStore.put(ABLocalStoreKeys.DAMAGEDUNIT+triggerId, target); + localStore.put(ABLocalStoreKeys.DAMAGECALC+triggerId, damage); + int prio = this.priority.callback(simulation, target, this.localStore, this.triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGECALC+triggerId); + return prio; + } @Override - public void onDamage(CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, - CDamageType damageType, float damage, float bonusDamage, float trueDamage) { - localStore.put(ABLocalStoreKeys.DAMAGINGUNIT+triggerId, attacker); + public void onDamage(CSimulation simulation, CUnit target, CDamageCalculation damage) { + localStore.put(ABLocalStoreKeys.DAMAGINGUNIT+triggerId, damage.getSource()); localStore.put(ABLocalStoreKeys.DAMAGEDUNIT+triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, flags.isAttack()); - localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, flags.isRanged()); - localStore.put(ABLocalStoreKeys.DAMAGETYPE+triggerId, damageType); - localStore.put(ABLocalStoreKeys.BASEDAMAGEDEALT+triggerId, damage); - localStore.put(ABLocalStoreKeys.BONUSDAMAGEDEALT+triggerId, bonusDamage); - localStore.put(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId, trueDamage); + localStore.put(ABLocalStoreKeys.DAMAGECALC+triggerId, damage); if (actions != null) { for (ABAction action : actions) { action.runAction(simulation, target, localStore, triggerId); @@ -46,12 +58,7 @@ public void onDamage(CSimulation simulation, CUnit attacker, CUnit target, final } localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT+triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEISATTACK+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEISRANGED+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGETYPE+triggerId); - localStore.remove(ABLocalStoreKeys.BASEDAMAGEDEALT+triggerId); - localStore.remove(ABLocalStoreKeys.BONUSDAMAGEDEALT+triggerId); - localStore.remove(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGECALC+triggerId); if (!this.useCastId) { this.triggerId++; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java index cc07ea160..e9508cf76 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java @@ -5,62 +5,63 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListenerDamageModResult; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABDamageTakenModificationListener implements CUnitAttackDamageTakenModificationListener { private Map localStore; + private ABIntegerCallback priority; private List actions; - + private int triggerId = 0; private boolean useCastId; - - public ABDamageTakenModificationListener(Map localStore, List actions, int castId, boolean useCastId) { + + public ABDamageTakenModificationListener(Map localStore, ABIntegerCallback priority, + List actions, int castId, boolean useCastId) { this.localStore = localStore; + this.priority = priority; this.actions = actions; this.useCastId = useCastId; if (useCastId) { this.triggerId = castId; } } - + + @Override + public int getPriority(CSimulation simulation, CUnit target, CDamageCalculation damage) { + if (priority == null) { + return 0; + } + localStore.put(ABLocalStoreKeys.DAMAGINGUNIT + triggerId, damage.getSource()); + localStore.put(ABLocalStoreKeys.DAMAGEDUNIT + triggerId, target); + localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); + int prio = this.priority.callback(simulation, target, this.localStore, this.triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT + triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); + return prio; + } + @Override - public CUnitAttackDamageTakenModificationListenerDamageModResult onDamage(CSimulation simulation, CUnit attacker, - CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, - CUnitAttackDamageTakenModificationListenerDamageModResult previousDamage) { - localStore.put(ABLocalStoreKeys.DAMAGINGUNIT+triggerId, attacker); - localStore.put(ABLocalStoreKeys.DAMAGEDUNIT+triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, flags.isAttack()); - localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, flags.isRanged()); - localStore.put(ABLocalStoreKeys.ATTACKTYPE+triggerId, attackType); - localStore.put(ABLocalStoreKeys.DAMAGETYPE+triggerId, damageType); - localStore.put(ABLocalStoreKeys.BASEDAMAGEDEALT+triggerId, previousDamage.getBaseDamage()); - localStore.put(ABLocalStoreKeys.BONUSDAMAGEDEALT+triggerId, previousDamage.getBonusDamage()); - localStore.put(ABLocalStoreKeys.DAMAGEMODRESULT+triggerId, previousDamage); + public void onDamage(CSimulation simulation, CUnit target, CDamageCalculation damage) { + localStore.put(ABLocalStoreKeys.DAMAGINGUNIT + triggerId, damage.getSource()); + localStore.put(ABLocalStoreKeys.DAMAGEDUNIT + triggerId, target); + localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); if (actions != null) { for (ABAction action : actions) { action.runAction(simulation, target, localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEISATTACK+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEISRANGED+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKTYPE+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGETYPE+triggerId); - localStore.remove(ABLocalStoreKeys.BASEDAMAGEDEALT+triggerId); - localStore.remove(ABLocalStoreKeys.BONUSDAMAGEDEALT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEMODRESULT+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT + triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); if (!this.useCastId) { this.triggerId++; } - return previousDamage; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABFinalDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABFinalDamageTakenModificationListener.java deleted file mode 100644 index 318b73652..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABFinalDamageTakenModificationListener.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; - -import java.util.List; -import java.util.Map; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackFinalDamageTakenModificationListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; - -public class ABFinalDamageTakenModificationListener implements CUnitAttackFinalDamageTakenModificationListener { - - private Map localStore; - private List actions; - - private int triggerId = 0; - private boolean useCastId; - - public ABFinalDamageTakenModificationListener(Map localStore, List actions, int castId, boolean useCastId) { - this.localStore = localStore; - this.actions = actions; - this.useCastId = useCastId; - if (useCastId) { - this.triggerId = castId; - } - } - - @Override - public float onDamage(CSimulation simulation, CUnit attacker, - CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, - float previousDamage) { - localStore.put(ABLocalStoreKeys.DAMAGINGUNIT+triggerId, attacker); - localStore.put(ABLocalStoreKeys.DAMAGEDUNIT+triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGEISATTACK+triggerId, flags.isAttack()); - localStore.put(ABLocalStoreKeys.DAMAGEISRANGED+triggerId, flags.isRanged()); - localStore.put(ABLocalStoreKeys.ATTACKTYPE+triggerId, attackType); - localStore.put(ABLocalStoreKeys.DAMAGETYPE+triggerId, damageType); - localStore.put(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId, previousDamage); - localStore.put(ABLocalStoreKeys.DAMAGEMODRESULT+triggerId, previousDamage); - if (actions != null) { - for (ABAction action : actions) { - action.runAction(simulation, target, localStore, triggerId); - } - } - float finalDamage = (float) localStore.get(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEISATTACK+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEISRANGED+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKTYPE+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGETYPE+triggerId); - localStore.remove(ABLocalStoreKeys.TOTALDAMAGEDEALT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEMODRESULT+triggerId); - if (!this.useCastId) { - this.triggerId++; - } - return finalDamage; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackDamageFlags.java index e66aa0ae2..1fa5e0571 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackDamageFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackDamageFlags.java @@ -6,6 +6,15 @@ public CAttackDamageFlags(boolean ranged) { super(); this.setRanged(ranged); } + + private CAttackDamageFlags(CAttackDamageFlags base) { + super(base); + } + + @Override + public CDamageFlags copy() { + return new CAttackDamageFlags(this); + } @Override public boolean isAttack() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java index 4c4ddddf1..5c3d87011 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBaseDamageFlags.java @@ -14,6 +14,10 @@ public abstract class CBaseDamageFlags implements CDamageFlags { public CBaseDamageFlags() { } + protected CBaseDamageFlags(CBaseDamageFlags base) { + this.flags = base.flags; + } + @Override public boolean isAttack() { return (this.flags & ATTACK) != 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBonusDamage.java new file mode 100644 index 000000000..bf3507348 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBonusDamage.java @@ -0,0 +1,93 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; + +public class CBonusDamage { + protected final static int PREVENTMULTIPLY = 0b1; + private float amount; + private CDamageType damageType; + private CDamageFlags damageFlags; + private int internalFlags = 0b0; + + public float computeRawDamage(float multiplier) { + return this.amount * (this.isPreventMultiply() ? 1 : multiplier); + } + + public float computeFinalDamage(CSimulation simulation, CUnit unit, CAttackType attackType, float multiplier, float currentDamage) { + if (isImmuneToDamage(simulation, unit, attackType) + || (unit.isInvulnerable() && !this.isPassInvulnerable(simulation, unit))) { + return 0; + } + float trueDamage = CDamageCalculation.calculateDamageByArmor(simulation, unit, attackType, damageType, amount, + damageFlags) * (this.isPreventMultiply() ? 1 : multiplier); + if (damageFlags.isNonlethal() && trueDamage > 0 && (trueDamage + currentDamage) > unit.getLife() - 1) { + trueDamage = Math.max(unit.getLife() - 1 - currentDamage, 0); + } + return trueDamage; + } + + public boolean isImmuneToDamage(CSimulation simulation, CUnit unit, CAttackType attackType) { + if (damageFlags != null && damageFlags.isOnlyDamageSummons() && !unit.isUnitType(CUnitTypeJass.SUMMONED)) { + return true; + } + if (simulation.getGameplayConstants().isMagicImmuneResistsDamage()) { + if (attackType.isMagic() || damageType.isMagic()) { + if (unit.isMagicImmune() || (unit.isLimitedMagicImmune() && !damageFlags.isPassLimitedMagicImmune())) { + return true; + } + } else if (attackType.isPhysical() || damageType.isPhysical()) { + if (unit.isUnitType(CUnitTypeJass.ETHEREAL)) { + return true; + } + } + } else { + if (damageType.isOldMagic() && (unit.isMagicImmune() + || (unit.isLimitedMagicImmune() && !damageFlags.isPassLimitedMagicImmune()))) { + return true; + } + } + return false; + } + + public boolean isPassInvulnerable(CSimulation simulation, CUnit unit) { + return (this.damageFlags != null + && (this.damageFlags.isIgnoreInvulnerable() || (this.damageFlags.isOnlyDamageSummons() + && simulation.getGameplayConstants().isInvulnerableSummonsTakeDispelDamage() + && unit.isUnitType(CUnitTypeJass.SUMMONED)))); + } + + public float getAmount() { + return amount; + } + + public void setAmount(float amount) { + this.amount = amount; + } + + public CDamageType getDamageType() { + return damageType; + } + + public void setDamageType(CDamageType damageType) { + this.damageType = damageType; + } + + public CDamageFlags getDamageFlags() { + return damageFlags; + } + + public void setDamageFlags(CDamageFlags damageFlags) { + this.damageFlags = damageFlags; + } + + public void setPreventMultiply(boolean preventMultiply) { + this.internalFlags = preventMultiply ? this.internalFlags | PREVENTMULTIPLY : this.internalFlags & ~PREVENTMULTIPLY; + } + + public boolean isPreventMultiply() { + return ((this.internalFlags & PREVENTMULTIPLY) != 0); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java new file mode 100644 index 000000000..3ddc06169 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java @@ -0,0 +1,361 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat; + +import java.util.LinkedList; +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; + +public class CDamageCalculation { + public static float calculateDamageByArmor(CSimulation simulation, CUnit unit, CAttackType attackType, + CDamageType damageType, float amount, CDamageFlags damageFlags) { + float trueDamage = 0; + final float damageRatioFromArmorClass = simulation.getGameplayConstants().getDamageRatioAgainst(attackType, + (unit.isBuilding() && unit.isConstructing()) ? CDefenseType.NORMAL : unit.getDefenseType()); + final float damageRatioFromDefense; + final float defense = unit.getDefense(); + if (damageType != CDamageType.NORMAL || (unit.isBuilding() && unit.isConstructing())) { + damageRatioFromDefense = 1.0f; + } else if (defense >= 0) { + damageRatioFromDefense = 1f - ((defense * simulation.getGameplayConstants().getDefenseArmor()) + / (1 + (simulation.getGameplayConstants().getDefenseArmor() * defense))); + } else { + damageRatioFromDefense = 2f + - (float) StrictMath.pow(1f - simulation.getGameplayConstants().getDefenseArmor(), -defense); + } + trueDamage = damageRatioFromArmorClass * damageRatioFromDefense * amount; + if (damageFlags.isNonlethal() && trueDamage > 0 && trueDamage > unit.getLife() - 1) { + trueDamage = unit.getLife() - 1; + } + return trueDamage; + } + + private CAttackType attackType; + private float primaryAmount; + private CDamageType primaryDamageType; + private CDamageFlags primaryDamageFlags; + private String weaponSoundType; + + private LinkedList bonusDamages; + + private CUnit source; + + private float damageMultiplier; + private boolean miss; + + private boolean unlockBonus; + private boolean unlockMultiplier; + + private boolean splash; + private float splashFactor; + + private boolean endLoop = false; + private boolean endLevel = false; + + public CDamageCalculation(CUnit source, float damage, CAttackType attackType, CDamageType damageType, + CDamageFlags flags, String weaponSoundType) { + this.source = source; + this.primaryAmount = damage; + this.attackType = attackType; + this.primaryDamageType = damageType; + this.primaryDamageFlags = flags; + this.weaponSoundType = weaponSoundType; + + this.bonusDamages = null; + this.damageMultiplier = 1; + this.miss = false; + this.unlockBonus = true; + this.unlockMultiplier = true; + } + + public float computeFinalDamage(CSimulation simulation, CUnit unit) { + float trueDamage = 0; + if (!isImmuneToPrimaryDamage(simulation, unit) + && (!unit.isInvulnerable() || this.isPassInvulnerable(simulation, unit))) { + trueDamage = calculateDamageByArmor(simulation, unit, attackType, primaryDamageType, primaryAmount, + primaryDamageFlags); + } + + if (bonusDamages != null) { + for (CBonusDamage bonus : bonusDamages) { + trueDamage += bonus.computeFinalDamage(simulation, unit, attackType, this.damageMultiplier, trueDamage); + } + } + + return trueDamage * (this.splash ? this.splashFactor : 1); + } + + public float computeRawPrimaryDamage() { + return this.primaryAmount * this.damageMultiplier * (this.splash ? this.splashFactor : 1); + } + + public float computeRawBonusDamage() { + float trueDamage = 0; + + if (bonusDamages != null) { + for (CBonusDamage bonus : bonusDamages) { + trueDamage += bonus.computeRawDamage(this.damageMultiplier); + } + } + + return trueDamage * (this.splash ? this.splashFactor : 1); + } + + public float computeRawTotalDamage() { + return this.computeRawPrimaryDamage() + this.computeRawBonusDamage(); + } + + public boolean isImmuneToPrimaryDamage(CSimulation simulation, CUnit unit) { + if (primaryDamageFlags != null && primaryDamageFlags.isOnlyDamageSummons() + && !unit.isUnitType(CUnitTypeJass.SUMMONED)) { + return true; + } + if (simulation.getGameplayConstants().isMagicImmuneResistsDamage()) { + if (attackType.isMagic() || primaryDamageType.isMagic()) { + if (unit.isMagicImmune() + || (unit.isLimitedMagicImmune() && !primaryDamageFlags.isPassLimitedMagicImmune())) { + return true; + } + } else if (attackType.isPhysical() || primaryDamageType.isPhysical()) { + if (unit.isUnitType(CUnitTypeJass.ETHEREAL)) { + return true; + } + } + } else { + if (primaryDamageType.isOldMagic() && (unit.isMagicImmune() + || (unit.isLimitedMagicImmune() && !primaryDamageFlags.isPassLimitedMagicImmune()))) { + return true; + } + } + return false; + } + + public boolean isImmuneToDamage(CSimulation simulation, CUnit unit) { + if (this.isImmuneToPrimaryDamage(simulation, unit)) { + if (bonusDamages != null) { + for (CBonusDamage bonus : bonusDamages) { + if (!bonus.isImmuneToDamage(simulation, unit, this.attackType)) { + return false; + } + } + } + return true; + } + return false; + } + + public boolean isExplode() { + if (this.primaryDamageFlags.isExplode()) { + return true; + } + if (this.bonusDamages != null) { + for (CBonusDamage bonus : this.bonusDamages) { + if (bonus.getDamageFlags().isExplode()) { + return true; + } + } + } + return false; + } + + public boolean isPassInvulnerable(CSimulation simulation, CUnit unit) { + if (this.primaryDamageFlags != null + && (this.primaryDamageFlags.isIgnoreInvulnerable() || (this.primaryDamageFlags.isOnlyDamageSummons() + && simulation.getGameplayConstants().isInvulnerableSummonsTakeDispelDamage() + && unit.isUnitType(CUnitTypeJass.SUMMONED)))) { + return true; + } + if (this.bonusDamages != null) { + for (CBonusDamage bonus : this.bonusDamages) { + if (bonus.isPassInvulnerable(simulation, unit)) { + return true; + } + } + } + return false; + } + + public CAttackType getAttackType() { + return attackType; + } + + public void setAttackType(CAttackType attackType) { + this.attackType = attackType; + } + + public float getPrimaryAmount() { + return primaryAmount; + } + + public void setPrimaryAmount(float primaryAmount) { + this.primaryAmount = primaryAmount; + } + + public CDamageType getPrimaryDamageType() { + return primaryDamageType; + } + + public void setPrimaryDamageType(CDamageType primaryDamageType) { + this.primaryDamageType = primaryDamageType; + } + + public CDamageFlags getPrimaryDamageFlags() { + return primaryDamageFlags; + } + + public void setPrimaryDamageFlags(CDamageFlags primaryDamageFlags) { + this.primaryDamageFlags = primaryDamageFlags; + } + + public String getWeaponSoundType() { + return weaponSoundType; + } + + public void setWeaponSoundType(String weaponSoundType) { + this.weaponSoundType = weaponSoundType; + } + + public List getBonusDamages() { + return bonusDamages; + } + + public void setBonusDamages(LinkedList bonusDamages) { + this.bonusDamages = bonusDamages; + } + + public CUnit getSource() { + return source; + } + + public void setSource(CUnit source) { + this.source = source; + } + + public float getDamageMultiplier() { + return damageMultiplier; + } + + public void setDamageMultiplier(float damageMultiplier) { + if (unlockMultiplier) { + this.damageMultiplier = damageMultiplier; + } + } + + public void addDamageMultiplier(float damageMultiplier) { + if (unlockMultiplier) { + this.damageMultiplier *= damageMultiplier; + } + } + + public void lockBonus() { + unlockBonus = false; + unlockMultiplier = false; + } + + public void lock() { + unlockBonus = false; + unlockMultiplier = false; + } + + public boolean isMiss() { + return miss; + } + + public void setMiss(boolean miss) { + this.miss = miss; + } + + public boolean isUnlockBonus() { + return unlockBonus; + } + + public void setUnlockBonus(boolean unlockBonus) { + this.unlockBonus = unlockBonus; + } + + public boolean isUnlockMultiplier() { + return unlockMultiplier; + } + + public void setUnlockMultiplier(boolean unlockMultiplier) { + this.unlockMultiplier = unlockMultiplier; + } + + public void startSplash(float splashFactor) { + this.splashFactor = splashFactor; + this.splash = true; + } + + public void endSplash() { + this.splash = false; + } + + // Loop controls + public void startLoop(int i) { + this.endLevel = false; + } + + public void preventOtherModificationsWithSamePriority() { + this.endLevel = true; + } + + public void preventOtherModificationsOfOtherPriorities() { + this.endLoop = true; + } + + public void preventAllOtherModifications() { + this.endLevel = true; + this.endLoop = true; + } + + public boolean isSkipCurrentLevel() { + return this.endLevel; + } + + public boolean isEndLoop() { + return this.endLoop; + } + + public void resetLoop() { + this.endLevel = false; + this.endLoop = false; + } + + public void subtractTotalDamageDealt(float reduction, float minimum) { + float primMinus = this.primaryAmount - reduction; + if (primMinus > minimum) { + this.primaryAmount = primMinus; + } else { + if (this.bonusDamages != null) { + float remRed = reduction - this.primaryAmount; + for (CBonusDamage bonus : this.bonusDamages) { + + } + } else { + this.primaryAmount = Math.max(minimum, primMinus); + } + } + } + + public CBonusDamage addBonusDamage(float amount, CDamageType damageType, CDamageFlags flags) { + if (bonusDamages == null) { + this.bonusDamages = new LinkedList<>(); + } + CBonusDamage nb = new CBonusDamage(); + nb.setAmount(amount); + if (damageType == null) { + nb.setDamageType(primaryDamageType); + } else { + nb.setDamageType(damageType); + } + if (flags == null) { + nb.setDamageFlags(primaryDamageFlags.copy()); + } else { + nb.setDamageFlags(flags); + } + this.bonusDamages.add(nb); + return nb; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java index f43ec9ff6..83422485b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageFlags.java @@ -30,4 +30,6 @@ public interface CDamageFlags { void setPassLimitedMagicImmune(boolean limitedMagicImmune); + CDamageFlags copy(); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CGenericDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CGenericDamageFlags.java index 11ae03bb6..17c4a00c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CGenericDamageFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CGenericDamageFlags.java @@ -7,5 +7,14 @@ public CGenericDamageFlags(final boolean attack, final boolean ranged) { this.setAttack(attack); this.setRanged(ranged); } + + private CGenericDamageFlags(CGenericDamageFlags base) { + super(base); + } + + @Override + public CDamageFlags copy() { + return new CGenericDamageFlags(this); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CSpellDamageFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CSpellDamageFlags.java index 3a0eacfbb..5ab1e77e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CSpellDamageFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CSpellDamageFlags.java @@ -6,6 +6,15 @@ public CSpellDamageFlags() { super(); this.setRanged(true); } + + private CSpellDamageFlags(CSpellDamageFlags base) { + super(base); + } + + @Override + public CDamageFlags copy() { + return new CSpellDamageFlags(this); + } @Override public boolean isAttack() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java index 62f7f7137..56018dd61 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttack.java @@ -11,15 +11,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackEffectListenerStacking; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPostDamageListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerPriority; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; @@ -37,7 +36,6 @@ * these attacks as best as possible. */ public abstract class CUnitAttack { - private static CUnitPriorityLoopData postListenerLoop = new CUnitPriorityLoopData(); private float animationBackswingPointBase; private float animationBackswingPoint; private float animationDamagePoint; @@ -409,6 +407,8 @@ public int getTotalTemporaryDamageBonus() { public float getTotalAttackSpeedPercent() { return this.totalAttackSpeedPercent; } + + public abstract CDamageFlags getBaseAttackDamageFlags(); public abstract void launch(CSimulation simulation, CUnit unit, AbilityTarget target, float damage, CUnitAttackListener attackListener); @@ -424,97 +424,103 @@ public int roll(final Random seededRandom) { return damage + getTotalTemporaryDamageBonus(); } - public CUnitAttackPreDamageListenerDamageModResult runPreDamageListeners(final CSimulation simulation, - final CUnit attacker, final AbilityTarget target, final AbilityPointTarget attackImpactLocation, - final float damage, final CUnitAttackSettings settings) { - final CUnitAttackPreDamageListenerDamageModResult result = new CUnitAttackPreDamageListenerDamageModResult( - damage); - CUnitAttackEffectListenerStacking allowContinue = new CUnitAttackEffectListenerStacking(); + public CDamageCalculation runPreDamageListeners(final CSimulation simulation, final CUnit attacker, + final AbilityTarget target, final AbilityPointTarget attackImpactLocation, final float damage, + final CUnitAttackSettings settings) { + final CDamageCalculation calc = new CDamageCalculation(attacker, damage, getAttackType(), + getWeaponType().getDamageType(), this.getBaseAttackDamageFlags(), getWeaponSound()); + calc.resetLoop(); for (final CUnitAttackPreDamageListenerPriority priority : CUnitAttackPreDamageListenerPriority.values()) { - if (allowContinue.isAllowStacking()) { + calc.startLoop(priority.getPriority()); + if (!calc.isEndLoop()) { if (priority == CUnitAttackPreDamageListenerPriority.ATTACKREPLACEMENT && settings != null && settings.getPreDamageListeners() != null) { for (CUnitAttackPreDamageListener listener : settings.getPreDamageListeners()) { - if (allowContinue.isAllowSamePriorityStacking()) { - allowContinue = listener.onAttack(simulation, attacker, target, attackImpactLocation, this, - settings, result); + if (!calc.isSkipCurrentLevel()) { + listener.onAttack(simulation, target, attackImpactLocation, this, settings, + calc); } } } else { for (CUnitAttackPreDamageListener listener : attacker.getPreDamageListenersForPriority(priority)) { - if (allowContinue.isAllowSamePriorityStacking()) { - allowContinue = listener.onAttack(simulation, attacker, target, attackImpactLocation, this, - settings, result); + if (!calc.isSkipCurrentLevel()) { + listener.onAttack(simulation, target, attackImpactLocation, this, settings, + calc); } } } } - allowContinue.setAllowSamePriorityStacking(true); } - if (result.isMiss()) { + if (calc.isMiss()) { if (this.weaponType == CWeaponType.ARTILLERY || this.weaponType == CWeaponType.ALINE) { - result.setDamageMultiplier(simulation.getGameplayConstants().getMissDamageReduction()); - result.setBonusDamage(result.getBonusDamage() * simulation.getGameplayConstants().getMissDamageReduction()); - } else if (this.weaponType == CWeaponType.MSPLASH) { - result.setDamageMultiplier(simulation.getGameplayConstants().getMissDamageReduction()); - result.setBonusDamage(result.getBonusDamage() * simulation.getGameplayConstants().getMissDamageReduction()); - simulation.spawnTextTag(attacker, attacker.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, "miss"); + // no miss text for artillery } else { - result.setBaseDamage(0); - result.setBonusDamage(0); - result.setDamageMultiplier(0); - simulation.spawnTextTag(attacker, attacker.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, "miss"); // TODO - // Technically - // cheating - // here + simulation.spawnTextTag(attacker, attacker.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, "miss"); + // TODO Technically cheating here, using Critical Strike color for miss + // For some reason, the actual miss doesn't seem to load the values properly } } - if (!result.isMiss() && (result.getDamageMultiplier() != 1) && (result.getDamageMultiplier() != 0)) { - simulation.spawnTextTag(attacker, attacker.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, - Math.round(result.computeFinalDamage())); - } else if (result.getBonusDamage() != 0) { - simulation.spawnTextTag(attacker, attacker.getPlayerIndex(), TextTagConfigType.BASH, - Math.round(result.getBonusDamage())); + if (!calc.isMiss()) { + if ((calc.getDamageMultiplier() != 1) && (calc.getDamageMultiplier() != 0) + && calc.computeRawTotalDamage() != 0) { + simulation.spawnTextTag(attacker, attacker.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, + Math.round(calc.computeRawTotalDamage())); + } else if (calc.computeRawBonusDamage() != 0) { + simulation.spawnTextTag(attacker, attacker.getPlayerIndex(), TextTagConfigType.BASH, + Math.round(calc.computeRawBonusDamage())); + } } - return result; + return calc; } - public void runPostDamageListeners(final CSimulation simulation, final CUnit attacker, final AbilityTarget target, - final float actualDamage, final CUnitAttackSettings settings) { + public void runPostDamageListeners(final CSimulation simulation, final AbilityTarget target, + final CDamageCalculation damage, final CUnitAttackSettings settings) { + CUnit attacker = damage.getSource(); int maxPriority = 0; + int priorityMask = 0; int i = 0; - postListenerLoop.reset(); + boolean firstLoop = true; + damage.resetLoop(); while (i <= maxPriority) { - postListenerLoop.startLoop(i); - - if (settings.getPostDamageListeners() != null) { - for (int j = settings.getPostDamageListeners().size() - 1; j >= 0; j--) { - CUnitAttackPostDamageListener listener = settings.getPostDamageListeners().get(j); + if (i == 0 || (priorityMask & (1 << (i < 31 ? i : 31))) != 0) { + damage.startLoop(i); + + if (settings.getPostDamageListeners() != null) { + for (int j = settings.getPostDamageListeners().size() - 1; j >= 0; j--) { + CUnitAttackPostDamageListener listener = settings.getPostDamageListeners().get(j); + int prio = listener.getPriority(simulation, attacker, target, this); + if (firstLoop) { + if (prio > maxPriority) { + maxPriority = prio; + } + priorityMask |= 1 << (prio < 31 ? prio : 31); + } + if (prio == i && !damage.isSkipCurrentLevel()) { + listener.onHit(simulation, target, this, damage); + } + } + } + for (int j = attacker.getPostDamageListeners().size() - 1; j >= 0; j--) { + CUnitAttackPostDamageListener listener = attacker.getPostDamageListeners().get(j); int prio = listener.getPriority(simulation, attacker, target, this); - if (prio > maxPriority) { - maxPriority = prio; + if (firstLoop) { + if (prio > maxPriority) { + maxPriority = prio; + } + priorityMask |= 1 << (prio < 31 ? prio : 31); } - if (prio == i && !postListenerLoop.skipCurrentLevel()) { - listener.onHit(simulation, attacker, target, this, actualDamage, postListenerLoop); + if (prio == i && !damage.isSkipCurrentLevel()) { + listener.onHit(simulation, target, this, damage); } } - } - for (int j = attacker.getPostDamageListeners().size() - 1; j >= 0; j--) { - CUnitAttackPostDamageListener listener = attacker.getPostDamageListeners().get(j); - int prio = listener.getPriority(simulation, attacker, target, this); - if (prio > maxPriority) { - maxPriority = prio; - } - if (prio == i && !postListenerLoop.skipCurrentLevel()) { - listener.onHit(simulation, attacker, target, this, actualDamage, postListenerLoop); + if (damage.isEndLoop()) { + break; } } - if (postListenerLoop.end()) { - break; - } i++; + firstLoop = false; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java index c1c4e8441..df5a9bde2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackInstant.java @@ -11,9 +11,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectileInstant; @@ -48,6 +49,10 @@ public void setProjectileArt(final String projectileArt) { this.projectileArt = projectileArt; } + public CDamageFlags getBaseAttackDamageFlags() { + return ATTACK_FLAGS; + } + @Override public void launch(final CSimulation simulation, final CUnit unit, final AbilityTarget target, final float damage, final CUnitAttackListener attackListener) { @@ -71,14 +76,12 @@ public void doDamage(final CSimulation cSimulation, final CUnit source, final Ab final CUnitAttackSettings settings) { final CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { - CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(cSimulation, source, target, + CDamageCalculation modDamage = runPreDamageListeners(cSimulation, source, target, target.visit(AbilityTargetVisitor.POINT) != null ? target.visit(AbilityTargetVisitor.POINT) : new AbilityPointTarget(x, y), damage, settings); - float damageDealt = widget.damage(cSimulation, source, ATTACK_FLAGS, getAttackType(), - getWeaponType().getDamageType(), getWeaponSound(), modDamage.computeFinalDamage(), - modDamage.getBonusDamage()); - runPostDamageListeners(cSimulation, source, target, damageDealt, settings); + widget.damage(cSimulation, modDamage); + runPostDamageListeners(cSimulation, target, modDamage, settings); attackListener.onHit(target, damage); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java index 8922e6e55..db68a7788 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissile.java @@ -11,10 +11,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class CUnitAttackMissile extends CUnitAttack { @@ -83,6 +83,10 @@ public void setProjectileSpeed(final int projectileSpeed) { this.projectileSpeed = projectileSpeed; } + public CDamageFlags getBaseAttackDamageFlags() { + return ATTACK_FLAGS; + } + @Override public void launch(final CSimulation simulation, final CUnit unit, final AbilityTarget target, final float damage, final CUnitAttackListener attackListener) { @@ -96,14 +100,12 @@ public void doDamage(final CSimulation cSimulation, final CUnit source, final Ab final CUnitAttackListener attackListener, final CUnitAttackSettings settings) { final CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { - CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(cSimulation, source, target, + CDamageCalculation modDamage = runPreDamageListeners(cSimulation, source, target, target.visit(AbilityTargetVisitor.POINT) != null ? target.visit(AbilityTargetVisitor.POINT) : new AbilityPointTarget(x, y), damage, settings); - float damageDealt = widget.damage(cSimulation, source, damageFlags, getAttackType(), - getWeaponType().getDamageType(), getWeaponSound(), modDamage.computeFinalDamage(), - modDamage.getBonusDamage()); - runPostDamageListeners(cSimulation, source, target, damageDealt, settings); + widget.damage(cSimulation, modDamage); + runPostDamageListeners(cSimulation, target, modDamage, settings); attackListener.onHit(target, damage); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java index fd7c5f329..a7d7da577 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackMissileSplash.java @@ -15,9 +15,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class CUnitAttackMissileSplash extends CUnitAttackMissile { @@ -147,8 +147,7 @@ private static final class SplashDamageConsumer implements CUnitEnumFunction, CD private AbilityTarget target; private float x; private float y; - private float damage; - private float bonusDamage; + private CDamageCalculation damage; private CUnitAttackListener attackListener; private boolean hitTarget; @@ -162,7 +161,6 @@ public void doDamage(final CSimulation simulation, final CUnit source, final Abi this.settings = settings; this.x = x; this.y = y; - this.damage = damage; this.attackListener = attackListener; this.hitTarget = false; final float doubleMaxArea = Math.max( @@ -170,14 +168,12 @@ public void doDamage(final CSimulation simulation, final CUnit source, final Abi settings.getAreaOfEffectSmallDamage()) * 2; final float maxArea = doubleMaxArea / 2; this.rect.set(x - maxArea, y - maxArea, doubleMaxArea, doubleMaxArea); - CUnitAttackPreDamageListenerDamageModResult result = this.attack.runPreDamageListeners(simulation, + this.damage = this.attack.runPreDamageListeners(simulation, this.source, this.target, this.target.visit(AbilityTargetVisitor.POINT) != null ? this.target.visit(AbilityTargetVisitor.POINT) : new AbilityPointTarget(x, y), - this.damage, settings); - this.damage = result.computeFinalDamage(); - this.bonusDamage = result.getBonusDamage(); + damage, settings); simulation.getWorldCollision().enumUnitsInRect(this.rect, this); simulation.getWorldCollision().enumDestructablesInRect(this.rect, this); } @@ -186,10 +182,10 @@ public void doDamage(final CSimulation simulation, final CUnit source, final Abi public boolean call(final CUnit enumUnit) { if (enumUnit != this.source && enumUnit.canBeTargetedBy(this.simulation, this.source, this.attack.areaOfEffectTargets)) { - float damageDealt = damageTarget(enumUnit); + damageTarget(enumUnit); if (enumUnit == this.target) { this.hitTarget = true; - this.attack.runPostDamageListeners(simulation, this.source, target, damageDealt, settings); + this.attack.runPostDamageListeners(simulation, target, this.damage, settings); } } return false; @@ -198,37 +194,32 @@ public boolean call(final CUnit enumUnit) { @Override public boolean call(final CDestructable enumDestructable) { if (enumDestructable.canBeTargetedBy(this.simulation, this.source, this.attack.areaOfEffectTargets)) { - float damageDealt = damageTarget(enumDestructable); + damageTarget(enumDestructable); if (enumDestructable == this.target) { this.hitTarget = true; - this.attack.runPostDamageListeners(simulation, this.source, target, damageDealt, settings); + this.attack.runPostDamageListeners(simulation, target, this.damage, settings); } } return false; } - public float damageTarget(final CWidget enumUnit) { - float damageDealt = this.damage; + public void damageTarget(final CWidget enumUnit) { + float damageDealt = 0; final double distance = enumUnit.distance(this.x, this.y); if (distance <= (this.settings.getAreaOfEffectFullDamage())) { - damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, - this.attack.getAttackType(), this.attack.getWeaponType().getDamageType(), - this.attack.getWeaponSound(), this.damage, this.bonusDamage); - this.attackListener.onHit(enumUnit, this.damage + this.bonusDamage); + damageDealt = enumUnit.damage(this.simulation, this.damage); + this.attackListener.onHit(enumUnit, damageDealt); } else if (distance <= (this.settings.getAreaOfEffectMediumDamage())) { - damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, - this.attack.getAttackType(), this.attack.getWeaponType().getDamageType(), - this.attack.getWeaponSound(), this.damage * this.settings.getDamageFactorMedium(), - this.bonusDamage * this.settings.getDamageFactorMedium()); - this.attackListener.onHit(enumUnit, this.damage + this.bonusDamage); - } else if (distance <= (this.settings.getAreaOfEffectSmallDamage())) { - damageDealt = enumUnit.damage(this.simulation, this.source, this.attack.damageFlags, - this.attack.getAttackType(), this.attack.getWeaponType().getDamageType(), - this.attack.getWeaponSound(), this.damage * this.settings.getDamageFactorSmall(), - this.bonusDamage * this.settings.getDamageFactorSmall()); - this.attackListener.onHit(enumUnit, this.damage + this.bonusDamage); + this.damage.startSplash(this.settings.getDamageFactorMedium()); + damageDealt = enumUnit.damage(this.simulation, this.damage); + this.attackListener.onHit(enumUnit, damageDealt); + this.damage.endSplash(); + } else if (distance <= (this.settings.getDamageFactorSmall())) { + this.damage.startSplash(this.settings.getDamageFactorMedium()); + damageDealt = enumUnit.damage(this.simulation, this.damage); + this.attackListener.onHit(enumUnit, damageDealt); + this.damage.endSplash(); } - return damageDealt; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java index 0591b322b..f322317f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/CUnitAttackNormal.java @@ -11,9 +11,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetWidgetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerDamageModResult; public class CUnitAttackNormal extends CUnitAttack { private static CAttackDamageFlags ATTACK_FLAGS = new CAttackDamageFlags(false); @@ -35,20 +36,22 @@ public CUnitAttack copy() { getRange(), getRangeMotionBuffer(), isShowUI(), getTargetsAllowed(), getWeaponSound(), getWeaponType()); } + public CDamageFlags getBaseAttackDamageFlags() { + return ATTACK_FLAGS; + } + @Override public void launch(final CSimulation simulation, final CUnit unit, final AbilityTarget target, final float damage, final CUnitAttackListener attackListener) { attackListener.onLaunch(); final CWidget widget = target.visit(AbilityTargetWidgetVisitor.INSTANCE); if (widget != null) { - CUnitAttackPreDamageListenerDamageModResult modDamage = runPreDamageListeners(simulation, unit, target, + CDamageCalculation modDamage = runPreDamageListeners(simulation, unit, target, target.visit(AbilityTargetVisitor.POINT) != null ? target.visit(AbilityTargetVisitor.POINT) : new AbilityPointTarget(target.getX(), target.getY()), damage, this.attackModifier); - float damageDealt = widget.damage(simulation, unit, ATTACK_FLAGS, getAttackType(), - getWeaponType().getDamageType(), modDamage.isMiss() ? null : getWeaponSound(), - modDamage.computeFinalDamage(), modDamage.getBonusDamage()); - runPostDamageListeners(simulation, unit, target, damageDealt, this.attackModifier); + widget.damage(simulation, modDamage); + runPostDamageListeners(simulation, target, modDamage, this.attackModifier); attackListener.onHit(target, damage); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenListener.java index 5d3599a12..cda3ee531 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenListener.java @@ -4,12 +4,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public interface CUnitAttackDamageTakenListener { public static final EnumSet ENEMY_TARGET = EnumSet.of(CTargetType.ENEMIES); - public void onDamage(final CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CDamageType weaponType, float damage, float bonusDamage, float trueDamage); + public int getPriority(CSimulation simulation, CUnit target, CDamageCalculation damage); + + public void onDamage(CSimulation simulation, CUnit target, CDamageCalculation damage); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListener.java index 278de3806..56d7ff3f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListener.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public interface CUnitAttackDamageTakenModificationListener { - public CUnitAttackDamageTakenModificationListenerDamageModResult onDamage(final CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, CUnitAttackDamageTakenModificationListenerDamageModResult previousDamage); + public int getPriority(CSimulation simulation, CUnit cUnit, CDamageCalculation damage); + + public void onDamage(CSimulation simulation, CUnit cUnit, CDamageCalculation damage); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListenerDamageModResult.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListenerDamageModResult.java deleted file mode 100644 index 6daf1c9f7..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackDamageTakenModificationListenerDamageModResult.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners; - -public class CUnitAttackDamageTakenModificationListenerDamageModResult { - private float baseDamage; - private float bonusDamage; - private float damageMultiplier; - - public CUnitAttackDamageTakenModificationListenerDamageModResult(float baseDamage, float bonusDamage) { - this.baseDamage = baseDamage; - this.bonusDamage = bonusDamage; - this.damageMultiplier = 1; - - } - - public float getBaseDamage() { - return baseDamage; - } - - public void setBaseDamage(float baseDamage) { - this.baseDamage = baseDamage; - } - - public float getBonusDamage() { - return bonusDamage; - } - - public void setBonusDamage(float bonusDamage) { - this.bonusDamage = bonusDamage; - } - - public void addBonusDamage(float bonusDamage) { - this.bonusDamage += bonusDamage; - } - - public float getDamageMultiplier() { - return damageMultiplier; - } - - public void setDamageMultiplier(float damageMultiplier) { - this.damageMultiplier = damageMultiplier; - } - - public void addDamageMultiplier(float damageMultiplier) { - this.damageMultiplier *= damageMultiplier; - } - - public float computeFinalDamage() { - return (baseDamage * damageMultiplier) + bonusDamage; - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackEffectListenerStacking.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackEffectListenerStacking.java deleted file mode 100644 index 4d5bcb1ff..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackEffectListenerStacking.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners; - -public class CUnitAttackEffectListenerStacking { - private boolean allowStacking; - private boolean allowSamePriorityStacking; - - public CUnitAttackEffectListenerStacking() { - setAllowStacking(true); - setAllowSamePriorityStacking(true); - } - - public CUnitAttackEffectListenerStacking(boolean allowStacking) { - setAllowStacking(allowStacking); - setAllowSamePriorityStacking(true); - } - - public CUnitAttackEffectListenerStacking(boolean allowStacking, boolean allowSamePriorityStacking) { - setAllowStacking(allowStacking); - setAllowSamePriorityStacking(allowSamePriorityStacking); - } - - public boolean isAllowStacking() { - return allowStacking; - } - - public void setAllowStacking(boolean allowStacking) { - this.allowStacking = allowStacking; - } - - public boolean isAllowSamePriorityStacking() { - return allowSamePriorityStacking; - } - - public void setAllowSamePriorityStacking(boolean allowSamePriorityStacking) { - this.allowSamePriorityStacking = allowSamePriorityStacking; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackEvasionListener.java index d2a2af439..aad02bb08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackEvasionListener.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public interface CUnitAttackEvasionListener { - public boolean onAttack(final CSimulation simulation, CUnit attacker, CUnit target, boolean isAttack, boolean isRanged, CDamageType weaponType); + public boolean onAttack(CSimulation simulation, CUnit cUnit, CDamageCalculation damage); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackFinalDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackFinalDamageTakenModificationListener.java deleted file mode 100644 index bfb4eed7f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackFinalDamageTakenModificationListener.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; - -public interface CUnitAttackFinalDamageTakenModificationListener { - public float onDamage(final CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, float previousDamage); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPostDamageListener.java index 9d75c780b..87caa8e26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPostDamageListener.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public interface CUnitAttackPostDamageListener { - public void onHit(final CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack cUnitAttack, float damage, CUnitPriorityLoopData postListenerLoop); - public int getPriority(CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack cUnitAttack); + + public void onHit(CSimulation simulation, AbilityTarget target, CUnitAttack cUnitAttack, CDamageCalculation damage); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListener.java index 7040b4e37..99e483a3f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListener.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public interface CUnitAttackPreDamageListener { - public CUnitAttackEffectListenerStacking onAttack(final CSimulation simulation, CUnit attacker, - AbilityTarget target, AbilityPointTarget attackImpactLocation, CUnitAttack attack, - CUnitAttackSettings settings, CUnitAttackPreDamageListenerDamageModResult damageResult); + public void onAttack(CSimulation simulation, AbilityTarget target, + AbilityPointTarget attackImpactLocation, CUnitAttack cUnitAttack, CUnitAttackSettings settings, + CDamageCalculation calc); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListenerDamageModResult.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListenerDamageModResult.java deleted file mode 100644 index d61c90781..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitAttackPreDamageListenerDamageModResult.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners; - -public class CUnitAttackPreDamageListenerDamageModResult { - private float baseDamage; - private float bonusDamage; - private float damageMultiplier; - - private boolean miss = false; - - private boolean unlockBonus; - private boolean unlockMultiplier; - - public CUnitAttackPreDamageListenerDamageModResult(float baseDamage) { - this.baseDamage = baseDamage; - this.bonusDamage = 0; - this.damageMultiplier = 1; - - unlockBonus = true; - unlockMultiplier = true; - } - - public float getBaseDamage() { - return baseDamage; - } - - public void setBaseDamage(float baseDamage) { - this.baseDamage = baseDamage; - } - - public float getBonusDamage() { - return bonusDamage; - } - - public void setBonusDamage(float bonusDamage) { - if (unlockBonus) { - this.bonusDamage = bonusDamage; - } - } - - public void addBonusDamage(float bonusDamage) { - if (unlockBonus) { - this.bonusDamage += bonusDamage; - } - } - - public float getDamageMultiplier() { - return damageMultiplier; - } - - public void setDamageMultiplier(float damageMultiplier) { - if (unlockMultiplier) { - this.damageMultiplier = damageMultiplier; - } - } - - public void addDamageMultiplier(float damageMultiplier) { - if (unlockMultiplier) { - this.damageMultiplier *= damageMultiplier; - } - } - - public void lockBonus() { - unlockBonus = false; - unlockMultiplier = false; - } - - public void lock() { - unlockBonus = false; - unlockMultiplier = false; - } - - public float computeFinalDamage() { - return (baseDamage * damageMultiplier); - } - - public boolean isMiss() { - return miss; - } - - public void setMiss(boolean miss) { - this.miss = miss; - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultAccuracyCheckListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultAccuracyCheckListener.java index a2cf2a5ec..ad432bee6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultAccuracyCheckListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultAccuracyCheckListener.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; @@ -16,28 +17,26 @@ public CUnitDefaultAccuracyCheckListener() { } @Override - public CUnitAttackEffectListenerStacking onAttack(CSimulation simulation, CUnit attacker, AbilityTarget target, + public void onAttack(CSimulation simulation, AbilityTarget target, AbilityPointTarget attackImpactLocation, CUnitAttack attack, CUnitAttackSettings settings, - CUnitAttackPreDamageListenerDamageModResult damageResult) { + CDamageCalculation damageResult) { boolean miss = false; - if (target instanceof CUnit) { - if (simulation.getTerrainHeight(attacker.getX(), attacker.getY()) < simulation + if (target instanceof CUnit && damageResult.getSource() != null) { + if (simulation.getTerrainHeight(damageResult.getSource().getX(), damageResult.getSource().getY()) < simulation .getTerrainHeight(target.getX(), target.getY())) { Random random = simulation.getSeededRandom(); if (random.nextFloat(1f) < simulation.getGameplayConstants().getChanceToMiss()) { miss = true; } } - miss = miss || ((CUnit) target).checkForMiss(simulation, attacker, true, miss, null, null, - damageResult.getBaseDamage(), damageResult.getBonusDamage()); - + miss = miss || ((CUnit) target).checkForMiss(simulation, damageResult); } if (miss) { damageResult.setMiss(true); if (!settings.isApplyEffectsOnMiss()) { - return new CUnitAttackEffectListenerStacking(false, true); + damageResult.preventOtherModificationsOfOtherPriorities(); + return; } } - return new CUnitAttackEffectListenerStacking(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java index 0b1add69f..338568d2f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultEtherealDamageModListener.java @@ -2,28 +2,22 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class CUnitDefaultEtherealDamageModListener implements CUnitAttackDamageTakenModificationListener { public static CUnitDefaultEtherealDamageModListener INSTANCE = new CUnitDefaultEtherealDamageModListener(); @Override - public CUnitAttackDamageTakenModificationListenerDamageModResult onDamage(CSimulation game, CUnit attacker, - CUnit target, final CDamageFlags flags, CAttackType attackType, CDamageType damageType, - CUnitAttackDamageTakenModificationListenerDamageModResult previousDamage) { - if (attacker == null || game.getGameplayConstants().isEtherealDamageBonusAlly() || !game - .getPlayer(attacker.getPlayerIndex()).hasAlliance(target.getPlayerIndex(), CAllianceType.PASSIVE)) { - previousDamage.addDamageMultiplier(game.getGameplayConstants().getEtherealDamageBonus()[attackType.ordinal()]); - } -// if (damageType == CDamageType.NORMAL && attackType != CAttackType.MAGIC) { -// previousDamage.setBaseDamage(0); -// previousDamage.setBonusDamage(0); -// previousDamage.setDamageMultiplier(0); -// } + public int getPriority(CSimulation simulation, CUnit target, CDamageCalculation damage) { + return 0; + } - return previousDamage; + @Override + public void onDamage(CSimulation game, CUnit target, CDamageCalculation damage) { + if (damage.getSource() == null || game.getGameplayConstants().isEtherealDamageBonusAlly() || !game + .getPlayer(damage.getSource().getPlayerIndex()).hasAlliance(target.getPlayerIndex(), CAllianceType.PASSIVE)) { + damage.addDamageMultiplier(game.getGameplayConstants().getEtherealDamageBonus()[damage.getAttackType().ordinal()]); + } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultLifestealListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultLifestealListener.java index 5f0964b58..202f69b4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultLifestealListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultLifestealListener.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; @@ -18,17 +18,19 @@ public CUnitDefaultLifestealListener(float amount) { } @Override - public void onHit(final CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack cUnitAttack, float damage, CUnitPriorityLoopData postListenerLoop) { + public void onHit(CSimulation simulation, AbilityTarget target, CUnitAttack cUnitAttack, + CDamageCalculation damage) { CUnit tarU = target.visit(AbilityTargetVisitor.UNIT); - if (tarU != null && !tarU.isBuilding() && !tarU.isUnitType(CUnitTypeJass.MECHANICAL) - && !simulation.getPlayer(attacker.getPlayerIndex()).hasAlliance(tarU.getPlayerIndex(), + if (damage.getSource() != null && tarU != null && !tarU.isBuilding() + && !tarU.isUnitType(CUnitTypeJass.MECHANICAL) + && !simulation.getPlayer(damage.getSource().getPlayerIndex()).hasAlliance(tarU.getPlayerIndex(), CAllianceType.PASSIVE) && (!simulation.getGameplayConstants().isMagicImmuneResistsLeech() || !tarU.isUnitType(CUnitTypeJass.MAGIC_IMMUNE))) { - attacker.heal(simulation, damage * this.amount); + damage.getSource().heal(simulation, damage.computeFinalDamage(simulation, tarU) * this.amount); } } - + @Override public int getPriority(CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack cUnitAttack) { return 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java deleted file mode 100644 index 5db401ed5..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultMagicImmuneDamageModListener.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; - -public class CUnitDefaultMagicImmuneDamageModListener implements CUnitAttackFinalDamageTakenModificationListener { - public static CUnitDefaultMagicImmuneDamageModListener INSTANCE = new CUnitDefaultMagicImmuneDamageModListener(); - - @Override - public float onDamage(CSimulation game, CUnit attacker, CUnit target, final CDamageFlags flags, - CAttackType attackType, CDamageType damageType, float previousDamage) { -// if ((damageType != CDamageType.NORMAL && (damageType != CDamageType.UNIVERSAL && game.getGameplayConstants().isMagicImmuneResistsUltimates()) -// && attackType == CAttackType.SPELLS) -// || (attackType == CAttackType.MAGIC && game.getGameplayConstants().isMagicImmuneResistsDamage())) { -// return 0; -// } - - return previousDamage; - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultSleepListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultSleepListener.java index ed204173e..a1ad5de21 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultSleepListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultSleepListener.java @@ -2,8 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuffType; public class CUnitDefaultSleepListener implements CUnitAttackDamageTakenListener { @@ -13,9 +12,13 @@ public CUnitDefaultSleepListener() { } @Override - public void onDamage(final CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, - CDamageType damageType, float damage, float bonusDamage, float trueDamage) { - if (damage > 0 || bonusDamage > 0 || trueDamage > 0) { + public int getPriority(CSimulation simulation, CUnit target, CDamageCalculation damage) { + return 0; + } + + @Override + public void onDamage(CSimulation simulation, CUnit target, CDamageCalculation damage) { + if (damage.computeFinalDamage(simulation, target) > 0) { target.removeAllStateModBuffs(StateModBuffType.SLEEPING); target.computeUnitState(simulation, StateModBuffType.SLEEPING); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultThornsListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultThornsListener.java index 045d3834a..a1059be73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultThornsListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/attacks/listeners/CUnitDefaultThornsListener.java @@ -3,6 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CSpellDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -21,16 +22,24 @@ public CUnitDefaultThornsListener(boolean percentage, float amount) { } @Override - public void onDamage(final CSimulation simulation, CUnit attacker, CUnit target, final CDamageFlags flags, - CDamageType damageType, float damage, float bonusDamage, float trueDamage) { - if (damageType == CDamageType.NORMAL && !flags.isRanged() && target.canBeTargetedBy(simulation, attacker, ENEMY_TARGET) + public int getPriority(CSimulation simulation, CUnit target, CDamageCalculation damage) { + return 0; + } + + @Override + public void onDamage(CSimulation simulation, CUnit target, CDamageCalculation damage) { + if (damage.getSource() != null && damage.getPrimaryDamageType() == CDamageType.NORMAL + && !damage.getPrimaryDamageFlags().isRanged() + && target.canBeTargetedBy(simulation, damage.getSource(), ENEMY_TARGET) + && damage.computeRawTotalDamage() > 0 && (!simulation.getGameplayConstants().isMagicImmuneResistsThorns() - || !attacker.isUnitType(CUnitTypeJass.MAGIC_IMMUNE))) { + || !damage.getSource().isUnitType(CUnitTypeJass.MAGIC_IMMUNE))) { float thornsAmount = amount; if (percentage) { - thornsAmount *= damage; + thornsAmount *= damage.getPrimaryAmount(); + thornsAmount = Math.max(thornsAmount, 1); } - attacker.damage(simulation, target, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.DEFENSIVE, + damage.getSource().damage(simulation, target, DAMAGE_FLAGS, CAttackType.SPELLS, CDamageType.DEFENSIVE, CWeaponSoundTypeJass.WHOKNOWS.name(), thornsAmount); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java index 717e815fc..04ec7917f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CUnitData.java @@ -1104,6 +1104,9 @@ public CUnitType getUnitTypeByJassLegacyName(final String jassLegacyName) { private CUnitType getUnitTypeInstanceLightweight(final War3ID typeId, final GameObject unitType) { CUnitType unitTypeInstance = this.unitIdToUnitType.get(typeId); + if (unitTypeInstance == null) { + unitTypeInstance = this.unitIdToUnitTypeLightweight.get(typeId); + } if (unitTypeInstance == null) { final String legacyName = getLegacyName(unitType); final int life = unitType.getFieldAsInteger(HIT_POINT_MAXIMUM, 0); From 71d57ac26629823ae1b6c37c7867f10accbdec12 Mon Sep 17 00:00:00 2001 From: Glasir Date: Sun, 30 Nov 2025 03:47:11 -0500 Subject: [PATCH 30/44] Conclude Damage Refactor * Refactored damage into a single object that handles modifications and calculations * Removed excess classes related to damage listeners * Removed Final Damage Taken Modification listeners, as they no longer serve a purpose that Damage Taken Modification listeners cannot * Fixed Mana Shield bug that inverted the mp-to-hp data field value * Updated damage types for existing abilities --- .../AttackReplacementActives.json | 56 +++++++++++++++++++ .../AttackReplacementPassivesItems.json | 11 +++- .../AttackReplacementPassivesNonItem.json | 28 ++++++++++ ...ReplacementPassivesNonItemLowPriority.json | 21 +++++++ .../AttackReplacementPassivesPostDamage.json | 4 +- core/assets/abilityBehaviors/Chains.json | 7 +++ .../assets/abilityBehaviors/DeathSummons.json | 14 +++++ .../abilityBehaviors/TerrainDeform.json | 10 ++-- core/assets/abilityBehaviors/activeBuffs.json | 7 +++ .../abilityBehaviors/activeDebuffs.json | 7 +++ .../neutralHeroUnitActives.json | 24 ++++---- .../nightElfHeroUnitActives.json | 10 ++-- .../abilityBehaviors/orcHeroActives.json | 7 +++ .../handlers/w3x/simulation/CUnit.java | 1 + ...ActionPreDamageListenerAddBonusDamage.java | 9 ++- ...> ABCallbackGetFinalTotalDamageDealt.java} | 2 +- .../ABCallbackGetRawTotalDamageDealt.java | 18 ++++++ .../core/AbilityBuilderGsonBuilder.java | 3 +- .../w3x/simulation/combat/CBonusDamage.java | 32 ++++++++--- .../simulation/combat/CDamageCalculation.java | 46 +++++++++++++-- 20 files changed, 277 insertions(+), 40 deletions(-) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/{ABCallbackGetTotalDamageDealt.java => ABCallbackGetFinalTotalDamageDealt.java} (91%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java diff --git a/core/assets/abilityBehaviors/AttackReplacementActives.json b/core/assets/abilityBehaviors/AttackReplacementActives.json index 69f140e40..0d985bb82 100644 --- a/core/assets/abilityBehaviors/AttackReplacementActives.json +++ b/core/assets/abilityBehaviors/AttackReplacementActives.json @@ -14,6 +14,13 @@ "value": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } } }] }, @@ -154,6 +161,13 @@ "value": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } } }], "onModify": [{ @@ -192,6 +206,13 @@ "value": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "MAGIC" + } } },{ "type": "createTimedBuff", @@ -456,6 +477,13 @@ "value": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "COLD" + } } },{ "type": "createTimedBuff", @@ -648,6 +676,13 @@ "type": "rawString", "value": "incinerate" } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } } }], "elseActions": [{ @@ -655,6 +690,13 @@ "value": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } } }] },{ @@ -909,6 +951,13 @@ "value": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "POISON" + } } },{ "type": "createTimedBuff", @@ -1061,6 +1110,13 @@ "damage": { "type": "getAbilityDataAsFloat", "dataField": "B" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "POISON" + } } }], "delaySeconds": { diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json index d2c823382..a000aa145 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesItems.json @@ -609,7 +609,7 @@ "type": "getDamageTypeFromString", "id": { "type": "rawString", - "value": "FIRE" + "value": "UNIVERSAL" } }, "damage": { @@ -646,7 +646,7 @@ "type": "getDamageTypeFromString", "id": { "type": "rawString", - "value": "FIRE" + "value": "UNIVERSAL" } }, "damage": { @@ -1479,6 +1479,13 @@ "type": "rawString", "value": "dataA" } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "UNIVERSAL" + } } }], "delaySeconds": { diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItem.json b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItem.json index a3bca939b..0b668a1bf 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItem.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItem.json @@ -25,6 +25,20 @@ "value": { "type": "getAbilityDataAsFloat", "dataField": "C" + }, + "attackType": { + "type": "getAttackTypeFromString", + "id": { + "type": "rawString", + "value": "SPELLS" + } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "MAGIC" + } } },{ "type": "if", @@ -412,6 +426,13 @@ "type": "rawString", "value": "incinerate" } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } } }], "elseActions": [{ @@ -419,6 +440,13 @@ "value": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } } }] },{ diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json index 188d1c0d4..e795ab446 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json @@ -444,6 +444,13 @@ "damage": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } } }], "delaySeconds": { @@ -594,6 +601,13 @@ "value": "ratio" } } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "MAGIC" + } } }], "onHit": [{ @@ -1085,6 +1099,13 @@ "damage": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "POISON" + } } }], "delaySeconds": { diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesPostDamage.json b/core/assets/abilityBehaviors/AttackReplacementPassivesPostDamage.json index fae83806d..afaf76778 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesPostDamage.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesPostDamage.json @@ -37,7 +37,7 @@ "type": "getDamageTypeFromString", "id": { "type": "rawString", - "value": "ENHANCED" + "value": "SONIC" } }, "damage": { @@ -238,7 +238,7 @@ "damage": { "type": "f*", "value1": { - "type": "getTotalDamageDealt" + "type": "getFinalTotalDamageDealt" }, "value2": { "type": "getAbilityDataAsFloat", diff --git a/core/assets/abilityBehaviors/Chains.json b/core/assets/abilityBehaviors/Chains.json index 0c4a0bfb8..416c64eca 100644 --- a/core/assets/abilityBehaviors/Chains.json +++ b/core/assets/abilityBehaviors/Chains.json @@ -67,6 +67,13 @@ "type": "rawString", "value": "amount" } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "LIGHTNING" + } } },{ "type": "storeValueLocally", diff --git a/core/assets/abilityBehaviors/DeathSummons.json b/core/assets/abilityBehaviors/DeathSummons.json index c4bb57163..e1fb27293 100644 --- a/core/assets/abilityBehaviors/DeathSummons.json +++ b/core/assets/abilityBehaviors/DeathSummons.json @@ -193,6 +193,13 @@ "damage": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "UNIVERSAL" + } } }], "delaySeconds": { @@ -582,6 +589,13 @@ "damage": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "POISON" + } } }], "delaySeconds": { diff --git a/core/assets/abilityBehaviors/TerrainDeform.json b/core/assets/abilityBehaviors/TerrainDeform.json index 2d972e55b..ddadd849a 100644 --- a/core/assets/abilityBehaviors/TerrainDeform.json +++ b/core/assets/abilityBehaviors/TerrainDeform.json @@ -135,16 +135,16 @@ "target": { "type": "getEnumUnit" }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "B" + }, "damageType": { "type": "getDamageTypeFromString", "id": { "type": "rawString", "value": "UNIVERSAL" } - }, - "damage": { - "type": "getAbilityDataAsFloat", - "dataField": "B" } }], "elseActions": [{ @@ -1983,7 +1983,7 @@ "type": "getDamageTypeFromString", "id": { "type": "rawString", - "value": "DISEASE" + "value": "SONIC" } }, "damage": { diff --git a/core/assets/abilityBehaviors/activeBuffs.json b/core/assets/abilityBehaviors/activeBuffs.json index 845dd65c0..7e36d1dd6 100644 --- a/core/assets/abilityBehaviors/activeBuffs.json +++ b/core/assets/abilityBehaviors/activeBuffs.json @@ -582,6 +582,13 @@ "damage": { "type": "getAbilityDataAsFloat", "dataField": "B" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "DEATH" + } } }], "delaySeconds": { diff --git a/core/assets/abilityBehaviors/activeDebuffs.json b/core/assets/abilityBehaviors/activeDebuffs.json index d37deceb4..ae028fa07 100644 --- a/core/assets/abilityBehaviors/activeDebuffs.json +++ b/core/assets/abilityBehaviors/activeDebuffs.json @@ -606,6 +606,13 @@ "damage": { "type": "getAbilityDataAsFloat", "dataField": "A" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FIRE" + } } }], "delaySeconds": { diff --git a/core/assets/abilityBehaviors/neutralHeroUnitActives.json b/core/assets/abilityBehaviors/neutralHeroUnitActives.json index 124961f45..cf89b1fc2 100644 --- a/core/assets/abilityBehaviors/neutralHeroUnitActives.json +++ b/core/assets/abilityBehaviors/neutralHeroUnitActives.json @@ -13,7 +13,7 @@ } }, "onAddAbility": [{ - "type": "createFinalDamageTakenModificationListener", + "type": "createDamageTakenModificationListener", "actions": [{ "type": "storeValueLocally", "key": { @@ -21,7 +21,7 @@ "value": "maxAbsorb" }, "valueToStore": { - "type": "f/", + "type": "f*", "value1": { "type": "getUnitCurrentMana", "unit": { @@ -40,7 +40,7 @@ "value1": { "type": "f*", "value1": { - "type": "getTotalDamageDealt" + "type": "getRawTotalDamageDealt" }, "value2": { "type": "getAbilityDataAsFloat", @@ -82,11 +82,11 @@ "type": "getListenerUnit" }, "amount": { - "type": "f*", + "type": "f/", "value1": { "type": "f*", "value1": { - "type": "getTotalDamageDealt" + "type": "getRawTotalDamageDealt" }, "value2": { "type": "getAbilityDataAsFloat", @@ -103,7 +103,7 @@ "amount": { "type": "f*", "value1": { - "type": "getTotalDamageDealt" + "type": "getRawTotalDamageDealt" }, "value2": { "type": "getAbilityDataAsFloat", @@ -135,12 +135,12 @@ "type": "getLastCreatedBuff" } },{ - "type": "addFinalDamageTakenModificationListener", - "target": { + "type": "addDamageTakenModificationListener", + "targetUnit": { "type": "getCastingUnit" }, "listener": { - "type": "getLastCreatedFinalDamageTakenModificationListener" + "type": "getLastCreatedDamageTakenModificationListener" } }], "onDeactivate": [{ @@ -152,12 +152,12 @@ "type": "getLastCreatedBuff" } },{ - "type": "removeFinalDamageTakenModificationListener", - "target": { + "type": "removeDamageTakenModificationListener", + "targetUnit": { "type": "getCastingUnit" }, "listener": { - "type": "getLastCreatedFinalDamageTakenModificationListener" + "type": "getLastCreatedDamageTakenModificationListener" } }] },{ diff --git a/core/assets/abilityBehaviors/nightElfHeroUnitActives.json b/core/assets/abilityBehaviors/nightElfHeroUnitActives.json index 95b794c43..a7222b75e 100644 --- a/core/assets/abilityBehaviors/nightElfHeroUnitActives.json +++ b/core/assets/abilityBehaviors/nightElfHeroUnitActives.json @@ -55,16 +55,16 @@ "target": { "type": "getBuffedUnit" }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "E" + }, "damageType": { "type": "getDamageTypeFromString", "id": { "type": "rawString", - "value": "SHADOW_STRIKE" + "value": "SLOW_POISON" } - }, - "damage": { - "type": "getAbilityDataAsFloat", - "dataField": "E" } },{ "type": "createNumericFloatingTextOnUnit", diff --git a/core/assets/abilityBehaviors/orcHeroActives.json b/core/assets/abilityBehaviors/orcHeroActives.json index fe4d9677f..f3463a281 100644 --- a/core/assets/abilityBehaviors/orcHeroActives.json +++ b/core/assets/abilityBehaviors/orcHeroActives.json @@ -247,6 +247,13 @@ "value": { "type": "getAbilityDataAsFloat", "dataField": "C" + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "FORCE" + } } },{ "type": "lockDamageModifications" diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index e1672e8d5..e5dfa008f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -3411,6 +3411,7 @@ public float damage(final CSimulation simulation, final CDamageCalculation damag priorityMask |= 1 << (prio < 31 ? prio : 31); } if (prio == i && !damage.isSkipCurrentLevel()) { + damage.applyMultiplier(); listener.onDamage(simulation, this, damage); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java index 57112a89f..9d5da8881 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java @@ -6,11 +6,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -19,6 +21,7 @@ public class ABActionPreDamageListenerAddBonusDamage implements ABAction { private ABFloatCallback value; private ABDamageTypeCallback damageType; + private ABAttackTypeCallback attackType; private ABBooleanCallback inheritFlags; private ABBooleanCallback isRanged; @@ -35,6 +38,10 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java new file mode 100644 index 000000000..19359f4fd --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; + +import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; + +public class ABCallbackGetRawTotalDamageDealt extends ABFloatCallback { + + @Override + public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).computeRawTotalDamage(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index 694f2d669..08890304a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -311,7 +311,8 @@ private static void registerFloatCallbacks(RuntimeTypeAdapterFactory callbackTyp .registerSubtype(ABCallbackGetDistanceBetweenUnits.class, "getDistanceBetweenUnits") .registerSubtype(ABCallbackTicksForDuration.class, "ticksForDuration") - .registerSubtype(ABCallbackGetTotalDamageDealt.class, "getTotalDamageDealt") + .registerSubtype(ABCallbackGetRawTotalDamageDealt.class, "getRawTotalDamageDealt") + .registerSubtype(ABCallbackGetFinalTotalDamageDealt.class, "getFinalTotalDamageDealt") .registerSubtype(ABCallbackGetAttackBaseDamage.class, "getAttackBaseDamage") .registerSubtype(ABCallbackGetReactionAttackProjectileDamage.class, "getReactionAttackProjectileDamage") diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBonusDamage.java index bf3507348..d0898c8ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CBonusDamage.java @@ -8,6 +8,7 @@ public class CBonusDamage { protected final static int PREVENTMULTIPLY = 0b1; private float amount; + private CAttackType attackType = null; private CDamageType damageType; private CDamageFlags damageFlags; private int internalFlags = 0b0; @@ -16,16 +17,24 @@ public float computeRawDamage(float multiplier) { return this.amount * (this.isPreventMultiply() ? 1 : multiplier); } - public float computeFinalDamage(CSimulation simulation, CUnit unit, CAttackType attackType, float multiplier, float currentDamage) { - if (isImmuneToDamage(simulation, unit, attackType) + public void applyMultiplier(float damageMultiplier) { + this.amount *= damageMultiplier; + } + + public float computeFinalDamage(CSimulation simulation, CUnit unit, CAttackType primaryAttackType, CDamageType primaryDamageType, float multiplier, + float currentDamage) { + if (isImmuneToDamage(simulation, unit, this.attackType == null ? primaryAttackType : this.attackType) || (unit.isInvulnerable() && !this.isPassInvulnerable(simulation, unit))) { return 0; } - float trueDamage = CDamageCalculation.calculateDamageByArmor(simulation, unit, attackType, damageType, amount, - damageFlags) * (this.isPreventMultiply() ? 1 : multiplier); + float trueDamage = CDamageCalculation.calculateDamageByArmor(simulation, unit, + this.attackType == null ? primaryAttackType : this.attackType, primaryDamageType, amount, damageFlags) + * (this.isPreventMultiply() ? 1 : multiplier); if (damageFlags.isNonlethal() && trueDamage > 0 && (trueDamage + currentDamage) > unit.getLife() - 1) { trueDamage = Math.max(unit.getLife() - 1 - currentDamage, 0); } + System.err.println("Computing damage for bonus damage... bonus:" + this.amount + " attackType:" + + (this.attackType == null ? primaryAttackType : this.attackType) + " damageType:" + this.damageType + " final:" + trueDamage); return trueDamage; } @@ -67,6 +76,14 @@ public void setAmount(float amount) { this.amount = amount; } + public CAttackType getAttackType() { + return attackType; + } + + public void setAttackType(CAttackType attackType) { + this.attackType = attackType; + } + public CDamageType getDamageType() { return damageType; } @@ -82,11 +99,12 @@ public CDamageFlags getDamageFlags() { public void setDamageFlags(CDamageFlags damageFlags) { this.damageFlags = damageFlags; } - + public void setPreventMultiply(boolean preventMultiply) { - this.internalFlags = preventMultiply ? this.internalFlags | PREVENTMULTIPLY : this.internalFlags & ~PREVENTMULTIPLY; + this.internalFlags = preventMultiply ? this.internalFlags | PREVENTMULTIPLY + : this.internalFlags & ~PREVENTMULTIPLY; } - + public boolean isPreventMultiply() { return ((this.internalFlags & PREVENTMULTIPLY) != 0); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java index 3ddc06169..8f3c8875b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat; +import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -70,6 +71,19 @@ public CDamageCalculation(CUnit source, float damage, CAttackType attackType, CD this.unlockMultiplier = true; } + public void applyMultiplier() { + if (this.damageMultiplier == 1f) { + return; + } + this.primaryAmount *= this.damageMultiplier; + if (bonusDamages != null) { + for (CBonusDamage bonus : bonusDamages) { + bonus.applyMultiplier(this.damageMultiplier); + } + } + this.damageMultiplier = 1f; + } + public float computeFinalDamage(CSimulation simulation, CUnit unit) { float trueDamage = 0; if (!isImmuneToPrimaryDamage(simulation, unit) @@ -80,7 +94,8 @@ public float computeFinalDamage(CSimulation simulation, CUnit unit) { if (bonusDamages != null) { for (CBonusDamage bonus : bonusDamages) { - trueDamage += bonus.computeFinalDamage(simulation, unit, attackType, this.damageMultiplier, trueDamage); + trueDamage += bonus.computeFinalDamage(simulation, unit, this.attackType, this.primaryDamageType, + this.damageMultiplier, trueDamage); } } @@ -324,27 +339,50 @@ public void resetLoop() { } public void subtractTotalDamageDealt(float reduction, float minimum) { + System.err.println("Reducing damage: start:" + this.primaryAmount + " reduction:" + reduction + " min:" + minimum); float primMinus = this.primaryAmount - reduction; if (primMinus > minimum) { this.primaryAmount = primMinus; } else { if (this.bonusDamages != null) { - float remRed = reduction - this.primaryAmount; + float total = this.primaryAmount; for (CBonusDamage bonus : this.bonusDamages) { - + total += bonus.getAmount(); + } + float target = Math.max(minimum, total - reduction); + if (target < total) { + Iterator reverse = this.bonusDamages.descendingIterator(); + CBonusDamage bonus = null; + do { + bonus = reverse.next(); + float cur = bonus.getAmount(); + if (cur > target) { + bonus.setAmount(target); + target = 0; + } else { + target = Math.max(0, target - cur); + } + } while (reverse.hasNext()); + this.primaryAmount = target; } } else { this.primaryAmount = Math.max(minimum, primMinus); } } + System.err.println("Reduced damage: final:" + this.primaryAmount); + } - public CBonusDamage addBonusDamage(float amount, CDamageType damageType, CDamageFlags flags) { + public CBonusDamage addBonusDamage(float amount, CAttackType attackType, CDamageType damageType, + CDamageFlags flags) { if (bonusDamages == null) { this.bonusDamages = new LinkedList<>(); } CBonusDamage nb = new CBonusDamage(); nb.setAmount(amount); + if (attackType != null) { + nb.setAttackType(attackType); + } if (damageType == null) { nb.setDamageType(primaryDamageType); } else { From 6ebf03e9118210c01285e09cfc2f4b85219bdcbe Mon Sep 17 00:00:00 2001 From: Glasir Date: Mon, 1 Dec 2025 11:24:33 -0500 Subject: [PATCH 31/44] Added missing ability file update --- .../undeadHeroUnitActives.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/core/assets/abilityBehaviors/undeadHeroUnitActives.json b/core/assets/abilityBehaviors/undeadHeroUnitActives.json index fe93fb97d..3d6940908 100644 --- a/core/assets/abilityBehaviors/undeadHeroUnitActives.json +++ b/core/assets/abilityBehaviors/undeadHeroUnitActives.json @@ -377,19 +377,19 @@ "target": { "type": "getProjectileHitUnit" }, - "damageType": { - "type": "getDamageTypeFromString", - "id": { - "type": "rawString", - "value": "DISEASE" - } - }, "damage": { "type": "getStoredFloatByKey", "key": { "type": "rawString", "value": "dpt" } + }, + "damageType": { + "type": "getDamageTypeFromString", + "id": { + "type": "rawString", + "value": "SONIC" + } } }], "elseActions": [] @@ -762,16 +762,16 @@ "target": { "type": "getBuffedUnit" }, + "damage": { + "type": "getAbilityDataAsFloat", + "dataField": "C" + }, "damageType": { "type": "getDamageTypeFromString", "id": { "type": "rawString", - "value": "MAGIC" + "value": "FORCE" } - }, - "damage": { - "type": "getAbilityDataAsFloat", - "dataField": "C" } },{ "type": "if", From e0f76c74391049cb3c4acd4ed152f6a79c7a0cb1 Mon Sep 17 00:00:00 2001 From: Glasir Date: Wed, 10 Dec 2025 01:24:52 -0500 Subject: [PATCH 32/44] Major AB Refactor: Part 1 - Stores * Created new LocalDataStore and GlobalDataStore classes * LocalDataStore wraps the previous Map to allow for easier modifications in the future * GlobalDataStore will be used in rare cases (Spirit Link) for commonly available values --- .../etheller/warsmash/parsers/jass/Jass2.java | 98 ++++++++++--------- .../scope/CommonTriggerExecutionScope.java | 9 +- .../ability/AbilityBuilderAbility.java | 4 +- .../ability/AbilityBuilderActiveAbility.java | 4 +- ...AbilityAbilityBuilderActiveAutoTarget.java | 5 +- ...AbilityAbilityBuilderActiveFlexTarget.java | 4 +- .../CAbilityAbilityBuilderActiveNoTarget.java | 5 +- .../CAbilityAbilityBuilderActivePairing.java | 4 +- ...bilityAbilityBuilderActivePointTarget.java | 4 +- ...AbilityAbilityBuilderActiveUnitTarget.java | 5 +- .../CAbilityAbilityBuilderGenericActive.java | 8 +- .../ability/CAbilityAbilityBuilderNoIcon.java | 8 +- .../CAbilityAbilityBuilderPassive.java | 8 +- .../GetInstantTransformationBuffVisitor.java | 9 +- .../CAbilityAbilityBuilderAuraTemplate.java | 6 +- ...ilityAbilityBuilderSimpleAuraTemplate.java | 5 +- ...AbilityAbilityBuilderStatAuraTemplate.java | 6 +- ...lityAbilityBuilderStatPassiveTemplate.java | 6 +- .../behavior/CBehaviorAbilityBuilderBase.java | 6 +- .../CBehaviorAbilityBuilderNoTarget.java | 6 +- .../CBehaviorFinishTransformation.java | 22 ++--- .../behavior/action/ABActionAddAbility.java | 5 +- .../behavior/action/ABActionAddSlowBuff.java | 6 +- .../behavior/action/ABActionAddStunBuff.java | 5 +- .../action/ABActionCleanUpCastInstance.java | 5 +- .../action/ABActionCreateAbilityFromId.java | 6 +- .../action/ABActionDeleteStoredKey.java | 8 +- .../ABActionPrepUnownedAbilityForUse.java | 5 +- .../action/ABActionRemoveAbility.java | 5 +- .../ABActionAbilityAddUniqueFlag.java | 7 +- .../ABActionAbilityAttemptToApplyEffect.java | 5 +- .../ABActionAbilityRemoveUniqueFlag.java | 7 +- .../ABActionAbilityRemoveUniqueValue.java | 7 +- .../ABActionAbilityRunEndCastingActions.java | 11 +-- .../abilities/ABActionAbilitySetShowIcon.java | 8 +- .../ABActionAbilityStoreUniqueValue.java | 10 +- .../ABActionActivateToggledAbility.java | 6 +- .../ability/ABActionAddTargetAllowed.java | 4 +- .../ability/ABActionBeginChanneling.java | 6 +- .../ability/ABActionClickDisableAbility.java | 11 +-- .../ability/ABActionClickEnableAbility.java | 11 +-- .../ABActionDeactivateToggledAbility.java | 6 +- .../ability/ABActionDisableAbility.java | 11 +-- .../ability/ABActionDisableAbilityById.java | 6 +- .../action/ability/ABActionEnableAbility.java | 11 +-- .../ability/ABActionEnableAbilityById.java | 6 +- .../ability/ABActionFinishChanneling.java | 5 +- .../ability/ABActionRemoveTargetAllowed.java | 5 +- .../action/ability/ABActionResetCooldown.java | 6 +- .../ABActionSendStartCastingEvents.java | 6 +- .../ability/ABActionSetAbilityCastRange.java | 6 +- .../ABActionSetAutoTargetDestructable.java | 6 +- .../ability/ABActionSetAutoTargetUnit.java | 5 +- .../ability/ABActionSetPreventEndEvents.java | 6 +- .../action/ability/ABActionStartCooldown.java | 32 +++--- .../attack/ABActionAddAttackModifier.java | 8 +- .../attack/ABActionCreateAttackModifier.java | 4 +- .../attack/ABActionFireModifiedAttack.java | 5 +- .../attack/ABActionRemoveAttackModifier.java | 6 +- .../attack/ABActionStartModifiedAttack.java | 6 +- ...ABActionAttackModifierAddAnimationTag.java | 5 +- ...onAttackModifierAddPostDamageListener.java | 5 +- ...ionAttackModifierAddPreDamageListener.java | 5 +- ...ActionAttackModifierApplyAllArtFields.java | 6 +- .../ABActionAttackModifierApplyArt.java | 6 +- ...BActionAttackModifierApplyArtAndSpeed.java | 6 +- ...ActionAttackModifierApplyDefaultSpeed.java | 5 +- ...tackModifierPreventOtherModifications.java | 5 +- ...PreventOtherSamePriorityModifications.java | 6 +- ...ctionAttackModifierRemoveAnimationTag.java | 5 +- ...ttackModifierRemovePostDamageListener.java | 5 +- ...AttackModifierRemovePreDamageListener.java | 5 +- .../ABActionAttackModifierSetAttackArc.java | 5 +- ...ctionAttackModifierSetAttackDeathTime.java | 6 +- ...ABActionAttackModifierSetAttackHoming.java | 6 +- ...BActionAttackModifierSetAttackImpactZ.java | 5 +- ...ABActionAttackModifierSetAttackStartZ.java | 6 +- ...ABActionAttackModifierSetSplashFields.java | 5 +- ...ABCallbackGetModifiedAttackAttackType.java | 9 +- ...ABCallbackGetModifiedAttackDamageType.java | 5 +- ...ABCallbackGetModifiedAttackWeaponType.java | 9 +- ...ctionAttemptToReOrderPreviousBehavior.java | 5 +- ...ActionAttemptToResumePreviousBehavior.java | 5 +- .../behavior/action/buff/ABActionAddBuff.java | 6 +- .../ABActionAddNonStackingDisplayBuff.java | 5 +- .../buff/ABActionBuffAddUniqueFlag.java | 6 +- .../buff/ABActionBuffRemoveUniqueFlag.java | 6 +- .../buff/ABActionBuffRemoveUniqueValue.java | 6 +- .../buff/ABActionBuffStoreUniqueValue.java | 6 +- .../buff/ABActionCreatePassiveBuff.java | 4 +- .../buff/ABActionCreateTargetingBuff.java | 3 +- .../buff/ABActionCreateTimedArtBuff.java | 7 +- .../action/buff/ABActionCreateTimedBuff.java | 4 +- .../buff/ABActionCreateTimedLifeBuff.java | 7 +- ...ActionCreateTimedPausedExpirationBuff.java | 3 +- .../ABActionCreateTimedTargetingBuff.java | 3 +- .../buff/ABActionCreateTimedTickingBuff.java | 7 +- .../ABActionCreateTimedTickingPausedBuff.java | 4 +- ...ActionCreateTimedTickingPostDeathBuff.java | 4 +- .../action/buff/ABActionRemoveBuff.java | 6 +- .../ABActionRemoveNonStackingDisplayBuff.java | 6 +- .../ABActionAddDestructableBuff.java | 6 +- .../ABActionCreateDestructable.java | 7 +- .../ABActionCreateDestructableBuff.java | 4 +- .../ABActionDamageDestructable.java | 6 +- .../ABActionDispelDestructableBuffs.java | 4 +- ...IterateDestructablesInRangeOfLocation.java | 5 +- .../ABActionKillDestructable.java | 5 +- .../ABActionRemoveDestructable.java | 6 +- .../ABActionRemoveDestructableBuff.java | 5 +- .../ABActionCreateTimeOfDayEvent.java | 4 +- .../ABActionRegisterTimeOfDayEvent.java | 5 +- .../ABActionRegisterUniqueTimeOfDayEvent.java | 6 +- .../ABActionUnregisterTimeOfDayEvent.java | 6 +- .../widget/ABActionCreateWidgetEvent.java | 4 +- .../widget/ABActionRegisterWidgetEvent.java | 6 +- .../widget/ABActionUnregisterWidgetEvent.java | 5 +- .../ABActionCreateFloatingTextOnUnit.java | 5 +- ...ActionCreateNumericFloatingTextOnUnit.java | 5 +- .../ABActionCreateGroupEffectAtLocation.java | 6 +- .../fx/ABActionCreateLightningEffect.java | 5 +- ...ionCreateLoopingSoundEffectAtLocation.java | 6 +- ...BActionCreateLoopingSoundEffectOnUnit.java | 10 +- .../ABActionCreateSoundEffectAtLocation.java | 5 +- .../fx/ABActionCreateSoundEffectOnUnit.java | 6 +- .../ABActionCreateSpellEffectAtLocation.java | 6 +- .../fx/ABActionCreateSpellEffectAtPoint.java | 6 +- .../fx/ABActionCreateSpellEffectOnUnit.java | 6 +- ...nCreateTemporarySpellEffectAtLocation.java | 8 +- ...tionCreateTemporarySpellEffectAtPoint.java | 6 +- ...ctionCreateTemporarySpellEffectOnUnit.java | 9 +- .../ABActionCreateTerrainBowlAtLocation.java | 6 +- ...ABActionCreateTerrainRippleAtLocation.java | 15 ++- .../ABActionCreateTerrainWaveAtLocation.java | 6 +- .../action/fx/ABActionCreateUberSplat.java | 5 +- .../fx/ABActionModifyTerrainVertex.java | 5 +- .../action/fx/ABActionRemoveEffect.java | 6 +- .../fx/ABActionRemoveLightningEffect.java | 6 +- .../gamestate/ABActionSetFalseTimeOfDay.java | 6 +- .../action/item/ABActionChargeItem.java | 8 +- .../action/item/ABActionTransformItem.java | 6 +- .../action/list/ABActionListRemove.java | 5 +- .../action/list/ABActionLocationListAdd.java | 4 +- .../list/ABActionSortableListRemove.java | 5 +- .../player/ABActionGiveResourcesToPlayer.java | 6 +- .../ABActionSetAbilityEnabledForPlayer.java | 6 +- ...teLocationTargetedCollisionProjectile.java | 4 +- ...ctionCreateLocationTargetedProjectile.java | 4 +- ...reateLocationTargetedPseudoProjectile.java | 18 ++-- ...nCreateUnitTargetedBouncingProjectile.java | 11 +-- ...CreateUnitTargetedCollisionProjectile.java | 4 +- .../ABActionCreateUnitTargetedProjectile.java | 4 +- ...ionCreateUnitTargetedPseudoProjectile.java | 18 ++-- .../ABActionSetAttackProjectileDamage.java | 6 +- .../projectile/ABActionSetProjectileDone.java | 5 +- .../ABActionSetProjectileReflected.java | 6 +- .../ABActionSetProjectileTarget.java | 6 +- .../action/stats/ABActionAddDefenseBonus.java | 8 +- .../stats/ABActionAddNonStackingStatBuff.java | 6 +- .../ABActionCreateNonStackingStatBuff.java | 6 +- .../ABActionRecomputeStatBuffsOnUnit.java | 6 +- .../stats/ABActionRemoveDefenseBonus.java | 8 +- .../ABActionRemoveNonStackingStatBuff.java | 6 +- .../ABActionUpdateNonStackingStatBuff.java | 5 +- .../action/structural/ABActionBreak.java | 6 +- .../structural/ABActionChainEffect.java | 8 +- .../structural/ABActionCreateSubroutine.java | 5 +- .../action/structural/ABActionFor.java | 5 +- .../action/structural/ABActionIf.java | 5 +- .../ABActionIterateUnitsInGroup.java | 5 +- .../ABActionIterateUnitsInQueue.java | 5 +- ...itsInRangeOfLocationMatchingCondition.java | 5 +- ...geOfLocationMatchingConditionWithSort.java | 14 +-- ...teUnitsInRangeOfUnitMatchingCondition.java | 8 +- ...nRangeOfUnitMatchingConditionWithSort.java | 14 +-- .../ABActionIterateUnitsInRect.java | 4 +- .../structural/ABActionPeriodicExecute.java | 5 +- .../ABActionResetPeriodicExecute.java | 5 +- .../structural/ABActionRunReuseAction.java | 5 +- .../ABActionRunReuseActionWithArguments.java | 3 +- .../structural/ABActionRunSubroutine.java | 11 +-- .../structural/ABActionStoreValueLocally.java | 35 +++---- .../action/structural/ABActionWhile.java | 5 +- .../action/timer/ABActionCreateTimer.java | 13 +-- .../action/timer/ABActionKillTimer.java | 5 +- .../action/timer/ABActionRemoveTimer.java | 5 +- .../action/timer/ABActionStartTimer.java | 5 +- .../timer/ABActionUpdateTimerTimeout.java | 6 +- .../behavior/action/unit/ABActionAddMp.java | 5 +- .../action/unit/ABActionAddNewAbility.java | 6 +- .../action/unit/ABActionAddRallyAbility.java | 5 +- .../ABActionChangeAttackActionToMovement.java | 24 ++--- .../ABActionCheckAbilityEffectReaction.java | 5 +- .../ABActionCheckAbilityProjReaction.java | 5 +- .../action/unit/ABActionCreateUnit.java | 20 ++-- .../action/unit/ABActionDamageArea.java | 4 +- .../unit/ABActionDamageAttackSplash.java | 4 +- .../action/unit/ABActionDamageBurst.java | 4 +- .../action/unit/ABActionDamageSplash.java | 4 +- .../action/unit/ABActionDamageTarget.java | 5 +- .../unit/ABActionDisableWorkerAbilities.java | 5 +- .../action/unit/ABActionDispelBuffs.java | 4 +- .../unit/ABActionEnableWorkerAbilities.java | 8 +- .../ABActionForceBeginCreatedBehavior.java | 5 +- .../behavior/action/unit/ABActionHeal.java | 8 +- .../action/unit/ABActionHideUnit.java | 5 +- .../unit/ABActionInstantReturnResources.java | 8 +- .../action/unit/ABActionIssueStopOrder.java | 5 +- .../action/unit/ABActionKillUnit.java | 5 +- .../action/unit/ABActionMergeUnits.java | 17 ++-- .../unit/ABActionMultiplyUnitScale.java | 5 +- .../action/unit/ABActionRemoveUnit.java | 5 +- .../action/unit/ABActionResurrect.java | 5 +- .../unit/ABActionSendUnitBackToWork.java | 11 +-- .../unit/ABActionSetExplodesOnDeath.java | 5 +- .../behavior/action/unit/ABActionSetHp.java | 5 +- .../behavior/action/unit/ABActionSetMp.java | 8 +- .../action/unit/ABActionSetSpeed.java | 5 +- .../unit/ABActionStartSacrificingUnit.java | 5 +- .../unit/ABActionStartTrainingUnit.java | 5 +- .../action/unit/ABActionSubtractMp.java | 5 +- .../action/unit/ABActionTransformUnit.java | 8 +- .../unit/ABActionTransformUnitAppearance.java | 5 +- .../unit/ABActionTransformUnitInstant.java | 8 +- .../ABActionTransformedUnitAbilityAdd.java | 4 +- .../ABActionTransformedUnitAbilityRemove.java | 4 +- .../action/unit/ABActionUnhideUnit.java | 5 +- .../ABActionAddSecondaryAnimationTag.java | 5 +- .../unit/animation/ABActionPlayAnimation.java | 5 +- .../animation/ABActionQueueAnimation.java | 5 +- .../ABActionRemoveSecondaryAnimationTag.java | 6 +- .../unit/art/ABActionDivideUnitAlpha.java | 5 +- .../unit/art/ABActionMultiplyUnitAlpha.java | 5 +- .../action/unit/art/ABActionSetUnitAlpha.java | 5 +- .../movement/ABActionSetUnitFlyHeight.java | 5 +- ...BActionSetUnitMovementTypeNoCollision.java | 8 +- .../unitgroup/ABActionAddUnitToGroup.java | 4 +- .../unitgroup/ABActionCreateUnitGroup.java | 4 +- .../ABActionRemoveUnitFromGroup.java | 4 +- ...ctionAddAbilityEffectReactionListener.java | 8 +- ...BActionAddAbilityProjReactionListener.java | 8 +- .../ABActionAddAttackPostDamageListener.java | 6 +- .../ABActionAddAttackPreDamageListener.java | 11 ++- ...ABActionAddAttackProjReactionListener.java | 6 +- .../ABActionAddBehaviorChangeListener.java | 6 +- .../ABActionAddDamageTakenListener.java | 6 +- ...ionAddDamageTakenModificationListener.java | 6 +- .../ABActionAddDeathReplacementEffect.java | 6 +- .../ABActionAddEvasionListener.java | 6 +- .../ABActionAddUnitStateListener.java | 6 +- ...onCreateAbilityEffectReactionListener.java | 8 +- ...tionCreateAbilityProjReactionListener.java | 5 +- ...BActionCreateAttackPostDamageListener.java | 8 +- ...ABActionCreateAttackPreDamageListener.java | 5 +- ...ctionCreateAttackProjReactionListener.java | 5 +- .../ABActionCreateBehaviorChangeListener.java | 5 +- .../ABActionCreateDamageTakenListener.java | 5 +- ...CreateDamageTakenModificationListener.java | 4 +- .../ABActionCreateDeathReplacementEffect.java | 5 +- .../ABActionCreateEvasionListener.java | 5 +- .../ABActionCreateUnitStateListener.java | 4 +- ...onRemoveAbilityEffectReactionListener.java | 6 +- ...tionRemoveAbilityProjReactionListener.java | 8 +- ...BActionRemoveAttackPostDamageListener.java | 6 +- ...ABActionRemoveAttackPreDamageListener.java | 11 ++- ...ctionRemoveAttackProjReactionListener.java | 8 +- .../ABActionRemoveBehaviorChangeListener.java | 8 +- .../ABActionRemoveDamageTakenListener.java | 6 +- ...RemoveDamageTakenModificationListener.java | 6 +- .../ABActionRemoveDeathReplacementEffect.java | 6 +- .../ABActionRemoveEvasionListener.java | 6 +- .../ABActionRemoveUnitStateListener.java | 6 +- ...nModificationMultiplyDamageMultiplier.java | 6 +- ...eTakenModificationSetDamageMultiplier.java | 6 +- ...onDeathReplacementFinishReincarnating.java | 8 +- ...ctionDeathReplacementSetReincarnating.java | 6 +- .../ABActionDeathReplacementSetReviving.java | 6 +- ...ActionPreDamageListenerAddBonusDamage.java | 5 +- ...nPreDamageListenerAddDamageMultiplier.java | 6 +- ...DamageListenerLockDamageModifications.java | 6 +- .../ABActionPreDamageListenerSetMiss.java | 6 +- .../ABActionReactionPreventHit.java | 6 +- .../ABActionSetPreDamageStacking.java | 5 +- .../ABActionSubtractTotalDamageDealt.java | 6 +- .../ABCallbackGetAttackBaseDamage.java | 9 +- ...BCallbackGetAttackMaximumSplashRadius.java | 5 +- .../ABCallbackGetAttackType.java | 9 +- .../ABCallbackGetDamageType.java | 5 +- .../ABCallbackGetFinalTotalDamageDealt.java | 10 +- .../ABCallbackGetNewBehaviorTarget.java | 9 +- .../ABCallbackGetRawTotalDamageDealt.java | 5 +- ...GetReactionAttackProjectileAttackType.java | 10 +- ...backGetReactionAttackProjectileDamage.java | 5 +- .../ABCallbackGetTriggeringAttackType.java | 5 +- .../ABCallbackGetTriggeringDamageType.java | 9 +- .../ABCallbackGetWeaponType.java | 9 +- .../ABConditionIsAttackArtillery.java | 5 +- .../ABConditionIsAttackHoming.java | 9 +- ...BConditionIsNewBehaviorCategoryInList.java | 8 +- ...ABConditionIsTriggeringDamageAnAttack.java | 10 +- .../ABConditionIsTriggeringDamageRanged.java | 5 +- ...onditionIsUnitValidSplashDamageTarget.java | 12 +-- .../unitqueue/ABActionAddUnitToQueue.java | 5 +- .../unitqueue/ABActionClearUnitQueue.java | 5 +- .../unitqueue/ABActionCreateUnitQueue.java | 4 +- .../ABActionRemoveUnitFromQueue.java | 5 +- .../unitstate/ABActionAddStateModBuff.java | 8 +- .../unitstate/ABActionCreateStateModBuff.java | 10 +- .../unitstate/ABActionRemoveStateModBuff.java | 8 +- .../unitstate/ABActionSetUnitFadeTimer.java | 6 +- .../unitstate/ABActionUpdateStateModBuff.java | 6 +- .../ABActionCreateLocationVisionModifier.java | 5 +- ...BActionCreateProjectileVisionModifier.java | 8 +- .../ABActionCreateUnitVisionModifier.java | 5 +- .../vision/ABActionRemoveVisionModifier.java | 5 +- .../vision/ABActionSetBurrowPlaceholder.java | 7 +- .../behavior/callback/ABCallbackNull.java | 6 +- .../abilitycallbacks/ABAbilityCallback.java | 9 +- .../ABCallbackArgumentAbility.java | 8 +- .../ABCallbackGetAbilityById.java | 9 +- .../ABCallbackGetBuffSourceAbility.java | 7 +- .../ABCallbackGetLastCreatedAbility.java | 5 +- .../ABCallbackGetMatchingAbility.java | 5 +- .../ABCallbackGetPartnerAbility.java | 5 +- .../ABCallbackGetReactionAbility.java | 5 +- .../ABCallbackGetStoredAbilityByKey.java | 5 +- .../ABCallbackGetThisAbility.java | 5 +- .../ABCallbackInlineConditionAbility.java | 5 +- .../ABCallbackReuseAbility.java | 9 +- .../ABCallbackReuseAbilityWithArguments.java | 4 +- .../attack/ABAttackModifierCallback.java | 5 +- ...BCallbackGetLastCreatedAttackModifier.java | 5 +- ...BCallbackGetStoredAttackModifierByKey.java | 11 ++- .../ABAttackSettingsCallback.java | 5 +- .../ABCallbackGetCurrentAttackSettings.java | 5 +- ...BCallbackGetLastCreatedAttackSettings.java | 5 +- ...BCallbackGetStoredAttackSettingsByKey.java | 5 +- .../booleancallbacks/ABBooleanCallback.java | 6 +- .../ABCallbackGetAbilityDataAsBoolean.java | 4 +- ...BCallbackGetAbilityUniqueValueBoolean.java | 6 +- .../ABCallbackGetBuffUniqueValueBoolean.java | 7 +- ...CallbackGetParentAbilityDataAsBoolean.java | 6 +- .../ABCallbackGetStoredBooleanByKey.java | 5 +- .../ABCallbackInlineConditionBoolean.java | 7 +- .../ABCallbackIntegerToBoolean.java | 5 +- .../ABCallbackRawBoolean.java | 5 +- .../buffcallbacks/ABBuffCallback.java | 9 +- .../buffcallbacks/ABCallbackArgumentBuff.java | 6 +- .../buffcallbacks/ABCallbackEnumBuff.java | 6 +- .../buffcallbacks/ABCallbackGetBuffById.java | 9 +- .../ABCallbackGetLastCreatedBuff.java | 8 +- .../ABCallbackGetMatchingBuff.java | 5 +- .../ABCallbackGetStoredBuffByKey.java | 5 +- .../ABCallbackInlineConditionBuff.java | 5 +- .../buffcallbacks/ABCallbackReuseBuff.java | 6 +- .../ABCallbackReuseBuffWithArguments.java | 8 +- .../buffcallbacks/ABCallbackThisBuff.java | 6 +- .../ABCallbackArgumentDestructable.java | 6 +- ...allbackGetAbilityTargetedDestructable.java | 5 +- .../ABCallbackGetAttackedDestructable.java | 5 +- .../ABCallbackGetEnumDestructable.java | 5 +- .../ABCallbackGetLastCreatedDestructable.java | 5 +- ...BCallbackGetProjectileHitDestructable.java | 5 +- .../ABCallbackGetStoredDestructableByKey.java | 6 +- ...ABCallbackInlineConditionDestructable.java | 5 +- .../ABCallbackReuseDestructable.java | 6 +- ...allbackReuseDestructableWithArguments.java | 4 +- .../destructable/ABDestructableCallback.java | 7 +- .../ABCallbackArgumentDestructableBuff.java | 9 +- .../ABCallbackEnumDestructableBuff.java | 5 +- ...allbackGetLastCreatedDestructableBuff.java | 5 +- ...allbackGetStoredDestructableBuffByKey.java | 5 +- ...llbackInlineConditionDestructableBuff.java | 7 +- .../ABCallbackMatchingDestructableBuff.java | 5 +- .../ABCallbackReuseDestructableBuff.java | 6 +- ...ackReuseDestructableBuffWithArguments.java | 9 +- .../ABDestructableBuffCallback.java | 5 +- ...tackPreDamageListenerPriorityCallback.java | 6 +- .../enumcallbacks/ABAttackTypeCallback.java | 6 +- .../enumcallbacks/ABAutocastTypeCallback.java | 7 +- .../ABCallbackConditionalAutocastType.java | 7 +- .../ABCallbackGetAttackTypeFromString.java | 5 +- .../ABCallbackGetAutocastTypeFromString.java | 5 +- .../ABCallbackGetDamageTypeFromString.java | 6 +- .../ABCallbackGetDefenseTypeFromString.java | 6 +- .../ABCallbackGetMovementTypeFromString.java | 5 +- ...kGetNonStackingStatBuffTypeFromString.java | 5 +- .../ABCallbackGetStoredAttackTypeByKey.java | 8 +- .../ABCallbackGetStoredDamageTypeByKey.java | 6 +- .../ABCallbackGetStoredDefenseTypeByKey.java | 6 +- .../ABCallbackGetStoredMovementTypeByKey.java | 6 +- .../ABCallbackGetStoredTargetTypeByKey.java | 8 +- .../ABCallbackGetStoredWeaponTypeByKey.java | 8 +- .../ABCallbackGetTargetTypeFromString.java | 6 +- .../ABCallbackGetUnitDefenseType.java | 5 +- .../ABCallbackGetUnitMovementType.java | 6 +- .../ABCallbackGetUnitTypeMovementType.java | 5 +- .../ABCallbackGetWeaponTypeFromString.java | 6 +- .../ABCallbackRawDeathEffectPriority.java | 6 +- ...BCallbackRawPreDamageListenerPriority.java | 8 +- .../ABCallbackRawTargetType.java | 7 +- .../ABCallbackRawWeaponType.java | 7 +- .../enumcallbacks/ABDamageTypeCallback.java | 6 +- .../ABDeathReplacementPriorityCallback.java | 6 +- .../enumcallbacks/ABDefenseTypeCallback.java | 6 +- .../enumcallbacks/ABMovementTypeCallback.java | 6 +- .../ABNonStackingStatBuffTypeCallback.java | 6 +- .../enumcallbacks/ABTargetTypeCallback.java | 6 +- .../enumcallbacks/ABWeaponTypeCallback.java | 6 +- .../ABCallbackArgumentTimeOfDayEvent.java | 9 +- ...BCallbackGetLastCreatedTimeOfDayEvent.java | 5 +- ...BCallbackGetStoredTimeOfDayEventByKey.java | 13 +-- ...CallbackInlineConditionTimeOfDayEvent.java | 7 +- .../ABCallbackReuseTimeOfDayEvent.java | 6 +- ...lbackReuseTimeOfDayEventWithArguments.java | 4 +- .../ABTimeOfDayEventCallback.java | 5 +- .../ABCallbackArgumentWidgetEvent.java | 9 +- .../ABCallbackGetLastCreatedWidgetEvent.java | 5 +- .../ABCallbackGetStoredWidgetEventByKey.java | 13 +-- .../ABCallbackInlineConditionWidgetEvent.java | 5 +- .../ABCallbackReuseWidgetEvent.java | 9 +- ...CallbackReuseWidgetEventWithArguments.java | 4 +- .../ABWidgetEventCallback.java | 7 +- .../floatcallbacks/ABCallbackAddFloat.java | 7 +- .../ABCallbackArgumentFloat.java | 6 +- .../floatcallbacks/ABCallbackCeilFloat.java | 5 +- .../floatcallbacks/ABCallbackCos.java | 5 +- .../floatcallbacks/ABCallbackDegToRad.java | 7 +- .../floatcallbacks/ABCallbackDivideFloat.java | 6 +- .../floatcallbacks/ABCallbackFMaxValue.java | 5 +- .../floatcallbacks/ABCallbackFloorFloat.java | 5 +- .../ABCallbackGetAbilityArea.java | 5 +- .../ABCallbackGetAbilityCastRange.java | 9 +- .../ABCallbackGetAbilityCastTime.java | 4 +- .../ABCallbackGetAbilityCooldown.java | 9 +- .../ABCallbackGetAbilityDataAsFloat.java | 5 +- .../ABCallbackGetAbilityDuration.java | 5 +- .../ABCallbackGetAbilityHeroDuration.java | 9 +- .../ABCallbackGetAbilityProjectileSpeed.java | 6 +- .../ABCallbackGetAbilityUniqueValueFloat.java | 7 +- .../ABCallbackGetAngleBetweenLocations.java | 5 +- .../ABCallbackGetBuffDurationElapsed.java | 5 +- .../ABCallbackGetBuffUniqueValueFloat.java | 6 +- ...ABCallbackGetDistanceBetweenLocations.java | 5 +- .../ABCallbackGetDistanceBetweenUnits.java | 5 +- .../ABCallbackGetLocationX.java | 7 +- .../ABCallbackGetLocationY.java | 5 +- ...ABCallbackGetParentAbilityDataAsFloat.java | 18 ++-- .../ABCallbackGetStoredFloatByKey.java | 6 +- .../ABCallbackGetUnitAcquisitionRange.java | 5 +- .../ABCallbackGetUnitCastPoint.java | 5 +- .../ABCallbackGetUnitCurrentHp.java | 5 +- .../ABCallbackGetUnitCurrentMana.java | 5 +- .../ABCallbackGetUnitFacing.java | 5 +- .../ABCallbackGetUnitInitialMana.java | 7 +- .../ABCallbackGetUnitLocationX.java | 5 +- .../ABCallbackGetUnitLocationY.java | 5 +- .../ABCallbackInlineConditionFloat.java | 5 +- .../floatcallbacks/ABCallbackIntToFloat.java | 5 +- .../floatcallbacks/ABCallbackMaxFloat.java | 5 +- .../floatcallbacks/ABCallbackMinFloat.java | 5 +- .../ABCallbackMultiplyFloat.java | 7 +- .../ABCallbackNegativeFloat.java | 6 +- .../floatcallbacks/ABCallbackOneGameTick.java | 5 +- .../callback/floatcallbacks/ABCallbackPi.java | 5 +- .../ABCallbackRandomBoundedFloat.java | 5 +- .../floatcallbacks/ABCallbackRandomFloat.java | 6 +- .../floatcallbacks/ABCallbackRawFloat.java | 5 +- .../floatcallbacks/ABCallbackReuseFloat.java | 6 +- .../ABCallbackReuseFloatWithArguments.java | 8 +- .../floatcallbacks/ABCallbackSin.java | 7 +- .../ABCallbackSubtractFloat.java | 6 +- .../floatcallbacks/ABCallbackTan.java | 7 +- .../ABCallbackTicksForDuration.java | 7 +- .../floatcallbacks/ABFloatCallback.java | 6 +- .../fxcallbacks/ABCallbackArgumentFX.java | 6 +- .../ABCallbackGetLastCreatedFX.java | 6 +- ...CallbackGetLastCreatedLightningEffect.java | 6 +- .../ABCallbackGetStoredFXByKey.java | 6 +- .../ABCallbackGetStoredLightningByKey.java | 14 +-- .../ABCallbackInlineConditionFX.java | 5 +- .../fxcallbacks/ABCallbackReuseFX.java | 10 +- .../ABCallbackReuseFXWithArguments.java | 10 +- .../callback/fxcallbacks/ABFXCallback.java | 6 +- .../fxcallbacks/ABLightningCallback.java | 6 +- .../idcallbacks/ABCallbackArgumentID.java | 8 +- .../ABCallbackGetAbilityDataAsID.java | 4 +- .../ABCallbackGetAbilityDataAsIDFromList.java | 4 +- ...lbackGetAbilityDataAsRandomIDFromList.java | 4 +- .../ABCallbackGetAbilityUniqueValueId.java | 7 +- .../ABCallbackGetAbilityUnitId.java | 13 +-- .../idcallbacks/ABCallbackGetAlias.java | 6 +- .../idcallbacks/ABCallbackGetBuffAlias.java | 5 +- .../ABCallbackGetBuffIdFromCode.java | 6 +- .../idcallbacks/ABCallbackGetCode.java | 6 +- .../idcallbacks/ABCallbackGetFirstBuffId.java | 5 +- .../ABCallbackGetFirstEffectId.java | 4 +- .../idcallbacks/ABCallbackGetItemType.java | 5 +- .../ABCallbackGetNonCurrentTransformType.java | 11 +-- .../idcallbacks/ABCallbackGetParentAlias.java | 8 +- .../ABCallbackGetSecondBuffId.java | 6 +- .../ABCallbackGetStoredIDByKey.java | 13 +-- .../idcallbacks/ABCallbackGetUnitType.java | 9 +- .../ABCallbackGetWar3IDFromString.java | 5 +- .../ABCallbackInlineConditionID.java | 5 +- .../idcallbacks/ABCallbackNullIfFalse.java | 7 +- .../idcallbacks/ABCallbackRandomItemId.java | 5 +- .../ABCallbackRandomMechanicalCritterId.java | 6 +- .../idcallbacks/ABCallbackReuseID.java | 8 +- .../ABCallbackReuseIDWithArguments.java | 4 +- .../callback/idcallbacks/ABIDCallback.java | 5 +- .../ABCallbackAddInteger.java | 5 +- .../ABCallbackAndInteger.java | 5 +- .../ABCallbackArgumentInteger.java | 6 +- ...backCountBuffsOnUnitMatchingCondition.java | 5 +- ...ABCallbackCountUnitsInRangeOfLocation.java | 18 ++-- .../ABCallbackCountUnitsInRangeOfUnit.java | 15 ++- ...ABCallbackDetectionDropdownConversion.java | 5 +- .../ABCallbackDivideInteger.java | 5 +- ...ABCallbackGetAbilityCastTimeAsInteger.java | 4 +- .../ABCallbackGetAbilityDataAsInteger.java | 4 +- .../ABCallbackGetAbilityHandleAsInteger.java | 5 +- .../ABCallbackGetAbilityManaCost.java | 9 +- ...lbackGetAbilityTargetAttachmentPoints.java | 9 +- ...BCallbackGetAbilityUniqueValueInteger.java | 6 +- .../ABCallbackGetBuffHandleAsInteger.java | 9 +- .../ABCallbackGetBuffUniqueValueInteger.java | 7 +- .../integercallbacks/ABCallbackGetCastId.java | 6 +- .../ABCallbackGetIntegerFromList.java | 6 +- .../ABCallbackGetItemCharges.java | 13 ++- .../ABCallbackGetItemLevel.java | 13 ++- .../ABCallbackGetItemMaxCharges.java | 13 ++- .../ABCallbackGetItemSlot.java | 5 +- .../ABCallbackGetListSize.java | 9 +- .../ABCallbackGetNeutralHostilePlayerId.java | 5 +- .../ABCallbackGetNeutralPassivePlayerId.java | 5 +- .../ABCallbackGetPlayerId.java | 5 +- ...lbackGetProjectileDestructableTargets.java | 5 +- .../ABCallbackGetProjectileUnitTargets.java | 5 +- .../ABCallbackGetSortableListSize.java | 9 +- .../ABCallbackGetSpellLevel.java | 5 +- .../ABCallbackGetStoredIntegerByKey.java | 5 +- .../ABCallbackGetUnitGroupSize.java | 7 +- .../ABCallbackGetUnitHandleAsInteger.java | 5 +- .../ABCallbackGetUnitMaximumHp.java | 5 +- .../ABCallbackGetUnitMaximumMp.java | 5 +- .../ABCallbackGetUnitQueueSize.java | 7 +- .../ABCallbackGetUnitTypeFoodCost.java | 7 +- .../ABCallbackGetUnitTypeGoldCost.java | 5 +- .../ABCallbackGetUnitTypeLumberCost.java | 5 +- .../ABCallbackGetUnitTypeSpeed.java | 5 +- .../ABCallbackInlineConditionInteger.java | 5 +- .../integercallbacks/ABCallbackIntegerIf.java | 5 +- .../ABCallbackIntegerZeroIfFalse.java | 5 +- .../ABCallbackIntegerZeroIfNull.java | 7 +- .../integercallbacks/ABCallbackIterator.java | 5 +- .../ABCallbackMaxInteger.java | 12 +-- .../ABCallbackMinInteger.java | 10 +- .../ABCallbackMultiplyInteger.java | 5 +- .../integercallbacks/ABCallbackOrInteger.java | 7 +- .../ABCallbackPlayerToStateModValue.java | 7 +- .../ABCallbackRandomInteger.java | 11 +-- .../ABCallbackRawInteger.java | 5 +- .../ABCallbackReuseInteger.java | 6 +- .../ABCallbackReuseIntegerWithArguments.java | 4 +- .../ABCallbackSubtractInteger.java | 5 +- .../ABCallbackTruncateFloatToInteger.java | 7 +- .../integercallbacks/ABIntegerCallback.java | 6 +- .../callback/item/ABCallbackArgumentItem.java | 8 +- .../ABCallbackGetAbilityTargetedItem.java | 7 +- .../item/ABCallbackGetAttackedItem.java | 5 +- .../item/ABCallbackGetLastCreatedItem.java | 5 +- .../item/ABCallbackGetStoredItemByKey.java | 5 +- .../item/ABCallbackInlineConditionItem.java | 5 +- .../callback/item/ABCallbackReuseItem.java | 8 +- .../ABCallbackReuseItemWithArguments.java | 8 +- .../callback/item/ABItemCallback.java | 6 +- .../callback/list/ABCallbackArgumentList.java | 8 +- .../list/ABCallbackArgumentSortableList.java | 5 +- .../list/ABCallbackGetStoredListByKey.java | 4 +- .../ABCallbackGetStoredSortableListByKey.java | 4 +- .../list/ABCallbackInlineConditionList.java | 6 +- ...ABCallbackInlineConditionSortableList.java | 4 +- .../callback/list/ABCallbackListSorted.java | 4 +- .../callback/list/ABCallbackReuseList.java | 5 +- .../ABCallbackReuseListWithArguments.java | 4 +- .../list/ABCallbackReuseSortableList.java | 8 +- ...allbackReuseSortableListWithArguments.java | 4 +- .../callback/list/ABListCallback.java | 6 +- .../callback/list/ABSortableListCallback.java | 6 +- .../integer/ABCallbackEmptyIntegerList.java | 5 +- .../integer/ABCallbackIntegerListOfRange.java | 4 +- .../list/integer/ABIntegerListCallback.java | 4 +- .../location/ABCallbackEmptyLocationList.java | 5 +- .../list/location/ABLocationListCallback.java | 4 +- ...AbilityEffectReactionListenerCallback.java | 5 +- ...ABAbilityProjReactionListenerCallback.java | 5 +- .../ABAttackPostDamageListenerCallback.java | 6 +- .../ABAttackPreDamageListenerCallback.java | 5 +- .../ABAttackProjReactionListenerCallback.java | 5 +- .../ABBehaviorChangeListenerCallback.java | 5 +- ...tCreatedAbilityEffectReactionListener.java | 6 +- ...astCreatedAbilityProjReactionListener.java | 6 +- ...etLastCreatedAttackPostDamageListener.java | 6 +- ...GetLastCreatedAttackPreDamageListener.java | 6 +- ...LastCreatedAttackProjReactionListener.java | 6 +- ...kGetLastCreatedBehaviorChangeListener.java | 6 +- ...backGetLastCreatedDamageTakenListener.java | 5 +- ...reatedDamageTakenModificationListener.java | 6 +- ...allbackGetLastCreatedDeathReplacement.java | 6 +- ...CallbackGetLastCreatedEvasionListener.java | 6 +- ...llbackGetLastCreatedUnitStateListener.java | 5 +- ...redAbilityEffectReactionListenerByKey.java | 12 ++- ...toredAbilityProjReactionListenerByKey.java | 6 +- ...etStoredAttackPostDamageListenerByKey.java | 6 +- ...GetStoredAttackPreDamageListenerByKey.java | 12 ++- ...StoredAttackProjReactionListenerByKey.java | 6 +- ...kGetStoredBehaviorChangeListenerByKey.java | 6 +- ...backGetStoredDamageTakenListenerByKey.java | 11 ++- ...dDamageTakenModificationListenerByKey.java | 12 ++- ...allbackGetStoredDeathReplacementByKey.java | 12 ++- ...CallbackGetStoredEvasionListenerByKey.java | 6 +- ...llbackGetStoredUnitStateListenerByKey.java | 11 ++- .../ABDamageTakenListenerCallback.java | 5 +- ...mageTakenModificationListenerCallback.java | 5 +- .../ABDeathReplacementCallback.java | 5 +- .../ABEvasionListenerCallback.java | 5 +- .../ABUnitStateListenerCallback.java | 5 +- .../ABCallbackArgumentLocation.java | 9 +- .../ABCallbackCreateLocationFromOffset.java | 5 +- .../ABCallbackCreateLocationFromTarget.java | 5 +- .../ABCallbackCreateLocationFromXY.java | 5 +- .../ABCallbackCreateLocationFromXYOffset.java | 11 +-- .../ABCallbackGetAttackImpactLocation.java | 5 +- .../ABCallbackGetAttackTargetLocation.java | 5 +- .../ABCallbackGetGroundAttackedLocation.java | 5 +- .../ABCallbackGetLocationFromList.java | 6 +- ...BCallbackGetProjectileCurrentLocation.java | 7 +- .../ABCallbackGetStoredLocationByKey.java | 5 +- .../ABCallbackGetTargetedLocation.java | 6 +- .../ABCallbackGetUnitLocation.java | 6 +- .../ABCallbackInlineConditionLocation.java | 5 +- .../ABCallbackModifyLocationWithOffset.java | 5 +- .../ABCallbackModifyLocationWithXYOffset.java | 5 +- .../ABCallbackRandomLocationInRange.java | 10 +- .../ABCallbackReuseLocation.java | 6 +- .../ABCallbackReuseLocationWithArguments.java | 4 +- .../locationcallbacks/ABLocationCallback.java | 5 +- .../longcallbacks/ABCallbackAddLong.java | 5 +- .../longcallbacks/ABCallbackAndLong.java | 5 +- .../longcallbacks/ABCallbackArgumentLong.java | 6 +- .../ABCallbackCreateDetectedData.java | 5 +- .../ABCallbackCreateDetectorData.java | 5 +- .../ABCallbackCreateOwnershipData.java | 9 +- .../longcallbacks/ABCallbackDivideLong.java | 7 +- .../ABCallbackGetAbilityDataAsLong.java | 4 +- .../ABCallbackGetAbilityUniqueValueLong.java | 6 +- .../ABCallbackGetBuffUniqueValueLong.java | 6 +- .../ABCallbackGetStoredLongByKey.java | 13 +-- .../ABCallbackInlineConditionLong.java | 7 +- .../longcallbacks/ABCallbackMaxLong.java | 12 +-- .../longcallbacks/ABCallbackMinLong.java | 10 +- .../longcallbacks/ABCallbackMultiplyLong.java | 5 +- .../longcallbacks/ABCallbackOrLong.java | 5 +- .../ABCallbackPlayerMaskAllPlayers.java | 5 +- .../ABCallbackPlayerMaskExcludePlayers.java | 4 +- .../ABCallbackPlayerMaskIncludePlayers.java | 4 +- .../longcallbacks/ABCallbackRawLong.java | 9 +- .../longcallbacks/ABCallbackReuseLong.java | 8 +- .../ABCallbackReuseLongWithArguments.java | 4 +- .../longcallbacks/ABCallbackSubtractLong.java | 5 +- .../longcallbacks/ABLongCallback.java | 6 +- .../orderid/ABCallbackArgumentOrderId.java | 8 +- .../ABCallbackGetStoredOrderIdByKey.java | 8 +- .../callback/orderid/ABCallbackIdString.java | 5 +- .../ABCallbackInlineConditionOrderId.java | 5 +- .../callback/orderid/ABCallbackRawID.java | 9 +- .../orderid/ABCallbackReuseOrderId.java | 9 +- .../ABCallbackReuseOrderIdWithArguments.java | 4 +- .../callback/orderid/ABOrderIdCallback.java | 6 +- .../player/ABCallbackArgumentPlayer.java | 8 +- .../player/ABCallbackGetCastingPlayer.java | 5 +- .../player/ABCallbackGetOwnerOfUnit.java | 9 +- .../player/ABCallbackGetPlayerById.java | 5 +- .../ABCallbackGetStoredPlayerByKey.java | 5 +- .../ABCallbackInlineConditionPlayer.java | 5 +- .../player/ABCallbackReusePlayer.java | 9 +- .../ABCallbackReusePlayerWithArguments.java | 4 +- .../callback/player/ABPlayerCallback.java | 6 +- .../ABCallbackArgumentProjectile.java | 9 +- .../ABCallbackGetLastCreatedProjectile.java | 5 +- ...BCallbackGetReactionAbilityProjectile.java | 6 +- ...ABCallbackGetReactionAttackProjectile.java | 5 +- .../ABCallbackGetStoredProjectileByKey.java | 5 +- .../ABCallbackGetThisProjectile.java | 5 +- .../ABCallbackInlineConditionProjectile.java | 5 +- .../projectile/ABCallbackReuseProjectile.java | 9 +- ...BCallbackReuseProjectileWithArguments.java | 4 +- .../projectile/ABProjectileCallback.java | 6 +- ...ABCallbackArgumentNonStackingStatBuff.java | 6 +- ...backGetLastCreatedNonStackingStatBuff.java | 7 +- ...backGetStoredNonStackingStatBuffByKey.java | 5 +- ...ackInlineConditionNonStackingStatBuff.java | 5 +- .../ABCallbackReuseNonStackingStatBuff.java | 9 +- ...ReuseNonStackingStatBuffWithArguments.java | 9 +- .../ABNonStackingStatBuffCallback.java | 6 +- .../ABCallbackArgumentStateModBuff.java | 9 +- .../ABCallbackGetLastCreatedStateModBuff.java | 5 +- .../ABCallbackGetStoredStateModBuffByKey.java | 5 +- ...ABCallbackInlineConditionStateModBuff.java | 5 +- .../ABCallbackReuseStateModBuff.java | 6 +- ...allbackReuseStateModBuffWithArguments.java | 10 +- .../ABStateModBuffCallback.java | 6 +- .../ABCallbackArgumentString.java | 6 +- .../ABCallbackBooleanToString.java | 9 +- .../stringcallbacks/ABCallbackCatStrings.java | 4 +- .../ABCallbackFloatToString.java | 9 +- .../ABCallbackGetAbilityDataAsString.java | 4 +- .../ABCallbackGetAbilityHandleAsString.java | 9 +- ...ABCallbackGetAbilityUniqueValueString.java | 6 +- .../ABCallbackGetAliasAsString.java | 5 +- .../ABCallbackGetAllowStackingKey.java | 5 +- .../ABCallbackGetBuffHandleAsString.java | 5 +- .../ABCallbackGetBuffUniqueValueString.java | 7 +- .../ABCallbackGetCodeAsString.java | 5 +- .../ABCallbackGetStoredStringByKey.java | 6 +- .../ABCallbackGetUnitHandleAsString.java | 5 +- .../stringcallbacks/ABCallbackIdToString.java | 5 +- .../ABCallbackInlineConditionString.java | 7 +- .../ABCallbackIntegerToString.java | 5 +- .../ABCallbackLongToString.java | 5 +- .../stringcallbacks/ABCallbackRawString.java | 6 +- .../ABCallbackReuseString.java | 9 +- .../ABCallbackReuseStringWithArguments.java | 4 +- .../stringcallbacks/ABStringCallback.java | 6 +- .../ABCallbackArgumentTarget.java | 6 +- .../ABCallbackGetAbilityTarget.java | 5 +- .../ABCallbackGetStoredTargetByKey.java | 5 +- .../ABCallbackInlineConditionTarget.java | 5 +- .../ABCallbackReuseTarget.java | 9 +- .../ABCallbackReuseTargetWithArguments.java | 9 +- .../targetcallbacks/ABTargetCallback.java | 7 +- .../ABCallbackArgumentTimer.java | 6 +- .../ABCallbackGetFiringTimer.java | 5 +- .../ABCallbackGetLastCreatedTimer.java | 5 +- .../ABCallbackGetLastStartedTimer.java | 5 +- .../ABCallbackGetStoredTimerByKey.java | 11 ++- .../ABCallbackInlineConditionTimer.java | 7 +- .../timercallbacks/ABCallbackReuseTimer.java | 6 +- .../ABCallbackReuseTimerWithArguments.java | 4 +- .../timercallbacks/ABTimerCallback.java | 7 +- .../unitcallbacks/ABCallbackArgumentUnit.java | 8 +- .../ABCallbackGetAbilityPairedUnit.java | 5 +- .../ABCallbackGetAbilityTargetedUnit.java | 6 +- .../ABCallbackGetAttackedUnit.java | 5 +- .../ABCallbackGetAttackingUnit.java | 5 +- .../ABCallbackGetBuffCastingUnit.java | 6 +- .../ABCallbackGetBuffedUnit.java | 6 +- .../ABCallbackGetCastingUnit.java | 6 +- .../unitcallbacks/ABCallbackGetChainUnit.java | 6 +- .../unitcallbacks/ABCallbackGetCompUnit1.java | 9 +- .../unitcallbacks/ABCallbackGetCompUnit2.java | 6 +- .../ABCallbackGetDamagedUnit.java | 7 +- .../ABCallbackGetDamagingUnit.java | 7 +- .../unitcallbacks/ABCallbackGetDyingUnit.java | 7 +- .../unitcallbacks/ABCallbackGetEnumUnit.java | 5 +- .../ABCallbackGetKillingUnit.java | 7 +- .../ABCallbackGetLastCreatedUnit.java | 5 +- .../ABCallbackGetListenerUnit.java | 5 +- .../ABCallbackGetMatchingUnit.java | 5 +- ...CallbackGetNearestCorpseInRangeOfUnit.java | 4 +- ...ABCallbackGetNearestUnitInRangeOfUnit.java | 4 +- .../ABCallbackGetParentCastingUnit.java | 5 +- .../ABCallbackGetProjectileHitUnit.java | 5 +- .../ABCallbackGetProjectileSourceUnit.java | 7 +- ...CallbackGetReactionAbilityCastingUnit.java | 7 +- ...BCallbackGetReactionAbilityTargetUnit.java | 5 +- .../ABCallbackGetStoredUnitByKey.java | 5 +- .../ABCallbackInlineConditionUnit.java | 5 +- .../ABCallbackPollUnitQueue.java | 5 +- .../unitcallbacks/ABCallbackReuseUnit.java | 8 +- .../ABCallbackReuseUnitWithArguments.java | 6 +- .../unitcallbacks/ABUnitCallback.java | 5 +- .../ABCallbackArgumentUnitGroup.java | 5 +- .../ABCallbackGetLastCreatedUnitGroup.java | 4 +- .../ABCallbackGetStoredUnitGroupByKey.java | 7 +- .../ABCallbackGetUnitGroupByName.java | 4 +- .../ABCallbackInlineConditionUnitGroup.java | 6 +- .../ABCallbackReuseUnitGroup.java | 5 +- ...ABCallbackReuseUnitGroupWithArguments.java | 4 +- .../ABUnitGroupCallback.java | 5 +- .../ABCallbackArgumentUnitQueue.java | 5 +- .../ABCallbackGetLastCreatedUnitQueue.java | 4 +- .../ABCallbackGetStoredUnitQueueByKey.java | 7 +- .../ABCallbackGetUnitQueueByName.java | 4 +- .../ABCallbackInlineConditionUnitQueue.java | 4 +- .../unitqueue/ABCallbackReuseUnitQueue.java | 5 +- ...ABCallbackReuseUnitQueueWithArguments.java | 9 +- .../unitqueue/ABUnitQueueCallback.java | 5 +- .../ABCallbackArgumentVisionModifier.java | 6 +- ...BCallbackGetLastCreatedVisionModifier.java | 5 +- ...BCallbackGetStoredVisionModifierByKey.java | 5 +- ...CallbackInlineConditionVisionModifier.java | 5 +- .../ABCallbackReuseVisionModifier.java | 9 +- ...lbackReuseVisionModifierWithArguments.java | 9 +- .../ABVisionModifierCallback.java | 6 +- .../widget/ABCallbackArgumentWidget.java | 8 +- .../ABCallbackDestructableToWidget.java | 5 +- .../ABCallbackGetProjectileHitWidget.java | 8 +- .../ABCallbackGetStoredWidgetByKey.java | 8 +- .../ABCallbackInlineConditionWidget.java | 5 +- .../widget/ABCallbackItemToWidget.java | 5 +- .../widget/ABCallbackReuseWidget.java | 7 +- .../ABCallbackReuseWidgetWithArguments.java | 11 ++- .../widget/ABCallbackUnitToWidget.java | 7 +- .../callback/widget/ABWidgetCallback.java | 6 +- .../condition/ABCallbackArgumentBoolean.java | 8 +- .../condition/ABCallbackReuseBoolean.java | 9 +- .../ABCallbackReuseBooleanWithArguments.java | 9 +- .../ABConditionIsDestructableValidTarget.java | 4 +- ...ConditionIsPassAllAbilityTargetChecks.java | 5 +- .../condition/ABConditionIsUnitInGroup.java | 4 +- .../ABConditionIsUnitInRangeOfUnit.java | 8 +- ...itionIsUnitPassAllAbilityTargetChecks.java | 5 +- .../ABConditionIsUnitValidTarget.java | 4 +- .../condition/ABConditionIsValidTarget.java | 4 +- ...tionMatchingCorpseExistsInRangeOfUnit.java | 4 +- ...ditionMatchingUnitExistsInRangeOfUnit.java | 13 ++- .../ABConditionSetCantUseReasonOnFailure.java | 4 +- .../ABConditionDoesAbilityHaveUniqueFlag.java | 7 +- .../ABConditionIsAutoCastCurrentlyActive.java | 5 +- .../ability/ABConditionIsDisabled.java | 5 +- ...BConditionIsFlexAbilityNonPointTarget.java | 5 +- .../ABConditionIsFlexAbilityNonTargeted.java | 5 +- .../ABConditionIsFlexAbilityPointTarget.java | 5 +- .../ABConditionIsFlexAbilityTargeted.java | 8 +- .../ability/ABConditionIsOnCooldown.java | 5 +- .../ABConditionIsToggleAbilityActive.java | 5 +- .../ABConditionIsTransformingToAlternate.java | 7 +- .../ability/ABConditionWasAutoCast.java | 5 +- ...BConditionWasAutoCastPreviouslyActive.java | 5 +- .../ABConditionWasCastingInterrupted.java | 5 +- .../attack/ABConditionIsAttackProjectile.java | 7 +- .../attack/ABConditionIsAttackRanged.java | 7 +- .../ABConditionDoesBuffHaveUniqueFlag.java | 7 +- .../condition/buff/ABConditionIsBuffAlly.java | 5 +- .../buff/ABConditionIsBuffEnemy.java | 5 +- .../buff/ABConditionIsBuffMagic.java | 7 +- .../buff/ABConditionIsBuffNegative.java | 7 +- .../buff/ABConditionIsBuffPositive.java | 7 +- .../ABConditionIsAttackTypeEqual.java | 4 +- .../ABConditionIsDamageTypeEqual.java | 4 +- .../ABConditionIsDefenseTypeEqual.java | 4 +- .../ABConditionIsDefenseTypeInList.java | 4 +- .../comparison/ABConditionIsIdEqual.java | 5 +- .../ABConditionIsMovementTypeEqual.java | 5 +- .../comparison/ABConditionIsUnitEqual.java | 4 +- .../ABConditionIsWeaponTypeEqual.java | 4 +- .../ABConditionDoesDestructableHaveBuff.java | 10 +- ...DestructableHaveBuffMatchingCondition.java | 5 +- .../destructable/ABConditionIsTree.java | 7 +- .../ABConditionIsDestructableBuffMagic.java | 5 +- ...ameplayConstantCanDisableDivineShield.java | 4 +- ...ionGameplayConstantIsDefendCanDeflect.java | 4 +- ...ameplayConstantIsRelativeUpgradeCosts.java | 4 +- ...tionGameplayConstantSmartAbolishMagic.java | 4 +- .../game/ABConditionIsTimeOfDayInRange.java | 4 +- .../item/ABConditionIsItemAbility.java | 5 +- .../item/ABConditionItemHasCharges.java | 7 +- .../item/ABConditionItemIsCharged.java | 5 +- .../ABConditionIsLocationDeepWater.java | 5 +- .../ABConditionIsLocationFlyingOnly.java | 9 +- .../ABConditionIsLocationShallowWater.java | 8 +- .../ABConditionIsLocationWalkable.java | 5 +- ...ABConditionIsLocationWalkableNonWater.java | 5 +- .../condition/logical/ABConditionAnd.java | 8 +- .../condition/logical/ABConditionBool.java | 7 +- .../condition/logical/ABConditionIsNull.java | 5 +- .../condition/logical/ABConditionNot.java | 5 +- .../condition/logical/ABConditionNotNull.java | 7 +- .../condition/logical/ABConditionOr.java | 6 +- .../numeric/ABConditionFloatEq0.java | 5 +- .../numeric/ABConditionFloatEqual.java | 5 +- .../condition/numeric/ABConditionFloatGt.java | 5 +- .../numeric/ABConditionFloatGt0.java | 9 +- .../numeric/ABConditionFloatGte.java | 9 +- .../condition/numeric/ABConditionFloatLt.java | 11 +-- .../numeric/ABConditionFloatLte.java | 11 +-- .../condition/numeric/ABConditionFloatNe.java | 5 +- .../numeric/ABConditionFloatNe0.java | 5 +- .../numeric/ABConditionIntegerEq.java | 9 +- .../numeric/ABConditionIntegerEq0.java | 5 +- .../numeric/ABConditionIntegerGt.java | 7 +- .../numeric/ABConditionIntegerGt0.java | 5 +- .../numeric/ABConditionIntegerGte.java | 7 +- .../numeric/ABConditionIntegerIsEven.java | 7 +- .../numeric/ABConditionIntegerIsOdd.java | 7 +- .../numeric/ABConditionIntegerLt.java | 5 +- .../numeric/ABConditionIntegerLte.java | 5 +- .../numeric/ABConditionIntegerNe.java | 7 +- .../numeric/ABConditionIntegerNe0.java | 7 +- .../ABConditionIsProjectileReflected.java | 5 +- .../timer/ABConditionIsTimerActive.java | 5 +- ...nDoesUnitHaveAbilityMatchingCondition.java | 4 +- .../unit/ABConditionDoesUnitHaveBuff.java | 6 +- ...tionDoesUnitHaveBuffMatchingCondition.java | 4 +- .../unit/ABConditionIsUnitAlive.java | 4 +- .../unit/ABConditionIsUnitBuilding.java | 4 +- .../unit/ABConditionIsUnitConstructing.java | 4 +- ...onditionIsUnitConstructingOrUpgrading.java | 4 +- .../condition/unit/ABConditionIsUnitDead.java | 4 +- .../unit/ABConditionIsUnitEnemy.java | 8 +- .../unit/ABConditionIsUnitFriend.java | 8 +- .../condition/unit/ABConditionIsUnitHero.java | 4 +- .../unit/ABConditionIsUnitHeroDuration.java | 4 +- .../unit/ABConditionIsUnitHidden.java | 4 +- .../unit/ABConditionIsUnitMagicImmune.java | 4 +- .../unit/ABConditionIsUnitMaxHp.java | 5 +- .../unit/ABConditionIsUnitMaxMp.java | 5 +- .../unit/ABConditionIsUnitMorphImmune.java | 4 +- .../unit/ABConditionIsUnitPolymorphed.java | 4 +- .../unit/ABConditionIsUnitShareSpells.java | 4 +- .../unit/ABConditionIsUnitSleeping.java | 4 +- .../unit/ABConditionIsUnitSummoned.java | 4 +- .../unit/ABConditionIsUnitTraining.java | 4 +- .../condition/unit/ABConditionIsUnitType.java | 4 +- .../unit/ABConditionIsUnitUpgrading.java | 4 +- .../unit/ABConditionIsUnitVisible.java | 5 +- ...BConditionSuccessfullyChargeResources.java | 6 +- .../unit/ABConditionUnitHasResearch.java | 4 +- ...ditionIsCurrentBehaviorCategoryInList.java | 4 +- ...onditionIsLocationPathableForUnitType.java | 7 +- .../abilitybuilder/buff/ABBuff.java | 6 +- .../abilitybuilder/buff/ABBuffSlow.java | 7 +- .../abilitybuilder/buff/ABBuffStun.java | 5 +- .../buff/ABDestructableBuff.java | 45 ++++----- .../abilitybuilder/buff/ABGenericArtBuff.java | 5 +- .../buff/ABGenericAuraBuff.java | 3 +- .../buff/ABGenericPermanentBuff.java | 7 +- .../buff/ABGenericTimedBuff.java | 8 +- .../buff/ABPermanentPassiveBuff.java | 10 +- .../abilitybuilder/buff/ABTargetingBuff.java | 5 +- .../abilitybuilder/buff/ABTimedArtBuff.java | 7 +- .../abilitybuilder/buff/ABTimedBuff.java | 6 +- .../ABTimedInstantTransformationBuff.java | 5 +- .../buff/ABTimedPausedExpirationBuff.java | 19 ++-- .../buff/ABTimedTargetingBuff.java | 5 +- .../buff/ABTimedTickingBuff.java | 6 +- .../buff/ABTimedTickingPausedBuff.java | 13 ++- .../buff/ABTimedTickingPostDeathBuff.java | 13 ++- .../buff/ABTimedTransformationBuff.java | 21 ++-- .../abilitybuilder/core/ABAction.java | 5 +- .../abilitybuilder/core/ABCallback.java | 5 +- .../abilitybuilder/core/ABCondition.java | 6 +- .../abilitybuilder/datastore/DataStore.java | 30 ++++++ .../datastore/GlobalDataStore.java | 82 ++++++++++++++++ .../datastore/LocalDataStore.java | 5 + .../datastore/MapLocalDataStore.java | 79 +++++++++++++++ .../event/ABGlobalWidgetEvent.java | 6 +- .../abilitybuilder/event/ABPlayerEvent.java | 6 +- .../event/ABTimeOfDayEvent.java | 6 +- .../abilitybuilder/event/ABWidgetEvent.java | 6 +- .../handler/TransformationHandler.java | 20 ++-- .../iterstructs/ABUnitComparator.java | 6 +- .../abilitybuilder/jass/ABActionJass.java | 4 +- .../abilitybuilder/jass/ABConditionJass.java | 7 +- .../ABAbilityEffectReactionListener.java | 6 +- .../ABAbilityProjReactionListener.java | 6 +- .../listener/ABAttackEvasionListener.java | 6 +- .../listener/ABAttackModifier.java | 6 +- .../listener/ABAttackPostDamageListener.java | 6 +- .../listener/ABAttackPreDamageListener.java | 6 +- .../ABAttackProjReactionListener.java | 29 +++--- .../listener/ABBehaviorChangeListener.java | 27 ++--- .../listener/ABDamageTakenListener.java | 38 +++---- .../ABDamageTakenModificationListener.java | 6 +- .../listener/ABDeathReplacementEffect.java | 26 ++--- .../listener/ABUnitStateListener.java | 10 +- .../ABCollisionProjectileListener.java | 5 +- .../projectile/ABProjectileListener.java | 6 +- .../abilitybuilder/timer/ABTimer.java | 6 +- .../DelayInstantTransformationTimer.java | 12 +-- .../abilitybuilder/timer/DelayTimerTimer.java | 9 +- .../impl/CAbilityTypeAbilityBuilder.java | 6 +- .../CAbilityTypeAbilityTemplateBuilder.java | 6 +- 985 files changed, 3232 insertions(+), 3403 deletions(-) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/DataStore.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/GlobalDataStore.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/LocalDataStore.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/MapLocalDataStore.java diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index b53e4f3fa..fddefe594 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -152,6 +152,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPausedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPostDeathBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.MapLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.jass.ABActionJass; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.jass.ABConditionJass; @@ -6633,7 +6635,7 @@ public HandleJassValue accept(final CItem target) { final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.get(childKey); if (object != null) { return new StringJassValue((String) object); @@ -6647,7 +6649,7 @@ public HandleJassValue accept(final CItem target) { final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.get(childKey); if (object != null) { return IntegerJassValue.of((Integer) object); @@ -6661,7 +6663,7 @@ public HandleJassValue accept(final CItem target) { final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.get(childKey); if (object != null) { return BooleanJassValue.of((Boolean) object); @@ -6686,7 +6688,7 @@ public HandleJassValue accept(final CItem target) { // TODO below is overwriting what already exists jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreLocationHandle", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); Object object = localStore.get(childKey); @@ -6702,7 +6704,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreHandle", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object unwrappedHandleUnderlyingJavaObject = nullable(arguments, 2, @@ -6717,7 +6719,7 @@ public HandleJassValue accept(final CItem target) { final String value = nullable(arguments, 2, StringJassValueVisitor.getInstance()); if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.put(childKey, value); return BooleanJassValue.of(object != null); } @@ -6730,7 +6732,7 @@ public HandleJassValue accept(final CItem target) { final Integer value = arguments.get(2).visit(IntegerJassValueVisitor.getInstance()); if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.put(childKey, value); return BooleanJassValue.of(object != null); } @@ -6743,7 +6745,7 @@ public HandleJassValue accept(final CItem target) { final Boolean value = arguments.get(2).visit(BooleanJassValueVisitor.getInstance()); if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.put(childKey, value); return BooleanJassValue.of(object != null); } @@ -6755,7 +6757,7 @@ public HandleJassValue accept(final CItem target) { final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); return BooleanJassValue.of(localStore.containsKey(childKey)); } return BooleanJassValue.FALSE; @@ -6766,7 +6768,7 @@ public HandleJassValue accept(final CItem target) { if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; if (ability != null) { - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); localStore.clear(); } } @@ -6778,7 +6780,7 @@ public HandleJassValue accept(final CItem target) { final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); return BooleanJassValue.of(localStore.remove(childKey) != null); } return BooleanJassValue.FALSE; @@ -6787,11 +6789,11 @@ public HandleJassValue accept(final CItem target) { // ===== local store ===== jassProgramVisitor.getJassNativeManager().createNative("CreateLocalStore", (arguments, globalScope, triggerScope) -> { - return new HandleJassValue(localstoreType, new HashMap()); + return new HandleJassValue(localstoreType, new MapLocalDataStore()); }); jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreString", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -6802,7 +6804,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreInteger", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -6816,7 +6818,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreReal", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -6827,7 +6829,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreCode", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -6838,7 +6840,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreBoolean", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -6849,7 +6851,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreString", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final String value = nullable(arguments, 2, StringJassValueVisitor.getInstance()); @@ -6858,7 +6860,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreInteger", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Integer value = arguments.get(2).visit(IntegerJassValueVisitor.getInstance()); @@ -6867,7 +6869,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreReal", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final float value = arguments.get(2).visit(RealJassValueVisitor.getInstance()).floatValue(); @@ -6876,7 +6878,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreBoolean", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Boolean value = arguments.get(2).visit(BooleanJassValueVisitor.getInstance()); @@ -6885,7 +6887,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreCode", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final CodeJassValue value = arguments.get(2).visit(CodeJassValueVisitor.getInstance()); @@ -6894,14 +6896,14 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("LocalStoreContainsKey", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); return BooleanJassValue.of(localStore.containsKey(childKey)); }); final JassFunction flushParentLocalStore = (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); localStore.clear(); return null; }; @@ -6909,7 +6911,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("DestroyLocalStore", flushParentLocalStore); jassProgramVisitor.getJassNativeManager().createNative("FlushChildLocalStore", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); return BooleanJassValue.of(localStore.remove(childKey) != null); @@ -6917,7 +6919,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("LocalStoreCleanUpCastInstance", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); final Set keySet = new HashSet<>(localStore.keySet()); @@ -6933,7 +6935,7 @@ public HandleJassValue accept(final CItem target) { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); return new HandleJassValue(localstoreType, localStore); } return localstoreType.getNullValue(); @@ -7593,7 +7595,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { int argIndex = 0; final CUnit casterUnit = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, argIndex++, + final LocalDataStore localStore = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(argIndex++).visit(IntegerJassValueVisitor.getInstance()); @@ -7646,7 +7648,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { int argIndex = 0; final CUnit casterUnit = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, argIndex++, + final LocalDataStore localStore = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(argIndex++).visit(IntegerJassValueVisitor.getInstance()); @@ -7683,7 +7685,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { int argIndex = 0; final CUnit casterUnit = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, argIndex++, + final LocalDataStore localStore = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(argIndex++).visit(IntegerJassValueVisitor.getInstance()); @@ -7744,7 +7746,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { int argIndex = 0; final CUnit casterUnit = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, argIndex++, + final LocalDataStore localStore = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(argIndex++).visit(IntegerJassValueVisitor.getInstance()); @@ -7794,7 +7796,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { int argIndex = 0; final CUnit casterUnit = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, argIndex++, + final LocalDataStore localStore = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(argIndex++).visit(IntegerJassValueVisitor.getInstance()); @@ -7947,7 +7949,7 @@ public void remove() { final CEffectType artType = nullable(arguments, 4, ObjectJassValueVisitor.getInstance()); final boolean showFx = arguments.get(5).visit(BooleanJassValueVisitor.getInstance()); final boolean playSfx = arguments.get(6).visit(BooleanJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, 7, + final LocalDataStore localStore = nullable(arguments, 7, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(8).visit(IntegerJassValueVisitor.getInstance()); final boolean leveled = arguments.get(9).visit(BooleanJassValueVisitor.getInstance()); @@ -7969,7 +7971,7 @@ public void remove() { jassProgramVisitor.getJassNativeManager().createNative("CreateTargetingBuff", (arguments, globalScope, triggerScope) -> { final int buffRawcode = arguments.get(0).visit(IntegerJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, 1, + final LocalDataStore localStore = nullable(arguments, 1, ObjectJassValueVisitor.getInstance()); final CBuff ability = new ABTargetingBuff( @@ -7988,7 +7990,7 @@ public void remove() { final boolean leveled = arguments.get(4).visit(BooleanJassValueVisitor.getInstance()); final boolean positive = arguments.get(5).visit(BooleanJassValueVisitor.getInstance()); final boolean dispellable = arguments.get(6).visit(BooleanJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, 7, + final LocalDataStore localStore = nullable(arguments, 7, ObjectJassValueVisitor.getInstance()); final ABTimedArtBuff ability = new ABTimedArtBuff( @@ -8010,7 +8012,7 @@ public void remove() { final CodeJassValue onExpireAction = nullable(arguments, 5, CodeJassValueVisitor.getInstance()); final boolean showIcon = arguments.get(6).visit(BooleanJassValueVisitor.getInstance()); final CEffectType artType = nullable(arguments, 7, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, 8, + final LocalDataStore localStore = nullable(arguments, 8, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(9).visit(IntegerJassValueVisitor.getInstance()); final boolean leveled = arguments.get(10).visit(BooleanJassValueVisitor.getInstance()); @@ -8041,7 +8043,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { final int buffRawcode = arguments.get(0).visit(IntegerJassValueVisitor.getInstance()); final float duration = arguments.get(1).visit(RealJassValueVisitor.getInstance()).floatValue(); - final Map localStore = nullable(arguments, 2, + final LocalDataStore localStore = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); final CBuff ability = new ABTimedTargetingBuff( @@ -8061,7 +8063,7 @@ public void remove() { final CodeJassValue onTickAction = nullable(arguments, 6, CodeJassValueVisitor.getInstance()); final boolean showIcon = arguments.get(7).visit(BooleanJassValueVisitor.getInstance()); final CEffectType artType = nullable(arguments, 8, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, 9, + final LocalDataStore localStore = nullable(arguments, 9, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(10).visit(IntegerJassValueVisitor.getInstance()); final boolean leveled = arguments.get(11).visit(BooleanJassValueVisitor.getInstance()); @@ -8088,7 +8090,7 @@ public void remove() { final CodeJassValue onTickAction = nullable(arguments, 6, CodeJassValueVisitor.getInstance()); final boolean showIcon = arguments.get(7).visit(BooleanJassValueVisitor.getInstance()); final CEffectType artType = nullable(arguments, 8, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, 9, + final LocalDataStore localStore = nullable(arguments, 9, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(10).visit(IntegerJassValueVisitor.getInstance()); final boolean leveled = arguments.get(11).visit(BooleanJassValueVisitor.getInstance()); @@ -8115,7 +8117,7 @@ public void remove() { final CodeJassValue onTickAction = nullable(arguments, 6, CodeJassValueVisitor.getInstance()); final boolean showIcon = arguments.get(7).visit(BooleanJassValueVisitor.getInstance()); final CEffectType artType = nullable(arguments, 8, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, 9, + final LocalDataStore localStore = nullable(arguments, 9, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(10).visit(IntegerJassValueVisitor.getInstance()); final boolean leveled = arguments.get(11).visit(BooleanJassValueVisitor.getInstance()); @@ -8161,7 +8163,7 @@ public void remove() { final CUnit casterUnit = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int buffRawcode = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); final int level = arguments.get(2).visit(IntegerJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, 3, + final LocalDataStore localStore = nullable(arguments, 3, ObjectJassValueVisitor.getInstance()); final CodeJassValue onAddAction = nullable(arguments, 4, CodeJassValueVisitor.getInstance()); final CodeJassValue onRemoveAction = nullable(arguments, 5, CodeJassValueVisitor.getInstance()); @@ -8184,7 +8186,7 @@ public void remove() { final float endTime = arguments.get(2).visit(RealJassValueVisitor.getInstance()).floatValue(); final String equalityId = nullable(arguments, 3, StringJassValueVisitor.getInstance()); final CUnit casterUnit = nullable(arguments, 4, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, 5, + final LocalDataStore localStore = nullable(arguments, 5, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(6).visit(IntegerJassValueVisitor.getInstance()); @@ -8993,7 +8995,7 @@ public boolean call(final CUnit unit) { final CodeJassValue threadFunction = arguments.get(0).visit(CodeJassValueVisitor.getInstance()); final CUnit casterUnit = nullable(arguments, 1, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, 2, + final LocalDataStore localStore = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(3).visit(IntegerJassValueVisitor.getInstance()); @@ -9005,7 +9007,7 @@ public boolean call(final CUnit unit) { jassProgramVisitor.getJassNativeManager().createNative("CreateABTimer", (arguments, globalScope, triggerScope) -> { final CUnit casterUnit = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); - final Map localStore = nullable(arguments, 1, + final LocalDataStore localStore = nullable(arguments, 1, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(2).visit(IntegerJassValueVisitor.getInstance()); final CodeJassValue threadFunction = nullable(arguments, 3, CodeJassValueVisitor.getInstance()); @@ -9248,7 +9250,7 @@ private static void registerAbilityUserDataHandleNatives(final JassProgram jassP final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.get(childKey); if (object != null) { return new HandleJassValue(handleType, object); @@ -9264,7 +9266,7 @@ private static void registerAbilityUserDataHandleNatives(final JassProgram jassP ObjectJassValueVisitor.getInstance()); if (abilityFromHandle instanceof AbilityBuilderAbility) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final Map localStore = ability.getLocalStore(); + final LocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.put(childKey, unwrappedHandleUnderlyingJavaObject); return BooleanJassValue.of(object != null); } @@ -9273,7 +9275,7 @@ private static void registerAbilityUserDataHandleNatives(final JassProgram jassP jassProgramVisitor.getJassNativeManager().createNative("GetLocalStore" + nameSuffix + "Handle", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -9284,7 +9286,7 @@ private static void registerAbilityUserDataHandleNatives(final JassProgram jassP }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStore" + nameSuffix + "Handle", (arguments, globalScope, triggerScope) -> { - final Map localStore = nullable(arguments, 0, + final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object unwrappedHandleUnderlyingJavaObject = nullable(arguments, 2, diff --git a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java index 488aa6e9c..28711e37c 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java +++ b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.parsers.jass.scope; -import java.util.Map; - import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.interpreter.ast.scope.trigger.Trigger; import com.etheller.warsmash.util.War3ID; @@ -15,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.COrderButton.JassOrderButtonType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerJass; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.region.CRegion; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; @@ -90,7 +89,7 @@ public class CommonTriggerExecutionScope extends TriggerExecutionScope { private JassOrderButtonType spellAbilityTargetType; // Warsmash only private COrderButton spellAbilityOrderCommandCard; // Warsmash only private String enumFilePath; // Warsmash only - private Map triggerLocalStore; // warsmash only + private LocalDataStore triggerLocalStore; // warsmash only private int triggerCastId; // Warsmash only private float damageTaken; private CUnit damageSource; @@ -450,7 +449,7 @@ public String getEnumFilePath() { return this.enumFilePath; } - public Map getTriggerLocalStore() { + public LocalDataStore getTriggerLocalStore() { return this.triggerLocalStore; } @@ -928,7 +927,7 @@ public static CommonTriggerExecutionScope jassAbilityBasicScope(final CAbility s return scope; } - public static TriggerExecutionScope abilityBuilder(final CUnit caster, final Map localStore, + public static TriggerExecutionScope abilityBuilder(final CUnit caster, final LocalDataStore localStore, final int castId) { final CommonTriggerExecutionScope scope = new CommonTriggerExecutionScope(null, TriggerExecutionScope.EMPTY); scope.spellAbilityUnit = caster; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java index 3939a32b7..5b02ac3fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.Aliased; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -16,7 +16,7 @@ public interface AbilityBuilderAbility extends CLevelingAbility, Aliased { public AbilityBuilderConfiguration getConfig(); - public Map getLocalStore(); + public LocalDataStore getLocalStore(); public float getArea(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java index 96a21930b..1dfdaaf56 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java @@ -2,7 +2,6 @@ import java.util.EnumSet; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; @@ -14,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.GenericSingleIconActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; @@ -24,7 +24,7 @@ public interface AbilityBuilderActiveAbility extends AbilityBuilderAbility, CAut public AbilityBuilderConfiguration getConfig(); - public Map getLocalStore(); + public LocalDataStore getLocalStore(); public int getChargedManaCost(); public void setCastRange(float castRange); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java index 6f1dffc11..c929af621 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,10 +8,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -24,7 +23,7 @@ public class CAbilityAbilityBuilderActiveAutoTarget extends CAbilityAbilityBuild public CAbilityAbilityBuilderActiveAutoTarget(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, - Map localStore) { + LocalDataStore localStore) { super(handleId, code, alias, levelData, config, localStore); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java index fd5b7dd53..94850058d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -15,6 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -30,7 +30,7 @@ public class CAbilityAbilityBuilderActiveFlexTarget extends CAbilityAbilityBuild public CAbilityAbilityBuilderActiveFlexTarget(int handleId, War3ID alias, War3ID code, List levelData, AbilityBuilderConfiguration config, - Map localStore) { + LocalDataStore localStore) { super(handleId, alias, code, levelData, config, localStore); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java index 6bd295583..ed8cea36a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,9 +8,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -27,7 +26,7 @@ public class CAbilityAbilityBuilderActiveNoTarget extends CAbilityAbilityBuilder public CAbilityAbilityBuilderActiveNoTarget(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, - Map localStore) { + LocalDataStore localStore) { super(handleId, code, alias, levelData, config, localStore); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java index 06a45ee6b..2d3c4e953 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java @@ -2,7 +2,6 @@ import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import com.badlogic.gdx.math.Rectangle; @@ -20,6 +19,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorSendOrder; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -50,7 +50,7 @@ public class CAbilityAbilityBuilderActivePairing extends CAbilityAbilityBuilderG public CAbilityAbilityBuilderActivePairing(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, - Map localStore) { + LocalDataStore localStore) { super(handleId, code, alias, levelData, config, localStore); if (this.castingPrimaryTag == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java index 259e9fa02..3974bf46c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -12,6 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -24,7 +24,7 @@ public class CAbilityAbilityBuilderActivePointTarget extends CAbilityAbilityBuil public CAbilityAbilityBuilderActivePointTarget(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, - Map localStore) { + LocalDataStore localStore) { super(handleId, code, alias, levelData, config, localStore); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java index 90ca4df26..7b7541056 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -12,6 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -24,7 +24,7 @@ public class CAbilityAbilityBuilderActiveUnitTarget extends CAbilityAbilityBuild public CAbilityAbilityBuilderActiveUnitTarget(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, - Map localStore) { + LocalDataStore localStore) { super(handleId, code, alias, levelData, config, localStore); } @@ -88,5 +88,4 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord return false; } - } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index ca0a654be..35e6e12e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -3,7 +3,6 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.units.GameObject; @@ -36,6 +35,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ManaDepletedCheckTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -54,7 +54,7 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri implements AbilityBuilderActiveAbility { protected List levelData; protected AbilityBuilderConfiguration config; - protected Map localStore; + protected LocalDataStore localStore; protected int orderId; protected int unorderId = 0; protected int autoCastOnId = 0; @@ -102,7 +102,7 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri public CAbilityAbilityBuilderGenericActive(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, - Map localStore) { + LocalDataStore localStore) { super(handleId, code, alias); this.levelData = levelData; this.config = config; @@ -464,7 +464,7 @@ public AbilityBuilderConfiguration getConfig() { return this.config; } - public Map getLocalStore() { + public LocalDataStore getLocalStore() { return this.localStore; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java index 4d641acee..af5192061 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java @@ -2,7 +2,6 @@ import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.units.GameObject; @@ -19,6 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -30,7 +30,7 @@ public class CAbilityAbilityBuilderNoIcon extends AbstractGenericNoIconAbility i protected List levelData; protected AbilityBuilderConfiguration config; - protected Map localStore; + protected LocalDataStore localStore; protected CItem item = null; @@ -44,7 +44,7 @@ public class CAbilityAbilityBuilderNoIcon extends AbstractGenericNoIconAbility i private int visibleMenuId = 0; public CAbilityAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, List levelData, - AbilityBuilderConfiguration config, Map localStore) { + AbilityBuilderConfiguration config, LocalDataStore localStore) { super(handleId, code, alias); this.levelData = levelData; this.config = config; @@ -125,7 +125,7 @@ public AbilityBuilderConfiguration getConfig() { } @Override - public Map getLocalStore() { + public LocalDataStore getLocalStore() { return this.localStore; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java index c3e81811b..191c244c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java @@ -2,7 +2,6 @@ import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.units.GameObject; @@ -18,6 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; @@ -27,7 +27,7 @@ public class CAbilityAbilityBuilderPassive extends AbilityGenericSingleIconPassi protected List levelData; protected AbilityBuilderConfiguration config; - protected Map localStore; + protected LocalDataStore localStore; protected CItem item = null; @@ -44,7 +44,7 @@ public class CAbilityAbilityBuilderPassive extends AbilityGenericSingleIconPassi public CAbilityAbilityBuilderPassive(int handleId, War3ID code, War3ID alias, List levelData, AbilityBuilderConfiguration config, - Map localStore) { + LocalDataStore localStore) { super(code, alias, handleId); this.levelData = levelData; this.config = config; @@ -131,7 +131,7 @@ public AbilityBuilderConfiguration getConfig() { } @Override - public Map getLocalStore() { + public LocalDataStore getLocalStore() { return this.localStore; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java index 18dc77e49..158deacd0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java @@ -1,12 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityGenericDoNothing; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityMove; @@ -33,7 +30,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedInstantTransformationBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTransformationBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; public class GetInstantTransformationBuffVisitor implements CAbilityVisitor { @@ -45,7 +42,7 @@ public static GetInstantTransformationBuffVisitor getInstance() { private CSimulation game; private CUnit caster; - private Map localStore; + private LocalDataStore localStore; private CUnitType newType; private boolean keepRatios; private OnTransformationActions actions; @@ -55,7 +52,7 @@ public static GetInstantTransformationBuffVisitor getInstance() { private float duration; private boolean permanent; - public GetInstantTransformationBuffVisitor reset(CSimulation game, CUnit caster, Map localStore, + public GetInstantTransformationBuffVisitor reset(CSimulation game, CUnit caster, LocalDataStore localStore, CUnitType newType, final boolean keepRatios, OnTransformationActions actions, War3ID buffId, boolean addAlternateTagAfter, float transformationTime, float duration, boolean permanent) { this.game = game; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderAuraTemplate.java index 5cf47f08f..405b64ec1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderAuraTemplate.java @@ -4,7 +4,6 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import com.badlogic.gdx.math.Rectangle; @@ -17,13 +16,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class CAbilityAbilityBuilderAuraTemplate extends AbilityGenericSingleIconPassiveAbility { private List levelData; - private Map localStore; + private LocalDataStore localStore; private Set auraGroup; private int lastSeenLevel = 0; @@ -44,7 +44,7 @@ public class CAbilityAbilityBuilderAuraTemplate extends AbilityGenericSingleIcon private final int RESET_GROUP_TICKS = LEAVE_GROUP_TICKS * 2; public CAbilityAbilityBuilderAuraTemplate(int handleId, War3ID code, War3ID alias, - List levelData, Map localStore, + List levelData, LocalDataStore localStore, List addToAuraActions, List updateAuraLevelActions, List removeFromAuraActions) { super(code, alias, handleId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderSimpleAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderSimpleAuraTemplate.java index 4cf2594b9..275277bc8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderSimpleAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderSimpleAuraTemplate.java @@ -19,13 +19,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class CAbilityAbilityBuilderSimpleAuraTemplate extends AbilityGenericSingleIconPassiveAbility { private List levelData; - private Map localStore; + private LocalDataStore localStore; private Set auraGroup; private int lastSeenLevel = 0; @@ -48,7 +49,7 @@ public class CAbilityAbilityBuilderSimpleAuraTemplate extends AbilityGenericSing private final int RESET_GROUP_TICKS = LEAVE_GROUP_TICKS * 2; public CAbilityAbilityBuilderSimpleAuraTemplate(int handleId, War3ID code, War3ID alias, - List levelData, Map localStore, + List levelData, LocalDataStore localStore, Map> abilityIdsToAddPerLevel, List levellingAbilityIdsToAdd) { super(code, alias, handleId); this.levelData = levelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java index 1085c5f28..57a30f2e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java @@ -4,7 +4,6 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import com.badlogic.gdx.math.Rectangle; @@ -17,6 +16,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericAuraBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.MeleeRangeTargetOverride; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.StatBuffFromDataField; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -30,7 +30,7 @@ public class CAbilityAbilityBuilderStatAuraTemplate extends AbilityGenericSingleIconPassiveAbility { private List levelData; - private Map localStore; + private LocalDataStore localStore; private Set auraGroup; private int loopTick = 0; @@ -58,7 +58,7 @@ public class CAbilityAbilityBuilderStatAuraTemplate extends AbilityGenericSingle private boolean leveled; public CAbilityAbilityBuilderStatAuraTemplate(int handleId, War3ID code, War3ID alias, - List levelData, Map localStore, + List levelData, LocalDataStore localStore, List statBuffDataFields, MeleeRangeTargetOverride meleeRangeTargetOverride) { super(code, alias, handleId); this.levelData = levelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java index 283e5e70e..a3528f046 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.StatBuffFromDataField; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; @@ -17,7 +17,7 @@ public class CAbilityAbilityBuilderStatPassiveTemplate extends AbilityGenericSingleIconPassiveAbility { private List levelData; - private Map localStore; + private LocalDataStore localStore; private War3ID buffId; private CBuff buff; @@ -29,7 +29,7 @@ public class CAbilityAbilityBuilderStatPassiveTemplate extends AbilityGenericSin private List statBuffDataFields; public CAbilityAbilityBuilderStatPassiveTemplate(int handleId, War3ID code, War3ID alias, - List levelData, Map localStore, + List levelData, LocalDataStore localStore, List statBuffDataFields) { super(code, alias, handleId); this.levelData = levelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java index 2665e8a91..821c4d5c9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; import java.util.EnumSet; -import java.util.Map; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; @@ -15,6 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CAbstractRangedBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; @@ -22,7 +22,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; public class CBehaviorAbilityBuilderBase extends CAbstractRangedBehavior implements ABBehavior { - private Map localStore; + private LocalDataStore localStore; private AbilityBuilderActiveAbility ability; private ABAbilityTargetStillTargetableVisitor preCastTargetableVisitor; @@ -46,7 +46,7 @@ public class CBehaviorAbilityBuilderBase extends CAbstractRangedBehavior impleme private EnumSet channelTags; private boolean firstAnimation; - public CBehaviorAbilityBuilderBase(final CUnit unit, final Map localStore, + public CBehaviorAbilityBuilderBase(final CUnit unit, final LocalDataStore localStore, AbilityBuilderActiveAbility ability) { super(unit); this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java index c4bbe9b4e..3bc49b0f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; import java.util.EnumSet; -import java.util.Map; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; @@ -14,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorVisitor; @@ -21,7 +21,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; public class CBehaviorAbilityBuilderNoTarget implements ABBehavior { - private Map localStore; + private LocalDataStore localStore; private AbilityBuilderActiveAbility ability; private int castStartTick = 0; @@ -42,7 +42,7 @@ public class CBehaviorAbilityBuilderNoTarget implements ABBehavior { private EnumSet channelTags; private boolean firstAnimation; - public CBehaviorAbilityBuilderNoTarget(final CUnit unit, final Map localStore, + public CBehaviorAbilityBuilderNoTarget(final CUnit unit, final LocalDataStore localStore, AbilityBuilderActiveAbility ability) { this.unit = unit; this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java index 6800b7f64..31e6973b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -20,7 +19,7 @@ public class CBehaviorFinishTransformation implements CBehavior { private CUnit sourceUnit; - private Map localStore; + private LocalDataStore localStore; private OnTransformationActions actions; private CUnit unit; private AbilityBuilderAbility ability; @@ -49,7 +48,7 @@ public class CBehaviorFinishTransformation implements CBehavior { private int castStartTick = 0; - public CBehaviorFinishTransformation(CUnit sourceUnit, Map localStore, final CUnit unit, + public CBehaviorFinishTransformation(CUnit sourceUnit, LocalDataStore localStore, final CUnit unit, AbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, OnTransformationActions actions, boolean addAlternateTagAfter, final int visibleOrderId, boolean permanent, float duration, float transformationTime, float landingDelay, float altitudeAdjustmentDelay, @@ -106,14 +105,15 @@ public CBehavior update(CSimulation game) { ability, addAlternateTagAfter, permanent, takingOff); if (instantTransformAtDurationEnd) { - TransformationHandler.createInstantTransformBackBuff(game, sourceUnit, localStore, unit, baseTypeForDuration, - keepRatios, actions.createUntransformActions(), ability, buffId, addAlternateTagAfter, - transformationTime, duration, permanent); + TransformationHandler.createInstantTransformBackBuff(game, sourceUnit, localStore, unit, + baseTypeForDuration, keepRatios, actions.createUntransformActions(), ability, buffId, + addAlternateTagAfter, transformationTime, duration, permanent); } else { - TransformationHandler.createSlowTransformBackBuff(game, sourceUnit, localStore, unit, baseTypeForDuration, - keepRatios, actions.createUntransformActions(), ability, buffId, addAlternateTagAfter, - transformationTime, duration, permanent, takingOff, landing, immediateTakeoff, immediateLanding, - altitudeAdjustmentDelay, landingDelay, altitudeAdjustmentDuration); + TransformationHandler.createSlowTransformBackBuff(game, sourceUnit, localStore, unit, + baseTypeForDuration, keepRatios, actions.createUntransformActions(), ability, buffId, + addAlternateTagAfter, transformationTime, duration, permanent, takingOff, landing, + immediateTakeoff, immediateLanding, altitudeAdjustmentDelay, landingDelay, + altitudeAdjustmentDuration); } this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java index 61386d5bf..c6dbac5a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddAbility implements ABSingleAction { @@ -17,7 +16,7 @@ public class ABActionAddAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); CUnit theUnit = caster; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java index a1416bc2b..3210f96ed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -14,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuffSlow; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddSlowBuff implements ABSingleAction { @@ -25,7 +24,8 @@ public class ABActionAddSlowBuff implements ABSingleAction { private ABBooleanCallback leveled; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { War3ID alias = null; boolean isLeveled = false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java index d46391252..cfc84b636 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -14,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuffStun; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddStunBuff implements ABSingleAction { @@ -25,7 +24,7 @@ public class ABActionAddStunBuff implements ABSingleAction { private ABBooleanCallback leveled; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { War3ID alias = null; boolean isLeveled = false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCleanUpCastInstance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCleanUpCastInstance.java index 8de038866..98abe4403 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCleanUpCastInstance.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCleanUpCastInstance.java @@ -1,18 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; import java.util.HashSet; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCleanUpCastInstance implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final Set keySet = new HashSet<>(localStore.keySet()); for (final String key : keySet) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java index d04cf0e89..f6b6e58ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -11,13 +9,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCreateAbilityFromId implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { War3ID theId = this.id.callback(game, caster, localStore, castId); CAbilityType type = game.getAbilityData().getAbilityType(theId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java index c8467c208..937226ca8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionDeleteStoredKey implements ABAction { private ABStringCallback key; - + @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { - localStore.remove(key.callback(game, caster, localStore, castId)); + localStore.remove(key.callback(game, caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java index 086c280a5..a7503b28f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionPrepUnownedAbilityForUse implements ABSingleAction { @@ -16,7 +15,7 @@ public class ABActionPrepUnownedAbilityForUse implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); CUnit theUnit = caster; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java index f8808b150..7164058c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveAbility implements ABSingleAction { @@ -16,7 +15,7 @@ public class ABActionRemoveAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java index 2a7ee065b..13a6acb75 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAbilityAddUniqueFlag implements ABSingleAction { @@ -17,11 +16,11 @@ public class ABActionAbilityAddUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); if (theAbility instanceof AbilityBuilderAbility) { - ((AbilityBuilderAbility)theAbility).addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ((AbilityBuilderAbility) theAbility).addUniqueFlag(flag.callback(game, caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java index 84f36bef8..efb670a9e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -12,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; @@ -22,7 +21,7 @@ public class ABActionAbilityAttemptToApplyEffect implements ABSingleAction { private ABUnitCallback target; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theCaster = caster; if (source != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java index 04e52789e..d06b1ec78 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAbilityRemoveUniqueFlag implements ABSingleAction { @@ -17,11 +16,11 @@ public class ABActionAbilityRemoveUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); if (theAbility instanceof AbilityBuilderAbility) { - ((AbilityBuilderAbility)theAbility).removeUniqueFlag(flag.callback(game, caster, localStore, castId)); + ((AbilityBuilderAbility) theAbility).removeUniqueFlag(flag.callback(game, caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java index 621bc707a..573c1c5f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAbilityRemoveUniqueValue implements ABAction { @@ -17,10 +16,10 @@ public class ABActionAbilityRemoveUniqueValue implements ABAction { private ABStringCallback key; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CAbility theAbility = null; - if (ability != null) { + if (ability != null) { theAbility = ability.callback(game, caster, localStore, castId); } else { theAbility = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java index f6a4dca81..3287a3aba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -14,25 +12,26 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAbilityRunEndCastingActions implements ABSingleAction { private ABAbilityCallback ability; private ABUnitCallback caster; - + private ABLocationCallback targetLoc; private ABUnitCallback targetUnit; private ABItemCallback targetItem; private ABDestructableCallback targetDest; @Override - public void runAction(final CSimulation game, final CUnit originalCaster, final Map localStore, + public void runAction(final CSimulation game, final CUnit originalCaster, final LocalDataStore localStore, final int castId) { CUnit theCaster = originalCaster; if (caster != null) { theCaster = caster.callback(game, originalCaster, localStore, castId); } - + AbilityTarget tar = null; if (targetLoc != null) { tar = targetLoc.callback(game, originalCaster, localStore, castId); @@ -43,7 +42,7 @@ public void runAction(final CSimulation game, final CUnit originalCaster, final } else if (targetDest != null) { tar = targetDest.callback(game, originalCaster, localStore, castId); } - + final CAbility theAbility = this.ability.callback(game, originalCaster, localStore, castId); if (theAbility instanceof AbilityBuilderActiveAbility) { AbilityBuilderActiveAbility active = ((AbilityBuilderActiveAbility) theAbility); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java index bcfd33975..5de130293 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAbilitySetShowIcon implements ABSingleAction { @@ -18,15 +17,14 @@ public class ABActionAbilitySetShowIcon implements ABSingleAction { private ABBooleanCallback show; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if (this.ability != null) { final CAbility abil = ability.callback(game, caster, localStore, castId); if (abil != null) { abil.setIconShowing(show.callback(game, caster, localStore, castId)); } - } - else { + } else { final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setIconShowing(show.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java index bae2ce22b..4dc0370bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAbilityStoreUniqueValue implements ABAction { @@ -19,15 +18,16 @@ public class ABActionAbilityStoreUniqueValue implements ABAction { private ABCallback valueToStore; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CAbility theAbility = null; - if (ability != null) { + if (ability != null) { theAbility = ability.callback(game, caster, localStore, castId); } else { theAbility = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); } - theAbility.addUniqueValue(valueToStore.callback(game, caster, localStore, castId), key.callback(game, caster, localStore, castId)); + theAbility.addUniqueValue(valueToStore.callback(game, caster, localStore, castId), + key.callback(game, caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java index e828c7c7d..ad195f411 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,11 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionActivateToggledAbility implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore .get(ABLocalStoreKeys.ABILITY); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java index 77a675ec8..bc1137c3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java @@ -2,7 +2,6 @@ import java.util.EnumSet; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; @@ -12,6 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; @@ -21,7 +21,7 @@ public class ABActionAddTargetAllowed implements ABSingleAction { @Override @SuppressWarnings("unchecked") - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (ability != null && ability instanceof AbilityBuilderActiveAbility) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java index 7cbc7616d..a21766202 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionBeginChanneling implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.CHANNELING, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java index a19e0cc22..60e4becce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,21 +9,21 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionClickDisableAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if (this.ability != null) { final CAbility abil = ability.callback(game, caster, localStore, castId); if (abil != null) { abil.setClickDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } - } - else { + } else { final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setClickDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } @@ -35,8 +33,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if (this.ability != null) { final CAbility abil = ability.callback(game, caster, localStore, castId); if (abil != null) { abil.setClickDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } - } - else { + } else { final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setClickDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } @@ -35,8 +33,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore .get(ABLocalStoreKeys.ABILITY); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java index 8765042b7..b297186a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,21 +9,21 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionDisableAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if (this.ability != null) { final CAbility abil = ability.callback(game, caster, localStore, castId); if (abil != null) { abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } - } - else { + } else { final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } @@ -35,8 +33,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java index f75b2cd60..cb5da27e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,21 +9,21 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionEnableAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if (this.ability != null) { final CAbility abil = ability.callback(game, caster, localStore, castId); if (abil != null) { abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } - } - else { + } else { final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } @@ -35,8 +33,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java index 61eaa9c34..93be03a80 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionFinishChanneling implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.CHANNELING, false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java index 2cdc67e99..0015f2bbb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java @@ -2,7 +2,6 @@ import java.util.EnumSet; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; @@ -12,6 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; @@ -21,7 +21,8 @@ public class ABActionRemoveTargetAllowed implements ABSingleAction { @Override @SuppressWarnings("unchecked") - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (ability != null && ability instanceof AbilityBuilderActiveAbility) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java index 7ba392619..b1ff823fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; @@ -13,6 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionResetCooldown implements ABSingleAction { @@ -20,7 +19,8 @@ public class ABActionResetCooldown implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java index c198b4b16..cd47027e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABActionSendStartCastingEvents implements ABAction { @@ -17,7 +16,8 @@ public class ABActionSendStartCastingEvents implements ABAction { private ABUnitCallback caster; private ABWidgetCallback target; @Override - public void runAction(final CSimulation game, final CUnit basecaster, final Map localStore, + public void runAction(final CSimulation game, final CUnit basecaster, + final LocalDataStore localStore, final int castId) { CUnit theUnit = basecaster; CWidget theTarget = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java index 881f28201..49d7b7cd3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -10,13 +8,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetAbilityCastRange implements ABSingleAction { private ABFloatCallback range; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore .get(ABLocalStoreKeys.ISTOGGLEDABILITY); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetDestructable.java index 2c39b23be..d75d769d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetDestructable.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,13 +7,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetAutoTargetDestructable implements ABSingleAction { private ABDestructableCallback dest; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, this.dest.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetUnit.java index 2c785c985..42a3cc118 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetUnit.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,13 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetAutoTargetUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, this.unit.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java index e96f4794d..60e3ac524 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetPreventEndEvents implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.PREVENTENDEVENTS+castId, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java index e9370583f..4be26a23c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; @@ -14,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionStartCooldown implements ABSingleAction { @@ -22,7 +21,8 @@ public class ABActionStartCooldown implements ABSingleAction { private ABFloatCallback cooldown; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { @@ -32,21 +32,18 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnit target = unit.callback(game, caster, localStore, castId); - + target.addAttackModifier(modifier.callback(game, caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java index dce779e88..5b199ea2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; public class ABActionCreateAttackModifier implements ABAction { @@ -23,7 +23,7 @@ public class ABActionCreateAttackModifier implements ABAction { private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { boolean isUseCastId = true; if (useCastId != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java index b261de849..7ca6a323c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorAttackListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; @@ -23,7 +22,7 @@ public class ABActionFireModifiedAttack implements ABAction { private ABBooleanCallback showMissOnFailure; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java index 31223b5da..4b4da1317 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveAttackModifier implements ABAction { private ABUnitCallback unit; private ABAttackModifierCallback modifier; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnit target = unit.callback(game, caster, localStore, castId); target.removeAttackModifier(modifier.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java index 3c615a764..94b190061 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorAttackListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; @@ -24,7 +23,8 @@ public class ABActionStartModifiedAttack implements ABAction { private ABBooleanCallback stopOnFailure; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java index 475748d8d..b47c0d904 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java @@ -1,21 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddAnimationTag implements ABAction { private ABStringCallback tag; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.addAnimationName(SecondaryTag.valueOf(tag.callback(game, caster, localStore, castId))); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java index 267b05d55..87a88f5f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddPostDamageListener implements ABAction { private ABAttackPostDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.addPostDamageListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java index 5bcd4a16f..51ecb51a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddPreDamageListener implements ABAction { private ABAttackPreDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.addPreDamageListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java index 1dc11ba76..3498c9d63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java @@ -1,21 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyAllArtFields implements ABAction { private ABBooleanCallback applyArtIfMissing; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java index 333207d13..448d80da5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java @@ -1,21 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyArt implements ABAction { private ABBooleanCallback applyArtIfMissing; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java index 2d473a82e..98580e181 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java @@ -1,21 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyArtAndSpeed implements ABAction { private ABBooleanCallback applyArtIfMissing; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java index 5f8018336..121183fd9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyDefaultSpeed implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (settings.getProjectileSpeed() == 0) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java index c5ec1f4bd..adfaa7209 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public class ABActionAttackModifierPreventOtherModifications implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore.get(ABLocalStoreKeys.ATTACKMODLOOP + castId); if (loop != null) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java index f05a87d2d..8b419a235 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public class ABActionAttackModifierPreventOtherSamePriorityModifications implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore.get(ABLocalStoreKeys.ATTACKMODLOOP + castId); if (loop != null) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java index 66702084a..7852fe27c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java @@ -1,21 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemoveAnimationTag implements ABAction { private ABStringCallback tag; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.removeAnimationName(SecondaryTag.valueOf(tag.callback(game, caster, localStore, castId))); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java index 9a42574a0..b76cb4c9e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemovePostDamageListener implements ABAction { private ABAttackPostDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.removePostDamageListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java index 36546d532..b6308c640 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemovePreDamageListener implements ABAction { private ABAttackPreDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.removePreDamageListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java index 49744cc27..e4af8583e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackArc implements ABAction { private ABFloatCallback arc; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (arc != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java index 2574137a9..ad6219443 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackDeathTime implements ABAction { private ABFloatCallback deathTime; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (deathTime != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java index 0016e969a..75f5fe73e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackHoming implements ABAction { private ABBooleanCallback homing; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (homing != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java index 406762fa3..f7c1c5d51 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackImpactZ implements ABAction { private ABFloatCallback impactZ; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (impactZ != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java index cef09dbcc..e0b51773c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackStartZ implements ABAction { private ABFloatCallback z; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (z != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java index 51a1b250e..db9c688db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetSplashFields implements ABAction { @@ -19,7 +18,7 @@ public class ABActionAttackModifierSetSplashFields implements ABAction { private ABFloatCallback damageFactorMedium; private ABFloatCallback damageFactorSmall; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (areaOfEffectFullDamage != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java index 525b530fa..7d0e62f82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABCallbackGetModifiedAttackAttackType extends ABAttackTypeCallback { - + @Override - public CAttackType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getAttackType(); + public CAttackType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getAttackType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java index fde0bf1cb..9fbf232ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetModifiedAttackDamageType extends ABDamageTypeCallback { @Override - public CDamageType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CDamageType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().getDamageType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java index d576844b3..be6844af5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABCallbackGetModifiedAttackWeaponType extends ABWeaponTypeCallback { - + @Override - public CWeaponType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType(); + public CWeaponType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java index fafb8eaf2..11e71801e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -15,7 +14,7 @@ public class ABActionAttemptToReOrderPreviousBehavior implements ABAction { private ABBooleanCallback checkForOrders; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { CBehavior b = (CBehavior) localStore.get(ABLocalStoreKeys.PREVIOUSBEHAVIOR); if (b != null && b != caster.getCurrentBehavior()) { if (checkForOrders == null || checkForOrders.callback(game, caster, localStore, castId)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java index 23dd6f79a..c1c883284 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAttemptToResumePreviousBehavior implements ABAction { private ABBooleanCallback checkForOrders; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (checkForOrders == null || checkForOrders.callback(game, caster, localStore, castId)) { if (caster.getOrderQueue().isEmpty()) { localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, localStore.get(ABLocalStoreKeys.PREVIOUSBEHAVIOR)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java index 732288ca9..b5ce6c4bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddBuff implements ABSingleAction { @@ -17,7 +16,8 @@ public class ABActionAddBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CBuff ability = this.buff.callback(game, caster, localStore, castId); if (ability != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java index b60ffee8b..4f711799e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddNonStackingDisplayBuff implements ABSingleAction { @@ -19,7 +18,7 @@ public class ABActionAddNonStackingDisplayBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CBuff ability = this.buff.callback(game, caster, localStore, castId); this.target.callback(game, caster, localStore, castId).addNonStackingDisplayBuff(game, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java index f687033c3..1bce46969 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionBuffAddUniqueFlag implements ABSingleAction { @@ -17,7 +16,8 @@ public class ABActionBuffAddUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CBuff theBuff = this.buff.callback(game, caster, localStore, castId); if (theBuff instanceof ABBuff) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java index 5d3dda308..14df47659 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionBuffRemoveUniqueFlag implements ABSingleAction { @@ -17,7 +16,8 @@ public class ABActionBuffRemoveUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CBuff theBuff = this.buff.callback(game, caster, localStore, castId); if (theBuff instanceof ABBuff) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java index edaae4104..f2dd85bff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionBuffRemoveUniqueValue implements ABAction { @@ -15,7 +14,8 @@ public class ABActionBuffRemoveUniqueValue implements ABAction { private ABStringCallback key; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CBuff theAbility = buff.callback(game, caster, localStore, castId); theAbility.removeUniqueValue(key.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java index 796c21409..7029ce34f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionBuffStoreUniqueValue implements ABAction { @@ -17,7 +16,8 @@ public class ABActionBuffStoreUniqueValue implements ABAction { private ABCallback valueToStore; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CBuff theAbility = buff.callback(game, caster, localStore, castId); theAbility.addUniqueValue(valueToStore.callback(game, caster, localStore, castId), key.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java index 29065d7fa..380709a84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -15,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreatePassiveBuff implements ABSingleAction { @@ -37,7 +38,8 @@ public class ABActionCreatePassiveBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { ABPermanentPassiveBuff ability = null; boolean isLeveled = false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java index 9a0084177..a3fd032f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java @@ -13,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCreateTargetingBuff implements ABSingleAction { @@ -22,7 +23,7 @@ public class ABActionCreateTargetingBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final ABTargetingBuff ability = new ABTargetingBuff(game.getHandleIdAllocator().createId(), this.buffId.callback(game, caster, localStore, castId), localStore, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java index 88cbfc2fd..99e693667 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -15,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTimedArtBuff implements ABSingleAction { @@ -34,7 +35,8 @@ public class ABActionCreateTimedArtBuff implements ABSingleAction { private List uniqueFlags; private Map uniqueValues; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { boolean isLeveled = false; if (leveled != null) { @@ -56,7 +58,8 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java index 0b926655c..ff64a0f16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,15 +9,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCreateTimedLifeBuff implements ABSingleAction { private ABIDCallback buffId; private ABFloatCallback duration; private ABBooleanCallback explode; - + @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CBuffTimedLife ability = new CBuffTimedLife(game.getHandleIdAllocator().createId(), this.buffId.callback(game, caster, localStore, castId), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java index c0ca32b68..aacc89da9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java @@ -18,6 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -51,7 +52,7 @@ public class ABActionCreateTimedPausedExpirationBuff implements ABAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java index 16c1c4979..39533c5c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java @@ -15,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCreateTimedTargetingBuff implements ABSingleAction { @@ -27,7 +28,7 @@ public class ABActionCreateTimedTargetingBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final ABTimedTargetingBuff ability = new ABTimedTargetingBuff(game.getHandleIdAllocator().createId(), this.buffId.callback(game, caster, localStore, castId), localStore, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java index db88aa904..8e9022493 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java @@ -19,6 +19,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -52,7 +53,8 @@ public class ABActionCreateTimedTickingBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { @@ -95,7 +97,8 @@ public void runAction(final CSimulation game, final CUnit caster, final Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java index 35281c0d9..1e71a5cc7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java @@ -19,6 +19,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -52,7 +53,8 @@ public class ABActionCreateTimedTickingPostDeathBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java index f9386a232..e5a270aa0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveBuff implements ABSingleAction { @@ -16,7 +15,8 @@ public class ABActionRemoveBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CBuff theBuff = this.buff.callback(game, caster, localStore, castId); if (theBuff != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java index 3aa5a9701..28f4fd6bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveNonStackingDisplayBuff implements ABSingleAction { @@ -18,7 +17,8 @@ public class ABActionRemoveNonStackingDisplayBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CBuff ability = this.buff.callback(game, caster, localStore, castId); this.target.callback(game, caster, localStore, castId).removeNonStackingDisplayBuff(game, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionAddDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionAddDestructableBuff.java index 9499f0644..bf7831b52 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionAddDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionAddDestructableBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddDestructableBuff implements ABSingleAction { @@ -16,7 +15,8 @@ public class ABActionAddDestructableBuff implements ABSingleAction { private ABDestructableBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CDestructableBuff ability = this.buff.callback(game, caster, localStore, castId); this.target.callback(game, caster, localStore, castId).add(game, ability); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java index dab16f9e7..ece055293 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java @@ -1,9 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; -import java.util.Map; - -import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; +import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -15,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCreateDestructable implements ABAction { @@ -27,7 +26,7 @@ public class ABActionCreateDestructable implements ABAction { private ABBooleanCallback playBirthAnim; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { float theFacing = 0; float theScale = 1; int theVariation = 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java index aea72a0b4..f17b59b47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -13,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCreateDestructableBuff implements ABSingleAction { @@ -23,7 +23,7 @@ public class ABActionCreateDestructableBuff implements ABSingleAction { private ABBooleanCallback dispellable; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { boolean isDispellable = false; if (dispellable != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java index ecbe499d7..37e7cd279 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -12,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -28,7 +27,8 @@ public class ABActionDamageDestructable implements ABSingleAction { private ABFloatCallback damage; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { boolean isItAttack = false; boolean isItRanged = true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java index 1cea61656..112b33d91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -13,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionDispelDestructableBuffs implements ABAction { @@ -21,7 +21,7 @@ public class ABActionDispelDestructableBuffs implements ABAction { private ABCondition filter; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theCaster = caster; if (source != null) { theCaster = source.callback(game, theCaster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionIterateDestructablesInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionIterateDestructablesInRangeOfLocation.java index eb85f58aa..03ff8eb83 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionIterateDestructablesInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionIterateDestructablesInRangeOfLocation.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -17,6 +16,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionIterateDestructablesInRangeOfLocation implements ABAction { @@ -27,7 +27,8 @@ public class ABActionIterateDestructablesInRangeOfLocation implements ABAction { private List iterationActions; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityPointTarget target = this.location.callback(game, caster, localStore, castId); final Float rangeVal = this.range.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java index 0bbcfa818..f9b6280d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionKillDestructable implements ABAction { private ABDestructableCallback dest; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { dest.callback(game, caster, localStore, castId).setLife(game, 0); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java index e543294df..d0be97222 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveDestructable implements ABAction { private ABDestructableCallback dest; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { game.removeDestructable(dest.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructableBuff.java index 2f0214bc2..697b8838a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructableBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveDestructableBuff implements ABSingleAction { @@ -16,7 +15,7 @@ public class ABActionRemoveDestructableBuff implements ABSingleAction { private ABDestructableBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CDestructableBuff ability = this.buff.callback(game, caster, localStore, castId); this.target.callback(game, caster, localStore, castId).remove(game, ability); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java index 774f51727..6ec20dced 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -11,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABActionCreateTimeOfDayEvent implements ABSingleAction { @@ -22,7 +22,7 @@ public class ABActionCreateTimeOfDayEvent implements ABSingleAction { private ABStringCallback equalityId; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { String eqId = null; float st = 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java index 275877768..cbb2fe8a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRegisterTimeOfDayEvent implements ABSingleAction { private ABTimeOfDayEventCallback event; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { game.registerTimeOfDayEvent(this.event.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java index 5b52b607d..2737db431 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABActionRegisterUniqueTimeOfDayEvent implements ABSingleAction { @@ -14,7 +13,8 @@ public class ABActionRegisterUniqueTimeOfDayEvent implements ABSingleAction { private ABTimeOfDayEventCallback event; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final ABTimeOfDayEvent ev = this.event.callback(game, caster, localStore, castId); if (!game.isTimeOfDayEventRegistered(ev)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java index e70efb594..d938fbbec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java @@ -1,19 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionUnregisterTimeOfDayEvent implements ABSingleAction { private ABTimeOfDayEventCallback event; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { game.unregisterTimeOfDayEvent(this.event.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java index e7b8f86f8..23c38b78a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; @@ -21,7 +21,7 @@ public class ABActionCreateWidgetEvent implements ABAction { private JassGameEventsWar3 eventType; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final ABWidgetEvent event = new ABWidgetEvent(game, caster, localStore, castId, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java index a73d7739e..fcc3024eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks.ABWidgetEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABActionRegisterWidgetEvent implements ABSingleAction { @@ -14,7 +13,8 @@ public class ABActionRegisterWidgetEvent implements ABSingleAction { private ABWidgetEventCallback event; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { ABWidgetEvent theEvent = event.callback(game, caster, localStore, castId); theEvent.getWidget().addEvent(theEvent); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java index 9907b9a70..1ba26eadc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks.ABWidgetEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABActionUnregisterWidgetEvent implements ABSingleAction { @@ -14,7 +13,7 @@ public class ABActionUnregisterWidgetEvent implements ABSingleAction { private ABWidgetEventCallback event; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { ABWidgetEvent theEvent = event.callback(game, caster, localStore, castId); theEvent.remove(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java index 1cec1e9da..0e8cc83eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.floatingtext; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; public class ABActionCreateFloatingTextOnUnit implements ABSingleAction { @@ -17,7 +16,7 @@ public class ABActionCreateFloatingTextOnUnit implements ABSingleAction { private ABStringCallback message; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { game.spawnTextTag(this.target.callback(game, caster, localStore, castId), caster.getPlayerIndex(), this.textType, this.message.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java index 7f174d122..5094f90fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.floatingtext; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; public class ABActionCreateNumericFloatingTextOnUnit implements ABSingleAction { @@ -17,7 +16,7 @@ public class ABActionCreateNumericFloatingTextOnUnit implements ABSingleAction { private ABFloatCallback amount; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { float theAmount = 0; if (this.amount != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java index 83d1714fa..7c4452f89 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABGroupEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -22,7 +21,8 @@ public class ABActionCreateGroupEffectAtLocation implements ABAction { private CEffectType effectType; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); float rad = radius.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java index 0b82be90d..c48a47133 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABActionCreateLightningEffect implements ABAction { @@ -21,7 +20,7 @@ public class ABActionCreateLightningEffect implements ABAction { private ABFloatCallback duration; private ABIntegerCallback index; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { int i = 0; if (index != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java index 2c95d54d1..b039b785a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateLoopingSoundEffectAtLocation implements ABAction { @@ -16,7 +15,8 @@ public class ABActionCreateLoopingSoundEffectAtLocation implements ABAction { private ABLocationCallback location; private ABIDCallback id; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(game, caster, localStore, castId); SimulationRenderComponent ret = game.locationSoundEffectEvent(loc.getX(), loc.getY(), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java index 40ec4eb00..cc9c38011 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateLoopingSoundEffectOnUnit implements ABAction { @@ -15,10 +14,11 @@ public class ABActionCreateLoopingSoundEffectOnUnit implements ABAction { private ABUnitCallback unit; private ABIDCallback id; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { - SimulationRenderComponent ret = game.unitLoopSoundEffectEvent( - (unit.callback(game, caster, localStore, castId)), this.id.callback(game, caster, localStore, castId)); + SimulationRenderComponent ret = game.unitLoopSoundEffectEvent((unit.callback(game, caster, localStore, castId)), + this.id.callback(game, caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java index 2f3461f10..1668e9ea5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateSoundEffectAtLocation implements ABAction { @@ -16,7 +15,7 @@ public class ABActionCreateSoundEffectAtLocation implements ABAction { private ABLocationCallback location; private ABIDCallback id; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(game, caster, localStore, castId); SimulationRenderComponent ret = game.locationSoundEffectEvent(loc.getX(), loc.getY(), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java index a4861b2bc..c63b4c89a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateSoundEffectOnUnit implements ABAction { @@ -15,7 +14,8 @@ public class ABActionCreateSoundEffectOnUnit implements ABAction { private ABUnitCallback unit; private ABIDCallback id; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { SimulationRenderComponent ret = game.unitSoundEffectEvent( (unit.callback(game, caster, localStore, castId)), this.id.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java index 776389cad..824bf0748 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -22,7 +21,8 @@ public class ABActionCreateSpellEffectAtLocation implements ABAction { private CEffectType effectType; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); float dir = 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java index 28c949fa3..3d6b6a3fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -20,7 +19,8 @@ public class ABActionCreateSpellEffectAtPoint implements ABAction { private ABIDCallback id; private CEffectType effectType; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { float dir = 0; if (facing != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java index 38136b69f..b4580bfa7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -20,7 +19,8 @@ public class ABActionCreateSpellEffectOnUnit implements ABAction { private CEffectType effectType; private ABIntegerCallback index; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { War3ID theId = null; if (id == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java index 3a2cbae65..bcc0802d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -12,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTemporarySpellEffectAtLocation implements ABSingleAction { @@ -22,7 +21,7 @@ public class ABActionCreateTemporarySpellEffectAtLocation implements ABSingleAct private CEffectType effectType; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); float dir = 0; @@ -35,8 +34,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { float dir = 0; if (this.facing != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java index 5f2b4e562..c63a8e25e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTemporarySpellEffectOnUnit implements ABSingleAction { @@ -19,7 +18,7 @@ public class ABActionCreateTemporarySpellEffectOnUnit implements ABSingleAction private CEffectType effectType; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { War3ID theId = null; if (id == null) { @@ -27,8 +26,8 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); final float rad = radius.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java index 4b4009f17..d73fc81ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -11,30 +9,31 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainRippleEffect; public class ABActionCreateTerrainRippleAtLocation implements ABAction { private ABLocationCallback location; - + private ABFloatCallback startRadius; private ABFloatCallback finalRadius; private ABFloatCallback radius; - + private ABFloatCallback depth; - + private ABFloatCallback duration; private ABIntegerCallback rippleCount; - + private ABFloatCallback period; - + private ABIntegerCallback spaceWaves; private ABIntegerCallback timeWaves; private ABBooleanCallback onlyNegative; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java index 8ee95b780..21df1083f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainWaveEffect; @@ -25,7 +24,8 @@ public class ABActionCreateTerrainWaveAtLocation implements ABAction { private ABIntegerCallback count; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.startLocation.callback(game, caster, localStore, castId); final AbilityPointTarget tarloc = this.targetLocation.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java index 17a441888..433b23691 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateUberSplat implements ABAction { @@ -17,7 +16,7 @@ public class ABActionCreateUberSplat implements ABAction { private ABLocationCallback location; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { AbilityPointTarget loc = location.callback(game, caster, localStore, castId); SimulationRenderComponent splat = game.createStaticUberSplat(loc.getX(), loc.getY(), id.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java index 4e9cef23e..482d4765f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionModifyTerrainVertex implements ABAction { @@ -15,7 +14,7 @@ public class ABActionModifyTerrainVertex implements ABAction { private ABFloatCallback dz; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); game.adjustTerrain(loc.x, loc.y, dz.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java index cc4a06e2d..6ffe04a1b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java @@ -1,19 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks.ABFXCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveEffect implements ABSingleAction { private ABFXCallback effect; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { this.effect.callback(game, caster, localStore, castId).remove(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java index d7d891c73..ef8794756 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks.ABLightningCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveLightningEffect implements ABAction { private ABLightningCallback effect; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { effect.callback(game, caster, localStore, castId).remove(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java index 31112cf14..84c3f7ef3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.gamestate; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetFalseTimeOfDay implements ABSingleAction { @@ -16,7 +15,8 @@ public class ABActionSetFalseTimeOfDay implements ABSingleAction { private ABFloatCallback duration; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { game.addFalseTimeOfDay(this.hour.callback(game, caster, localStore, castId), this.minute.callback(game, caster, localStore, castId), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java index 79c8febb4..be3083c4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.item; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionChargeItem implements ABSingleAction { @@ -18,15 +17,14 @@ public class ABActionChargeItem implements ABSingleAction { private ABBooleanCallback checkForPerish; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CItem it = null; if (this.item == null) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); it = ability.getItem(); - } - else { + } else { it = this.item.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java index 0a3d80f68..fd88c53e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.item; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionTransformItem implements ABAction { @@ -16,7 +15,8 @@ public class ABActionTransformItem implements ABAction { private ABIDCallback newType; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CItem it = this.item.callback(game, caster, localStore, castId); War3ID type = newType.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java index c1d748f69..ab72a1b22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionListRemove implements ABAction { @@ -17,7 +17,8 @@ public class ABActionListRemove implements ABAction { private ABCallback object; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final List l = this.list.callback(game, caster, localStore, castId); if (object != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java index f0d2f467e..16c85b915 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionLocationListAdd implements ABAction { @@ -18,7 +18,7 @@ public class ABActionLocationListAdd implements ABAction { private ABIntegerCallback index; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final List l = this.list.callback(game, caster, localStore, castId); if (index != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java index 05471ceaf..0c7837d81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSortableListRemove implements ABAction { @@ -17,7 +17,8 @@ public class ABActionSortableListRemove implements ABAction { private ABCallback object; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final List l = this.list.callback(game, caster, localStore, castId); if (object != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java index 160d3b2e5..261a3ff10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionGiveResourcesToPlayer implements ABSingleAction { @@ -17,7 +16,8 @@ public class ABActionGiveResourcesToPlayer implements ABSingleAction { private ABIntegerCallback lumber; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CPlayer p = this.player.callback(game, caster, localStore, castId); if (this.gold != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java index 792895490..79d23b8e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionSetAbilityEnabledForPlayer implements ABSingleAction { @@ -18,7 +17,8 @@ public class ABActionSetAbilityEnabledForPlayer implements ABSingleAction { private ABBooleanCallback enabled; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CPlayer p = this.player.callback(game, caster, localStore, castId); boolean e = true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java index 6cc0142bc..0c7b9519f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -18,6 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -44,7 +44,7 @@ public class ABActionCreateLocationTargetedCollisionProjectile implements ABSing private ABBooleanCallback provideCounts; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { Float theSpeed = null; Boolean isHoming = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java index 21c4a244a..251b07426 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -16,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -33,7 +33,7 @@ public class ABActionCreateLocationTargetedProjectile implements ABSingleAction private List onHit; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { Float theSpeed = null; Boolean isHoming = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java index d4e59c32f..2eacb1e1c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.units.GameObject; @@ -20,6 +19,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -50,7 +50,7 @@ public class ABActionCreateLocationTargetedPseudoProjectile implements ABSingleA private ABBooleanCallback provideCounts; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { float theSpeed = 0; boolean isHoming = false; @@ -108,16 +108,14 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theSource = caster; if (source != null) { @@ -143,7 +143,7 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); } - private void startPerformJump(final CSimulation game, final CUnit caster, final Map localStore, + private void startPerformJump(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (remainingJumps <= 0) { @@ -164,12 +164,11 @@ public void onFire(CSimulation simulation) { runner.setTimeoutTime(delay); runner.start(game); } else { - performJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, - remainingJumps); + performJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, remainingJumps); } } - private void performJump(final CSimulation game, final CUnit caster, final Map localStore, + private void performJump(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (originUnitTarget == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java index c845ad68b..66ec417ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -17,6 +16,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -43,7 +43,7 @@ public class ABActionCreateUnitTargetedCollisionProjectile implements ABSingleAc private ABBooleanCallback provideCounts; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { Float theSpeed = null; Boolean isHoming = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java index dc04a4378..54b36d9d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -16,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -34,7 +34,7 @@ public class ABActionCreateUnitTargetedProjectile implements ABSingleAction { private List onHit; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CUnit theSource = this.source.callback(game, caster, localStore, castId); AbilityTarget sourceLocation = theSource; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java index 220fbef7b..0a1b4a96b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.units.GameObject; @@ -19,6 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -49,7 +49,7 @@ public class ABActionCreateUnitTargetedPseudoProjectile implements ABSingleActio private ABBooleanCallback provideCounts; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { float theSpeed = 0; boolean isHoming = false; @@ -107,16 +107,14 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CProjectile proj = this.projectile.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java index 4ccc31b54..3d25ccd24 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABActionSetProjectileDone implements ABSingleAction { @@ -16,7 +15,7 @@ public class ABActionSetProjectileDone implements ABSingleAction { private ABBooleanCallback done; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CProjectile proj = this.projectile.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java index 281b436be..405bf2ec8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABActionSetProjectileReflected implements ABSingleAction { @@ -16,7 +15,8 @@ public class ABActionSetProjectileReflected implements ABSingleAction { private ABBooleanCallback reflected; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CProjectile proj = this.projectile.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java index 89e93768b..d446d2a60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABActionSetProjectileTarget implements ABSingleAction { @@ -16,7 +15,8 @@ public class ABActionSetProjectileTarget implements ABSingleAction { private ABUnitCallback target; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CProjectile proj = this.projectile.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java index 4192e8e55..b092a0bd3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddDefenseBonus implements ABSingleAction { @@ -17,7 +16,7 @@ public class ABActionAddDefenseBonus implements ABSingleAction { private ABBooleanCallback percentage; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CUnit target = this.targetUnit.callback(game, caster, localStore, castId); @@ -25,8 +24,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CUnit target = this.targetUnit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java index 2592b890f..f5583d5ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java @@ -1,8 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABActionCreateNonStackingStatBuff implements ABSingleAction { @@ -20,7 +19,8 @@ public class ABActionCreateNonStackingStatBuff implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final NonStackingStatBuff buff = new NonStackingStatBuff( this.buffType.callback(game, caster, localStore, castId), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java index 773f1533b..c281748e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABNonStackingStatBuffTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; public class ABActionRecomputeStatBuffsOnUnit implements ABSingleAction { @@ -17,7 +16,8 @@ public class ABActionRecomputeStatBuffsOnUnit implements ABSingleAction { private ABNonStackingStatBuffTypeCallback buffType; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CUnit unit = this.targetUnit.callback(game, caster, localStore, castId); NonStackingStatBuffType btype = this.buffType.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java index 15bef3180..3f4160a03 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveDefenseBonus implements ABSingleAction { @@ -17,7 +16,7 @@ public class ABActionRemoveDefenseBonus implements ABSingleAction { private ABBooleanCallback percentage; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CUnit target = this.targetUnit.callback(game, caster, localStore, castId); @@ -25,8 +24,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CUnit target = this.targetUnit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java index ca3c9d1ae..7393c33dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABActionUpdateNonStackingStatBuff implements ABSingleAction { @@ -17,7 +16,7 @@ public class ABActionUpdateNonStackingStatBuff implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final NonStackingStatBuff buffObj = this.buff.callback(game, caster, localStore, castId); buffObj.setValue(this.value.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java index 172163c9a..e4c145f89 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionBreak implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.BREAK, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java index d4c4b47a9..6512d2501 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import com.badlogic.gdx.math.Rectangle; @@ -18,6 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABNearestUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; @@ -42,7 +42,7 @@ public class ABActionChainEffect implements ABAction { private ABBooleanCallback allowMultipleBouncesPerUnit; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CUnit originUnitTarget = this.target.callback(game, caster, localStore, castId); boolean multiBounce = game.getGameplayConstants().isAllowMultiBounce(); @@ -77,7 +77,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + private void startPerformJump(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (remainingJumps <= 0) { @@ -102,7 +102,7 @@ public void onFire(CSimulation simulation) { } } - private void performJump(final CSimulation game, final CUnit caster, final Map localStore, + private void performJump(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (originUnitTarget == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java index 80a59e109..e281b5a2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -11,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCreateSubroutine implements ABSingleAction { @@ -19,7 +19,8 @@ public class ABActionCreateSubroutine implements ABSingleAction { private List actions; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { localStore.put(ABLocalStoreKeys.combineSubroutineInstanceKey( diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java index fa6c4863f..94a91bdb8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; @@ -11,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionFor implements ABAction { @@ -20,7 +20,8 @@ public class ABActionFor implements ABAction { private ABCallback unique; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final int max = this.times.callback(game, caster, localStore, castId); for (int i = 0; i < max; i++) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java index 3d8b6761d..00d4c20f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionIf implements ABAction { @@ -16,7 +16,8 @@ public class ABActionIf implements ABAction { private List elseActions; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { if (condition.callback(game, caster, localStore, castId)) { if (this.thenActions != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInGroup.java index 76763925a..1d3fb1d9e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInGroup.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -14,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionIterateUnitsInGroup implements ABAction { private static final boolean ALLOW_BREAK_JASS = true; @@ -22,7 +22,8 @@ public class ABActionIterateUnitsInGroup implements ABAction { private List iterationActions; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final Set unitSet = this.unitGroup.callback(game, caster, localStore, castId); final List unitList = new ArrayList<>(unitSet); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInQueue.java index 1b4e3cf94..09bf78546 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInQueue.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -12,6 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionIterateUnitsInQueue implements ABAction { @@ -19,7 +19,8 @@ public class ABActionIterateUnitsInQueue implements ABAction { private List iterationActions; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final Queue unitQueue = this.queue.callback(game, caster, localStore, castId); final List unitList = new ArrayList<>(unitQueue); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java index a52eda5e8..b1c1e62fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -17,6 +16,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionIterateUnitsInRangeOfLocationMatchingCondition implements ABAction { @@ -28,7 +28,8 @@ public class ABActionIterateUnitsInRangeOfLocationMatchingCondition implements A private ABCondition condition; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityPointTarget target = this.location.callback(game, caster, localStore, castId); final Float rangeVal = this.range.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java index f04f7330d..82757ab23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -18,6 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; public class ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort implements ABAction { @@ -28,11 +28,11 @@ public class ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort impl private ABFloatCallback range; private List iterationActions; private ABCondition condition; - + private ABIntegerCallback sort; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityPointTarget target = this.location.callback(game, caster, localStore, castId); final Float rangeVal = this.range.callback(game, caster, localStore, castId); @@ -43,7 +43,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CUnit originUnitTarget = this.originUnit.callback(game, caster, localStore, castId); final Float rangeVal = this.range.callback(game, caster, localStore, castId); @@ -38,9 +38,9 @@ public void runAction(final CSimulation game, final CUnit caster, final Map iterationActions; private ABCondition condition; - + private ABIntegerCallback sort; private ABUnitCallback originUnit; private ABFloatCallback range; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CUnit originUnitTarget = this.originUnit.callback(game, caster, localStore, castId); final Float rangeVal = this.range.callback(game, caster, localStore, castId); @@ -43,7 +43,7 @@ public void runAction(final CSimulation game, final CUnit caster, final Map iterationActions; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { recycleRect.set(this.x1, this.y1, this.x2 - this.x1, this.y2 - this.y1); game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java index f1bf227d0..959d17b6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.WarsmashConstants; @@ -12,6 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionPeriodicExecute implements ABAction { private final static int HARD_LOOP_CAP = 100; @@ -23,7 +23,8 @@ public class ABActionPeriodicExecute implements ABAction { private ABCallback unique; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { float nextActiveTick = 0; Object u = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java index 52d3ff3cd..d2b1bfab3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionResetPeriodicExecute implements ABAction { private ABCallback unique; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (this.unique != null) { localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + this.unique.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java index a195910a1..f6ee91166 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -11,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABActionRunReuseAction implements ABSingleAction { @@ -18,7 +18,8 @@ public class ABActionRunReuseAction implements ABSingleAction { private ABStringCallback name; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java index e4ca42e7f..7c4a8d499 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java @@ -12,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABActionRunReuseActionWithArguments implements ABSingleAction { @@ -20,7 +21,7 @@ public class ABActionRunReuseActionWithArguments implements ABSingleAction { private Map arguments; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java index 2c17ad6c5..52f3a28b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -11,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRunSubroutine implements ABSingleAction { @@ -19,16 +19,15 @@ public class ABActionRunSubroutine implements ABSingleAction { @Override @SuppressWarnings("unchecked") - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { List actions; if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { actions = (List) localStore.get(ABLocalStoreKeys .combineSubroutineInstanceKey(this.name.callback(game, caster, localStore, castId), castId)); - } - else { - actions = (List) localStore.get( - ABLocalStoreKeys.combineSubroutineKey(this.name.callback(game, caster, localStore, castId), castId)); + } else { + actions = (List) localStore.get(ABLocalStoreKeys + .combineSubroutineKey(this.name.callback(game, caster, localStore, castId), castId)); } if (actions != null) { for (final ABAction action : actions) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionStoreValueLocally.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionStoreValueLocally.java index b3dcab44d..b62f260c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionStoreValueLocally.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionStoreValueLocally.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -13,6 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionStoreValueLocally implements ABSingleAction { @@ -21,13 +20,12 @@ public class ABActionStoreValueLocally implements ABSingleAction { private ABCallback valueToStore; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { localStore.put(ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId), this.valueToStore.callback(game, caster, localStore, castId)); - } - else { + } else { localStore.put(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId), this.valueToStore.callback(game, caster, localStore, castId)); } @@ -42,44 +40,35 @@ public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) if (this.valueToStore instanceof ABStringCallback) { if (this.instanceValue == null) { return "SetLocalStoreUserCastStringAU(" + args + ")"; - } - else { + } else { return "StoreStringLocallyAU(" + args + ", " + this.instanceValue.generateJassEquivalent(jassTextGenerator) + ")"; } - } - else if ((this.valueToStore instanceof ABIntegerCallback) || (this.valueToStore instanceof ABIDCallback)) { + } else if ((this.valueToStore instanceof ABIntegerCallback) || (this.valueToStore instanceof ABIDCallback)) { if (this.instanceValue == null) { return "SetLocalStoreUserCastIntegerAU(" + args + ")"; - } - else { + } else { return "StoreIntegerLocallyAU(" + args + ", " + this.instanceValue.generateJassEquivalent(jassTextGenerator) + ")"; } - } - else if (this.valueToStore instanceof ABBooleanCallback) { + } else if (this.valueToStore instanceof ABBooleanCallback) { if (this.instanceValue == null) { return "SetLocalStoreUserCastBooleanAU(" + args + ")"; - } - else { + } else { return "StoreBooleanLocallyAU(" + args + ", " + this.instanceValue.generateJassEquivalent(jassTextGenerator) + ")"; } - } - else if (this.valueToStore instanceof ABFloatCallback) { + } else if (this.valueToStore instanceof ABFloatCallback) { if (this.instanceValue == null) { return "SetLocalStoreUserCastRealAU(" + args + ")"; - } - else { + } else { return "StoreRealLocallyAU(" + args + ", " + this.instanceValue.generateJassEquivalent(jassTextGenerator) + ")"; } - } - else { + } else { if (this.instanceValue == null) { return "SetLocalStoreUserCastHandleAU(" + args + ")"; - } - else { + } else { return "StoreHandleLocallyAU(" + args + ", " + this.instanceValue.generateJassEquivalent(jassTextGenerator) + ")"; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java index 5d9bde524..b50c72787 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionWhile implements ABAction { @@ -17,7 +17,8 @@ public class ABActionWhile implements ABAction { private List loopActions; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { while (condition.callback(game, caster, localStore, castId)) { for (ABAction periodicAction : loopActions) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java index 15814b308..d30c34513 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -11,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; @@ -23,7 +23,7 @@ public class ABActionCreateTimer implements ABSingleAction { private ABFloatCallback delay; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CTimer timer = new ABTimer(caster, localStore, this.actions, castId); @@ -35,14 +35,12 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { this.timer.callback(game, caster, localStore, castId).kill(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java index 403c5bcc5..e26054794 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveTimer implements ABSingleAction { private ABTimerCallback timer; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { this.timer.callback(game, caster, localStore, castId).pause(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java index fcb9ee11a..c5ac5bf80 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionStartTimer implements ABSingleAction { @@ -15,7 +14,7 @@ public class ABActionStartTimer implements ABSingleAction { private ABTimerCallback timer; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CTimer t = this.timer.callback(game, caster, localStore, castId); t.start(game); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java index 06207b86d..d63194d5c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionUpdateTimerTimeout implements ABSingleAction { @@ -16,7 +15,8 @@ public class ABActionUpdateTimerTimeout implements ABSingleAction { private ABFloatCallback timeout; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CTimer theT = this.timer.callback(game, caster, localStore, castId); theT.resetTimeoutTime(this.timeout.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddMp.java index 3dfba18ed..5e97d4cbe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddMp.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddMp implements ABSingleAction { @@ -17,7 +16,7 @@ public class ABActionAddMp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { percent = this.isPercent.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddNewAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddNewAbility.java index 6436fe00c..83c014b19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddNewAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddNewAbility.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddNewAbility implements ABSingleAction { @@ -17,7 +16,8 @@ public class ABActionAddNewAbility implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CAbility ability = game.getAbilityData() .getAbilityType(this.id.callback(game, caster, localStore, castId)) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddRallyAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddRallyAbility.java index 28fb8dd4b..b32add295 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddRallyAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddRallyAbility.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,13 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddRallyAbility implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CAbility ability = new CAbilityRally(game.getHandleIdAllocator().createId()); this.unit.callback(game, caster, localStore, castId).add(game, ability); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java index 01ede0dab..ced6a3a14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorNextBehaviorVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; @@ -16,7 +15,7 @@ public class ABActionChangeAttackActionToMovement implements ABAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (unit != null) { targetUnit = this.unit.callback(game, caster, localStore, castId); @@ -24,16 +23,17 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (targetUnit.getCurrentBehavior().getBehaviorCategory() == CBehaviorCategory.ATTACK) { targetUnit.beginBehavior(game, targetUnit.getMoveBehavior().reset(targetUnit.getMoveBehavior().getHighlightOrderId(), - targetUnit.getCurrentBehavior().visit(BehaviorTargetVisitor.INSTANCE)), true); - } else - if (targetUnit.getCurrentBehavior().getBehaviorCategory() == CBehaviorCategory.MOVEMENT) { - CRangedBehavior next = targetUnit.getCurrentBehavior().visit(BehaviorNextBehaviorVisitor.INSTANCE); - if (next != null && next.getBehaviorCategory() == CBehaviorCategory.ATTACK) { - targetUnit.beginBehavior(game, - targetUnit.getMoveBehavior().reset(targetUnit.getMoveBehavior().getHighlightOrderId(), - next.visit(BehaviorTargetVisitor.INSTANCE)), true); - } + targetUnit.getCurrentBehavior().visit(BehaviorTargetVisitor.INSTANCE)), + true); + } else if (targetUnit.getCurrentBehavior().getBehaviorCategory() == CBehaviorCategory.MOVEMENT) { + CRangedBehavior next = targetUnit.getCurrentBehavior().visit(BehaviorNextBehaviorVisitor.INSTANCE); + if (next != null && next.getBehaviorCategory() == CBehaviorCategory.ATTACK) { + targetUnit.beginBehavior(game, + targetUnit.getMoveBehavior().reset(targetUnit.getMoveBehavior().getHighlightOrderId(), + next.visit(BehaviorTargetVisitor.INSTANCE)), + true); } + } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityEffectReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityEffectReaction.java index ad2ce3c04..830d91d97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityEffectReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityEffectReaction.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; @@ -12,6 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCheckAbilityEffectReaction implements ABSingleAction { @@ -20,7 +20,8 @@ public class ABActionCheckAbilityEffectReaction implements ABSingleAction { private List onBlockActions; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit tarU = caster; if (this.target != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityProjReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityProjReaction.java index cf3707611..d265d88e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityProjReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityProjReaction.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCheckAbilityProjReaction implements ABSingleAction { @@ -19,7 +19,8 @@ public class ABActionCheckAbilityProjReaction implements ABSingleAction { private List onBlockActions; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit tarU = caster; if (this.target != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java index 1bc62f059..c1443e73c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -15,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionCreateUnit implements ABSingleAction { @@ -23,17 +22,17 @@ public class ABActionCreateUnit implements ABSingleAction { private ABPlayerCallback owner; private ABLocationCallback loc; private ABFloatCallback facing; - + private ABBooleanCallback addSummonedTag; private ABBooleanCallback removeFood; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { War3ID theId = id.callback(game, caster, localStore, castId); if (theId == null) { return; } - + CPlayer thePlayer = null; float theFacing = 0; if (this.owner != null) { @@ -45,13 +44,13 @@ public void runAction(CSimulation game, CUnit caster, Map localS theFacing = this.facing.callback(game, caster, localStore, castId); } final AbilityPointTarget location = this.loc.callback(game, caster, localStore, castId); - final CUnit createdUnit = game.createUnitSimple(theId, thePlayer.getId(), - location.getX(), location.getY(), theFacing); - + final CUnit createdUnit = game.createUnitSimple(theId, thePlayer.getId(), location.getX(), location.getY(), + theFacing); + if (addSummonedTag == null || addSummonedTag.callback(game, caster, localStore, castId)) { createdUnit.addClassification(CUnitClassification.SUMMONED); } - + if (removeFood != null && removeFood.callback(game, caster, localStore, castId)) { thePlayer.setUnitFoodUsed(createdUnit, 0); thePlayer.setUnitFoodMade(createdUnit, 0); @@ -65,8 +64,7 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String playerIndexExpression; if (this.owner != null) { playerIndexExpression = this.owner.generateJassEquivalent(jassTextGenerator); - } - else { + } else { playerIndexExpression = "TODOJASS(" + jassTextGenerator.getCaster() + ")"; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java index ab81d8fd4..a191f2b65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -16,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; @@ -47,7 +47,7 @@ public class ABActionDamageArea implements ABAction { private List extraActions; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java index 31bdcd6e1..8692e2795 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -16,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; @@ -51,7 +51,7 @@ public class ABActionDamageAttackSplash implements ABAction { private List extraActions; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java index b2f7eadee..3abf344c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -16,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; @@ -49,7 +49,7 @@ public class ABActionDamageBurst implements ABAction { private List extraActions; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java index 562735d65..64f13cb09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -16,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; @@ -51,7 +51,7 @@ public class ABActionDamageSplash implements ABAction { private List extraActions; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java index 3bdccf5ba..77fbce542 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; @@ -34,7 +33,7 @@ public class ABActionDamageTarget implements ABSingleAction { private ABBooleanCallback nonlethal; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; CDamageFlags flags = new CGenericDamageFlags(false, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDisableWorkerAbilities.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDisableWorkerAbilities.java index 46529b336..eb3634acf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDisableWorkerAbilities.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDisableWorkerAbilities.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -20,6 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityWispHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionDisableWorkerAbilities implements ABSingleAction { @@ -27,7 +26,7 @@ public class ABActionDisableWorkerAbilities implements ABSingleAction { @SuppressWarnings({ "rawtypes", "unchecked" }) @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (this.unit != null) { targetUnit = this.unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java index bba016c89..4e2750b8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -13,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionDispelBuffs implements ABAction { @@ -21,7 +21,7 @@ public class ABActionDispelBuffs implements ABAction { private ABCondition filter; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theCaster = caster; if (source != null) { theCaster = source.callback(game, theCaster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionEnableWorkerAbilities.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionEnableWorkerAbilities.java index 2202563c2..92f33b623 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionEnableWorkerAbilities.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionEnableWorkerAbilities.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -20,6 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityWispHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionEnableWorkerAbilities implements ABSingleAction { @@ -27,7 +26,7 @@ public class ABActionEnableWorkerAbilities implements ABSingleAction { @SuppressWarnings({ "rawtypes", "unchecked" }) @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (this.unit != null) { targetUnit = this.unit.callback(game, caster, localStore, castId); @@ -52,8 +51,7 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String casterExpression; if (this.unit != null) { casterExpression = this.unit.generateJassEquivalent(jassTextGenerator); - } - else { + } else { casterExpression = jassTextGenerator.getCaster(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java index 71812366b..dbe84482d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; public class ABActionForceBeginCreatedBehavior implements ABAction { @@ -14,7 +13,7 @@ public class ABActionForceBeginCreatedBehavior implements ABAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (unit != null) { targetUnit = this.unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHeal.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHeal.java index dab4e98a0..fdb286b9c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHeal.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHeal.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionHeal implements ABSingleAction { @@ -17,7 +16,7 @@ public class ABActionHeal implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { percent = this.isPercent.callback(game, caster, localStore, castId); @@ -25,8 +24,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS if (percent) { final CUnit targetUnit = this.target.callback(game, caster, localStore, castId); targetUnit.heal(game, this.amount.callback(game, caster, localStore, castId) * targetUnit.getMaximumLife()); - } - else { + } else { this.target.callback(game, caster, localStore, castId).heal(game, this.amount.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java index b0f280206..96c8be299 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionHideUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); targetUnit.setHidden(true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionInstantReturnResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionInstantReturnResources.java index a6b4a50f1..6dcbc2715 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionInstantReturnResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionInstantReturnResources.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.ResourceType; @@ -16,7 +15,7 @@ public class ABActionInstantReturnResources implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (this.unit != null) { targetUnit = this.unit.callback(game, caster, localStore, castId); @@ -61,8 +60,7 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String targetExpression; if (this.unit != null) { targetExpression = this.unit.generateJassEquivalent(jassTextGenerator); - } - else { + } else { targetExpression = jassTextGenerator.getCaster(); } return "UnitInstantReturnResources(" + targetExpression + ")"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionIssueStopOrder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionIssueStopOrder.java index 30caae4ff..8b798774e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionIssueStopOrder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionIssueStopOrder.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionIssueStopOrder implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); targetUnit.performDefaultBehavior(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java index d4b124a56..d5587aa5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionKillUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); targetUnit.kill(game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMergeUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMergeUnits.java index 692ce6f06..7a131e4c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMergeUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMergeUnits.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -14,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionMergeUnits implements ABSingleAction { @@ -27,7 +26,7 @@ public class ABActionMergeUnits implements ABSingleAction { private ABBooleanCallback resetHpMp; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { int thePlayerId = caster.getPlayerIndex(); float theFacing = caster.getFacing(); AbilityPointTarget loc = null; @@ -39,8 +38,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS } if (this.location != null) { loc = this.location.callback(game, caster, localStore, castId); - } - else { + } else { loc = new AbilityPointTarget(caster.getX(), caster.getY()); } @@ -70,22 +68,19 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String playerExpression; if (this.playerIndex != null) { playerExpression = "Player(" + this.playerIndex.generateJassEquivalent(jassTextGenerator) + ")"; - } - else { + } else { playerExpression = "GetOwningPlayer(" + jassTextGenerator.getCaster() + ")"; } String facingExpression; if (this.facing != null) { facingExpression = this.facing.generateJassEquivalent(jassTextGenerator); - } - else { + } else { facingExpression = "GetUnitFacing(" + jassTextGenerator.getCaster() + ")"; } String locExpression; if (this.location != null) { locExpression = this.location.generateJassEquivalent(jassTextGenerator); - } - else { + } else { locExpression = "GetUnitLoc(" + jassTextGenerator.getCaster() + ")"; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java index 75b2e5dd9..11c988152 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionMultiplyUnitScale implements ABSingleAction { @@ -15,7 +14,7 @@ public class ABActionMultiplyUnitScale implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); game.changeUnitScale(targetUnit, value.callback(game, caster, localStore, castId), true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java index 6a00b7e83..8976cce50 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); game.removeUnit(targetUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java index 9972da925..bada86354 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionResurrect implements ABSingleAction { private ABUnitCallback target; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.target.callback(game, caster, localStore, castId); if (targetUnit.isDead()) { targetUnit.resurrect(game); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSendUnitBackToWork.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSendUnitBackToWork.java index ba326ad46..8b8b1a42a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSendUnitBackToWork.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSendUnitBackToWork.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTimer; public class ABActionSendUnitBackToWork implements ABSingleAction { @@ -14,12 +13,11 @@ public class ABActionSendUnitBackToWork implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit; if (this.unit != null) { targetUnit = this.unit.callback(game, caster, localStore, castId); - } - else { + } else { targetUnit = caster; } @@ -39,8 +37,7 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String unitExpression; if (this.unit != null) { unitExpression = this.unit.generateJassEquivalent(jassTextGenerator); - } - else { + } else { unitExpression = jassTextGenerator.getCaster(); } return "SendUnitBackToWorkAU(" + unitExpression + ", " + jassTextGenerator.getTriggerLocalStore() + ", " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java index 2ebaa8037..317e28304 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetExplodesOnDeath implements ABAction { @@ -17,7 +16,7 @@ public class ABActionSetExplodesOnDeath implements ABAction { private ABIDCallback buffId; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); targetUnit.setExplodesOnDeath(this.explodes.callback(game, caster, localStore, castId)); if (this.buffId != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetHp.java index 67986dbb6..b69b8b486 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetHp.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetHp implements ABSingleAction { @@ -17,7 +16,7 @@ public class ABActionSetHp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { percent = this.isPercent.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetMp.java index b3b21c923..979f8c610 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetMp.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetMp implements ABSingleAction { @@ -17,7 +16,7 @@ public class ABActionSetMp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { percent = this.isPercent.callback(game, caster, localStore, castId); @@ -27,8 +26,7 @@ public void runAction(CSimulation game, CUnit caster, Map localS targetUnit.setMana(Math .max(Math.min(this.amount.callback(game, caster, localStore, castId) * targetUnit.getMaximumMana(), targetUnit.getMaximumMana()), 0)); - } - else { + } else { targetUnit.setMana(Math.max( Math.min(this.amount.callback(game, caster, localStore, castId), targetUnit.getMaximumMana()), 0)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java index 994bca0ac..41639c2d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetSpeed implements ABAction { @@ -14,7 +13,7 @@ public class ABActionSetSpeed implements ABAction { private ABIntegerCallback value; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); targetUnit.setSpeed(value.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java index cf559772d..f539c88aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionStartSacrificingUnit implements ABSingleAction { @@ -16,7 +15,7 @@ public class ABActionStartSacrificingUnit implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit theUnit = this.unit.callback(game, caster, localStore, castId); theUnit.queueSacrificingUnit(game, this.id.callback(game, caster, localStore, castId), this.sacrifice.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java index 57dc462c2..87a472223 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionStartTrainingUnit implements ABSingleAction { @@ -15,7 +14,7 @@ public class ABActionStartTrainingUnit implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit theUnit = this.unit.callback(game, caster, localStore, castId); theUnit.queueTrainingUnit(game, this.id.callback(game, caster, localStore, castId)); theUnit.notifyOrdersChanged(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java index e89d82363..9dd2f96a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSubtractMp implements ABSingleAction { @@ -17,7 +16,7 @@ public class ABActionSubtractMp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { percent = this.isPercent.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java index 5c2f5ec2c..bfe6bb87b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -16,10 +15,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABActionTransformUnit implements ABAction { @@ -53,7 +53,7 @@ public class ABActionTransformUnit implements ABAction { private List onUntransformActions; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { u1 = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java index 75ca4892d..4d7fcb485 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionTransformUnitAppearance implements ABAction { @@ -14,7 +13,7 @@ public class ABActionTransformUnitAppearance implements ABAction { private ABIDCallback id; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); game.unitUpdatedType(targetUnit, id.callback(game, caster, localStore, castId), false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java index e294551ca..58ed327c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -14,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.DelayInstantTransformationTimer; @@ -41,7 +41,7 @@ public class ABActionTransformUnitInstant implements ABAction { private List onUntransformActions; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { u1 = unit.callback(game, caster, localStore, castId); @@ -155,8 +155,8 @@ public void runAction(CSimulation game, CUnit caster, Map localS TransformationHandler.instantTransformation(game, localStore, u1, targetType, isKeepRatios, actions, abil, addAlternateTagAfter, perm, true); if (dur > 0) { - TransformationHandler.createInstantTransformBackBuff(game, caster, localStore, u1, baseType, isKeepRatios, - unActions, abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); + TransformationHandler.createInstantTransformBackBuff(game, caster, localStore, u1, baseType, + isKeepRatios, unActions, abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java index 71d7e622f..0e9473bcc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; @@ -15,6 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; @@ -48,7 +48,7 @@ public class ABActionTransformedUnitAbilityAdd implements ABAction { private List onUntransformActions; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { u1 = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java index d67155a8c..697362714 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -13,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; public class ABActionTransformedUnitAbilityRemove implements ABAction { @@ -28,7 +28,7 @@ public class ABActionTransformedUnitAbilityRemove implements ABAction { private List onUntransformActions; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { boolean perm = false; if (permanent != null) { perm = permanent.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java index 01c55b97b..178bb6f48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionUnhideUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); targetUnit.setHidden(false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java index b94e9081d..d0d7a8815 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.animation; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddSecondaryAnimationTag implements ABSingleAction { @@ -16,7 +15,7 @@ public class ABActionAddSecondaryAnimationTag implements ABSingleAction { private ABStringCallback tag; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); if (targetUnit.getUnitAnimationListener() diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java index abe7e41fa..51b1d80ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.animation; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; @@ -12,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionPlayAnimation implements ABSingleAction { @@ -23,7 +22,7 @@ public class ABActionPlayAnimation implements ABSingleAction { private ABBooleanCallback allowVariations; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); boolean f = true; float s = 1f; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java index 2c37f3b05..146378974 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.animation; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionQueueAnimation implements ABAction { @@ -19,7 +18,7 @@ public class ABActionQueueAnimation implements ABAction { private ABBooleanCallback allowVariations; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); boolean av = false; if (this.allowVariations != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java index c2787e387..c47634d9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.animation; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveSecondaryAnimationTag implements ABSingleAction { @@ -16,7 +15,8 @@ public class ABActionRemoveSecondaryAnimationTag implements ABSingleAction { private ABStringCallback tag; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); if (targetUnit.getUnitAnimationListener() diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java index d84744088..ce50b4c14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionDivideUnitAlpha implements ABSingleAction { @@ -15,7 +14,7 @@ public class ABActionDivideUnitAlpha implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); final float[] color = game.getUnitVertexColor(targetUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java index a62309250..5a008f541 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionMultiplyUnitAlpha implements ABSingleAction { @@ -15,7 +14,7 @@ public class ABActionMultiplyUnitAlpha implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); final float[] color = game.getUnitVertexColor(targetUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java index 7c1ab4cae..9dd860691 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetUnitAlpha implements ABSingleAction { @@ -15,7 +14,7 @@ public class ABActionSetUnitAlpha implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); final float[] color = game.getUnitVertexColor(targetUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java index 277fd816d..7f7f40a87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.movement; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetUnitFlyHeight implements ABSingleAction { @@ -15,7 +14,7 @@ public class ABActionSetUnitFlyHeight implements ABSingleAction { private ABFloatCallback height; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); targetUnit.setFlyHeight(this.height.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java index 4eb9d3f4f..1ce6d0160 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.movement; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetUnitMovementTypeNoCollision implements ABSingleAction { @@ -15,12 +14,11 @@ public class ABActionSetUnitMovementTypeNoCollision implements ABSingleAction { private ABBooleanCallback active; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, final int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); if (this.active != null) { targetUnit.setNoCollisionMovementType(this.active.callback(game, caster, localStore, castId)); - } - else { + } else { targetUnit.setNoCollisionMovementType(true); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java index ac4a7875d..59db03bda 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitgroup; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddUnitToGroup implements ABSingleAction { @@ -17,7 +17,7 @@ public class ABActionAddUnitToGroup implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final Set groupSet = this.group.callback(game, caster, localStore, castId); final CUnit rUnit = this.unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java index 88b846212..a73079404 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitgroup; import java.util.HashSet; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -9,13 +8,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCreateUnitGroup implements ABSingleAction { private String name; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final Set group = new HashSet<>(); if (this.name != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java index fc26d016c..d068253df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitgroup; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveUnitFromGroup implements ABSingleAction { @@ -17,7 +17,7 @@ public class ABActionRemoveUnitFromGroup implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final Set groupSet = this.group.callback(game, caster, localStore, castId); final CUnit rUnit = this.unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityEffectReactionListener.java index e73957fa2..60f48fc86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityEffectReactionListener.java @@ -1,22 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityEffectReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddAbilityEffectReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityEffectReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); - + target.addAbilityEffectReactionListener(listener.callback(game, caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityProjReactionListener.java index 124d27dec..ee9c0ba9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityProjReactionListener.java @@ -1,22 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddAbilityProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityProjReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); - + target.addAbilityProjReactionListener(listener.callback(game, caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java index c1e8e8299..531dde276 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddAttackPostDamageListener implements ABAction { private ABUnitCallback unit; private ABAttackPostDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = unit.callback(game, caster, localStore, castId); target.addPostDamageListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPreDamageListener.java index 8ceb23bd4..028af9dfc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPreDamageListener.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackPreDamageListenerPriorityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddAttackPreDamageListener implements ABAction { @@ -16,9 +15,11 @@ public class ABActionAddAttackPreDamageListener implements ABAction { private ABAttackPreDamageListenerPriorityCallback priority; private ABAttackPreDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); - - target.addPreDamageListener(priority.callback(game, caster, localStore, castId), listener.callback(game, caster, localStore, castId)); + + target.addPreDamageListener(priority.callback(game, caster, localStore, castId), + listener.callback(game, caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackProjReactionListener.java index c67d94b04..5b733270a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackProjReactionListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddAttackProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAttackProjReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); target.addAttackProjReactionListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddBehaviorChangeListener.java index 3fdc4e35d..115af6bf9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddBehaviorChangeListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABBehaviorChangeListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddBehaviorChangeListener implements ABAction { private ABUnitCallback unit; private ABBehaviorChangeListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = unit.callback(game, caster, localStore, castId); target.addBehaviorChangeListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenListener.java index d262727f5..ad2522652 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddDamageTakenListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); target.addDamageTakenListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenModificationListener.java index 391db54ca..2995880a6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenModificationListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenModificationListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddDamageTakenModificationListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenModificationListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); target.addDamageTakenModificationListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDeathReplacementEffect.java index 44e8c7bdc..7fd9a7e63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDeathReplacementEffect.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDeathReplacementPriorityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDeathReplacementCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddDeathReplacementEffect implements ABAction { @@ -16,7 +15,8 @@ public class ABActionAddDeathReplacementEffect implements ABAction { private ABDeathReplacementPriorityCallback priority; private ABDeathReplacementCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit targetUnit = target.callback(game, caster, localStore, castId); targetUnit.addDeathReplacementEffect(priority.callback(game, caster, localStore, castId), listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddEvasionListener.java index 2a04f337c..866b27212 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddEvasionListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABEvasionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddEvasionListener implements ABAction { private ABUnitCallback targetUnit; private ABEvasionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); target.addEvasionListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java index 9954dd178..f08f8c9f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java @@ -1,21 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABUnitStateListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddUnitStateListener implements ABAction { private ABUnitCallback unit; private ABUnitStateListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = unit.callback(game, caster, localStore, castId); localStore.put(ABLocalStoreKeys.LASTSTATELISTENERADDEDUNIT, target); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityEffectReactionListener.java index 39db98c54..6330f4f28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityEffectReactionListener.java @@ -2,13 +2,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; public class ABActionCreateAbilityEffectReactionListener implements ABAction { @@ -16,12 +16,14 @@ public class ABActionCreateAbilityEffectReactionListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(game, caster, localStore, castId); } - ABAbilityEffectReactionListener listener = new ABAbilityEffectReactionListener(localStore, actions, castId, ucid); + ABAbilityEffectReactionListener listener = new ABAbilityEffectReactionListener(localStore, actions, castId, + ucid); localStore.put(ABLocalStoreKeys.LASTCREATEDAbERL, listener); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityProjReactionListener.java index 5fdc04405..3f33ff0e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityProjReactionListener.java @@ -2,13 +2,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; public class ABActionCreateAbilityProjReactionListener implements ABAction { @@ -16,7 +16,8 @@ public class ABActionCreateAbilityProjReactionListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java index 5cd8b96c2..9524709ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public class ABActionCreateAttackPostDamageListener implements ABAction { @@ -18,12 +18,14 @@ public class ABActionCreateAttackPostDamageListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(game, caster, localStore, castId); } - ABAttackPostDamageListener listener = new ABAttackPostDamageListener(localStore, priority, actions, castId, ucid); + ABAttackPostDamageListener listener = new ABAttackPostDamageListener(localStore, priority, actions, castId, + ucid); localStore.put(ABLocalStoreKeys.LASTCREATEDAPoDL, listener); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPreDamageListener.java index a52886f09..ce244ae4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPreDamageListener.java @@ -2,13 +2,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; public class ABActionCreateAttackPreDamageListener implements ABAction { @@ -16,7 +16,8 @@ public class ABActionCreateAttackPreDamageListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackProjReactionListener.java index 0edfd59b4..88ecf51c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackProjReactionListener.java @@ -2,13 +2,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; public class ABActionCreateAttackProjReactionListener implements ABAction { @@ -16,7 +16,8 @@ public class ABActionCreateAttackProjReactionListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateBehaviorChangeListener.java index 104e1d00c..7e0301a5e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateBehaviorChangeListener.java @@ -2,13 +2,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; public class ABActionCreateBehaviorChangeListener implements ABAction { @@ -16,7 +16,8 @@ public class ABActionCreateBehaviorChangeListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java index 472112e61..ec83f4270 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public class ABActionCreateDamageTakenListener implements ABAction { @@ -18,7 +18,8 @@ public class ABActionCreateDamageTakenListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenModificationListener.java index 32923868c..b6187f839 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenModificationListener.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; public class ABActionCreateDamageTakenModificationListener implements ABAction { @@ -18,7 +18,7 @@ public class ABActionCreateDamageTakenModificationListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDeathReplacementEffect.java index 89812f3d3..eb026a868 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDeathReplacementEffect.java @@ -2,13 +2,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; public class ABActionCreateDeathReplacementEffect implements ABAction { @@ -16,7 +16,8 @@ public class ABActionCreateDeathReplacementEffect implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateEvasionListener.java index 21ca6a14d..334ed2e2f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateEvasionListener.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public class ABActionCreateEvasionListener implements ABAction { @@ -17,7 +17,8 @@ public class ABActionCreateEvasionListener implements ABAction { private List conditions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java index a0f2e0099..6026bcc27 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java @@ -2,12 +2,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; public class ABActionCreateUnitStateListener implements ABAction { @@ -25,7 +25,7 @@ public class ABActionCreateUnitStateListener implements ABAction { private List onUpgradesChanged; private List onHideStateChanged; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { ABUnitStateListener modifier = new ABUnitStateListener(game, caster, localStore, castId, onLifeChanged, onManaChanged, onOrdersChanged, onQueueChanged, onRallyPointChanged, onWaypointsChanged, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityEffectReactionListener.java index 1548d113c..ef2a423c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityEffectReactionListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityEffectReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveAbilityEffectReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityEffectReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); target.removeAbilityEffectReactionListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityProjReactionListener.java index c0511e89a..4f932c303 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityProjReactionListener.java @@ -1,22 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveAbilityProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityProjReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); - + target.removeAbilityProjReactionListener(listener.callback(game, caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java index 166aabf4b..3c4922a68 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveAttackPostDamageListener implements ABAction { private ABUnitCallback unit; private ABAttackPostDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = unit.callback(game, caster, localStore, castId); target.removePostDamageListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java index 4aae190e2..d4e336fa8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackPreDamageListenerPriorityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveAttackPreDamageListener implements ABAction { @@ -16,9 +15,11 @@ public class ABActionRemoveAttackPreDamageListener implements ABAction { private ABAttackPreDamageListenerPriorityCallback priority; private ABAttackPreDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); - - target.removePreDamageListener(priority.callback(game, caster, localStore, castId), listener.callback(game, caster, localStore, castId)); + + target.removePreDamageListener(priority.callback(game, caster, localStore, castId), + listener.callback(game, caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackProjReactionListener.java index de92f70c4..172c7f40a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackProjReactionListener.java @@ -1,22 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveAttackProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAttackProjReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); - + target.removeAttackProjReactionListener(listener.callback(game, caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveBehaviorChangeListener.java index 1c8affcea..10197c6b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveBehaviorChangeListener.java @@ -1,22 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABBehaviorChangeListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveBehaviorChangeListener implements ABAction { private ABUnitCallback unit; private ABBehaviorChangeListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnit target = unit.callback(game, caster, localStore, castId); - + target.removeBehaviorChangeListener(listener.callback(game, caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java index 19556478b..5c91985c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveDamageTakenListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); target.removeDamageTakenListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java index c1d061acf..a57a771ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenModificationListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveDamageTakenModificationListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenModificationListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); target.removeDamageTakenModificationListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDeathReplacementEffect.java index f6a1dd2ad..f5321f123 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDeathReplacementEffect.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDeathReplacementPriorityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDeathReplacementCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveDeathReplacementEffect implements ABAction { @@ -16,7 +15,8 @@ public class ABActionRemoveDeathReplacementEffect implements ABAction { private ABDeathReplacementPriorityCallback priority; private ABDeathReplacementCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { target.callback(game, caster, localStore, castId).removeDeathReplacementEffect( priority.callback(game, caster, localStore, castId), listener.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java index 379f35f05..488c67f26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABEvasionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveEvasionListener implements ABAction { private ABUnitCallback targetUnit; private ABEvasionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); target.removeEvasionListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java index b0a3bbab3..39705af59 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABUnitStateListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveUnitStateListener implements ABAction { private ABUnitCallback unit; private ABUnitStateListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnit target = unit.callback(game, caster, localStore, castId); target.removeStateListener(listener.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java index cef6a5b29..cdbd30fa3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionDamageTakenModificationMultiplyDamageMultiplier implements ABAction { private ABFloatCallback multiplier; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); damage.addDamageMultiplier(multiplier.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java index 9bb14b8e6..bb6577404 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionDamageTakenModificationSetDamageMultiplier implements ABAction { private ABFloatCallback multiplier; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementFinishReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementFinishReincarnating.java index dec4b2ac4..f43bb2caf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementFinishReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementFinishReincarnating.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - -import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; +import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionDeathReplacementFinishReincarnating implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { caster.setFalseDeath(false); game.getWorldCollision().addUnit(caster); caster.getUnitAnimationListener().playAnimation(true, PrimaryTag.STAND, SequenceUtils.EMPTY, 1.0f, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReincarnating.java index 588131988..41f9a3724 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReincarnating.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; public class ABActionDeathReplacementSetReincarnating implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnitDeathReplacementResult result = (CUnitDeathReplacementResult)localStore.get(ABLocalStoreKeys.DEATHRESULT+castId); CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking)localStore.get(ABLocalStoreKeys.DEATHSTACKING+castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java index 89ebe5fd5..e1ddca557 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; public class ABActionDeathReplacementSetReviving implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnitDeathReplacementResult result = (CUnitDeathReplacementResult)localStore.get(ABLocalStoreKeys.DEATHRESULT+castId); CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking)localStore.get(ABLocalStoreKeys.DEATHSTACKING+castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java index 9d5da8881..65827dd81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java @@ -1,8 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; @@ -32,7 +31,7 @@ public class ABActionPreDamageListenerAddBonusDamage implements ABAction { private ABBooleanCallback isNonlethal; private ABBooleanCallback isPassLimitedMagicImmune; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CDamageType theDamageType = null; if (damageType != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java index fe674c0fb..4e4f4fc70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerAddDamageMultiplier implements ABAction { private ABFloatCallback value; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); damage.addDamageMultiplier(value.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java index e90a451c0..0acccca9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerLockDamageModifications implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); damage.lock(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java index 9c900ee19..17d6dd5e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerSetMiss implements ABAction { private ABBooleanCallback miss; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); if (miss != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionReactionPreventHit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionReactionPreventHit.java index 2abfdf16a..4de4945ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionReactionPreventHit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionReactionPreventHit.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionReactionPreventHit implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.REACTIONALLOWHIT+castId, false); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java index 89f99538f..f6be5ee26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionSetPreDamageStacking implements ABAction { @@ -15,7 +14,7 @@ public class ABActionSetPreDamageStacking implements ABAction { private ABBooleanCallback allowStacking; private ABBooleanCallback allowSamePriorityStacking; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java index 71f670104..c65f3b66c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionSubtractTotalDamageDealt implements ABAction { @@ -15,7 +14,8 @@ public class ABActionSubtractTotalDamageDealt implements ABAction { private ABFloatCallback amount; private ABFloatCallback minimum; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { float theMin = 0; if (minimum != null) { theMin = minimum.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java index 4aa5f4ccb..0320d70df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetAttackBaseDamage extends ABFloatCallback { - + @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); return settings.getBaseDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java index 9c9800565..d85e039db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetAttackMaximumSplashRadius extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); return Math.max(settings.getAreaOfEffectFullDamage(), Math.max(settings.getAreaOfEffectMediumDamage(), settings.getAreaOfEffectSmallDamage())); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java index ae8700ab9..4d7337f0e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABCallbackGetAttackType extends ABAttackTypeCallback { - + @Override - public CAttackType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getAttackType(); + public CAttackType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getAttackType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java index aa7c3daed..a9aab37ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetDamageType extends ABDamageTypeCallback { @Override - public CDamageType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CDamageType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().getDamageType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetFinalTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetFinalTotalDamageDealt.java index 4a3b79b37..ccd15ca76 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetFinalTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetFinalTotalDamageDealt.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABCallbackGetFinalTotalDamageDealt extends ABFloatCallback { - + @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).computeFinalDamage(game, caster); + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).computeFinalDamage(game, + caster); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetNewBehaviorTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetNewBehaviorTarget.java index 150544836..e69a77489 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetNewBehaviorTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetNewBehaviorTarget.java @@ -1,22 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks.ABTargetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; public class ABCallbackGetNewBehaviorTarget extends ABTargetCallback { @Override - public AbilityTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CBehavior beh = (CBehavior) localStore.get(ABLocalStoreKeys.POSTCHANGEBEHAVIOR+castId); + public AbilityTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + CBehavior beh = (CBehavior) localStore.get(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + castId); AbilityTarget tar = beh.visit(BehaviorTargetVisitor.INSTANCE); - + return tar; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java index 19359f4fd..41dda72c9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABCallbackGetRawTotalDamageDealt extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).computeRawTotalDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileAttackType.java index 7fc5fa7db..52a576c56 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileAttackType.java @@ -1,19 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; public class ABCallbackGetReactionAttackProjectileAttackType extends ABAttackTypeCallback { - + @Override - public CAttackType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ+castId)).getUnitAttack().getAttackType(); + public CAttackType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ + castId)).getUnitAttack() + .getAttackType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileDamage.java index 4c868d00b..192590be8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileDamage.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; public class ABCallbackGetReactionAttackProjectileDamage extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ+castId)).getDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java index 032a3dca4..9788bdd4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABCallbackGetTriggeringAttackType extends ABAttackTypeCallback { @Override - public CAttackType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CAttackType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java index 6e7b4cd90..ccd84d643 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetTriggeringDamageType extends ABDamageTypeCallback { - + @Override - public CDamageType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getPrimaryDamageType(); + public CDamageType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).getPrimaryDamageType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java index 3466fa3dc..833747662 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABCallbackGetWeaponType extends ABWeaponTypeCallback { - + @Override - public CWeaponType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType(); + public CWeaponType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java index 2a900b6a4..a27c9c4c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileLine; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; @@ -13,7 +12,7 @@ public class ABConditionIsAttackArtillery extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnitAttack attack = (CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId); if (attack instanceof CUnitAttackMissileSplash) { return ((CUnitAttackMissileSplash)attack).isArtillery(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java index 889bbd811..818dcdf69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABConditionIsAttackHoming extends ABCondition { - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); return settings.isProjectileHomingEnabled(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java index 79c7bf89e..d6822d389 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java @@ -1,22 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; public class ABConditionIsNewBehaviorCategoryInList extends ABCondition { private List list; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, int castId) { - CBehavior beh = (CBehavior) localStore.get(ABLocalStoreKeys.POSTCHANGEBEHAVIOR+castId); + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + CBehavior beh = (CBehavior) localStore.get(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + castId); CBehaviorCategory cat = CBehaviorCategory.IDLE; if (beh != null) { cat = beh.getBehaviorCategory(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java index 49cb18394..3f7d040a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABConditionIsTriggeringDamageAnAttack extends ABCondition { - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getPrimaryDamageFlags().isAttack(); + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).getPrimaryDamageFlags() + .isAttack(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java index eac51f0ae..8818be7b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABConditionIsTriggeringDamageRanged extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getPrimaryDamageFlags().isRanged(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java index 142da4466..cfddafeca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; import java.util.EnumSet; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; @@ -22,18 +22,18 @@ public class ABConditionIsUnitValidSplashDamageTarget extends ABCondition { private ABBooleanCallback targetedEffect; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; - - CUnitAttack atk = (CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId); + + CUnitAttack atk = (CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId); if (atk instanceof CUnitAttackMissileSplash) { - targetsAllowed = ((CUnitAttackMissileSplash)atk).getAreaOfEffectTargets(); + targetsAllowed = ((CUnitAttackMissileSplash) atk).getAreaOfEffectTargets(); } else { return false; } - + if (targetsAllowed.isEmpty()) { return true; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java index 2f7b250f0..8c11b82a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitqueue; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionAddUnitToQueue implements ABSingleAction { @@ -17,7 +17,8 @@ public class ABActionAddUnitToQueue implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final Queue groupQueue = this.queue.callback(game, caster, localStore, castId); final CUnit rUnit = this.unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java index 2dbddc969..7973618aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitqueue; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -8,13 +7,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionClearUnitQueue implements ABSingleAction { private ABUnitQueueCallback queue; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final Queue groupQueue = this.queue.callback(game, caster, localStore, castId); groupQueue.clear(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java index a5d5e9e0b..890582838 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitqueue; import java.util.LinkedList; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -9,13 +8,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionCreateUnitQueue implements ABSingleAction { private String name; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final Queue queue = new LinkedList<>(); if (this.name != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java index 671e76181..1a2631ba9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitqueue; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveUnitFromQueue implements ABSingleAction { @@ -17,7 +17,8 @@ public class ABActionRemoveUnitFromQueue implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final Queue groupQueue = this.queue.callback(game, caster, localStore, castId); final CUnit rUnit = this.unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java index 971c2a7ea..cd153a50e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABActionAddStateModBuff implements ABAction { @@ -15,10 +14,11 @@ public class ABActionAddStateModBuff implements ABAction { private ABUnitCallback targetUnit; private ABStateModBuffCallback buff; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); StateModBuff theBuff = buff.callback(game, caster, localStore, castId); - + target.addStateModBuff(theBuff); target.computeUnitState(game, theBuff.getBuffType()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java index f5af5fc08..3c88c813c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.ABLongCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuffType; @@ -16,7 +15,8 @@ public class ABActionCreateStateModBuff implements ABAction { private StateModBuffType buffType; private ABLongCallback value; - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { StateModBuff buff = null; if (value != null) { buff = new StateModBuff(buffType, value.callback(game, caster, localStore, castId)); @@ -25,5 +25,5 @@ public void runAction(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnit target = targetUnit.callback(game, caster, localStore, castId); StateModBuff theBuff = buff.callback(game, caster, localStore, castId); - + target.removeStateModBuff(theBuff); target.computeUnitState(game, theBuff.getBuffType()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java index f88cf80a8..57a3435f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionSetUnitFadeTimer implements ABAction { @@ -15,7 +14,8 @@ public class ABActionSetUnitFadeTimer implements ABAction { private ABTimerCallback timer; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final CUnit target = this.targetUnit.callback(game, caster, localStore, castId); final CTimer theTimer = this.timer.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java index 465041509..a5223adaa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.ABLongCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABActionUpdateStateModBuff implements ABAction { @@ -16,7 +15,8 @@ public class ABActionUpdateStateModBuff implements ABAction { private ABLongCallback value; @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final StateModBuff buffObj = this.buff.callback(game, caster, localStore, castId); buffObj.setValue(this.value.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java index e024c5885..4ba6417c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CCircleFogModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CTimedCircleFogModifier; @@ -23,7 +22,7 @@ public class ABActionCreateLocationVisionModifier implements ABAction { private ABPlayerCallback player; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { CFogModifier vision; final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); if (this.duration == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java index dcbdac34a..c704732e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CProjectileVisionFogModifier; public class ABActionCreateProjectileVisionModifier implements ABAction { @@ -18,9 +17,10 @@ public class ABActionCreateProjectileVisionModifier implements ABAction { private ABFloatCallback radius; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { final CProjectileVisionFogModifier vision = new CProjectileVisionFogModifier( - this.projectile.callback(game, caster, localStore, castId), radius.callback(game, caster, localStore, castId)); + this.projectile.callback(game, caster, localStore, castId), + radius.callback(game, caster, localStore, castId)); if (this.player != null) { this.player.callback(game, caster, localStore, castId).addFogModifer(game, vision, false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java index bd53b91d2..9b8c49120 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CUnitVisionFogModifier; public class ABActionCreateUnitVisionModifier implements ABAction { @@ -18,7 +17,7 @@ public class ABActionCreateUnitVisionModifier implements ABAction { private ABBooleanCallback alwaysNightVision; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { boolean alwaysNight = false; if (this.alwaysNightVision != null) { alwaysNight = this.alwaysNightVision.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java index df0caf181..70ad3a0e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier.ABVisionModifierCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionRemoveVisionModifier implements ABAction { @@ -14,7 +13,7 @@ public class ABActionRemoveVisionModifier implements ABAction { private ABPlayerCallback player; @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { player.callback(game, caster, localStore, castId).removeFogModifer(game, modifier.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java index b35a3d382..1a2689a5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionSetBurrowPlaceholder implements ABAction { @Override - public void runAction(CSimulation game, CUnit caster, Map localStore, int castId) { + public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { // TODO Auto-generated method stub - + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java index 28270b0cb..880ff32da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java @@ -1,17 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackNull implements ABCallback { - @Override - public Object callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Object callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABAbilityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABAbilityCallback.java index 203c1c91e..3e23be429 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABAbilityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABAbilityCallback.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABAbilityCallback implements ABCallback { - abstract public CAbility callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); - - + abstract public CAbility callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java index 444b05f31..06a9b4c1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,20 +7,22 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentAbility extends ABAbilityCallback { private ABStringCallback name; @Override - public CAbility callback(final CSimulation game, final CUnit caster, final Map localStore, + public CAbility callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABAbilityCallback) { return ((ABAbilityCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseAbilityCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseAbilityCallback, but key is missing or callback was the wrong type: " + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java index 2901fda5b..83c542c1e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityById extends ABAbilityCallback { @@ -15,13 +14,13 @@ public class ABCallbackGetAbilityById extends ABAbilityCallback { private ABUnitCallback unit; @Override - public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { theUnit = this.unit.callback(game, caster, localStore, castId); } - return theUnit.getAbility(GetABAbilityByRawcodeVisitor.getInstance() - .reset(this.id.callback(game, caster, localStore, castId))); + return theUnit.getAbility( + GetABAbilityByRawcodeVisitor.getInstance().reset(this.id.callback(game, caster, localStore, castId))); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java index e68a9e9c2..672b6dca6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffSourceAbility extends ABAbilityCallback { private ABBuffCallback buff; - + @Override - public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return buff.callback(game, caster, localStore, castId).getSourceAbility(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetLastCreatedAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetLastCreatedAbility.java index 50625f51e..38ce371bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetLastCreatedAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetLastCreatedAbility.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLastCreatedAbility extends ABAbilityCallback { @Override - public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.LASTCREATEDABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java index f4ae61d1e..116ccbca4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetMatchingAbility extends ABAbilityCallback { @Override - public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.MATCHINGABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetPartnerAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetPartnerAbility.java index 5e5a4d663..68551979b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetPartnerAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetPartnerAbility.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetPartnerAbility extends ABAbilityCallback { @Override - public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.LASTPARTNERABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetReactionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetReactionAbility.java index 240b809ff..ddbf376e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetReactionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetReactionAbility.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetReactionAbility extends ABAbilityCallback { @Override - public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.REACTIONABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetStoredAbilityByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetStoredAbilityByKey.java index 0651154f5..16bb24cb5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetStoredAbilityByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetStoredAbilityByKey.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredAbilityByKey extends ABAbilityCallback { @@ -16,7 +15,7 @@ public class ABCallbackGetStoredAbilityByKey extends ABAbilityCallback { private ABBooleanCallback instanceValue; @Override - public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (CAbility) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java index 2bd2a9ee3..8c9e3b9dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetThisAbility extends ABAbilityCallback { @Override - public CAbility callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.ABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java index a15b81477..4c724f78f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionAbility extends ABAbilityCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionAbility extends ABAbilityCallback { private ABAbilityCallback fail; @Override - public CAbility callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java index e24bcc676..4c27180bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseAbility extends ABAbilityCallback { @@ -17,7 +16,7 @@ public class ABCallbackReuseAbility extends ABAbilityCallback { private ABStringCallback name; @Override - public CAbility callback(final CSimulation game, final CUnit caster, final Map localStore, + public CAbility callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -27,7 +26,9 @@ public CAbility callback(final CSimulation game, final CUnit caster, final Map arguments; @Override - public CAbility callback(final CSimulation game, final CUnit caster, final Map localStore, + public CAbility callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java index 3a93896c8..b0fa1b0f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; public abstract class ABAttackModifierCallback implements ABCallback { abstract public ABAttackModifier callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java index 7bd0eaf84..44adb0991 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; public class ABCallbackGetLastCreatedAttackModifier extends ABAttackModifierCallback { @Override - public ABAttackModifier callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAttackModifier callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (ABAttackModifier) localStore.get(ABLocalStoreKeys.LASTCREATEDAMod); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java index 5f33a8428..1be5c4dfa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; public class ABCallbackGetStoredAttackModifierByKey extends ABAttackModifierCallback { @@ -14,11 +13,13 @@ public class ABCallbackGetStoredAttackModifierByKey extends ABAttackModifierCall private ABBooleanCallback instanceValue; @Override - public ABAttackModifier callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAttackModifier callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABAttackModifier) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (ABAttackModifier) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (ABAttackModifier) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABAttackModifier) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java index 4f2724f54..d0b88c7db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public abstract class ABAttackSettingsCallback implements ABCallback { abstract public CUnitAttackSettings callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java index 240067fae..448d877a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetCurrentAttackSettings extends ABAttackSettingsCallback { @Override - public CUnitAttackSettings callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnitAttackSettings callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { System.err.println("Getting: " + localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId)); return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java index 2a855ab61..1c4e37d97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetLastCreatedAttackSettings extends ABAttackSettingsCallback { @Override - public CUnitAttackSettings callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnitAttackSettings callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.LASTCREATEDASettings); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java index 5cf7611a0..5eb729504 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetStoredAttackSettingsByKey extends ABAttackSettingsCallback { @@ -14,7 +13,7 @@ public class ABCallbackGetStoredAttackSettingsByKey extends ABAttackSettingsCall private ABBooleanCallback instanceValue; @Override - public CUnitAttackSettings callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnitAttackSettings callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABBooleanCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABBooleanCallback.java index 0485e2504..50120bca5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABBooleanCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABBooleanCallback.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABBooleanCallback implements ABCallback { - abstract public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java index 35ff82ff1..ddbb24159 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -17,7 +17,7 @@ public class ABCallbackGetAbilityDataAsBoolean extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java index b39e5a241..479f488ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueBoolean extends ABBooleanCallback { @@ -16,7 +15,8 @@ public class ABCallbackGetAbilityUniqueValueBoolean extends ABBooleanCallback { private ABBooleanCallback allowNull; @Override - public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + public Boolean callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = key.callback(game, caster, localStore, castId); final CAbility theAbility = ability.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java index e5de02a4b..05bf4fa06 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java @@ -1,22 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffUniqueValueBoolean extends ABBooleanCallback { private ABBuffCallback buff; private ABStringCallback key; - + private ABBooleanCallback allowNull; @Override - public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = key.callback(game, caster, localStore, castId); final CBuff theBuff = buff.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java index a580c6326..fbf513eb8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; public class ABCallbackGetParentAbilityDataAsBoolean extends ABCondition { @@ -17,10 +17,10 @@ public class ABCallbackGetParentAbilityDataAsBoolean extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.PARENTLEVELDATA); - final int parentLevel = (int) ((Map) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) + final int parentLevel = (int) ((LocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) .get(ABLocalStoreKeys.CURRENTLEVEL); final String data = levelData.get(parentLevel - 1).getData() diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java index 795122eb8..2abd29853 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredBooleanByKey extends ABCondition { @@ -15,7 +14,7 @@ public class ABCallbackGetStoredBooleanByKey extends ABCondition { private ABBooleanCallback instanceValue; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (Boolean) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java index da0576dc3..7039075fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionBoolean extends ABBooleanCallback { private ABCondition condition; private ABBooleanCallback pass; private ABBooleanCallback fail; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, int castBoolean) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castBoolean) { if (condition != null && condition.callback(game, caster, localStore, castBoolean)) { return pass.callback(game, caster, localStore, castBoolean); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java index f06be83b5..fdde7ee18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIntegerToBoolean extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return this.value.callback(game, caster, localStore, castId) != 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java index 5732db44f..e01aceab4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRawBoolean extends ABCondition { private Boolean value; @Override - public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABBuffCallback.java index f22148639..5522f6e29 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABBuffCallback.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABBuffCallback implements ABCallback { - abstract public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); - - + abstract public CBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java index 5f6789b01..bff8ebf55 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,13 +7,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentBuff extends ABBuffCallback { private ABStringCallback name; @Override - public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public CBuff callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java index d873c8fa9..2ab69e815 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackEnumBuff extends ABBuffCallback { @Override - public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public CBuff callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.ENUMBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java index 2f580f422..93d97eb26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffById extends ABBuffCallback { @@ -16,14 +15,14 @@ public class ABCallbackGetBuffById extends ABBuffCallback { private ABIDCallback id; @Override - public CBuff callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(game, caster, localStore, castId); War3ID theId = id.callback(game, caster, localStore, castId); if (theUnit != null) { for (CAbility ability : theUnit.getAbilities()) { if (ability instanceof CBuff) { - if (((CBuff)ability).getAlias() == theId) { - return (CBuff)ability; + if (((CBuff) ability).getAlias() == theId) { + return (CBuff) ability; } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetLastCreatedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetLastCreatedBuff.java index beb430e0b..a609a2c4f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetLastCreatedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetLastCreatedBuff.java @@ -1,25 +1,25 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLastCreatedBuff extends ABBuffCallback { @Override - public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public CBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDBUFF); } @Override public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { - return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_LASTCREATEDBUFF", JassTextGeneratorType.BuffHandle); + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_LASTCREATEDBUFF", + JassTextGeneratorType.BuffHandle); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java index a0c4152d3..58967e5bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetMatchingBuff extends ABBuffCallback { @Override - public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public CBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.MATCHINGBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetStoredBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetStoredBuffByKey.java index 77831022a..2ac981e87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetStoredBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetStoredBuffByKey.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredBuffByKey extends ABBuffCallback { @@ -16,7 +15,7 @@ public class ABCallbackGetStoredBuffByKey extends ABBuffCallback { private ABBooleanCallback instanceValue; @Override - public CBuff callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (CBuff) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java index d2088d41e..636d232dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionBuff extends ABBuffCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionBuff extends ABBuffCallback { private ABBuffCallback fail; @Override - public CBuff callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public CBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java index 215a09c3f..fd4f1ecfc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseBuff extends ABBuffCallback { @@ -17,7 +16,8 @@ public class ABCallbackReuseBuff extends ABBuffCallback { private ABStringCallback name; @Override - public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public CBuff callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java index fd472f883..202fdd439 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseBuffWithArguments extends ABBuffCallback { @@ -18,7 +19,7 @@ public class ABCallbackReuseBuffWithArguments extends ABBuffCallback { private Map arguments; @Override - public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public CBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -31,10 +32,11 @@ public CBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public CBuff callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.BUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java index bc71f855d..bbff8a729 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,13 +7,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentDestructable extends ABDestructableCallback { private ABStringCallback name; @Override - public CDestructable callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDestructable callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java index a254b1fee..03b6fa60b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityTargetedDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java index f9b245a5c..bfc8e0dc2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAttackedDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.DESTRUCTABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java index e55f8f8f7..7d0ba5992 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetEnumDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.ENUMDESTRUCTABLE+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java index eb933ca6e..b4a4b7e00 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLastCreatedDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.LASTCREATEDDESTRUCTABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java index e732b8e29..fd0d0c2ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetProjectileHitDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.PROJECTILEHITDEST+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java index 3a439dfcb..364b20541 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredDestructableByKey extends ABDestructableCallback { @@ -16,7 +15,8 @@ public class ABCallbackGetStoredDestructableByKey extends ABDestructableCallback private ABBooleanCallback instanceValue; @Override - public CDestructable callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDestructable callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (CDestructable) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java index 6c6a979a1..1ea9847e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionDestructable extends ABDestructableCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionDestructable extends ABDestructableCallbac private ABDestructableCallback fail; @Override - public CDestructable callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java index 8aff3373b..a48ffae99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseDestructable extends ABDestructableCallback { @@ -17,7 +16,8 @@ public class ABCallbackReuseDestructable extends ABDestructableCallback { private ABStringCallback name; @Override - public CDestructable callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDestructable callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java index eed651f8c..840de23da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseDestructableWithArguments extends ABDestructableCallback { @@ -18,7 +19,8 @@ public class ABCallbackReuseDestructableWithArguments extends ABDestructableCall private Map arguments; @Override - public CDestructable callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDestructable callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java index 4ca32a3c6..79f32b3c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABDestructableCallback implements ABCallback { - abstract public CDestructable callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + abstract public CDestructable callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java index f43eae9a5..91534f065 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,20 +7,23 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentDestructableBuff extends ABDestructableBuffCallback { private ABStringCallback name; @Override - public CDestructableBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDestructableBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABDestructableBuffCallback) { return ((ABDestructableBuffCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " + + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java index e19bf5479..a94240205 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackEnumDestructableBuff extends ABDestructableBuffCallback { @Override - public CDestructableBuff callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CDestructableBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructableBuff) localStore.get(ABLocalStoreKeys.ENUMDESTBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java index dd30aac82..8b6c891fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLastCreatedDestructableBuff extends ABDestructableBuffCallback { @Override - public CDestructableBuff callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CDestructableBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructableBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDDESTBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java index 0325cffe8..2c5439e30 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredDestructableBuffByKey extends ABDestructableBuffCallback { @@ -15,7 +14,7 @@ public class ABCallbackGetStoredDestructableBuffByKey extends ABDestructableBuff private ABBooleanCallback instanceValue; @Override - public CDestructableBuff callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CDestructableBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (CDestructableBuff) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java index dc256af39..9395a8b4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionDestructableBuff extends ABDestructableBuffCallback { private ABCondition condition; private ABDestructableBuffCallback pass; private ABDestructableBuffCallback fail; - + @Override - public CDestructableBuff callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public CDestructableBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java index 10919f7c8..bafed857a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackMatchingDestructableBuff extends ABDestructableBuffCallback { @Override - public CDestructableBuff callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CDestructableBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructableBuff) localStore.get(ABLocalStoreKeys.MATCHINGDESTBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java index 8244008b4..e285e5adc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseDestructableBuff extends ABDestructableBuffCallback { @@ -17,7 +16,8 @@ public class ABCallbackReuseDestructableBuff extends ABDestructableBuffCallback private ABStringCallback name; @Override - public CDestructableBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDestructableBuff callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java index 232829c6b..91f844484 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseDestructableBuffWithArguments extends ABDestructableBuffCallback { @@ -18,7 +19,7 @@ public class ABCallbackReuseDestructableBuffWithArguments extends ABDestructable private Map arguments; @Override - public CDestructableBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDestructableBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -31,10 +32,12 @@ public CDestructableBuff callback(final CSimulation game, final CUnit caster, fi localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABDestructableBuffCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseDestructableBuffCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java index 92a683539..c8fa8083d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABDestructableBuffCallback implements ABCallback { abstract public CDestructableBuff callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackPreDamageListenerPriorityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackPreDamageListenerPriorityCallback.java index 0ca870e21..482289461 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackPreDamageListenerPriorityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackPreDamageListenerPriorityCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerPriority; public abstract class ABAttackPreDamageListenerPriorityCallback implements ABCallback { - abstract public CUnitAttackPreDamageListenerPriority callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CUnitAttackPreDamageListenerPriority callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackTypeCallback.java index b96f85b73..4e2acabc9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackTypeCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public abstract class ABAttackTypeCallback implements ABCallback { - abstract public CAttackType callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CAttackType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAutocastTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAutocastTypeCallback.java index 13fec532a..cfa2fbcd1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAutocastTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAutocastTypeCallback.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABAutocastTypeCallback implements ABCallback { - abstract public AutocastType callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + abstract public AutocastType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java index 0ac4d9b07..210573d0c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackConditionalAutocastType extends ABAutocastTypeCallback { private ABCondition condition; private ABAutocastTypeCallback value1; private ABAutocastTypeCallback value2; - + @Override - public AutocastType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public AutocastType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (condition.callback(game, caster, localStore, castId)) { return value1.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAttackTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAttackTypeFromString.java index 4632db04e..1a79a7d53 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAttackTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAttackTypeFromString.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public class ABCallbackGetAttackTypeFromString extends ABAttackTypeCallback { @@ -12,7 +11,7 @@ public class ABCallbackGetAttackTypeFromString extends ABAttackTypeCallback { private ABStringCallback id; @Override - public CAttackType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CAttackType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return CAttackType.valueOf(id.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAutocastTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAutocastTypeFromString.java index fb305c0f3..f0baeffb5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAutocastTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAutocastTypeFromString.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAutocastTypeFromString extends ABAutocastTypeCallback { private ABStringCallback id; @Override - public AutocastType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public AutocastType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return AutocastType.valueOf(id.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDamageTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDamageTypeFromString.java index 2b44e9938..1ca7440ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDamageTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDamageTypeFromString.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABCallbackRawString; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetDamageTypeFromString extends ABDamageTypeCallback { @@ -14,7 +13,8 @@ public class ABCallbackGetDamageTypeFromString extends ABDamageTypeCallback { private ABStringCallback id; @Override - public CDamageType callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDamageType callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return CDamageType.valueOf(this.id.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java index ac4bf7da3..73101ed40 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABCallbackGetDefenseTypeFromString extends ABDefenseTypeCallback { @@ -12,7 +11,8 @@ public class ABCallbackGetDefenseTypeFromString extends ABDefenseTypeCallback { private ABStringCallback id; @Override - public CDefenseType callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDefenseType callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return CDefenseType.valueOf(this.id.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java index 2f93fb38c..0095a7a16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetMovementTypeFromString extends ABMovementTypeCallback { private ABStringCallback id; @Override - public MovementType callback(final CSimulation game, final CUnit caster, final Map localStore, + public MovementType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { return MovementType.valueOf(this.id.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetNonStackingStatBuffTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetNonStackingStatBuffTypeFromString.java index 3b7328cb1..f05d70ff4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetNonStackingStatBuffTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetNonStackingStatBuffTypeFromString.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABCallbackRawString; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; public class ABCallbackGetNonStackingStatBuffTypeFromString extends ABNonStackingStatBuffTypeCallback { @@ -15,7 +14,7 @@ public class ABCallbackGetNonStackingStatBuffTypeFromString extends ABNonStackin @Override public NonStackingStatBuffType callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId) { + final LocalDataStore localStore, final int castId) { return NonStackingStatBuffType.valueOf(this.id.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java index 86500fb9e..cde84d006 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public class ABCallbackGetStoredAttackTypeByKey extends ABAttackTypeCallback { @@ -15,13 +14,12 @@ public class ABCallbackGetStoredAttackTypeByKey extends ABAttackTypeCallback { private ABBooleanCallback instanceValue; @Override - public CAttackType callback(final CSimulation game, final CUnit caster, final Map localStore, + public CAttackType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (CAttackType) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); - } - else { + } else { return (CAttackType) localStore .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java index dbb8959ad..45d0f7ad5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetStoredDamageTypeByKey extends ABDamageTypeCallback { @@ -15,7 +14,8 @@ public class ABCallbackGetStoredDamageTypeByKey extends ABDamageTypeCallback { private ABBooleanCallback instanceValue; @Override - public CDamageType callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDamageType callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (CDamageType) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java index c195f8a75..60ef5b57f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABCallbackGetStoredDefenseTypeByKey extends ABDefenseTypeCallback { @@ -15,7 +14,8 @@ public class ABCallbackGetStoredDefenseTypeByKey extends ABDefenseTypeCallback { private ABBooleanCallback instanceValue; @Override - public CDefenseType callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDefenseType callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (CDefenseType) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java index 837c1a705..143a43c96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredMovementTypeByKey extends ABMovementTypeCallback { @@ -15,7 +14,8 @@ public class ABCallbackGetStoredMovementTypeByKey extends ABMovementTypeCallback private ABBooleanCallback instanceValue; @Override - public MovementType callback(final CSimulation game, final CUnit caster, final Map localStore, + public MovementType callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (MovementType) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java index cd26a0353..badbb2f19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABCallbackGetStoredTargetTypeByKey extends ABTargetTypeCallback { @@ -15,13 +14,12 @@ public class ABCallbackGetStoredTargetTypeByKey extends ABTargetTypeCallback { private ABBooleanCallback instanceValue; @Override - public CTargetType callback(final CSimulation game, final CUnit caster, final Map localStore, + public CTargetType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (CTargetType) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); - } - else { + } else { return (CTargetType) localStore .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java index ce62adcb8..ddbb74dc8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABCallbackGetStoredWeaponTypeByKey extends ABWeaponTypeCallback { @@ -15,13 +14,12 @@ public class ABCallbackGetStoredWeaponTypeByKey extends ABWeaponTypeCallback { private ABBooleanCallback instanceValue; @Override - public CWeaponType callback(final CSimulation game, final CUnit caster, final Map localStore, + public CWeaponType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (CWeaponType) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); - } - else { + } else { return (CWeaponType) localStore .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java index 143b7c166..a457f64b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABCallbackGetTargetTypeFromString extends ABTargetTypeCallback { @@ -12,7 +11,8 @@ public class ABCallbackGetTargetTypeFromString extends ABTargetTypeCallback { private ABStringCallback id; @Override - public CTargetType callback(final CSimulation game, final CUnit caster, final Map localStore, + public CTargetType callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return CTargetType.valueOf(this.id.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java index a9b2dd8f1..8b903ba2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABCallbackGetUnitDefenseType extends ABDefenseTypeCallback { @@ -12,7 +11,7 @@ public class ABCallbackGetUnitDefenseType extends ABDefenseTypeCallback { private ABUnitCallback unit; @Override - public CDefenseType callback(final CSimulation game, final CUnit caster, final Map localStore, + public CDefenseType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { return unit.callback(game, caster, localStore, castId).getDefenseType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java index 2097fdb34..359da7370 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitMovementType extends ABMovementTypeCallback { private ABUnitCallback unit; @Override - public MovementType callback(final CSimulation game, final CUnit caster, final Map localStore, + public MovementType callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return unit.callback(game, caster, localStore, castId).getMovementType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java index 57e72098b..d5a427c70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitTypeMovementType extends ABMovementTypeCallback { private ABIDCallback type; @Override - public MovementType callback(final CSimulation game, final CUnit caster, final Map localStore, + public MovementType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { War3ID theType = type.callback(game, caster, localStore, castId); return game.getUnitData().getUnitType(theType).getMovementType(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java index 9fcd5093f..89b3141f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABCallbackRawString; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABCallbackGetWeaponTypeFromString extends ABWeaponTypeCallback { @@ -14,7 +13,8 @@ public class ABCallbackGetWeaponTypeFromString extends ABWeaponTypeCallback { private ABStringCallback id; @Override - public CWeaponType callback(final CSimulation game, final CUnit caster, final Map localStore, + public CWeaponType callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return CWeaponType.valueOf(this.id.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawDeathEffectPriority.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawDeathEffectPriority.java index 6303e42bc..46e0c78ed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawDeathEffectPriority.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawDeathEffectPriority.java @@ -1,9 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffectPriority; public class ABCallbackRawDeathEffectPriority extends ABDeathReplacementPriorityCallback { @@ -11,7 +10,8 @@ public class ABCallbackRawDeathEffectPriority extends ABDeathReplacementPriority private CUnitDeathReplacementEffectPriority priority; @Override - public CUnitDeathReplacementEffectPriority callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnitDeathReplacementEffectPriority callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { return priority; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawPreDamageListenerPriority.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawPreDamageListenerPriority.java index 61734c9c1..2569fefe2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawPreDamageListenerPriority.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawPreDamageListenerPriority.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerPriority; public class ABCallbackRawPreDamageListenerPriority extends ABAttackPreDamageListenerPriorityCallback { private CUnitAttackPreDamageListenerPriority priority; - + @Override - public CUnitAttackPreDamageListenerPriority callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnitAttackPreDamageListenerPriority callback(CSimulation game, CUnit caster, LocalDataStore localStore, + final int castId) { return priority; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java index 9cf83190a..d38423c7d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABCallbackRawTargetType extends ABTargetTypeCallback { private CTargetType value; - + @Override - public CTargetType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CTargetType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java index eb90188fd..921bebd19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABCallbackRawWeaponType extends ABWeaponTypeCallback { private CWeaponType value; - + @Override - public CWeaponType callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CWeaponType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDamageTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDamageTypeCallback.java index ab95bd34e..5ecbe7b93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDamageTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDamageTypeCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public abstract class ABDamageTypeCallback implements ABCallback { - abstract public CDamageType callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CDamageType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDeathReplacementPriorityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDeathReplacementPriorityCallback.java index 00b8cacce..30dcc293d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDeathReplacementPriorityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDeathReplacementPriorityCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffectPriority; public abstract class ABDeathReplacementPriorityCallback implements ABCallback { - abstract public CUnitDeathReplacementEffectPriority callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CUnitDeathReplacementEffectPriority callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java index 2713e39d0..77b09db98 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public abstract class ABDefenseTypeCallback implements ABCallback { - abstract public CDefenseType callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CDefenseType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java index dc0cce81b..d4ed7a9ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABMovementTypeCallback implements ABCallback { - abstract public MovementType callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public MovementType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABNonStackingStatBuffTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABNonStackingStatBuffTypeCallback.java index 24446dc1e..b682f499b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABNonStackingStatBuffTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABNonStackingStatBuffTypeCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; public abstract class ABNonStackingStatBuffTypeCallback implements ABCallback { - abstract public NonStackingStatBuffType callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public NonStackingStatBuffType callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java index 3f6bc1c93..3e1409623 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public abstract class ABTargetTypeCallback implements ABCallback { - abstract public CTargetType callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CTargetType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java index 31daf69c1..c5cdf2479 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public abstract class ABWeaponTypeCallback implements ABCallback { - abstract public CWeaponType callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CWeaponType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java index ad2f3d67d..1304ec32f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackArgumentTimeOfDayEvent extends ABTimeOfDayEventCallback { @@ -15,14 +14,16 @@ public class ABCallbackArgumentTimeOfDayEvent extends ABTimeOfDayEventCallback { private ABStringCallback name; @Override - public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABTimeOfDayEventCallback) { return ((ABTimeOfDayEventCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseTimeOfDayEventCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseTimeOfDayEventCallback, but key is missing or callback was the wrong type: " + + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetLastCreatedTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetLastCreatedTimeOfDayEvent.java index 326b441d5..e71c0c089 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetLastCreatedTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetLastCreatedTimeOfDayEvent.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackGetLastCreatedTimeOfDayEvent extends ABTimeOfDayEventCallback { @Override - public ABTimeOfDayEvent callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABTimeOfDayEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (ABTimeOfDayEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDTODEVENT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetStoredTimeOfDayEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetStoredTimeOfDayEventByKey.java index 105dbe68a..95148ea2f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetStoredTimeOfDayEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetStoredTimeOfDayEventByKey.java @@ -1,25 +1,26 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackGetStoredTimeOfDayEventByKey extends ABTimeOfDayEventCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; - + @Override - public ABTimeOfDayEvent callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABTimeOfDayEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABTimeOfDayEvent) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (ABTimeOfDayEvent) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (ABTimeOfDayEvent) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABTimeOfDayEvent) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java index 620763bc4..45f0bc137 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackInlineConditionTimeOfDayEvent extends ABTimeOfDayEventCallback { @@ -12,9 +11,9 @@ public class ABCallbackInlineConditionTimeOfDayEvent extends ABTimeOfDayEventCal private ABCondition condition; private ABTimeOfDayEventCallback pass; private ABTimeOfDayEventCallback fail; - + @Override - public ABTimeOfDayEvent callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public ABTimeOfDayEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java index faa8a14f0..89719ccb5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; @@ -17,7 +16,8 @@ public class ABCallbackReuseTimeOfDayEvent extends ABTimeOfDayEventCallback { private ABStringCallback name; @Override - public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java index 47fca8c5e..0626e1505 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; @@ -18,7 +19,8 @@ public class ABCallbackReuseTimeOfDayEventWithArguments extends ABTimeOfDayEvent private Map arguments; @Override - public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABTimeOfDayEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABTimeOfDayEventCallback.java index 7537c5cf2..29d31a027 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABTimeOfDayEventCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABTimeOfDayEventCallback.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public abstract class ABTimeOfDayEventCallback implements ABCallback { abstract public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java index b8b4dacb1..727624abb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackArgumentWidgetEvent extends ABWidgetEventCallback { @@ -15,14 +14,16 @@ public class ABCallbackArgumentWidgetEvent extends ABWidgetEventCallback { private ABStringCallback name; @Override - public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABWidgetEventCallback) { return ((ABWidgetEventCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseWidgetEventCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseWidgetEventCallback, but key is missing or callback was the wrong type: " + + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java index 69c43fd72..1f6c02e38 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackGetLastCreatedWidgetEvent extends ABWidgetEventCallback { @Override - public ABWidgetEvent callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABWidgetEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (ABWidgetEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDWIDEVENT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java index 279ae4824..3ce8d9fdb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java @@ -1,25 +1,26 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackGetStoredWidgetEventByKey extends ABWidgetEventCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; - + @Override - public ABWidgetEvent callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABWidgetEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABWidgetEvent) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (ABWidgetEvent) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (ABWidgetEvent) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABWidgetEvent) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java index 4f5fa7cd4..d32a42b97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackInlineConditionWidgetEvent extends ABWidgetEventCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionWidgetEvent extends ABWidgetEventCallback private ABWidgetEventCallback fail; @Override - public ABWidgetEvent callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public ABWidgetEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java index 01bcb30ef..623318409 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; @@ -17,7 +16,7 @@ public class ABCallbackReuseWidgetEvent extends ABWidgetEventCallback { private ABStringCallback name; @Override - public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -27,7 +26,9 @@ public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final if (callback != null && callback instanceof ABWidgetEventCallback) { return ((ABWidgetEventCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseWidgetEventCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseWidgetEventCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseWidgetEventCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java index 94de1d7a8..873e3f54c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; @@ -18,7 +19,8 @@ public class ABCallbackReuseWidgetEventWithArguments extends ABWidgetEventCallba private Map arguments; @Override - public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final Map localStore, + public ABWidgetEvent callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java index f8326bb3e..9c330024f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public abstract class ABWidgetEventCallback implements ABCallback { - abstract public ABWidgetEvent callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + abstract public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackAddFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackAddFloat.java index b3b85a5b8..1740b52e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackAddFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackAddFloat.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackAddFloat extends ABFloatCallback { private ABFloatCallback value1; private ABFloatCallback value2; - + @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) + value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java index 0c2b2a922..649d6f3b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentFloat extends ABFloatCallback { private ABStringCallback name; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCeilFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCeilFloat.java index 440231a79..ee4eb3fef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCeilFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCeilFloat.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCeilFloat extends ABFloatCallback { private ABFloatCallback value; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (float) Math.ceil(value.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCos.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCos.java index 06370aff9..5a4317f72 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCos.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCos.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCos extends ABFloatCallback { private ABFloatCallback angle; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (float) StrictMath.cos(angle.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java index da8cb70ee..f6a67a68b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackDegToRad extends ABFloatCallback { - + private ABFloatCallback angle; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (float) StrictMath.toRadians(angle.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDivideFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDivideFloat.java index 5fadfa223..c0aafccb4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDivideFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDivideFloat.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackDivideFloat extends ABFloatCallback { @@ -12,7 +11,8 @@ public class ABCallbackDivideFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return this.value1.callback(game, caster, localStore, castId) / this.value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFMaxValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFMaxValue.java index 1b1003781..a0388e229 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFMaxValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFMaxValue.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackFMaxValue extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return Float.MAX_VALUE; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFloorFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFloorFloat.java index 59ac487e2..6d8e3ba7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFloorFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFloorFloat.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackFloorFloat extends ABFloatCallback { private ABFloatCallback value; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (float) Math.floor(value.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityArea.java index d62c94574..e531b54ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityArea.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityArea extends ABFloatCallback { private ABAbilityCallback ability; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (ability == null) { AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getArea(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastRange.java index a150352a0..113213aa3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastRange.java @@ -1,27 +1,26 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityCastRange extends ABFloatCallback { private ABAbilityCallback ability; - + @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (ability == null) { AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getCastRange(); } else { CAbility abil = ability.callback(game, caster, localStore, castId); if (abil instanceof AbilityBuilderAbility) { - return ((AbilityBuilderAbility)abil).getCastRange(); + return ((AbilityBuilderAbility) abil).getCastRange(); } else { return 0f; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java index 72d5622ff..e0fd20607 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; public class ABCallbackGetAbilityCastTime extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (ability != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCooldown.java index 1c10c3f2e..68671dc8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCooldown.java @@ -1,27 +1,26 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityCooldown extends ABFloatCallback { private ABAbilityCallback ability; - + @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (ability == null) { AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getCooldown(); } else { CAbility abil = ability.callback(game, caster, localStore, castId); if (abil instanceof AbilityBuilderAbility) { - return ((AbilityBuilderAbility)abil).getCooldown(); + return ((AbilityBuilderAbility) abil).getCooldown(); } else { return 0f; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDataAsFloat.java index 12427c989..015cdda7d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDataAsFloat.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -16,7 +16,8 @@ public class ABCallbackGetAbilityDataAsFloat extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDuration.java index e56020bb4..2462b92cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDuration.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; @@ -17,7 +17,8 @@ public class ABCallbackGetAbilityDuration extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityHeroDuration.java index 84bd0f6db..314af3be5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityHeroDuration.java @@ -1,20 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; public class ABCallbackGetAbilityHeroDuration extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); - return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL))-1).getDurationHero(); + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getDurationHero(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java index 679d206c5..a5bf1d31c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityProjectileSpeed extends ABFloatCallback { @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java index 6f6dbd625..0ae318e0d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java @@ -1,23 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueFloat extends ABFloatCallback { private ABAbilityCallback ability; private ABStringCallback key; - + private ABBooleanCallback allowNull; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = key.callback(game, caster, localStore, castId); final CAbility theAbility = ability.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAngleBetweenLocations.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAngleBetweenLocations.java index eb44d1a92..cbc8edf37 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAngleBetweenLocations.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAngleBetweenLocations.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAngleBetweenLocations extends ABFloatCallback { @@ -14,7 +13,7 @@ public class ABCallbackGetAngleBetweenLocations extends ABFloatCallback { private ABLocationCallback target; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final AbilityPointTarget o = this.origin.callback(game, caster, localStore, castId); final AbilityPointTarget t = this.target.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java index 3ee8fe04a..8f23430d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffDurationElapsed extends ABFloatCallback { private ABBuffCallback buff; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final CBuff theBuff = buff.callback(game, caster, localStore, castId); return theBuff.getDurationMax() - theBuff.getDurationRemaining(game, caster); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java index 9dbfd69b8..781b22e29 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffUniqueValueFloat extends ABFloatCallback { @@ -17,7 +16,8 @@ public class ABCallbackGetBuffUniqueValueFloat extends ABFloatCallback { private ABBooleanCallback allowNull; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = key.callback(game, caster, localStore, castId); final CBuff theBuff = buff.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenLocations.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenLocations.java index fbb0d8fda..5af06ee4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenLocations.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenLocations.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetDistanceBetweenLocations extends ABFloatCallback { @@ -13,7 +12,7 @@ public class ABCallbackGetDistanceBetweenLocations extends ABFloatCallback { private ABLocationCallback target; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityPointTarget o = origin.callback(game, caster, localStore, castId); AbilityPointTarget t = target.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java index 05246212c..9bc579be1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetDistanceBetweenUnits extends ABFloatCallback { @@ -12,7 +11,7 @@ public class ABCallbackGetDistanceBetweenUnits extends ABFloatCallback { private ABUnitCallback target; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit o = origin.callback(game, caster, localStore, castId); CUnit t = target.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationX.java index 357eb985c..23dd6bea4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationX.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLocationX extends ABFloatCallback { private ABLocationCallback location; - + @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return location.callback(game, caster, localStore, castId).getX(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationY.java index f121accdf..8416d2cc1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationY.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLocationY extends ABFloatCallback { private ABLocationCallback location; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return location.callback(game, caster, localStore, castId).getY(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetParentAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetParentAbilityDataAsFloat.java index f65feb881..b0e7d5ed1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetParentAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetParentAbilityDataAsFloat.java @@ -1,26 +1,28 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; public class ABCallbackGetParentAbilityDataAsFloat extends ABFloatCallback { - + private DataFieldLetter dataField; @SuppressWarnings("unchecked") @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - List levelData = (List) localStore.get(ABLocalStoreKeys.PARENTLEVELDATA); - int parentLevel = (int) ((Map)localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)).get(ABLocalStoreKeys.CURRENTLEVEL); - - String data = levelData.get(parentLevel-1).getData().get(dataField.getIndex()); - + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + List levelData = (List) localStore + .get(ABLocalStoreKeys.PARENTLEVELDATA); + int parentLevel = (int) ((LocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) + .get(ABLocalStoreKeys.CURRENTLEVEL); + + String data = levelData.get(parentLevel - 1).getData().get(dataField.getIndex()); + return Float.parseFloat(data); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetStoredFloatByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetStoredFloatByKey.java index 0f0cdc0ce..863ae5b19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetStoredFloatByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetStoredFloatByKey.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredFloatByKey extends ABFloatCallback { @@ -15,7 +14,8 @@ public class ABCallbackGetStoredFloatByKey extends ABFloatCallback { private ABBooleanCallback instanceValue; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (Float) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitAcquisitionRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitAcquisitionRange.java index f3250f2e0..547f5e2a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitAcquisitionRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitAcquisitionRange.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitAcquisitionRange extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(game, caster, localStore, castId); if (theUnit.getAcquisitionRange() > 0) { return theUnit.getAcquisitionRange(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCastPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCastPoint.java index 54e23f904..5439a9ec2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCastPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCastPoint.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitCastPoint extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return unit.callback(game, caster, localStore, castId).getUnitType().getCastPoint(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java index b111d4aae..de1c0fbb1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitCurrentHp extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return unit == null ? caster.getLife() : this.unit.callback(game, caster, localStore, castId).getLife(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java index 5e064310e..cc819f949 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitCurrentMana extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return unit == null ? caster.getMana() : unit.callback(game, caster, localStore, castId).getMana(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitFacing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitFacing.java index 6728180a1..11fac2add 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitFacing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitFacing.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitFacing extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return this.unit.callback(game, caster, localStore, castId).getFacing(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitInitialMana.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitInitialMana.java index d85b2d0ca..d47bd9b79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitInitialMana.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitInitialMana.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitInitialMana extends ABFloatCallback { private ABUnitCallback unit; - + @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (float) unit.callback(game, caster, localStore, castId).getUnitType().getManaInitial(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationX.java index ef3b0fc0d..7042fb3c3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationX.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitLocationX extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return unit.callback(game, caster, localStore, castId).getX(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationY.java index fdc1745db..fb32723fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationY.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitLocationY extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return unit.callback(game, caster, localStore, castId).getY(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java index 0b4399dc4..13dac4e14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionFloat extends ABFloatCallback { @@ -13,7 +12,7 @@ public class ABCallbackInlineConditionFloat extends ABFloatCallback { private ABFloatCallback fail; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackIntToFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackIntToFloat.java index 7a60382f7..7384d89fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackIntToFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackIntToFloat.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIntToFloat extends ABFloatCallback { private ABIntegerCallback value; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return this.value.callback(game, caster, localStore, castId).floatValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMaxFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMaxFloat.java index 3e534303a..8e11faa34 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMaxFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMaxFloat.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackMaxFloat extends ABFloatCallback { @@ -12,7 +11,7 @@ public class ABCallbackMaxFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { return Math.max(this.value1.callback(game, caster, localStore, castId), this.value2.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMinFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMinFloat.java index ddc34e16d..000601bb5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMinFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMinFloat.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackMinFloat extends ABFloatCallback { @@ -12,7 +11,7 @@ public class ABCallbackMinFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { return Math.min(this.value1.callback(game, caster, localStore, castId), this.value2.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMultiplyFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMultiplyFloat.java index e7c1e3c9c..0ba9e32fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMultiplyFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMultiplyFloat.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackMultiplyFloat extends ABFloatCallback { private ABFloatCallback value1; private ABFloatCallback value2; - + @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) * value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackNegativeFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackNegativeFloat.java index 97fb186bd..db14a1089 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackNegativeFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackNegativeFloat.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackNegativeFloat extends ABFloatCallback { private ABFloatCallback value; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return -1 * this.value.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java index ed4fc1839..c1e6a47cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackOneGameTick extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return WarsmashConstants.SIMULATION_STEP_TIME + 0.000001f; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackPi.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackPi.java index 9a674959a..945a5e271 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackPi.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackPi.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackPi extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (float) StrictMath.PI; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomBoundedFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomBoundedFloat.java index 52e82be66..9dff4bf45 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomBoundedFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomBoundedFloat.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRandomBoundedFloat extends ABFloatCallback { private ABFloatCallback bound; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getSeededRandom().nextFloat(bound.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomFloat.java index 39bd66d20..3b5a87c36 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomFloat.java @@ -1,15 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRandomFloat extends ABFloatCallback { - @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getSeededRandom().nextFloat(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRawFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRawFloat.java index 5e1ae758f..da2ccd5d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRawFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRawFloat.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRawFloat extends ABFloatCallback { private Float value; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java index 1f62c7f8a..a362e7ff8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseFloat extends ABFloatCallback { @@ -16,7 +15,8 @@ public class ABCallbackReuseFloat extends ABFloatCallback { private ABStringCallback name; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java index daab9dd01..75bfe3f13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseFloatWithArguments extends ABFloatCallback { @@ -17,7 +18,7 @@ public class ABCallbackReuseFloatWithArguments extends ABFloatCallback { private Map arguments; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -30,10 +31,11 @@ public Float callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (float) StrictMath.sin(angle.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSubtractFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSubtractFloat.java index 61342c2c6..416d6659c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSubtractFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSubtractFloat.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackSubtractFloat extends ABFloatCallback { @@ -12,7 +11,8 @@ public class ABCallbackSubtractFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CSimulation game, final CUnit caster, final Map localStore, + public Float callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return this.value1.callback(game, caster, localStore, castId) - this.value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java index 264dabb12..1ed4b4a03 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackTan extends ABFloatCallback { - + private ABFloatCallback angle; @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (float) StrictMath.tan(angle.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTicksForDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTicksForDuration.java index b36b6ea32..debd78e3d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTicksForDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTicksForDuration.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackTicksForDuration extends ABFloatCallback { private ABFloatCallback duration; - + @Override - public Float callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return duration.callback(game, caster, localStore, castId) / WarsmashConstants.SIMULATION_STEP_TIME; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABFloatCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABFloatCallback.java index 863b4f947..15f8d3fec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABFloatCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABFloatCallback.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABFloatCallback implements ABCallback { - abstract public Float callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java index c1b15c2f6..d9a7e5c09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackArgumentFX extends ABFXCallback { @@ -15,7 +14,8 @@ public class ABCallbackArgumentFX extends ABFXCallback { private ABStringCallback name; @Override - public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, final Map localStore, + public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java index 0349ffee4..e29a743da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackGetLastCreatedFX extends ABFXCallback { @Override - public SimulationRenderComponent callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public SimulationRenderComponent callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.LASTCREATEDFX); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedLightningEffect.java index 04890439b..3027c56a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedLightningEffect.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABCallbackGetLastCreatedLightningEffect extends ABLightningCallback { @Override - public SimulationRenderComponentLightning callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public SimulationRenderComponentLightning callback(CSimulation game, CUnit caster, LocalDataStore localStore, + final int castId) { return (SimulationRenderComponentLightning) localStore.get(ABLocalStoreKeys.LASTCREATEDLIGHTNING); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredFXByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredFXByKey.java index 06ef5c1a5..235c14409 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredFXByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredFXByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackGetStoredFXByKey extends ABFXCallback { @@ -15,7 +14,8 @@ public class ABCallbackGetStoredFXByKey extends ABFXCallback { private ABBooleanCallback instanceValue; @Override - public SimulationRenderComponent callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public SimulationRenderComponent callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredLightningByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredLightningByKey.java index f132f1d81..0fffd0f5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredLightningByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredLightningByKey.java @@ -1,25 +1,27 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABCallbackGetStoredLightningByKey extends ABLightningCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; - + @Override - public SimulationRenderComponentLightning callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public SimulationRenderComponentLightning callback(CSimulation game, CUnit caster, LocalDataStore localStore, + final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (SimulationRenderComponentLightning) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (SimulationRenderComponentLightning) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (SimulationRenderComponentLightning) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (SimulationRenderComponentLightning) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java index e49413fb7..73069302a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackInlineConditionFX extends ABFXCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionFX extends ABFXCallback { private ABFXCallback fail; @Override - public SimulationRenderComponent callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public SimulationRenderComponent callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java index efb7dd53c..458939ec3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -17,8 +16,8 @@ public class ABCallbackReuseFX extends ABFXCallback { private ABStringCallback name; @Override - public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, final Map localStore, - final int castId) { + public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(game, caster, localStore, castId); @@ -27,7 +26,8 @@ public SimulationRenderComponent callback(final CSimulation game, final CUnit ca if (callback != null && callback instanceof ABFXCallback) { return ((ABFXCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseFXCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseFXCallback, but key is missing or callback was the wrong type: " + keyS); } } else { System.err.println("Trying to run ReuseFXCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java index 4ab622fbd..1f84df15b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -18,8 +19,8 @@ public class ABCallbackReuseFXWithArguments extends ABFXCallback { private Map arguments; @Override - public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, final Map localStore, - final int castId) { + public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(game, caster, localStore, castId); @@ -31,10 +32,11 @@ public SimulationRenderComponent callback(final CSimulation game, final CUnit ca localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABFXCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseFXCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseFXCallback, but key is missing or callback was the wrong type: " + keyS); } } else { System.err.println("Trying to run ReuseFXCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABFXCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABFXCallback.java index 8d12b9a50..c104c5a5f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABFXCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABFXCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public abstract class ABFXCallback implements ABCallback { - abstract public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABLightningCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABLightningCallback.java index baff6e25e..b1ec7b0e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABLightningCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABLightningCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public abstract class ABLightningCallback implements ABCallback { - abstract public SimulationRenderComponentLightning callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public SimulationRenderComponentLightning callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java index 0afbb5e8d..97e74bb04 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,20 +7,22 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentID extends ABIDCallback { private ABStringCallback name; @Override - public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + public War3ID callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABIDCallback) { return ((ABIDCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseIDCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseIDCallback, but key is missing or callback was the wrong type: " + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsID.java index 63aa90c53..ca16e5379 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsID.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -17,7 +17,7 @@ public class ABCallbackGetAbilityDataAsID extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java index 4f9dc7cb0..6abfa9775 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -19,7 +19,7 @@ public class ABCallbackGetAbilityDataAsIDFromList extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java index 3178b500c..b429e8e69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -17,7 +17,7 @@ public class ABCallbackGetAbilityDataAsRandomIDFromList extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java index 713112a1b..169f1e15b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,16 +7,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueId extends ABIDCallback { private ABAbilityCallback ability; private ABStringCallback key; - + private ABBooleanCallback allowNull; @Override - public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + public War3ID callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = key.callback(game, caster, localStore, castId); final CAbility theAbility = ability.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUnitId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUnitId.java index 9c40a5a65..094cfd184 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUnitId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUnitId.java @@ -1,23 +1,24 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; public class ABCallbackGetAbilityUnitId extends ABIDCallback { - + @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); - - War3ID unitId = levelData.get(level-1).getUnitId(); + + War3ID unitId = levelData.get(level - 1).getUnitId(); if (unitId == null) { return War3ID.NONE; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAlias.java index 12ca40221..cc4a881a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAlias.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAlias extends ABIDCallback { @Override - public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + public War3ID callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java index d66ba745a..16d813053 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffAlias extends ABIDCallback { private ABBuffCallback buff; @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return buff.callback(game, caster, localStore, castId).getAlias(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java index 4cae9c102..e9e36a82c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffIdFromCode extends ABIDCallback { @Override - public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + public War3ID callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return ((War3ID) localStore.get(ABLocalStoreKeys.CODE)).set(0, 'B'); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java index 67ae37b96..8b8e456ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; @@ -9,13 +7,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetCode extends ABIDCallback { private ABAbilityCallback ability; @Override - public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + public War3ID callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { if (ability != null) { return ability.callback(game, caster, localStore, castId).getCode(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java index 5a4bcf7cf..511028d00 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; public class ABCallbackGetFirstBuffId extends ABIDCallback { @@ -16,7 +16,8 @@ public class ABCallbackGetFirstBuffId extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + public War3ID callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final List buffs = ((List) localStore .get(ABLocalStoreKeys.LEVELDATA)).get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstEffectId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstEffectId.java index 3a132f119..198a48af2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstEffectId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstEffectId.java @@ -1,19 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; public class ABCallbackGetFirstEffectId extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { List effects = ((List) localStore.get(ABLocalStoreKeys.LEVELDATA)) .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getEffects(); if (effects != null && !effects.isEmpty()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java index 0d8001fe9..a3e3fc96b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetItemType extends ABIDCallback { private ABItemCallback item; @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return item.callback(game, caster, localStore, castId).getTypeId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetNonCurrentTransformType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetNonCurrentTransformType.java index 4923e6c43..dcf4f81b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetNonCurrentTransformType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetNonCurrentTransformType.java @@ -1,27 +1,26 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetNonCurrentTransformType extends ABIDCallback { - + private ABUnitCallback unit; private ABIDCallback baseUnitId; private ABIDCallback alternateUnitId; - + @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { u1 = unit.callback(game, caster, localStore, castId); } War3ID baseId = baseUnitId.callback(game, caster, localStore, castId); War3ID altId = alternateUnitId.callback(game, caster, localStore, castId); - + if (altId == null || u1.getTypeId().equals(altId)) { return baseId; } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetParentAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetParentAlias.java index c4530cb4d..70a7d5425 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetParentAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetParentAlias.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetParentAlias extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (War3ID) ((Map)localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)).get(ABLocalStoreKeys.ALIAS); + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return (War3ID) ((LocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) + .get(ABLocalStoreKeys.ALIAS); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetSecondBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetSecondBuffId.java index 83117eee0..5b2368f53 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetSecondBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetSecondBuffId.java @@ -1,23 +1,23 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; public class ABCallbackGetSecondBuffId extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { List buffs = ((List) localStore.get(ABLocalStoreKeys.LEVELDATA)) .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getBuffs(); - if (buffs != null && buffs.size()>1) { + if (buffs != null && buffs.size() > 1) { return buffs.get(1); } return null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetStoredIDByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetStoredIDByKey.java index 287cbb7ee..97b037fb8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetStoredIDByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetStoredIDByKey.java @@ -1,25 +1,26 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredIDByKey extends ABIDCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; - + @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (War3ID) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (War3ID) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (War3ID) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (War3ID) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetUnitType.java index 005bdd14f..c6c9ebe1c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetUnitType.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitType extends ABIDCallback { - + private ABUnitCallback unit; - + @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (unit == null) { return caster.getTypeId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetWar3IDFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetWar3IDFromString.java index 0d3a9f052..3f17b0813 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetWar3IDFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetWar3IDFromString.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetWar3IDFromString extends ABIDCallback { private String id; @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return War3ID.fromString(this.id); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java index 219ba8dd3..94700fe6d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionID extends ABIDCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionID extends ABIDCallback { private ABIDCallback fail; @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java index a0c466565..cf70ddb5f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackNullIfFalse extends ABIDCallback { private ABCondition condition; private ABIDCallback value; - + @Override - public War3ID callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return value.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java index d723097ee..fc87947bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItemType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.RandomTypeHandler; public class ABCallbackRandomItemId extends ABIDCallback { @@ -18,7 +17,7 @@ public class ABCallbackRandomItemId extends ABIDCallback { private ABBooleanCallback ignoreRandomFlag; @Override - public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + public War3ID callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if (previousId == null && level == null && ignoreValidFlag == null && ignoreRandomFlag == null) { return RandomTypeHandler.getRandomItemType(game).getTypeId(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java index 17c0adcda..558cd84a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.RandomTypeHandler; public class ABCallbackRandomMechanicalCritterId extends ABIDCallback { @Override - public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + public War3ID callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { CUnitType id = RandomTypeHandler.getRandomMechanicalCritterType(game); if (id == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java index 75673083c..1775c3563 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseID extends ABIDCallback { @@ -17,7 +16,7 @@ public class ABCallbackReuseID extends ABIDCallback { private ABStringCallback name; @Override - public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + public War3ID callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -27,7 +26,8 @@ public War3ID callback(final CSimulation game, final CUnit caster, final Map arguments; @Override - public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + public War3ID callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABIDCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABIDCallback.java index 259c15ddd..05fe624ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABIDCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABIDCallback.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABIDCallback implements ABCallback { @Override - abstract public War3ID callback(final CSimulation game, final CUnit caster, final Map localStore, + abstract public War3ID callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAddInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAddInteger.java index 1005e084f..64e4ca3e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAddInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAddInteger.java @@ -1,9 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackAddInteger extends ABIntegerCallback { @@ -11,7 +10,7 @@ public class ABCallbackAddInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) + value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAndInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAndInteger.java index 31d69a947..3e93542b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAndInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAndInteger.java @@ -1,9 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackAndInteger extends ABIntegerCallback { @@ -11,7 +10,7 @@ public class ABCallbackAndInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) & value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java index 0900f507f..46756c8e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentInteger extends ABIntegerCallback { private ABStringCallback name; @Override - public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + public Integer callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java index 2399a6046..aa7064c47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCountBuffsOnUnitMatchingCondition extends ABIntegerCallback { @@ -17,7 +16,7 @@ public class ABCallbackCountBuffsOnUnitMatchingCondition extends ABIntegerCallba private ABCondition condition; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit u = caster; if (unit != null) { u = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfLocation.java index 70839626b..5421f5c09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfLocation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,24 +7,24 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCountUnitsInRangeOfLocation extends ABIntegerCallback { private static final Rectangle recycleRect = new Rectangle(); private ABLocationCallback location; private ABFloatCallback range; - + private int count = 0; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityPointTarget origin = location.callback(game, caster, localStore, castId); Float rangeVal = range.callback(game, caster, localStore, castId); - - recycleRect.set(origin.getX() - rangeVal, origin.getY() - rangeVal, rangeVal * 2, - rangeVal * 2); - count = 0; - + + recycleRect.set(origin.getX() - rangeVal, origin.getY() - rangeVal, rangeVal * 2, rangeVal * 2); + count = 0; + game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfUnit.java index 12545a19a..a1ee47a47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfUnit.java @@ -1,31 +1,30 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCountUnitsInRangeOfUnit extends ABIntegerCallback { private static final Rectangle recycleRect = new Rectangle(); private ABUnitCallback unit; private ABFloatCallback range; - + private int count = 0; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit originUnitTarget = unit.callback(game, caster, localStore, castId); Float rangeVal = range.callback(game, caster, localStore, castId); - + recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - count = 0; - + count = 0; + game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDetectionDropdownConversion.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDetectionDropdownConversion.java index e12111478..83322a16a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDetectionDropdownConversion.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDetectionDropdownConversion.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackDetectionDropdownConversion extends ABIntegerCallback { private ABIntegerCallback value; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { int val = value.callback(game, caster, localStore, castId); switch(val) { case 1: diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDivideInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDivideInteger.java index b2fc8bff0..48b8d9ee0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDivideInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDivideInteger.java @@ -1,9 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackDivideInteger extends ABIntegerCallback { @@ -11,7 +10,7 @@ public class ABCallbackDivideInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) / value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java index 71af72b91..59dbdec3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java @@ -1,19 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; public class ABCallbackGetAbilityCastTimeAsInteger extends ABIntegerCallback { @SuppressWarnings("unchecked") @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (ability != null) { return (int) ability.getCastTime(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityDataAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityDataAsInteger.java index 26dae3bb3..6cc206cf7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityDataAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityDataAsInteger.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -16,7 +16,7 @@ public class ABCallbackGetAbilityDataAsInteger extends ABIntegerCallback { @SuppressWarnings("unchecked") @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java index 5f7f22bfa..9767d3d93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityHandleAsInteger extends ABIntegerCallback { private ABAbilityCallback ability; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return ability.callback(game, caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityManaCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityManaCost.java index 6cdffe8ff..b4d40dbc7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityManaCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityManaCost.java @@ -1,27 +1,26 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityManaCost extends ABIntegerCallback { private ABAbilityCallback ability; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (ability == null) { AbilityBuilderActiveAbility abil = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getChargedManaCost(); } else { CAbility abil = ability.callback(game, caster, localStore, castId); if (abil instanceof AbilityBuilderActiveAbility) { - return ((AbilityBuilderActiveAbility)abil).getChargedManaCost(); + return ((AbilityBuilderActiveAbility) abil).getChargedManaCost(); } else { return 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityTargetAttachmentPoints.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityTargetAttachmentPoints.java index efb543c74..54b004d31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityTargetAttachmentPoints.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityTargetAttachmentPoints.java @@ -1,27 +1,26 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityTargetAttachmentPoints extends ABIntegerCallback { private ABAbilityCallback ability; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (ability == null) { AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getAbilityIntField("Targetattachcount"); } else { CAbility abil = ability.callback(game, caster, localStore, castId); if (abil instanceof AbilityBuilderAbility) { - return ((AbilityBuilderAbility)abil).getAbilityIntField("Targetattachcount"); + return ((AbilityBuilderAbility) abil).getAbilityIntField("Targetattachcount"); } else { return 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java index 5610ce678..2746b89f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueInteger extends ABIntegerCallback { @@ -17,7 +16,8 @@ public class ABCallbackGetAbilityUniqueValueInteger extends ABIntegerCallback { private ABBooleanCallback allowNull; @Override - public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + public Integer callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = key.callback(game, caster, localStore, castId); final CAbility theAbility = ability.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java index 8aba01d9b..4f6e0e79e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffHandleAsInteger extends ABIntegerCallback { - + private ABBuffCallback buff; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return buff.callback(game, caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java index 2e253121d..b02c0e777 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java @@ -1,23 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffUniqueValueInteger extends ABIntegerCallback { private ABBuffCallback buff; private ABStringCallback key; - + private ABBooleanCallback allowNull; @Override - public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = key.callback(game, caster, localStore, castId); final CBuff theBuff = buff.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java index aa4ddce16..093792c37 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java @@ -1,15 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetCastId extends ABIntegerCallback { - @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return castId; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java index 1ea08bb23..e766102ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetIntegerFromList extends ABIntegerCallback { @@ -12,8 +11,7 @@ public class ABCallbackGetIntegerFromList extends ABIntegerCallback { private ABIntegerCallback index; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, - final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return list.callback(game, caster, localStore, castId).get(index.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java index 6fb5e7dd0..72a6f380c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java @@ -1,31 +1,30 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetItemCharges extends ABIntegerCallback { private ABItemCallback item; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; } - + CItem theItem; if (item != null) { theItem = item.callback(game, caster, localStore, castId); } else { - theItem = (CItem)localStore.get(ABLocalStoreKeys.ITEM); + theItem = (CItem) localStore.get(ABLocalStoreKeys.ITEM); } - + if (theItem == null) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java index 43a1ad1db..6cfde5913 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java @@ -1,31 +1,30 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetItemLevel extends ABIntegerCallback { private ABItemCallback item; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; } - + CItem theItem; if (item != null) { theItem = item.callback(game, caster, localStore, castId); } else { - theItem = (CItem)localStore.get(ABLocalStoreKeys.ITEM); + theItem = (CItem) localStore.get(ABLocalStoreKeys.ITEM); } - + if (theItem == null) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java index e7baf5109..baa2c0a3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java @@ -1,31 +1,30 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetItemMaxCharges extends ABIntegerCallback { private ABItemCallback item; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; } - + CItem theItem; if (item != null) { theItem = item.callback(game, caster, localStore, castId); } else { - theItem = (CItem)localStore.get(ABLocalStoreKeys.ITEM); + theItem = (CItem) localStore.get(ABLocalStoreKeys.ITEM); } - + if (theItem == null) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java index 7f8e73f0e..32709ccf8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetItemSlot extends ABIntegerCallback { private ABItemCallback item; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java index cd5b23062..aa474ba7f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetListSize extends ABIntegerCallback { - + private ABListCallback list; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return list.callback(game, caster, localStore, castId).size(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java index a43a68d38..09c03efa0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetNeutralHostilePlayerId extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return WarsmashConstants.MAX_PLAYERS - 4; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java index d0a99489d..986c06b8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetNeutralPassivePlayerId extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return WarsmashConstants.MAX_PLAYERS - 1; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetPlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetPlayerId.java index 2fce543f3..9308e3814 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetPlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetPlayerId.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetPlayerId extends ABIntegerCallback { private ABPlayerCallback player; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return player.callback(game, caster, localStore, castId).getId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileDestructableTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileDestructableTargets.java index 7e872f126..d2f4457ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileDestructableTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileDestructableTargets.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetProjectileDestructableTargets extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (Integer) localStore.get(ABLocalStoreKeys.PROJECTILEDESTTARGETS + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileUnitTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileUnitTargets.java index 0a08e98d2..5ed31801a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileUnitTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileUnitTargets.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetProjectileUnitTargets extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (Integer) localStore.get(ABLocalStoreKeys.PROJECTILEUNITTARGETS + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java index 28128e402..cadf6319c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetSortableListSize extends ABIntegerCallback { - + private ABSortableListCallback list; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return list.callback(game, caster, localStore, castId).size(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSpellLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSpellLevel.java index a00d3b4e3..2cfd5d9d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSpellLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSpellLevel.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetSpellLevel extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetStoredIntegerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetStoredIntegerByKey.java index b88184ce7..1678a454d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetStoredIntegerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetStoredIntegerByKey.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredIntegerByKey extends ABIntegerCallback { @@ -15,7 +14,7 @@ public class ABCallbackGetStoredIntegerByKey extends ABIntegerCallback { private ABBooleanCallback instanceValue; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (Integer) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitGroupSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitGroupSize.java index 21a301039..15017c09f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitGroupSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitGroupSize.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitGroupSize extends ABIntegerCallback { private ABUnitGroupCallback group; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return group.callback(game, caster, localStore, castId).size(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java index 4f6610724..078b9291e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitHandleAsInteger extends ABIntegerCallback { private ABUnitCallback unit; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return unit.callback(game, caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java index 3291d67b2..ea99d7adf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitMaximumHp extends ABIntegerCallback { private ABUnitCallback unit; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return unit == null ? caster.getMaximumLife() : this.unit.callback(game, caster, localStore, castId).getMaximumLife(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java index 307cb9133..c1a802aa7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitMaximumMp extends ABIntegerCallback { private ABUnitCallback unit; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return unit == null ? caster.getMaximumMana() : unit.callback(game, caster, localStore, castId).getMaximumMana(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitQueueSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitQueueSize.java index ec6381f70..a3dca80e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitQueueSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitQueueSize.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitQueueSize extends ABIntegerCallback { private ABUnitQueueCallback queue; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return queue.callback(game, caster, localStore, castId).size(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeFoodCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeFoodCost.java index 2d1528b43..22de467a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeFoodCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeFoodCost.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitTypeFoodCost extends ABIntegerCallback { private ABIDCallback id; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getUnitData().getUnitType(id.callback(game, caster, localStore, castId)).getFoodUsed(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeGoldCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeGoldCost.java index 4d8bc161a..8084ebe2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeGoldCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeGoldCost.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitTypeGoldCost extends ABIntegerCallback { private ABIDCallback id; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getUnitData().getUnitType(id.callback(game, caster, localStore, castId)).getGoldCost(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeLumberCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeLumberCost.java index 0b376e232..bf24843ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeLumberCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeLumberCost.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitTypeLumberCost extends ABIntegerCallback { private ABIDCallback id; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getUnitData().getUnitType(id.callback(game, caster, localStore, castId)).getLumberCost(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java index 7e0761912..93c44d7d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitTypeSpeed extends ABIntegerCallback { private ABIDCallback id; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getUnitData().getUnitType(id.callback(game, caster, localStore, castId)).getSpeed(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java index 3a804dd3c..b8e30b9f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionInteger extends ABIntegerCallback { @@ -13,7 +12,7 @@ public class ABCallbackInlineConditionInteger extends ABIntegerCallback { private ABIntegerCallback fail; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java index 0724ef777..bac174c89 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIntegerIf extends ABIntegerCallback { @@ -13,7 +12,7 @@ public class ABCallbackIntegerIf extends ABIntegerCallback { private ABCondition condition; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (condition == null || !condition.callback(game, caster, localStore, castId)) { return value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfFalse.java index dc7fe0f22..31f65fa40 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfFalse.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIntegerZeroIfFalse extends ABIntegerCallback { @@ -12,7 +11,7 @@ public class ABCallbackIntegerZeroIfFalse extends ABIntegerCallback { private ABBooleanCallback bool; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (bool == null || !bool.callback(game, caster, localStore, castId)) { return 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java index 7e1d984f6..f63b7c73e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIntegerZeroIfNull extends ABIntegerCallback { private ABIntegerCallback value; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v = value.callback(game, caster, localStore, castId); return v == null ? 0 : v; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java index 1561204be..1fa7b5189 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIterator extends ABIntegerCallback { private ABCallback unique; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (this.unique != null) { return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT+"$"+this.unique.callback(game, caster, localStore, castId), castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMaxInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMaxInteger.java index b6d7b0b74..3b052efc1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMaxInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMaxInteger.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackMaxInteger extends ABIntegerCallback { private ABIntegerCallback value1; private ABIntegerCallback value2; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return Math.max(value1.callback(game, caster, localStore, castId), value2.callback(game, caster, localStore, castId)); + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return Math.max(value1.callback(game, caster, localStore, castId), + value2.callback(game, caster, localStore, castId)); } - + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMinInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMinInteger.java index 9d989d5a4..26ba485e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMinInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMinInteger.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackMinInteger extends ABIntegerCallback { private ABIntegerCallback value1; private ABIntegerCallback value2; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return Math.min(value1.callback(game, caster, localStore, castId), value2.callback(game, caster, localStore, castId)); + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return Math.min(value1.callback(game, caster, localStore, castId), + value2.callback(game, caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMultiplyInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMultiplyInteger.java index 64a44d306..34aa312cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMultiplyInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMultiplyInteger.java @@ -1,9 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackMultiplyInteger extends ABIntegerCallback { @@ -11,7 +10,7 @@ public class ABCallbackMultiplyInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) * value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackOrInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackOrInteger.java index 257e00791..e67dfa334 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackOrInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackOrInteger.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackOrInteger extends ABIntegerCallback { private ABIntegerCallback value1; private ABIntegerCallback value2; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) | value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackPlayerToStateModValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackPlayerToStateModValue.java index 7d3544a6c..84a7c06bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackPlayerToStateModValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackPlayerToStateModValue.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackPlayerToStateModValue extends ABIntegerCallback { private ABPlayerCallback player; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return 1 << player.callback(game, caster, localStore, castId).getId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java index 5766d4679..c33e047fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRandomInteger extends ABIntegerCallback { private ABIntegerCallback lowerBound; private ABIntegerCallback upperBound; - + private ABIntegerCallback bound; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (bound != null) { return game.getSeededRandom().nextInt(bound.callback(game, caster, localStore, castId)); } @@ -26,7 +25,7 @@ public Integer callback(CSimulation game, CUnit caster, Map loca if (lowerBound != null) { low = lowerBound.callback(game, caster, localStore, castId); } - return game.getSeededRandom().nextInt(low,high); + return game.getSeededRandom().nextInt(low, high); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRawInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRawInteger.java index 9dee936e2..d34c6f7c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRawInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRawInteger.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRawInteger extends ABIntegerCallback { private Integer value; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java index d24d3fd86..ec1ccfe99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseInteger extends ABIntegerCallback { @@ -16,7 +15,8 @@ public class ABCallbackReuseInteger extends ABIntegerCallback { private ABStringCallback name; @Override - public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + public Integer callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java index 8f6c88c45..5c523f204 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseIntegerWithArguments extends ABIntegerCallback { @@ -17,7 +18,8 @@ public class ABCallbackReuseIntegerWithArguments extends ABIntegerCallback { private Map arguments; @Override - public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + public Integer callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackSubtractInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackSubtractInteger.java index 842e24db5..a5c76fc49 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackSubtractInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackSubtractInteger.java @@ -1,9 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackSubtractInteger extends ABIntegerCallback { @@ -11,7 +10,7 @@ public class ABCallbackSubtractInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) - value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java index abed304ca..26984582a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackTruncateFloatToInteger extends ABIntegerCallback { private ABFloatCallback value; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value.callback(game, caster, localStore, castId).intValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABIntegerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABIntegerCallback.java index 811581c80..3331354a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABIntegerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABIntegerCallback.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABIntegerCallback implements ABCallback { - abstract public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java index 690fd2e5a..39c72b112 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,20 +7,22 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentItem extends ABItemCallback { private ABStringCallback name; @Override - public CItem callback(final CSimulation game, final CUnit caster, final Map localStore, + public CItem callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABItemCallback) { return ((ABItemCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseItemCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseItemCallback, but key is missing or callback was the wrong type: " + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java index 6a3e1d357..4a29aa7fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityTargetedItem extends ABItemCallback { @Override - public CItem callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (CItem) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDITEM+castId); + public CItem callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return (CItem) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java index 71a8f544d..9aa6ffeba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAttackedItem extends ABItemCallback { @Override - public CItem callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CItem callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.ITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java index b3b9f65e9..42bfc8821 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLastCreatedItem extends ABItemCallback { @Override - public CItem callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CItem callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CItem) localStore.get(ABLocalStoreKeys.LASTCREATEDITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java index 8b1ce878d..3bee0f1c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredItemByKey extends ABItemCallback { @@ -15,7 +14,7 @@ public class ABCallbackGetStoredItemByKey extends ABItemCallback { private ABBooleanCallback instanceValue; @Override - public CItem callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CItem callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (CItem) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java index a4f771fa2..0d8c8a0f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionItem extends ABItemCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionItem extends ABItemCallback { private ABItemCallback fail; @Override - public CItem callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public CItem callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java index 7160ea047..2df172851 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseItem extends ABItemCallback { @@ -17,7 +16,7 @@ public class ABCallbackReuseItem extends ABItemCallback { private ABStringCallback name; @Override - public CItem callback(final CSimulation game, final CUnit caster, final Map localStore, + public CItem callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -27,7 +26,8 @@ public CItem callback(final CSimulation game, final CUnit caster, final Map arguments; @Override - public CItem callback(final CSimulation game, final CUnit caster, final Map localStore, + public CItem callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -31,10 +32,11 @@ public CItem callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CItem callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java index e97330db2..ccc334445 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentList extends ABListCallback { @@ -16,14 +16,16 @@ public class ABCallbackArgumentList extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(final CSimulation game, final CUnit caster, final Map localStore, + public List callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABListCallback) { return ((ABListCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ArgumentLocationCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ArgumentLocationCallback, but key is missing or callback was the wrong type: " + + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java index 9ef29af44..598bdaa18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentSortableList> extends ABSortableListCallback { @@ -16,7 +16,8 @@ public class ABCallbackArgumentSortableList> ext @SuppressWarnings("unchecked") @Override - public List callback(final CSimulation game, final CUnit caster, final Map localStore, + public List callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java index 6e7014410..bf3fac158 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredListByKey extends ABListCallback { private ABStringCallback key; @@ -15,7 +15,7 @@ public class ABCallbackGetStoredListByKey extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (List) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java index 8e13586a1..e1adb3af3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredSortableListByKey> extends ABSortableListCallback { private ABStringCallback key; @@ -15,7 +15,7 @@ public class ABCallbackGetStoredSortableListByKey callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (List) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java index b89ce90b4..6652b6210 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionList extends ABListCallback { private ABCondition condition; private ABListCallback pass; private ABListCallback fail; - + @Override - public List callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java index f9ed6c74b..743795c6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java @@ -1,11 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionSortableList> extends ABSortableListCallback { @@ -14,7 +14,7 @@ public class ABCallbackInlineConditionSortableList fail; @Override - public List callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java index b569e9047..e075d8c00 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java @@ -2,10 +2,10 @@ import java.util.Collections; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackListSorted> extends ABSortableListCallback { @@ -14,7 +14,7 @@ public class ABCallbackListSorted> extends ABSor @Override public List callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId) { + final LocalDataStore localStore, final int castId) { List theList = list.callback(game, caster, localStore, castId); switch(sort){ case DSC: diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java index 3fc1d57fc..a8888d4fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseList extends ABListCallback { @@ -18,7 +18,8 @@ public class ABCallbackReuseList extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(final CSimulation game, final CUnit caster, final Map localStore, + public List callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java index 15c9e6c6a..46b8075c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseListWithArguments extends ABListCallback { @@ -19,7 +20,8 @@ public class ABCallbackReuseListWithArguments extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(final CSimulation game, final CUnit caster, final Map localStore, + public List callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java index 4230e162f..6d376baa2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseSortableList> extends ABSortableListCallback { @@ -18,7 +18,7 @@ public class ABCallbackReuseSortableList> extend @SuppressWarnings("unchecked") @Override - public List callback(final CSimulation game, final CUnit caster, final Map localStore, + public List callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -28,7 +28,9 @@ public List callback(final CSimulation game, final CUnit caster, final Map) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseLocationCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java index bddcd7081..d03106562 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseSortableListWithArguments> extends ABSortableListCallback { @@ -19,7 +20,8 @@ public class ABCallbackReuseSortableListWithArguments callback(final CSimulation game, final CUnit caster, final Map localStore, + public List callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java index f9bd8775d..266e2bb46 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABListCallback implements ABCallback { - abstract public List callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + abstract public List callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java index 315f0b0e5..3f2a6317c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABSortableListCallback> implements ABCallback { - abstract public List callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + abstract public List callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java index 0364073aa..fccea5a99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java @@ -2,14 +2,15 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; + import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackEmptyIntegerList extends ABIntegerListCallback { @Override - public List callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { return new ArrayList<>(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java index a1a383a00..f211e3f84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.integer; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIntegerListOfRange extends ABIntegerListCallback { @@ -18,7 +18,7 @@ public class ABCallbackIntegerListOfRange extends ABIntegerListCallback { private ABBooleanCallback inclusiveEnd; @Override - public List callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { int theStart = 0; if (start != null) { theStart = start.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java index 344e63879..d4a2dda3a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.integer; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABIntegerListCallback extends ABSortableListCallback { abstract public List callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java index 25ab97f42..e5ee7db82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java @@ -2,15 +2,16 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; + import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackEmptyLocationList extends ABLocationListCallback { @Override - public List callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { return new ArrayList<>(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java index a1463ce23..1bc3cc19f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java @@ -1,15 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.location; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABLocationListCallback extends ABListCallback { abstract public List callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityEffectReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityEffectReactionListenerCallback.java index c6777fd61..809c9b7fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityEffectReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityEffectReactionListenerCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; public abstract class ABAbilityEffectReactionListenerCallback implements ABCallback { abstract public ABAbilityEffectReactionListener callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityProjReactionListenerCallback.java index 2341f58cf..a70233a81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityProjReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityProjReactionListenerCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; public abstract class ABAbilityProjReactionListenerCallback implements ABCallback { abstract public ABAbilityProjReactionListener callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPostDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPostDamageListenerCallback.java index 15ba51199..aaf0dc405 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPostDamageListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPostDamageListenerCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public abstract class ABAttackPostDamageListenerCallback implements ABCallback { - abstract public ABAttackPostDamageListener callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public ABAttackPostDamageListener callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPreDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPreDamageListenerCallback.java index 550befd35..f223e22f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPreDamageListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPreDamageListenerCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; public abstract class ABAttackPreDamageListenerCallback implements ABCallback { abstract public ABAttackPreDamageListener callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackProjReactionListenerCallback.java index 3772cd6cf..6bde5ad33 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackProjReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackProjReactionListenerCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; public abstract class ABAttackProjReactionListenerCallback implements ABCallback { abstract public ABAttackProjReactionListener callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABBehaviorChangeListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABBehaviorChangeListenerCallback.java index 571741aa7..7fd41e683 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABBehaviorChangeListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABBehaviorChangeListenerCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; public abstract class ABBehaviorChangeListenerCallback implements ABCallback { abstract public ABBehaviorChangeListener callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityEffectReactionListener.java index b6aaeab61..2be24ac07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityEffectReactionListener.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; public class ABCallbackGetLastCreatedAbilityEffectReactionListener extends ABAbilityEffectReactionListenerCallback { @Override - public ABAbilityEffectReactionListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAbilityEffectReactionListener callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { return (ABAbilityEffectReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbERL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityProjReactionListener.java index eb3cc3941..97721c8d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityProjReactionListener.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; public class ABCallbackGetLastCreatedAbilityProjReactionListener extends ABAbilityProjReactionListenerCallback { @Override - public ABAbilityProjReactionListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAbilityProjReactionListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, + final int castId) { return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbPRL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPostDamageListener.java index 449ec50ac..6ad469c44 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPostDamageListener.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public class ABCallbackGetLastCreatedAttackPostDamageListener extends ABAttackPostDamageListenerCallback { @Override - public ABAttackPostDamageListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAttackPostDamageListener callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPoDL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPreDamageListener.java index 0bbfbe256..7e36ad5ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPreDamageListener.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; public class ABCallbackGetLastCreatedAttackPreDamageListener extends ABAttackPreDamageListenerCallback { @Override - public ABAttackPreDamageListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAttackPreDamageListener callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { return (ABAttackPreDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPrDL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackProjReactionListener.java index d875ca9b2..b472c5688 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackProjReactionListener.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; public class ABCallbackGetLastCreatedAttackProjReactionListener extends ABAttackProjReactionListenerCallback { @Override - public ABAttackProjReactionListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAttackProjReactionListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, + final int castId) { return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAtkPRL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedBehaviorChangeListener.java index 698cd4e6d..793764e3a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedBehaviorChangeListener.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; public class ABCallbackGetLastCreatedBehaviorChangeListener extends ABBehaviorChangeListenerCallback { @Override - public ABBehaviorChangeListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABBehaviorChangeListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, + final int castId) { return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.LASTCREATEDBCL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenListener.java index 539b9e5fb..387e03613 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenListener.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public class ABCallbackGetLastCreatedDamageTakenListener extends ABDamageTakenListenerCallback { @Override - public ABDamageTakenListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABDamageTakenListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (ABDamageTakenListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenModificationListener.java index 564cc16e4..5a85db1be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenModificationListener.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; public class ABCallbackGetLastCreatedDamageTakenModificationListener extends ABDamageTakenModificationListenerCallback { @Override - public ABDamageTakenModificationListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABDamageTakenModificationListener callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { return (ABDamageTakenModificationListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTML); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDeathReplacement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDeathReplacement.java index 23393ef16..922f92cf1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDeathReplacement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDeathReplacement.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; public class ABCallbackGetLastCreatedDeathReplacement extends ABDeathReplacementCallback { @Override - public ABDeathReplacementEffect callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABDeathReplacementEffect callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { return (ABDeathReplacementEffect) localStore.get(ABLocalStoreKeys.LASTCREATEDDRE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedEvasionListener.java index 7746e2de3..16fdc10c8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedEvasionListener.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public class ABCallbackGetLastCreatedEvasionListener extends ABEvasionListenerCallback { @Override - public ABAttackEvasionListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAttackEvasionListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, + final int castId) { return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAEL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java index 3a334c3bf..399423e93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; public class ABCallbackGetLastCreatedUnitStateListener extends ABUnitStateListenerCallback { @Override - public ABUnitStateListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABUnitStateListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (ABUnitStateListener) localStore.get(ABLocalStoreKeys.LASTCREATEDUSL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java index 1a70f4144..e8cc07ab9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; public class ABCallbackGetStoredAbilityEffectReactionListenerByKey extends ABAbilityEffectReactionListenerCallback { @@ -14,11 +13,14 @@ public class ABCallbackGetStoredAbilityEffectReactionListenerByKey extends ABAbi private ABBooleanCallback instanceValue; @Override - public ABAbilityEffectReactionListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAbilityEffectReactionListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, + final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABAbilityEffectReactionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (ABAbilityEffectReactionListener) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (ABAbilityEffectReactionListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABAbilityEffectReactionListener) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityProjReactionListenerByKey.java index cbe863e1d..7a5ca609a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityProjReactionListenerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; public class ABCallbackGetStoredAbilityProjReactionListenerByKey extends ABAbilityProjReactionListenerCallback { @@ -14,7 +13,8 @@ public class ABCallbackGetStoredAbilityProjReactionListenerByKey extends ABAbili private ABBooleanCallback instanceValue; @Override - public ABAbilityProjReactionListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAbilityProjReactionListener callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPostDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPostDamageListenerByKey.java index b04bf19c5..44bc42617 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPostDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPostDamageListenerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public class ABCallbackGetStoredAttackPostDamageListenerByKey extends ABAttackPostDamageListenerCallback { @@ -14,7 +13,8 @@ public class ABCallbackGetStoredAttackPostDamageListenerByKey extends ABAttackPo private ABBooleanCallback instanceValue; @Override - public ABAttackPostDamageListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAttackPostDamageListener callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPreDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPreDamageListenerByKey.java index 0042162bc..41c274044 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPreDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPreDamageListenerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; public class ABCallbackGetStoredAttackPreDamageListenerByKey extends ABAttackPreDamageListenerCallback { @@ -14,11 +13,14 @@ public class ABCallbackGetStoredAttackPreDamageListenerByKey extends ABAttackPre private ABBooleanCallback instanceValue; @Override - public ABAttackPreDamageListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAttackPreDamageListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, + final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABAttackPreDamageListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (ABAttackPreDamageListener) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (ABAttackPreDamageListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABAttackPreDamageListener) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackProjReactionListenerByKey.java index 04b5862b0..3dfc510df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackProjReactionListenerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; public class ABCallbackGetStoredAttackProjReactionListenerByKey extends ABAttackProjReactionListenerCallback { @@ -14,7 +13,8 @@ public class ABCallbackGetStoredAttackProjReactionListenerByKey extends ABAttack private ABBooleanCallback instanceValue; @Override - public ABAttackProjReactionListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAttackProjReactionListener callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredBehaviorChangeListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredBehaviorChangeListenerByKey.java index bc4671755..39092b7a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredBehaviorChangeListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredBehaviorChangeListenerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; public class ABCallbackGetStoredBehaviorChangeListenerByKey extends ABBehaviorChangeListenerCallback { @@ -14,7 +13,8 @@ public class ABCallbackGetStoredBehaviorChangeListenerByKey extends ABBehaviorCh private ABBooleanCallback instanceValue; @Override - public ABBehaviorChangeListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABBehaviorChangeListener callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenListenerByKey.java index d0a8ef3b7..3d6a8fc18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenListenerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public class ABCallbackGetStoredDamageTakenListenerByKey extends ABDamageTakenListenerCallback { @@ -14,11 +13,13 @@ public class ABCallbackGetStoredDamageTakenListenerByKey extends ABDamageTakenLi private ABBooleanCallback instanceValue; @Override - public ABDamageTakenListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABDamageTakenListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABDamageTakenListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (ABDamageTakenListener) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (ABDamageTakenListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABDamageTakenListener) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenModificationListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenModificationListenerByKey.java index 76603a934..d6e9d8f84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenModificationListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenModificationListenerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; public class ABCallbackGetStoredDamageTakenModificationListenerByKey extends ABDamageTakenModificationListenerCallback { @@ -14,11 +13,14 @@ public class ABCallbackGetStoredDamageTakenModificationListenerByKey extends ABD private ABBooleanCallback instanceValue; @Override - public ABDamageTakenModificationListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABDamageTakenModificationListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, + final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABDamageTakenModificationListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (ABDamageTakenModificationListener) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (ABDamageTakenModificationListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABDamageTakenModificationListener) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDeathReplacementByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDeathReplacementByKey.java index d07f4db26..24a17b4db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDeathReplacementByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDeathReplacementByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; public class ABCallbackGetStoredDeathReplacementByKey extends ABDeathReplacementCallback { @@ -14,11 +13,14 @@ public class ABCallbackGetStoredDeathReplacementByKey extends ABDeathReplacement private ABBooleanCallback instanceValue; @Override - public ABDeathReplacementEffect callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABDeathReplacementEffect callback(CSimulation game, CUnit caster, LocalDataStore localStore, + final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABDeathReplacementEffect) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (ABDeathReplacementEffect) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (ABDeathReplacementEffect) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABDeathReplacementEffect) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredEvasionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredEvasionListenerByKey.java index 9bb07e8dd..b1c680666 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredEvasionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredEvasionListenerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public class ABCallbackGetStoredEvasionListenerByKey extends ABEvasionListenerCallback { @@ -14,7 +13,8 @@ public class ABCallbackGetStoredEvasionListenerByKey extends ABEvasionListenerCa private ABBooleanCallback instanceValue; @Override - public ABAttackEvasionListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABAttackEvasionListener callback(CSimulation game, CUnit caster, + LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java index 80dc40b81..133c2804e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; public class ABCallbackGetStoredUnitStateListenerByKey extends ABUnitStateListenerCallback { @@ -14,11 +13,13 @@ public class ABCallbackGetStoredUnitStateListenerByKey extends ABUnitStateListen private ABBooleanCallback instanceValue; @Override - public ABUnitStateListener callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public ABUnitStateListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABUnitStateListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (ABUnitStateListener) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (ABUnitStateListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABUnitStateListener) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenListenerCallback.java index 233cef036..f09de9928 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenListenerCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public abstract class ABDamageTakenListenerCallback implements ABCallback { abstract public ABDamageTakenListener callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenModificationListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenModificationListenerCallback.java index 66b56ffed..49151eae5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenModificationListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenModificationListenerCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; public abstract class ABDamageTakenModificationListenerCallback implements ABCallback { abstract public ABDamageTakenModificationListener callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDeathReplacementCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDeathReplacementCallback.java index 5dbc7fdd1..346d3bfb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDeathReplacementCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDeathReplacementCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; public abstract class ABDeathReplacementCallback implements ABCallback { abstract public ABDeathReplacementEffect callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABEvasionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABEvasionListenerCallback.java index 67aa1791c..217a3aa15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABEvasionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABEvasionListenerCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public abstract class ABEvasionListenerCallback implements ABCallback { abstract public ABAttackEvasionListener callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java index dabb930bc..ee1d755dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; public abstract class ABUnitStateListenerCallback implements ABCallback { abstract public ABUnitStateListener callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java index a8f55e03f..73f983c3e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,20 +7,23 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentLocation extends ABLocationCallback { private ABStringCallback name; @Override - public AbilityPointTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + public AbilityPointTarget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABLocationCallback) { return ((ABLocationCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ArgumentLocationCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ArgumentLocationCallback, but key is missing or callback was the wrong type: " + + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java index 99dcf9792..7da8db37e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateLocationFromOffset extends ABLocationCallback { @@ -18,7 +17,7 @@ public class ABCallbackCreateLocationFromOffset extends ABLocationCallback { private ABBooleanCallback angleInDegrees; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); final float d = this.dist.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromTarget.java index e49edabb0..ac42441c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromTarget.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks.ABTargetCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateLocationFromTarget extends ABLocationCallback { private ABTargetCallback target; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = target.callback(game, caster, localStore, castId); return new AbilityPointTarget(tar.getX(), tar.getY()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXY.java index ff77068b7..1a8b43206 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXY.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateLocationFromXY extends ABLocationCallback { @@ -13,7 +12,7 @@ public class ABCallbackCreateLocationFromXY extends ABLocationCallback { private ABFloatCallback y; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return new AbilityPointTarget(x.callback(game, caster, localStore, castId), y.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java index 8b25bd132..59cc3c7b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java @@ -1,23 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateLocationFromXYOffset extends ABLocationCallback { private ABLocationCallback origin; private ABFloatCallback xdist; private ABFloatCallback ydist; - + @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, - final int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); - return new AbilityPointTarget((float) (orig.x + xdist.callback(game, caster, localStore, castId)), (float) (orig.y + ydist.callback(game, caster, localStore, castId))); + return new AbilityPointTarget((float) (orig.x + xdist.callback(game, caster, localStore, castId)), + (float) (orig.y + ydist.callback(game, caster, localStore, castId))); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java index 835d1a0d6..0c23c37bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAttackImpactLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.ATTACKIMPACTLOCATION+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java index d1720ffb5..ebd5d1c76 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAttackTargetLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); if (tar.visit(AbilityTargetVisitor.POINT) != null) { return tar.visit(AbilityTargetVisitor.POINT); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java index e790c2ad7..0cf89a6fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetGroundAttackedLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.POINT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java index 062e4cd5c..5edf319fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLocationFromList extends ABLocationCallback { @@ -14,8 +13,7 @@ public class ABCallbackGetLocationFromList extends ABLocationCallback { private ABIntegerCallback index; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, - final int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return list.callback(game, caster, localStore, castId).get(index.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetProjectileCurrentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetProjectileCurrentLocation.java index ba8dbfdda..50d88ca64 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetProjectileCurrentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetProjectileCurrentLocation.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetProjectileCurrentLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.PROJECTILECURRENTLOC+castId); + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetStoredLocationByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetStoredLocationByKey.java index e2f06504d..72be9592a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetStoredLocationByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetStoredLocationByKey.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredLocationByKey extends ABLocationCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetTargetedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetTargetedLocation.java index b706e6b8b..86194b475 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetTargetedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetTargetedLocation.java @@ -1,19 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetTargetedLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, - final int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final AbilityPointTarget target = (AbilityPointTarget) localStore .get(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetUnitLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetUnitLocation.java index 678173251..2fc38f796 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetUnitLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetUnitLocation.java @@ -1,20 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitLocation extends ABLocationCallback { private ABUnitCallback unit; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, - final int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CUnit theUnit = this.unit.callback(game, caster, localStore, castId); return new AbilityPointTarget(theUnit.getX(), theUnit.getY()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java index 6b05ce7ed..d2c8a8cd4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionLocation extends ABLocationCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionLocation extends ABLocationCallback { private ABLocationCallback fail; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java index 2360f80af..22f983f3d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackModifyLocationWithOffset extends ABLocationCallback { @@ -17,7 +16,7 @@ public class ABCallbackModifyLocationWithOffset extends ABLocationCallback { private ABBooleanCallback angleInDegrees; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); final float d = this.dist.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java index 067f1f406..d19b3d2d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackModifyLocationWithXYOffset extends ABLocationCallback { @@ -14,7 +13,7 @@ public class ABCallbackModifyLocationWithXYOffset extends ABLocationCallback { private ABFloatCallback ydist; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); orig.add(xdist.callback(game, caster, localStore, castId), ydist.callback(game, caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java index acc570a0e..c0a079dbf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRandomLocationInRange extends ABLocationCallback { @@ -13,13 +12,12 @@ public class ABCallbackRandomLocationInRange extends ABLocationCallback { private ABFloatCallback range; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, Map localStore, - final int castId) { + public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); final float d = this.range.callback(game, caster, localStore, castId) * game.getSeededRandom().nextFloat(); final float a = (float) (Math.PI * 2 * game.getSeededRandom().nextFloat()); - - orig.add((float)(d * Math.cos(a)), (float)(d * Math.sin(a))); + + orig.add((float) (d * Math.cos(a)), (float) (d * Math.sin(a))); return orig; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java index 16321409d..c2ff34602 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseLocation extends ABLocationCallback { @@ -17,7 +16,8 @@ public class ABCallbackReuseLocation extends ABLocationCallback { private ABStringCallback name; @Override - public AbilityPointTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + public AbilityPointTarget callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java index 6d288549c..63c8b5d36 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseLocationWithArguments extends ABLocationCallback { @@ -18,7 +19,8 @@ public class ABCallbackReuseLocationWithArguments extends ABLocationCallback { private Map arguments; @Override - public AbilityPointTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + public AbilityPointTarget callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABLocationCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABLocationCallback.java index 35b659e7a..3fba67ff4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABLocationCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABLocationCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABLocationCallback implements ABCallback { abstract public AbilityPointTarget callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAddLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAddLong.java index 18510ad67..a49a5df5e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAddLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAddLong.java @@ -1,9 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackAddLong extends ABLongCallback { @@ -11,7 +10,7 @@ public class ABCallbackAddLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) + value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAndLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAndLong.java index 6174f7386..73c0859d7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAndLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAndLong.java @@ -1,9 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackAndLong extends ABLongCallback { @@ -11,7 +10,7 @@ public class ABCallbackAndLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) & value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java index e9542fbd1..453bf34a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentLong extends ABLongCallback { private ABStringCallback name; @Override - public Long callback(final CSimulation game, final CUnit caster, final Map localStore, + public Long callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java index 374715bd5..ff62e01a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateDetectedData extends ABLongCallback { @@ -12,7 +11,7 @@ public class ABCallbackCreateDetectedData extends ABLongCallback { private ABIntegerCallback playerDetectedData; @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { long ply = playerDetectedData.callback(game, caster, localStore, castId); byte val = detectionLevel.callback(game, caster, localStore, castId).byteValue(); return val + (ply<<8); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectorData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectorData.java index 2d0d043d8..ea2500315 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectorData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectorData.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateDetectorData extends ABLongCallback { @@ -14,7 +13,7 @@ public class ABCallbackCreateDetectorData extends ABLongCallback { private ABFloatCallback range; @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { long rng = Math.min(PathingGrid.getFogOfWarDistance(range.callback(game, caster, localStore, castId)), 8388607); byte val = detectionLevel.callback(game, caster, localStore, castId).byteValue(); return val + (rng<<8); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java index 37ad032bf..6b28050e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java @@ -1,21 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateOwnershipData extends ABLongCallback { private ABIntegerCallback priority; private ABIntegerCallback playerId; - + @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { long ply = playerId.callback(game, caster, localStore, castId); int val = Math.min(priority.callback(game, caster, localStore, castId), 15) & 0b1111; - return val + (ply<<4); + return val + (ply << 4); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackDivideLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackDivideLong.java index 6c946c99b..c20a0097d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackDivideLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackDivideLong.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackDivideLong extends ABLongCallback { private ABLongCallback value1; private ABLongCallback value2; - + @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) / value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java index 58a1463ce..907f20555 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -16,7 +16,7 @@ public class ABCallbackGetAbilityDataAsLong extends ABLongCallback { @SuppressWarnings("unchecked") @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java index 1e1ed3365..870085672 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueLong extends ABLongCallback { @@ -17,7 +16,8 @@ public class ABCallbackGetAbilityUniqueValueLong extends ABLongCallback { private ABBooleanCallback allowNull; @Override - public Long callback(final CSimulation game, final CUnit caster, final Map localStore, + public Long callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = key.callback(game, caster, localStore, castId); final CAbility theAbility = ability.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java index 4bc1d3fe2..910f31e33 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffUniqueValueLong extends ABLongCallback { @@ -17,7 +16,8 @@ public class ABCallbackGetBuffUniqueValueLong extends ABLongCallback { private ABBooleanCallback allowNull; @Override - public Long callback(final CSimulation game, final CUnit caster, final Map localStore, + public Long callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = key.callback(game, caster, localStore, castId); final CBuff theBuff = buff.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetStoredLongByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetStoredLongByKey.java index 7f7477a9a..1d9fe998c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetStoredLongByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetStoredLongByKey.java @@ -1,24 +1,25 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredLongByKey extends ABLongCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; - + @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (Long) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (Long) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (Long) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (Long) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java index 14ddaf57a..27789f384 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionLong extends ABLongCallback { private ABCondition condition; private ABLongCallback pass; private ABLongCallback fail; - + @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMaxLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMaxLong.java index 5be9dd0c8..e0c04f417 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMaxLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMaxLong.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackMaxLong extends ABLongCallback { private ABLongCallback value1; private ABLongCallback value2; - + @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return Math.max(value1.callback(game, caster, localStore, castId), value2.callback(game, caster, localStore, castId)); + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return Math.max(value1.callback(game, caster, localStore, castId), + value2.callback(game, caster, localStore, castId)); } - + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMinLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMinLong.java index 009fe226d..97b92b7f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMinLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMinLong.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackMinLong extends ABLongCallback { private ABLongCallback value1; private ABLongCallback value2; - + @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return Math.min(value1.callback(game, caster, localStore, castId), value2.callback(game, caster, localStore, castId)); + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return Math.min(value1.callback(game, caster, localStore, castId), + value2.callback(game, caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMultiplyLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMultiplyLong.java index 8604b2ecf..fa704a3c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMultiplyLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMultiplyLong.java @@ -1,9 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackMultiplyLong extends ABLongCallback { @@ -11,7 +10,7 @@ public class ABCallbackMultiplyLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) * value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackOrLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackOrLong.java index ed810c446..c3473f23f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackOrLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackOrLong.java @@ -1,9 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackOrLong extends ABLongCallback { @@ -11,7 +10,7 @@ public class ABCallbackOrLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) | value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java index 667a7b475..2dea5a171 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackPlayerMaskAllPlayers extends ABLongCallback { @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { long dat = 0; for (int i = 0; i < WarsmashConstants.MAX_PLAYERS; i++) { dat |= 1 << i; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java index cf1bff6ad..cbeb59bb0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackPlayerMaskExcludePlayers extends ABLongCallback { List players; @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { long dat = 0; for (ABPlayerCallback player : players) { dat |= 1 << player.callback(game, caster, localStore, castId).getId(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java index 977581769..1e44f9e66 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackPlayerMaskIncludePlayers extends ABLongCallback { List players; @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { long dat = 0; for (ABPlayerCallback player : players) { dat |= 1 << player.callback(game, caster, localStore, castId).getId(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackRawLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackRawLong.java index 0f05dde2f..36b19fecb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackRawLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackRawLong.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRawLong extends ABLongCallback { - + private Long value; - + @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java index daaf4f89f..3a0100245 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseLong extends ABLongCallback { @@ -16,7 +15,7 @@ public class ABCallbackReuseLong extends ABLongCallback { private ABStringCallback name; @Override - public Long callback(final CSimulation game, final CUnit caster, final Map localStore, + public Long callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -26,7 +25,8 @@ public Long callback(final CSimulation game, final CUnit caster, final Map arguments; @Override - public Long callback(final CSimulation game, final CUnit caster, final Map localStore, + public Long callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackSubtractLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackSubtractLong.java index 5ac646476..0d267ae4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackSubtractLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackSubtractLong.java @@ -1,9 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackSubtractLong extends ABLongCallback { @@ -11,7 +10,7 @@ public class ABCallbackSubtractLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value1.callback(game, caster, localStore, castId) - value2.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABLongCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABLongCallback.java index 18f86344e..f637f4ebf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABLongCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABLongCallback.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABLongCallback implements ABCallback { - abstract public Long callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public Long callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java index cdc500ad4..3bccdd49f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java @@ -1,27 +1,27 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentOrderId extends ABOrderIdCallback { private ABStringCallback name; @Override - public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABOrderIdCallback) { return ((ABOrderIdCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseOrderIdCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseOrderIdCallback, but key is missing or callback was the wrong type: " + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java index 8a495790e..59c8e85d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredOrderIdByKey extends ABOrderIdCallback { @@ -15,13 +14,12 @@ public class ABCallbackGetStoredOrderIdByKey extends ABOrderIdCallback { private ABBooleanCallback instanceValue; @Override - public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (Integer) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); - } - else { + } else { return (Integer) localStore .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java index 77f06d56d..cc8c38845 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIdUtils; public class ABCallbackIdString extends ABOrderIdCallback { @@ -12,7 +11,7 @@ public class ABCallbackIdString extends ABOrderIdCallback { private ABStringCallback idString; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return OrderIdUtils.getOrderId(idString.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java index 5c7184d3f..97bcbc64a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionOrderId extends ABOrderIdCallback { @@ -13,7 +12,7 @@ public class ABCallbackInlineConditionOrderId extends ABOrderIdCallback { private ABOrderIdCallback fail; @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java index 049bac028..ea22365db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRawID extends ABOrderIdCallback { - + private Integer id; - + @Override - public Integer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return id; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java index e056ba798..71339ea9c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseOrderId extends ABOrderIdCallback { @@ -16,7 +15,7 @@ public class ABCallbackReuseOrderId extends ABOrderIdCallback { private ABStringCallback name; @Override - public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -26,7 +25,9 @@ public Integer callback(final CSimulation game, final CUnit caster, final Map arguments; @Override - public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, + public Integer callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java index d7a51dc33..db57554b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABOrderIdCallback implements ABCallback { - abstract public Integer callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java index 5d29d6409..4ebe7932f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackArgumentPlayer extends ABPlayerCallback { @@ -15,14 +14,15 @@ public class ABCallbackArgumentPlayer extends ABPlayerCallback { private ABStringCallback name; @Override - public CPlayer callback(final CSimulation game, final CUnit caster, final Map localStore, + public CPlayer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABPlayerCallback) { return ((ABPlayerCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReusePlayerCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReusePlayerCallback, but key is missing or callback was the wrong type: " + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java index 44f69a557..8e726ee44 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetCastingPlayer extends ABPlayerCallback { @Override - public CPlayer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CPlayer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getPlayer(caster.getPlayerIndex()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java index e51234389..67fd018a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetOwnerOfUnit extends ABPlayerCallback { - + private ABUnitCallback unit; - + @Override - public CPlayer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CPlayer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getPlayer(unit.callback(game, caster, localStore, castId).getPlayerIndex()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java index c9ac77f5d..6058fc5b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetPlayerById extends ABPlayerCallback { @@ -12,7 +11,7 @@ public class ABCallbackGetPlayerById extends ABPlayerCallback { private ABIntegerCallback id; @Override - public CPlayer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CPlayer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getPlayer(id.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java index 5f1f7b035..6a7160990 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetStoredPlayerByKey extends ABPlayerCallback { @@ -14,7 +13,7 @@ public class ABCallbackGetStoredPlayerByKey extends ABPlayerCallback { private ABBooleanCallback instanceValue; @Override - public CPlayer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CPlayer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (CPlayer) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java index 4b8f7c1c0..8a6e7a43f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackInlineConditionPlayer extends ABPlayerCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionPlayer extends ABPlayerCallback { private ABPlayerCallback fail; @Override - public CPlayer callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public CPlayer callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java index 52b1f2a6b..73611444d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; @@ -17,7 +16,7 @@ public class ABCallbackReusePlayer extends ABPlayerCallback { private ABStringCallback name; @Override - public CPlayer callback(final CSimulation game, final CUnit caster, final Map localStore, + public CPlayer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -27,7 +26,9 @@ public CPlayer callback(final CSimulation game, final CUnit caster, final Map arguments; @Override - public CPlayer callback(final CSimulation game, final CUnit caster, final Map localStore, + public CPlayer callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java index a21eaf731..37d305112 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public abstract class ABPlayerCallback implements ABCallback { - abstract public CPlayer callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CPlayer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java index 3740577d1..ce6cf6ce9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackArgumentProjectile extends ABProjectileCallback { @@ -15,14 +14,16 @@ public class ABCallbackArgumentProjectile extends ABProjectileCallback { private ABStringCallback name; @Override - public CProjectile callback(final CSimulation game, final CUnit caster, final Map localStore, + public CProjectile callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABProjectileCallback) { return ((ABProjectileCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " + + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java index 5df29d48b..685cf05c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetLastCreatedProjectile extends ABProjectileCallback { @Override - public CProjectile callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CProjectile callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.LASTCREATEDPROJECTILE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java index 876450ead..269d4ad8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetReactionAbilityProjectile extends ABProjectileCallback { @Override - public CProjectile callback(final CSimulation game, final CUnit caster, final Map localStore, + public CProjectile callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.ABILITYPROJ); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java index 541370e83..22f3d0475 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetReactionAttackProjectile extends ABProjectileCallback { @Override - public CProjectile callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CProjectile callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java index 26aa50e8e..5a9f53d9e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetStoredProjectileByKey extends ABProjectileCallback { @@ -14,7 +13,7 @@ public class ABCallbackGetStoredProjectileByKey extends ABProjectileCallback { private ABBooleanCallback instanceValue; @Override - public CProjectile callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CProjectile callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (CProjectile) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java index 3546af298..a252661b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetThisProjectile extends ABProjectileCallback { @Override - public CProjectile callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CProjectile callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.THISPROJECTILE+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java index 099984fd2..92c4129d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackInlineConditionProjectile extends ABProjectileCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionProjectile extends ABProjectileCallback { private ABProjectileCallback fail; @Override - public CProjectile callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public CProjectile callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java index 9597559e3..4dfd638e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -17,7 +16,7 @@ public class ABCallbackReuseProjectile extends ABProjectileCallback { private ABStringCallback name; @Override - public CProjectile callback(final CSimulation game, final CUnit caster, final Map localStore, + public CProjectile callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -27,7 +26,9 @@ public CProjectile callback(final CSimulation game, final CUnit caster, final Ma if (callback != null && callback instanceof ABProjectileCallback) { return ((ABProjectileCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseProjectileCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java index 0e5645e77..9821adba9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -18,7 +19,8 @@ public class ABCallbackReuseProjectileWithArguments extends ABProjectileCallback private Map arguments; @Override - public CProjectile callback(final CSimulation game, final CUnit caster, final Map localStore, + public CProjectile callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java index 7dccb4446..457994141 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public abstract class ABProjectileCallback implements ABCallback { - abstract public CProjectile callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CProjectile callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java index 2fe7e8d80..b66b54b6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackArgumentNonStackingStatBuff extends ABNonStackingStatBuffCallback { @@ -15,7 +14,8 @@ public class ABCallbackArgumentNonStackingStatBuff extends ABNonStackingStatBuff private ABStringCallback name; @Override - public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetLastCreatedNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetLastCreatedNonStackingStatBuff.java index 7fa3ef4d5..49f038d18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetLastCreatedNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetLastCreatedNonStackingStatBuff.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackGetLastCreatedNonStackingStatBuff extends ABNonStackingStatBuffCallback { @Override - public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId) { + public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId) { return (NonStackingStatBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDNSSB); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetStoredNonStackingStatBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetStoredNonStackingStatBuffByKey.java index df546501d..d0ecc270a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetStoredNonStackingStatBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetStoredNonStackingStatBuffByKey.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackGetStoredNonStackingStatBuffByKey extends ABNonStackingStatBuffCallback { @@ -16,7 +15,7 @@ public class ABCallbackGetStoredNonStackingStatBuffByKey extends ABNonStackingSt @Override public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId) { + final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (NonStackingStatBuff) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java index 1e67f299e..4677254a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackInlineConditionNonStackingStatBuff extends ABNonStackingStatBuffCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionNonStackingStatBuff extends ABNonStackingS private ABNonStackingStatBuffCallback fail; @Override - public NonStackingStatBuff callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public NonStackingStatBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java index 80ba31d19..6f12abdc1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; @@ -17,7 +16,7 @@ public class ABCallbackReuseNonStackingStatBuff extends ABNonStackingStatBuffCal private ABStringCallback name; @Override - public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -27,7 +26,9 @@ public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, if (callback != null && callback instanceof ABNonStackingStatBuffCallback) { return ((ABNonStackingStatBuffCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseNonStackingStatBuffCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseNonStackingStatBuffCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseNonStackingStatBuffCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java index 6acc74754..fc6a12bc6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; @@ -18,7 +19,7 @@ public class ABCallbackReuseNonStackingStatBuffWithArguments extends ABNonStacki private Map arguments; @Override - public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -31,10 +32,12 @@ public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABNonStackingStatBuffCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseNonStackingStatBuffCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseNonStackingStatBuffCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseNonStackingStatBuffCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABNonStackingStatBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABNonStackingStatBuffCallback.java index 42207d5f0..fa43c7a28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABNonStackingStatBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABNonStackingStatBuffCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public abstract class ABNonStackingStatBuffCallback implements ABCallback { - abstract public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java index d7b870afb..119e4df4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackArgumentStateModBuff extends ABStateModBuffCallback { @@ -15,14 +14,16 @@ public class ABCallbackArgumentStateModBuff extends ABStateModBuffCallback { private ABStringCallback name; @Override - public StateModBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public StateModBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABStateModBuffCallback) { return ((ABStateModBuffCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseStateModBuffCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseStateModBuffCallback, but key is missing or callback was the wrong type: " + + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetLastCreatedStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetLastCreatedStateModBuff.java index a11b56e44..90e730720 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetLastCreatedStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetLastCreatedStateModBuff.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackGetLastCreatedStateModBuff extends ABStateModBuffCallback { @Override - public StateModBuff callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public StateModBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (StateModBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDSMB); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetStoredStateModBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetStoredStateModBuffByKey.java index aedb869b0..8771aa258 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetStoredStateModBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetStoredStateModBuffByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackGetStoredStateModBuffByKey extends ABStateModBuffCallback { @@ -14,7 +13,7 @@ public class ABCallbackGetStoredStateModBuffByKey extends ABStateModBuffCallback private ABBooleanCallback instanceValue; @Override - public StateModBuff callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public StateModBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (StateModBuff) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java index 6bdf897ee..3a93ab5d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackInlineConditionStateModBuff extends ABStateModBuffCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionStateModBuff extends ABStateModBuffCallbac private ABStateModBuffCallback fail; @Override - public StateModBuff callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public StateModBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java index bfe368811..c09a81b92 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -17,7 +16,8 @@ public class ABCallbackReuseStateModBuff extends ABStateModBuffCallback { private ABStringCallback name; @Override - public StateModBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public StateModBuff callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java index 92b28d749..3b2b0ee71 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -18,7 +19,8 @@ public class ABCallbackReuseStateModBuffWithArguments extends ABStateModBuffCall private Map arguments; @Override - public StateModBuff callback(final CSimulation game, final CUnit caster, final Map localStore, + public StateModBuff callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -31,10 +33,12 @@ public StateModBuff callback(final CSimulation game, final CUnit caster, final M localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABStateModBuffCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseStateModBuffCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseStateModBuffCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseStateModBuffCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABStateModBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABStateModBuffCallback.java index 9d1a26861..4775aa566 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABStateModBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABStateModBuffCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public abstract class ABStateModBuffCallback implements ABCallback { - abstract public StateModBuff callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public StateModBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java index b1bf10bc7..2860207d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java @@ -1,19 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentString extends ABStringCallback { private ABStringCallback name; @Override - public String callback(final CSimulation game, final CUnit caster, final Map localStore, + public String callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackBooleanToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackBooleanToString.java index 661820ecc..f2452e44d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackBooleanToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackBooleanToString.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackBooleanToString extends ABStringCallback { - + private ABBooleanCallback value; - + @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return "" + value.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackCatStrings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackCatStrings.java index 1f9fe6f1f..fe2c10643 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackCatStrings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackCatStrings.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCatStrings extends ABStringCallback { private List stringList; @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { String output = ""; for (ABStringCallback callB : stringList) { output += callB.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackFloatToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackFloatToString.java index 6ee69ebba..96240705f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackFloatToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackFloatToString.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackFloatToString extends ABStringCallback { - + private ABFloatCallback value; - + @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return "" + value.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityDataAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityDataAsString.java index b474a939c..5511388bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityDataAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityDataAsString.java @@ -1,11 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; @@ -15,7 +15,7 @@ public class ABCallbackGetAbilityDataAsString extends ABStringCallback { @SuppressWarnings("unchecked") @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java index 5522cd3e9..1ca730d67 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityHandleAsString extends ABStringCallback { - + private ABAbilityCallback ability; - + @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return "" + ability.callback(game, caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java index bab645583..ab391e430 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueString extends ABStringCallback { @@ -16,7 +15,8 @@ public class ABCallbackGetAbilityUniqueValueString extends ABStringCallback { private ABBooleanCallback allowNull; @Override - public String callback(final CSimulation game, final CUnit caster, final Map localStore, + public String callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = key.callback(game, caster, localStore, castId); final CAbility theAbility = ability.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAliasAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAliasAsString.java index afdd0361f..7f0dff87c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAliasAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAliasAsString.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAliasAsString extends ABStringCallback { @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return ((War3ID) localStore.get(ABLocalStoreKeys.ALIAS)).asStringValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAllowStackingKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAllowStackingKey.java index 58a198f7d..26bcc2ad2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAllowStackingKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAllowStackingKey.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackGetAllowStackingKey extends ABStringCallback { @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return NonStackingStatBuff.ALLOW_STACKING_KEY; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java index 67c9f8490..88dae46ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffHandleAsString extends ABStringCallback { private ABBuffCallback buff; @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return "" + buff.callback(game, caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java index 84b9b192d..269c97f06 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java @@ -1,22 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffUniqueValueString extends ABStringCallback { private ABBuffCallback buff; private ABStringCallback key; - + private ABBooleanCallback allowNull; @Override - public String callback(final CSimulation game, final CUnit caster, final Map localStore, + public String callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = key.callback(game, caster, localStore, castId); final CBuff theBuff = buff.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetCodeAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetCodeAsString.java index 174cff4ce..381a0ff5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetCodeAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetCodeAsString.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetCodeAsString extends ABStringCallback { @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return ((War3ID) localStore.get(ABLocalStoreKeys.CODE)).asStringValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java index 325c9bf90..ad6bd732f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredStringByKey extends ABStringCallback { @@ -14,7 +13,8 @@ public class ABCallbackGetStoredStringByKey extends ABStringCallback { private ABBooleanCallback instanceValue; @Override - public String callback(final CSimulation game, final CUnit caster, final Map localStore, + public String callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (String) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetUnitHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetUnitHandleAsString.java index 48c913677..b43c50295 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetUnitHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetUnitHandleAsString.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitHandleAsString extends ABStringCallback { private ABUnitCallback unit; @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return "" + unit.callback(game, caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java index d67937a4a..8b87c38a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIdToString extends ABStringCallback { private ABIDCallback value; @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value.callback(game, caster, localStore, castId).asStringValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java index 4c4e7548b..8bff0ada5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionString extends ABStringCallback { private ABCondition condition; private ABStringCallback pass; private ABStringCallback fail; - + @Override - public String callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIntegerToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIntegerToString.java index 6ce1460df..d70563300 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIntegerToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIntegerToString.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIntegerToString extends ABStringCallback { private ABIntegerCallback value; @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return "" + value.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackLongToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackLongToString.java index 04045f616..057df917f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackLongToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackLongToString.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.ABLongCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackLongToString extends ABStringCallback { private ABLongCallback value; @Override - public String callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return "" + value.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackRawString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackRawString.java index 00674b646..144c8d122 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackRawString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackRawString.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRawString extends ABStringCallback { private String value; @Override - public String callback(final CSimulation game, final CUnit caster, final Map localStore, + public String callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java index 8e7566e6d..bb287b952 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseString extends ABStringCallback { @@ -15,7 +14,7 @@ public class ABCallbackReuseString extends ABStringCallback { private ABStringCallback name; @Override - public String callback(final CSimulation game, final CUnit caster, final Map localStore, + public String callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -25,7 +24,9 @@ public String callback(final CSimulation game, final CUnit caster, final Map arguments; @Override - public String callback(final CSimulation game, final CUnit caster, final Map localStore, + public String callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABStringCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABStringCallback.java index 614507c7b..8280230f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABStringCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABStringCallback.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABStringCallback implements ABCallback { - abstract public String callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public String callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java index d3cfab720..e6f99cc97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,13 +7,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentTarget extends ABTargetCallback { private ABStringCallback name; @Override - public AbilityTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + public AbilityTarget callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetAbilityTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetAbilityTarget.java index 354995a26..af3f7065f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetAbilityTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetAbilityTarget.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityTarget extends ABTargetCallback { @Override - public AbilityTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public AbilityTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityPointTarget target = (AbilityPointTarget) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+castId); if (target != null) { return target; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetStoredTargetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetStoredTargetByKey.java index 154070a76..5d4590005 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetStoredTargetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetStoredTargetByKey.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredTargetByKey extends ABTargetCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; @Override - public AbilityTarget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public AbilityTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (AbilityTarget) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java index f4c506734..f9f035044 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionTarget extends ABTargetCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionTarget extends ABTargetCallback { private ABTargetCallback fail; @Override - public AbilityTarget callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public AbilityTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java index 943c03003..de806e2f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseTarget extends ABTargetCallback { @@ -17,7 +16,7 @@ public class ABCallbackReuseTarget extends ABTargetCallback { private ABStringCallback name; @Override - public AbilityTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + public AbilityTarget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -27,7 +26,9 @@ public AbilityTarget callback(final CSimulation game, final CUnit caster, final if (callback != null && callback instanceof ABTargetCallback) { return ((ABTargetCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseTargetCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseTargetCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseTargetCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java index 4b74da5f4..1a42eb02e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseTargetWithArguments extends ABTargetCallback { @@ -18,7 +19,7 @@ public class ABCallbackReuseTargetWithArguments extends ABTargetCallback { private Map arguments; @Override - public AbilityTarget callback(final CSimulation game, final CUnit caster, final Map localStore, + public AbilityTarget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -31,10 +32,12 @@ public AbilityTarget callback(final CSimulation game, final CUnit caster, final localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABTargetCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseTargetCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseTargetCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseTargetCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABTargetCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABTargetCallback.java index 968b074f4..9d962d51a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABTargetCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABTargetCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABTargetCallback implements ABCallback { - abstract public AbilityTarget callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + abstract public AbilityTarget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java index 244fdb719..f7811416f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackArgumentTimer extends ABTimerCallback { @@ -15,7 +14,8 @@ public class ABCallbackArgumentTimer extends ABTimerCallback { private ABStringCallback name; @Override - public CTimer callback(final CSimulation game, final CUnit caster, final Map localStore, + public CTimer callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetFiringTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetFiringTimer.java index 0b7931ede..c246129b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetFiringTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetFiringTimer.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetFiringTimer extends ABTimerCallback { @Override - public CTimer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CTimer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CTimer) localStore.get(ABLocalStoreKeys.FIRINGTIMER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastCreatedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastCreatedTimer.java index 00541eed3..0048eae9e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastCreatedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastCreatedTimer.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetLastCreatedTimer extends ABTimerCallback { @Override - public CTimer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CTimer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CTimer) localStore.get(ABLocalStoreKeys.LASTCREATEDTIMER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastStartedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastStartedTimer.java index 244e3366b..f9f287bc9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastStartedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastStartedTimer.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetLastStartedTimer extends ABTimerCallback { @Override - public CTimer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CTimer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CTimer) localStore.get(ABLocalStoreKeys.LASTSTARTEDTIMER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetStoredTimerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetStoredTimerByKey.java index 916e02c01..0c0f4cd6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetStoredTimerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetStoredTimerByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetStoredTimerByKey extends ABTimerCallback { @@ -14,11 +13,13 @@ public class ABCallbackGetStoredTimerByKey extends ABTimerCallback { private ABBooleanCallback instanceValue; @Override - public CTimer callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CTimer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (CTimer) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + return (CTimer) localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { - return (CTimer) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (CTimer) localStore + .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java index 4340cd341..fc3d4c072 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackInlineConditionTimer extends ABTimerCallback { @@ -12,9 +11,9 @@ public class ABCallbackInlineConditionTimer extends ABTimerCallback { private ABCondition condition; private ABTimerCallback pass; private ABTimerCallback fail; - + @Override - public CTimer callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public CTimer callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java index 80eaff965..751d7c680 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; @@ -17,7 +16,8 @@ public class ABCallbackReuseTimer extends ABTimerCallback { private ABStringCallback name; @Override - public CTimer callback(final CSimulation game, final CUnit caster, final Map localStore, + public CTimer callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java index 24539716c..c8efb1caa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; @@ -18,7 +19,8 @@ public class ABCallbackReuseTimerWithArguments extends ABTimerCallback { private Map arguments; @Override - public CTimer callback(final CSimulation game, final CUnit caster, final Map localStore, + public CTimer callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABTimerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABTimerCallback.java index 95b3cccc7..d78c6588a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABTimerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABTimerCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public abstract class ABTimerCallback implements ABCallback { - abstract public CTimer callback(final CSimulation game, final CUnit caster, - final Map localStore, final int castId); + abstract public CTimer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java index 556188a69..89b135ef9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentUnit extends ABUnitCallback { private ABStringCallback name; @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityPairedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityPairedUnit.java index a0e8bbd0f..2e424e7dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityPairedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityPairedUnit.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityPairedUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ABILITYPAIREDUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityTargetedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityTargetedUnit.java index 71b20ef4d..facfaa9ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityTargetedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityTargetedUnit.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityTargetedUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java index 243a3df56..baa1fe52f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAttackedUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.UNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackingUnit.java index 81b28bbf3..df075e84c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackingUnit.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAttackingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ATTACKINGUNIT+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffCastingUnit.java index e3857278c..583a2382e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffCastingUnit.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffCastingUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.BUFFCASTINGUNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffedUnit.java index 7f342b8a9..2e399d576 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffedUnit.java @@ -1,15 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffedUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return caster; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCastingUnit.java index 87035ccb0..7b6a8ad73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCastingUnit.java @@ -1,15 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetCastingUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return caster; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java index 6c2823508..3ca588889 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetChainUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.CHAINUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java index e3f93e188..5cd326dc1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java @@ -1,26 +1,23 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetCompUnit1 extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.COMPUNIT1); } @Override public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { - return jassTextGenerator.getUserDataExpr( - "AB_LOCAL_STORE_KEY_COMPUNIT1", - JassTextGeneratorType.UnitHandle); + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_COMPUNIT1", JassTextGeneratorType.UnitHandle); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java index 8b9a9f1fa..81bc87fee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetCompUnit2 extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.COMPUNIT2); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java index 11d99c9fb..d892557bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetDamagedUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGEDUNIT+castId); + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGEDUNIT + castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java index 2953ed615..d36cd0a89 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetDamagingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGINGUNIT+castId); + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGINGUNIT + castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDyingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDyingUnit.java index c87723587..6cb20279e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDyingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDyingUnit.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetDyingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.DYINGUNIT+castId); + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.DYINGUNIT + castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetEnumUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetEnumUnit.java index 03a1a026e..e42bced15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetEnumUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetEnumUnit.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetEnumUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ENUMUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetKillingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetKillingUnit.java index 8501afd15..a9b2dd75f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetKillingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetKillingUnit.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetKillingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.KILLINGUNIT+castId); + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.KILLINGUNIT + castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetLastCreatedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetLastCreatedUnit.java index a79ff3718..3a1765c26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetLastCreatedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetLastCreatedUnit.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLastCreatedUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.LASTCREATEDUNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetListenerUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetListenerUnit.java index 0bef7734d..c2f2f2248 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetListenerUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetListenerUnit.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetListenerUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return caster; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetMatchingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetMatchingUnit.java index c3ec53a62..70ccc6734 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetMatchingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetMatchingUnit.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetMatchingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.MATCHINGUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java index 2b08c1d4b..9ccf4c54c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; import java.util.List; -import java.util.Map; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; public class ABCallbackGetNearestCorpseInRangeOfUnit extends ABUnitCallback { @@ -20,7 +20,7 @@ public class ABCallbackGetNearestCorpseInRangeOfUnit extends ABUnitCallback { private List conditions; @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(game, caster, localStore, castId); Float rangeVal = range.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java index b2662245e..4ecbb2d16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; import java.util.List; -import java.util.Map; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; public class ABCallbackGetNearestUnitInRangeOfUnit extends ABUnitCallback { @@ -20,7 +20,7 @@ public class ABCallbackGetNearestUnitInRangeOfUnit extends ABUnitCallback { private List conditions; @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(game, caster, localStore, castId); Float rangeVal = range.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetParentCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetParentCastingUnit.java index 58bd70516..9c923e07a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetParentCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetParentCastingUnit.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetParentCastingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.PARENTCASTER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileHitUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileHitUnit.java index bc0fed690..aa38bf81e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileHitUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileHitUnit.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetProjectileHitUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java index cafe73ab7..339a56764 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetProjectileSourceUnit extends ABUnitCallback { private ABProjectileCallback proj; - + @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { CProjectile p = proj.callback(game, caster, localStore, castId); return p.getSource(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityCastingUnit.java index f0e8a627e..8cdaa8ba1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityCastingUnit.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetReactionAbilityCastingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.REACTIONABILITYCASTER+castId); + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.REACTIONABILITYCASTER + castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityTargetUnit.java index fa2991a10..6a8931468 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityTargetUnit.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetReactionAbilityTargetUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.REACTIONABILITYCASTER+castId); return tar.visit(AbilityTargetVisitor.UNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetStoredUnitByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetStoredUnitByKey.java index eeabe0d24..60f2df15f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetStoredUnitByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetStoredUnitByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredUnitByKey extends ABUnitCallback { @@ -14,7 +13,7 @@ public class ABCallbackGetStoredUnitByKey extends ABUnitCallback { private ABBooleanCallback instanceValue; @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (CUnit) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java index 16689665e..e9124d2a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionUnit extends ABUnitCallback { @@ -13,7 +12,7 @@ public class ABCallbackInlineConditionUnit extends ABUnitCallback { private ABUnitCallback fail; @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackPollUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackPollUnitQueue.java index b2c793ae8..837a67b50 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackPollUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackPollUnitQueue.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackPollUnitQueue extends ABUnitCallback { private ABUnitQueueCallback queue; @Override - public CUnit callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return queue.callback(game, caster, localStore, castId).poll(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java index ab371f40c..54250cb15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseUnit extends ABUnitCallback { @@ -16,7 +15,8 @@ public class ABCallbackReuseUnit extends ABUnitCallback { private ABStringCallback name; @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java index 9e6029109..772bd23da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java @@ -3,12 +3,13 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseUnitWithArguments extends ABUnitCallback { @@ -17,7 +18,8 @@ public class ABCallbackReuseUnitWithArguments extends ABUnitCallback { private Map arguments; @Override - public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + public CUnit callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABUnitCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABUnitCallback.java index d50c3026b..01c3133de 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABUnitCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABUnitCallback.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABUnitCallback implements ABCallback { @Override - abstract public CUnit callback(final CSimulation game, final CUnit caster, final Map localStore, + abstract public CUnit callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java index fbefe2f05..9704b71d7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -9,13 +8,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentUnitGroup extends ABUnitGroupCallback { private ABStringCallback name; @Override - public Set callback(final CSimulation game, final CUnit caster, final Map localStore, + public Set callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetLastCreatedUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetLastCreatedUnitGroup.java index 7af08a948..bf03ee673 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetLastCreatedUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetLastCreatedUnitGroup.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLastCreatedUnitGroup extends ABUnitGroupCallback { @SuppressWarnings("unchecked") @Override - public Set callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Set callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (Set) localStore.get(ABLocalStoreKeys.LASTCREATEDUNITGROUP); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java index 2a62e46ba..f05116ad1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredUnitGroupByKey extends ABUnitGroupCallback { @@ -17,13 +17,12 @@ public class ABCallbackGetStoredUnitGroupByKey extends ABUnitGroupCallback { @SuppressWarnings("unchecked") @Override - public Set callback(final CSimulation game, final CUnit caster, final Map localStore, + public Set callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (Set) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); - } - else { + } else { return (Set) localStore .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetUnitGroupByName.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetUnitGroupByName.java index 07082ce51..227485b8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetUnitGroupByName.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetUnitGroupByName.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitGroupByName extends ABUnitGroupCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetUnitGroupByName extends ABUnitGroupCallback { @SuppressWarnings("unchecked") @Override - public Set callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Set callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (Set) localStore.get("_unitgroup_" + name); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java index 772c492e6..5eef62e50 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionUnitGroup extends ABUnitGroupCallback { private ABCondition condition; private ABUnitGroupCallback pass; private ABUnitGroupCallback fail; - + @Override - public Set callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public Set callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java index 1bbf216b6..10031186a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseUnitGroup extends ABUnitGroupCallback { @@ -17,7 +17,8 @@ public class ABCallbackReuseUnitGroup extends ABUnitGroupCallback { private ABStringCallback name; @Override - public Set callback(final CSimulation game, final CUnit caster, final Map localStore, + public Set callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java index 615a40788..ebeb24276 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseUnitGroupWithArguments extends ABUnitGroupCallback { @@ -18,7 +19,8 @@ public class ABCallbackReuseUnitGroupWithArguments extends ABUnitGroupCallback { private Map arguments; @Override - public Set callback(final CSimulation game, final CUnit caster, final Map localStore, + public Set callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABUnitGroupCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABUnitGroupCallback.java index 3d5a52c09..b54986217 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABUnitGroupCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABUnitGroupCallback.java @@ -1,13 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABUnitGroupCallback implements ABCallback { - abstract public Set callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public Set callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java index bfbab409b..8b068f1c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -9,13 +8,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentUnitQueue extends ABUnitQueueCallback { private ABStringCallback name; @Override - public Queue callback(final CSimulation game, final CUnit caster, final Map localStore, + public Queue callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java index a8078748b..87ff751f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLastCreatedUnitQueue extends ABUnitQueueCallback { @SuppressWarnings("unchecked") @Override - public Queue callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Queue callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (Queue) localStore.get(ABLocalStoreKeys.LASTCREATEDUNITQUEUE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java index 15a352971..8cca2491d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredUnitQueueByKey extends ABUnitQueueCallback { @@ -17,13 +17,12 @@ public class ABCallbackGetStoredUnitQueueByKey extends ABUnitQueueCallback { @SuppressWarnings("unchecked") @Override - public Queue callback(final CSimulation game, final CUnit caster, final Map localStore, + public Queue callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (Queue) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); - } - else { + } else { return (Queue) localStore .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java index 62c6c9d6e..d5d981c19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitQueueByName extends ABUnitQueueCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetUnitQueueByName extends ABUnitQueueCallback { @SuppressWarnings("unchecked") @Override - public Queue callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Queue callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (Queue) localStore.get("_unitqueue_" + name); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java index a33b9c75e..6614a293b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java @@ -1,11 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionUnitQueue extends ABUnitQueueCallback { @@ -14,7 +14,7 @@ public class ABCallbackInlineConditionUnitQueue extends ABUnitQueueCallback { private ABUnitQueueCallback fail; @Override - public Queue callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public Queue callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java index 229aea92a..ce6189050 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseUnitQueue extends ABUnitQueueCallback { @@ -17,7 +17,8 @@ public class ABCallbackReuseUnitQueue extends ABUnitQueueCallback { private ABStringCallback name; @Override - public Queue callback(final CSimulation game, final CUnit caster, final Map localStore, + public Queue callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java index 99e0720ef..356e8ca1e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseUnitQueueWithArguments extends ABUnitQueueCallback { @@ -18,7 +19,7 @@ public class ABCallbackReuseUnitQueueWithArguments extends ABUnitQueueCallback { private Map arguments; @Override - public Queue callback(final CSimulation game, final CUnit caster, final Map localStore, + public Queue callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -31,10 +32,12 @@ public Queue callback(final CSimulation game, final CUnit caster, final M localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABUnitQueueCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseUnitQueueCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseUnitQueueCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseUnitQueueCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java index f4d4bf160..bcc9e92c3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java @@ -1,13 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; -import java.util.Map; import java.util.Queue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABUnitQueueCallback implements ABCallback { - abstract public Queue callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public Queue callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java index 43930818a..83c1683fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackArgumentVisionModifier extends ABVisionModifierCallback { @@ -15,7 +14,8 @@ public class ABCallbackArgumentVisionModifier extends ABVisionModifierCallback { private ABStringCallback name; @Override - public CFogModifier callback(final CSimulation game, final CUnit caster, final Map localStore, + public CFogModifier callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java index afe7382e3..2d4dacc87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackGetLastCreatedVisionModifier extends ABVisionModifierCallback { @Override - public CFogModifier callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CFogModifier callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (CFogModifier) localStore.get(ABLocalStoreKeys.LASTCREATEDVISIONMODIFIER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java index 9081a659c..c42d2b030 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackGetStoredVisionModifierByKey extends ABVisionModifierCallback { @@ -14,7 +13,7 @@ public class ABCallbackGetStoredVisionModifierByKey extends ABVisionModifierCall private ABBooleanCallback instanceValue; @Override - public CFogModifier callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CFogModifier callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { return (CFogModifier) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java index e3f6bd016..8e01d3abd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java @@ -1,10 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackInlineConditionVisionModifier extends ABVisionModifierCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionVisionModifier extends ABVisionModifierCal private ABVisionModifierCallback fail; @Override - public CFogModifier callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public CFogModifier callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java index c65bef39d..70ed102cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; @@ -17,7 +16,7 @@ public class ABCallbackReuseVisionModifier extends ABVisionModifierCallback { private ABStringCallback name; @Override - public CFogModifier callback(final CSimulation game, final CUnit caster, final Map localStore, + public CFogModifier callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -27,7 +26,9 @@ public CFogModifier callback(final CSimulation game, final CUnit caster, final M if (callback != null && callback instanceof ABVisionModifierCallback) { return ((ABVisionModifierCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseVisionModifierCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseVisionModifierCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseVisionModifierCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java index 5a12663ee..2c0669e95 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; @@ -18,7 +19,7 @@ public class ABCallbackReuseVisionModifierWithArguments extends ABVisionModifier private Map arguments; @Override - public CFogModifier callback(final CSimulation game, final CUnit caster, final Map localStore, + public CFogModifier callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -31,10 +32,12 @@ public CFogModifier callback(final CSimulation game, final CUnit caster, final M localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABVisionModifierCallback) callback).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseVisionModifierCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseVisionModifierCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseVisionModifierCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java index 91a794b60..7d6ec0c08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public abstract class ABVisionModifierCallback implements ABCallback { - abstract public CFogModifier callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CFogModifier callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java index d8c54f355..bd41ec935 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java @@ -1,21 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentWidget extends ABWidgetCallback { private ABStringCallback name; @Override - public CWidget callback(final CSimulation game, final CUnit caster, final Map localStore, + public CWidget callback(final CSimulation game, final CUnit caster, + final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java index 3b20099bc..043595a26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackDestructableToWidget extends ABWidgetCallback { private ABDestructableCallback destructable; @Override - public CWidget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CWidget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return destructable.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java index e96931a59..763964a61 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java @@ -1,23 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetProjectileHitWidget extends ABWidgetCallback { @Override - public CWidget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CWidget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CWidget unit = (CWidget) localStore.get(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); final CWidget dest = (CWidget) localStore.get(ABLocalStoreKeys.PROJECTILEHITDEST + castId); if (unit != null) { return unit; - } - else { + } else { return dest; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java index 7a765d140..27a363e06 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetStoredWidgetByKey extends ABWidgetCallback { @@ -16,13 +15,12 @@ public class ABCallbackGetStoredWidgetByKey extends ABWidgetCallback { private ABBooleanCallback instanceValue; @Override - public CWidget callback(final CSimulation game, final CUnit caster, final Map localStore, + public CWidget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { return (CWidget) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); - } - else { + } else { return (CWidget) localStore .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java index 35ba42c1c..70fbbc0f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackInlineConditionWidget extends ABWidgetCallback { @@ -14,7 +13,7 @@ public class ABCallbackInlineConditionWidget extends ABWidgetCallback { private ABWidgetCallback fail; @Override - public CWidget callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public CWidget callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { if (condition != null && condition.callback(game, caster, localStore, castId)) { return pass.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java index 852cb4caf..918089769 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackItemToWidget extends ABWidgetCallback { private ABItemCallback item; @Override - public CWidget callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public CWidget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return item.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java index 4cdc26f85..b5c5f2ff5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseWidget extends ABWidgetCallback { @@ -17,7 +16,7 @@ public class ABCallbackReuseWidget extends ABWidgetCallback { private ABStringCallback name; @Override - public CWidget callback(final CSimulation game, final CUnit caster, final Map localStore, + public CWidget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java index c6ebdbc4a..ff6949e48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java @@ -3,13 +3,14 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseWidgetWithArguments extends ABWidgetCallback { @@ -18,7 +19,7 @@ public class ABCallbackReuseWidgetWithArguments extends ABWidgetCallback { private Map arguments; @Override - public CWidget callback(final CSimulation game, final CUnit caster, final Map localStore, + public CWidget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -31,10 +32,12 @@ public CWidget callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public CWidget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return unit.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java index 773f2d03f..b5ea1eaac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABWidgetCallback implements ABCallback { - abstract public CWidget callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public CWidget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java index 99c6ae7f7..880856c13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,20 +8,22 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackArgumentBoolean extends ABCondition { private ABStringCallback name; @Override - public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final String keyS = name.callback(game, caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABBooleanCallback) { return ((ABBooleanCallback) cbck).callback(game, caster, localStore, castId); } else { - System.err.println("Trying to run ReuseBooleanCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseBooleanCallback, but key is missing or callback was the wrong type: " + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java index a4faeb0cf..3d986e874 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -11,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class ABCallbackReuseBoolean extends ABCondition { @@ -18,7 +17,7 @@ public class ABCallbackReuseBoolean extends ABCondition { private ABStringCallback name; @Override - public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -28,7 +27,9 @@ public Boolean callback(final CSimulation game, final CUnit caster, final Map arguments; @Override - public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); @@ -32,10 +33,12 @@ public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java index 24fbf3819..13f97e2ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; public class ABConditionIsPassAllAbilityTargetChecks extends ABCondition { @@ -18,7 +17,7 @@ public class ABConditionIsPassAllAbilityTargetChecks extends ABCondition { private ABWidgetCallback target; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; if (caster != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java index f983eb839..db0faf46f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -8,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitInGroup extends ABCondition { @@ -15,7 +15,7 @@ public class ABConditionIsUnitInGroup extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Set groupSet = group.callback(game, caster, localStore, castId); CUnit rUnit = unit.callback(game, caster, localStore, castId); return groupSet.contains(rUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java index 9ea406c51..fdffc2d73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitInRangeOfUnit extends ABCondition { @@ -15,8 +14,9 @@ public class ABConditionIsUnitInRangeOfUnit extends ABCondition { private ABFloatCallback range; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { - return caster.callback(game, casterUnit, localStore, castId).canReach(target.callback(game, casterUnit, localStore, castId), + public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { + return caster.callback(game, casterUnit, localStore, castId).canReach( + target.callback(game, casterUnit, localStore, castId), range.callback(game, casterUnit, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java index a7de9688c..31085ef36 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; @@ -9,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; public class ABConditionIsUnitPassAllAbilityTargetChecks extends ABCondition { @@ -17,7 +16,7 @@ public class ABConditionIsUnitPassAllAbilityTargetChecks extends ABCondition { private ABUnitCallback target; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; CUnit theTarget = target.callback(game, casterUnit, localStore, castId); if (theTarget == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java index 5f4fba60a..178291093 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java @@ -2,7 +2,6 @@ import java.util.EnumSet; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -14,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; @@ -26,7 +26,7 @@ public class ABConditionIsUnitValidTarget extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java index 34af796fb..08d5bbcbc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java @@ -2,7 +2,6 @@ import java.util.EnumSet; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -14,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; @@ -24,7 +24,7 @@ public class ABConditionIsValidTarget extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java index c1b596b01..1456c5b24 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; import java.util.List; -import java.util.Map; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -11,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; public class ABConditionMatchingCorpseExistsInRangeOfUnit extends ABCondition { @@ -21,7 +21,7 @@ public class ABConditionMatchingCorpseExistsInRangeOfUnit extends ABCondition { private List conditions; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(game, caster, localStore, castId); Float rangeVal = range.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java index 8dd637b9a..b4e231438 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import java.util.Map; - import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; public class ABConditionMatchingUnitExistsInRangeOfUnit extends ABCondition { @@ -20,12 +19,12 @@ public class ABConditionMatchingUnitExistsInRangeOfUnit extends ABCondition { private ABCondition condition; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(game, caster, localStore, castId); Float rangeVal = range.callback(game, caster, localStore, castId); - + final UnitAndRange ur = new UnitAndRange(); - + recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @@ -34,9 +33,9 @@ public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { if (ur.getUnit() == null) { if (condition != null) { - localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); + localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); boolean result = condition.callback(game, caster, localStore, castId); - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); + localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); if (result) { ur.setUnit(enumUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java index b776f90a3..d44f96e42 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeysEnum; public class ABConditionSetCantUseReasonOnFailure extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionSetCantUseReasonOnFailure extends ABCondition { private CommandStringErrorKeysEnum reason; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { boolean result = condition.callback(game, caster, localStore, castId); if (!result) { localStore.put(ABLocalStoreKeys.CANTUSEREASON, reason.getKey()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java index c3e275ae2..8eb0bca93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java @@ -1,21 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionDoesAbilityHaveUniqueFlag extends ABCondition { ABAbilityCallback ability; ABStringCallback flag; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CAbility theAbility = ability.callback(game, caster, localStore, castId); return theAbility.hasUniqueFlag(flag.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java index 345b12d96..e2be0182b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsAutoCastCurrentlyActive extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.ISAUTOCASTON); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java index b236e9915..0aae35fc7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsDisabled extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.isDisabled(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java index 108f67347..47f439cba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsFlexAbilityNonPointTarget extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return !ability.isPointTarget(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java index 4fb410696..11ed1e2da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsFlexAbilityNonTargeted extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return !ability.isTargetedSpell(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java index 07af67935..466cdb13b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsFlexAbilityPointTarget extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return ability.isPointTarget(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java index 9480c7db1..b99bbd1c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsFlexAbilityTargeted extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore + .get(ABLocalStoreKeys.ISFLEXABILITY); return ability.isTargetedSpell(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java index a6b7c5a45..8119e3d87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsOnCooldown extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.getCooldownRemainingTicks(game, caster) > 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java index ec9dbf0c3..70f369647 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,11 +7,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsToggleAbilityActive extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.isActive(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java index fb5e689ab..29b220bb1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsTransformingToAlternate extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return (Boolean) localStore.get(ABLocalStoreKeys.TRANSFORMINGTOALT +castId); + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return (Boolean) localStore.get(ABLocalStoreKeys.TRANSFORMINGTOALT + castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java index 3e5f2e720..0cd8a5520 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionWasAutoCast extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java index 74fca989f..fe90a4644 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionWasAutoCastPreviouslyActive extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.WASAUTOCASTON); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java index 2d32efa0a..d8fa47f16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionWasCastingInterrupted extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.INTERRUPTED); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java index a885a8e3c..9ef3451ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABConditionIsAttackProjectile extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().isProjectile(); + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isProjectile(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java index 3d88d8fd1..285b59a2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABConditionIsAttackRanged extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().isRanged(); + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isRanged(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java index 3e1ada5af..a1361d596 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java @@ -1,21 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionDoesBuffHaveUniqueFlag extends ABCondition { ABBuffCallback buff; ABStringCallback flag; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(game, caster, localStore, castId); return theBuff.hasUniqueFlag(flag.callback(game, caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java index 63ea9df8f..c14f9a397 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsBuffAlly extends ABCondition { @@ -14,7 +13,7 @@ public class ABConditionIsBuffAlly extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(game, caster, localStore, castId); return game.getPlayer(caster.getPlayerIndex()).hasAlliance(theBuff.getSourceUnit().getPlayerIndex(), CAllianceType.SHARED_SPELLS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java index df7d97fd7..342935896 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsBuffEnemy extends ABCondition { @@ -14,7 +13,7 @@ public class ABConditionIsBuffEnemy extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(game, caster, localStore, castId); return !game.getPlayer(caster.getPlayerIndex()).hasAlliance(theBuff.getSourceUnit().getPlayerIndex(), CAllianceType.PASSIVE); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java index 05e9044b4..53ab755a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsBuffMagic extends ABCondition { ABBuffCallback buff; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(game, caster, localStore, castId); return theBuff.isMagic(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java index f935c1096..dec0767e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsBuffNegative extends ABCondition { ABBuffCallback buff; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(game, caster, localStore, castId); return !theBuff.isPositive(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java index 0f04036f2..4d0c88ca3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsBuffPositive extends ABCondition { ABBuffCallback buff; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(game, caster, localStore, castId); return theBuff.isPositive(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java index dbead1aaf..05b2cca09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public class ABConditionIsAttackTypeEqual extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionIsAttackTypeEqual extends ABCondition { private ABAttackTypeCallback attackType2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CAttackType lA = attackType1.callback(game, caster, localStore, castId); CAttackType rA = attackType2.callback(game, caster, localStore, castId); if (lA == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java index cb715ab88..d75427f2b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABConditionIsDamageTypeEqual extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionIsDamageTypeEqual extends ABCondition { private ABDamageTypeCallback damageType2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CDamageType lD = damageType1.callback(game, caster, localStore, castId); CDamageType rD = damageType2.callback(game, caster, localStore, castId); if (lD == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java index 9e72fa77e..701815126 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDefenseTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABConditionIsDefenseTypeEqual extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionIsDefenseTypeEqual extends ABCondition { private ABDefenseTypeCallback defenseType2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CDefenseType lD = defenseType1.callback(game, caster, localStore, castId); CDefenseType rD = defenseType2.callback(game, caster, localStore, castId); if (lD == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java index 3e2a22c9c..bc0ce559b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDefenseTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABConditionIsDefenseTypeInList extends ABCondition { @@ -15,7 +15,7 @@ public class ABConditionIsDefenseTypeInList extends ABCondition { private List list; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { CDefenseType theType = defenseType.callback(game, caster, localStore, castId); for (ABDefenseTypeCallback lType : list) { if (theType == lType.callback(game, caster, localStore, castId)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java index 97d769b4f..53dd3b6f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsIdEqual extends ABCondition { @@ -14,7 +13,7 @@ public class ABConditionIsIdEqual extends ABCondition { private ABIDCallback id2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { War3ID lA = id1.callback(game, caster, localStore, castId); War3ID rA = id2.callback(game, caster, localStore, castId); if (lA == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java index 5e56d79e5..f1979e822 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABMovementTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsMovementTypeEqual extends ABCondition { @@ -14,7 +13,7 @@ public class ABConditionIsMovementTypeEqual extends ABCondition { private ABMovementTypeCallback movementType2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { MovementType lD = movementType1.callback(game, caster, localStore, castId); MovementType rD = movementType2.callback(game, caster, localStore, castId); if (lD == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java index ac7d6fac0..d82d59042 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitEqual extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsUnitEqual extends ABCondition { private ABUnitCallback unit2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit lUnit = unit1.callback(game, caster, localStore, castId); CUnit rUnit = unit2.callback(game, caster, localStore, castId); if (lUnit == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java index 18e91ef5c..f35493714 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABConditionIsWeaponTypeEqual extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionIsWeaponTypeEqual extends ABCondition { private ABWeaponTypeCallback weaponType2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CWeaponType lD = weaponType1.callback(game, caster, localStore, castId); CWeaponType rD = weaponType2.callback(game, caster, localStore, castId); if (lD == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java index f03e2a6e5..7c242343b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable; -import java.util.Map; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionDoesDestructableHaveBuff extends ABCondition { @@ -15,12 +15,12 @@ public class ABConditionDoesDestructableHaveBuff extends ABCondition { private ABIDCallback id; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CDestructable theDestructable = dest.callback(game, caster, localStore, castId); if (theDestructable != null) { for (CDestructableBuff ability : theDestructable.getBuffs()) { - if ((ability).getAlias() == id.callback(game, caster, localStore, castId)) { - return true; + if ((ability).getAlias() == id.callback(game, caster, localStore, castId)) { + return true; } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java index 4cbaafa41..f8f9d8012 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionDoesDestructableHaveBuffMatchingCondition extends ABCondition { @@ -17,7 +16,7 @@ public class ABConditionDoesDestructableHaveBuffMatchingCondition extends ABCond private ABBooleanCallback condition; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CDestructable theDestructable = dest.callback(game, caster, localStore, castId); if (theDestructable != null) { for (CDestructableBuff ability : theDestructable.getBuffs()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java index 5c61d4237..d5b726af8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java @@ -1,12 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable; import java.util.EnumSet; -import java.util.Map; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABConditionIsTree extends ABCondition { @@ -14,7 +15,7 @@ public class ABConditionIsTree extends ABCondition { private ABDestructableCallback dest; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CDestructable theDestructable = dest.callback(game, caster, localStore, castId); if (theDestructable != null) { return theDestructable.canBeTargetedBy(game, caster, EnumSet.of(CTargetType.TREE)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java index 500d9a302..f467f0986 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructablebuff; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsDestructableBuffMagic extends ABCondition { ABDestructableBuffCallback buff; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CDestructableBuff theBuff = buff.callback(game, caster, localStore, castId); return theBuff.isMagic(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java index b66847aac..a6432e777 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionGameplayConstantCanDisableDivineShield extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getGameplayConstants().isCanDisableDivineShield(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java index 65c062200..89bf5aeb6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionGameplayConstantIsDefendCanDeflect extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getGameplayConstants().isDefendDeflection(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java index 3d21bb333..a868f6249 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionGameplayConstantIsRelativeUpgradeCosts extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getGameplayConstants().isRelativeUpgradeCosts(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java index 19aa10b63..000e10afc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionGameplayConstantSmartAbolishMagic extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return game.getGameplayConstants().isAbolishMagicSmartDispel(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java index 69f0ab625..5af15bcb1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsTimeOfDayInRange extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsTimeOfDayInRange extends ABCondition { private ABFloatCallback endTime; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { float st = 0; float et = Float.MAX_VALUE; if (startTime != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java index 387444712..608d81df4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsItemAbility extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.getItem() != null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java index cc86d74cb..452f70259 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionItemHasCharges extends ABCondition { private ABItemCallback item; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (item == null) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java index 70aee6c1b..ac5e5554c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionItemIsCharged extends ABCondition { private ABItemCallback item; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { if (item == null) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java index 7dbad38aa..0ba58f90e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsLocationDeepWater extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(game, caster, localStore, castId); return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java index 7fac698ec..d7591a378 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java @@ -1,22 +1,23 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsLocationFlyingOnly extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(game, caster, localStore, castId); - return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.FLYABLE) && !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.FLYABLE) + && !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) + && !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java index 295a4f0c9..948b90265 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java @@ -1,22 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsLocationShallowWater extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(game, caster, localStore, castId); - return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) + && game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java index 70834b02a..ab50f93e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsLocationWalkable extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(game, caster, localStore, castId); return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java index 0aefb1ede..fced58891 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsLocationWalkableNonWater extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(game, caster, localStore, castId); return !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java index 31ec8a374..317cf5231 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java @@ -1,19 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; import java.util.List; -import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionAnd extends ABCondition { private List conditions; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { boolean result = true; if (conditions != null) { for (ABCondition cond : conditions) { @@ -28,7 +28,7 @@ public Boolean callback(CSimulation game, CUnit caster, Map loca @Override public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String result = ""; - for (int i = 0 ; i < conditions.size() ; i++) { + for (int i = 0; i < conditions.size(); i++) { result += conditions.get(i).generateJassEquivalent(jassTextGenerator); if (i < (conditions.size() - 1)) { result += " and "; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java index b9cd884d0..f529cd814 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionBool extends ABCondition { private ABBooleanCallback bool; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return bool.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java index 22a73d72b..0ab6c5ed3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsNull extends ABCondition { private ABCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value.callback(game, caster, localStore, castId) == null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java index 78dab2b48..359ecefbc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionNot extends ABCondition { private ABCondition condition; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return !condition.callback(game, caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java index 86586d971..dcfcca383 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionNotNull extends ABCondition { private ABCallback value; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return value.callback(game, caster, localStore, castId) != null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java index 6ac22de5b..9d6616604 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionOr extends ABCondition { private List conditions; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { boolean result = false; if (conditions != null) { for (ABCondition cond : conditions) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java index 81f3d91b8..190060c37 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionFloatEq0 extends ABCondition { private ABFloatCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Float v = value.callback(game, caster, localStore, castId); return v==0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java index c642a38d7..65668159d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionFloatEqual extends ABCondition { @@ -14,7 +13,7 @@ public class ABConditionFloatEqual extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java index 5e7024b0f..171b051a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionFloatGt extends ABCondition { @@ -14,7 +13,7 @@ public class ABConditionFloatGt extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java index 6adb49199..5d548577e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java @@ -1,20 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionFloatGt0 extends ABCondition { private ABFloatCallback value; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Float v = value.callback(game, caster, localStore, castId); - return v>0; + return v > 0; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java index 79c7a1d2e..79ea49033 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java @@ -1,22 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionFloatGte extends ABCondition { private ABFloatCallback value1; private ABFloatCallback value2; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); - return v1>=v2; + return v1 >= v2; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java index effcab044..5ff84ec9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java @@ -1,22 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionFloatLt extends ABCondition { private ABFloatCallback value1; private ABFloatCallback value2; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); - - return v1 localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); - - return v1<=v2; + + return v1 <= v2; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java index 68595280d..943dc3811 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionFloatNe extends ABCondition { @@ -13,7 +12,7 @@ public class ABConditionFloatNe extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Float v1 = value1.callback(game, caster, localStore, castId); Float v2 = value2.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java index 942a1eb09..4b3d73885 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionFloatNe0 extends ABCondition { private ABFloatCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Float v = value.callback(game, caster, localStore, castId); return v!=0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java index 9b37c4cb9..97c57ce2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java @@ -1,22 +1,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIntegerEq extends ABCondition { private ABIntegerCallback value1; private ABIntegerCallback value2; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); - + return v1.equals(v2); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java index 5aaab72b1..232c51d1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIntegerEq0 extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v1 = value.callback(game, caster, localStore, castId); return v1 == 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java index f085c6caf..5bdf88992 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIntegerGt extends ABCondition { private ABIntegerCallback value1; private ABIntegerCallback value2; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); return v1 > v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java index 66b798ccd..863f20b3e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIntegerGt0 extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v1 = value.callback(game, caster, localStore, castId); return v1 > 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java index 42806f3ef..2dd05c9c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIntegerGte extends ABCondition { private ABIntegerCallback value1; private ABIntegerCallback value2; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); return v1 >= v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java index 153e9ba54..4e1410648 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIntegerIsEven extends ABCondition { private ABIntegerCallback value; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v1 = value.callback(game, caster, localStore, castId); return (v1 % 2) == 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java index 69db176e6..8c174e293 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIntegerIsOdd extends ABCondition { private ABIntegerCallback value; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v1 = value.callback(game, caster, localStore, castId); return (v1 % 2) == 1; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java index 71012582e..0e61fde49 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIntegerLt extends ABCondition { @@ -14,7 +13,7 @@ public class ABConditionIntegerLt extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); return v1 < v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java index d21ec2958..3ff961760 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIntegerLte extends ABCondition { @@ -13,7 +12,7 @@ public class ABConditionIntegerLte extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); return v1 <= v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java index 58e7825a4..42dcaca49 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIntegerNe extends ABCondition { private ABIntegerCallback value1; private ABIntegerCallback value2; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v1 = value1.callback(game, caster, localStore, castId); Integer v2 = value2.callback(game, caster, localStore, castId); return !v1.equals(v2); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java index 8db9cb602..851a75da4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIntegerNe0 extends ABCondition { private ABIntegerCallback value; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { Integer v1 = value.callback(game, caster, localStore, castId); return v1 != 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java index 682f22239..9ca05b8ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.projectile; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABConditionIsProjectileReflected extends ABCondition { @@ -14,7 +13,7 @@ public class ABConditionIsProjectileReflected extends ABCondition { private ABProjectileCallback projectile; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { final CProjectile proj = this.projectile.callback(game, caster, localStore, castId); return proj.isReflected(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java index c962d0003..835d19d2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java @@ -1,18 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.timer; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsTimerActive extends ABCondition { private ABTimerCallback timer; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { return timer.callback(game, caster, localStore, castId).isRunning(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java index 99cae1da5..a63d1d3b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionDoesUnitHaveAbilityMatchingCondition extends ABCondition { @@ -16,7 +16,7 @@ public class ABConditionDoesUnitHaveAbilityMatchingCondition extends ABCondition private ABBooleanCallback condition; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java index b4c96f77c..443d8cbf1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; @@ -8,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionDoesUnitHaveBuff extends ABCondition { @@ -15,7 +15,7 @@ public class ABConditionDoesUnitHaveBuff extends ABCondition { private ABIDCallback id; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); @@ -23,7 +23,7 @@ public Boolean callback(CSimulation game, CUnit caster, Map loca if (theUnit != null) { for (CAbility ability : theUnit.getAbilities()) { if (ability instanceof CBuff) { - if (((CBuff)ability).getAlias() == id.callback(game, caster, localStore, castId)) { + if (((CBuff) ability).getAlias() == id.callback(game, caster, localStore, castId)) { return true; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java index 8ea80e8b4..1492eb380 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; @@ -9,6 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionDoesUnitHaveBuffMatchingCondition extends ABCondition { @@ -16,7 +16,7 @@ public class ABConditionDoesUnitHaveBuffMatchingCondition extends ABCondition { private ABBooleanCallback condition; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java index b1ef2be26..03d1671d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitAlive extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java index 7e47fd8d4..517e299b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitBuilding extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java index 9e7cf4873..1cef3b883 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitConstructing extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java index 0a6c830f4..3f46913ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitConstructingOrUpgrading extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java index 1695ddb48..5b3f15e1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitDead extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java index 1dfc55df9..e755bf434 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsUnitEnemy extends ABCondition { @@ -15,7 +14,7 @@ public class ABConditionIsUnitEnemy extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (this.self != null) { @@ -34,8 +33,7 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String casterExpr; if (this.self == null) { casterExpr = jassTextGenerator.getCaster(); - } - else { + } else { casterExpr = this.self.generateJassEquivalent(jassTextGenerator); } return "IsUnitEnemy(" + this.unit.generateJassEquivalent(jassTextGenerator) + ", GetOwningPlayer(" + casterExpr diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java index 7d3a684e7..06cf41033 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsUnitFriend extends ABCondition { @@ -15,7 +14,7 @@ public class ABConditionIsUnitFriend extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (this.self != null) { @@ -34,8 +33,7 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String casterExpr; if (this.self == null) { casterExpr = jassTextGenerator.getCaster(); - } - else { + } else { casterExpr = this.self.generateJassEquivalent(jassTextGenerator); } return "IsUnitEnemy(" + this.unit.generateJassEquivalent(jassTextGenerator) + ", GetOwningPlayer(" + casterExpr diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java index 005c9bc40..405e3065b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitHero extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java index 6232ab7ed..8e3e7991e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitHeroDuration extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsUnitHeroDuration extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(game, caster, localStore, castId); if (theUnit != null && (theUnit.isHero() || theUnit.isUnitType(CUnitTypeJass.RESISTANT))) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java index 336e5ac55..e4d4e6d5c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitHidden extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java index 71431095c..b8621333a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitMagicImmune extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java index 49b849972..5aa100623 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitMaxHp extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java index de608eb27..6df8851b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitMaxMp extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java index 51ec0e4c7..c2fec28a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitMorphImmune extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java index 14117391f..0b3847fc1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitPolymorphed extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsUnitPolymorphed extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java index a086ca1cb..d2a0eb24c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsUnitShareSpells extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionIsUnitShareSpells extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (caster != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java index 8179e5df4..363a52ce4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitSleeping extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsUnitSleeping extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java index f374dd90d..a886fb8ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitSummoned extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsUnitSummoned extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java index 91aa7e293..fbe16d5b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitTraining extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java index 189ad629e..df4141687 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java @@ -1,11 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitType extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionIsUnitType extends ABCondition { private ABIDCallback unitType; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java index 73a41921b..0e8172d13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java @@ -1,17 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitUpgrading extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java index e3ad2999b..578454441 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java @@ -1,12 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsUnitVisible extends ABCondition { @@ -14,7 +13,7 @@ public class ABConditionIsUnitVisible extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (this.caster != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java index 0fd6b02e4..4dda35617 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABConditionSuccessfullyChargeResources extends ABCondition { @@ -20,7 +20,7 @@ public class ABConditionSuccessfullyChargeResources extends ABCondition { private ABIntegerCallback food; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); @@ -55,7 +55,7 @@ public Boolean callback(CSimulation game, CUnit caster, Map loca if (manaCost > 0) theUnit.chargeMana(manaCost); - theUnit.notifyAbilitiesChanged(); + theUnit.notifyAbilitiesChanged(); if (goldCost > 0 || lumberCost > 0) thePlayer.charge(goldCost, lumberCost); if (foodCost > 0) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java index 86ca0265d..b0dc6b09b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java @@ -1,11 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionUnitHasResearch extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionUnitHasResearch extends ABCondition { private ABIDCallback researchId; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, final int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java index f2ee469f0..b50b24dc0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.behavior; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; @@ -16,7 +16,7 @@ public class ABConditionIsCurrentBehaviorCategoryInList extends ABCondition { private List list; @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(game, caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java index 0b3d55d9a..3245de34b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unittype; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,14 +7,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionIsLocationPathableForUnitType extends ABCondition { ABLocationCallback location; ABIDCallback unitType; - + @Override - public Boolean callback(CSimulation game, CUnit caster, Map localStore, int castId) { + public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { War3ID uType = unitType.callback(game, caster, localStore, castId); AbilityPointTarget loc = location.callback(game, caster, localStore, castId); return game.getPathingGrid().isPathable(loc.x, loc.y, game.getUnitData().getUnitType(uType).getMovementType()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java index 8c2dad3a0..1f80a0196 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import com.etheller.warsmash.util.War3ID; @@ -15,6 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractCBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; @@ -32,13 +32,13 @@ public abstract class ABBuff extends AbstractCBuff { protected int flags = DISPELLABLE; - protected Map localStore; + protected LocalDataStore localStore; protected List uniqueFlags = null; private String visibilityGroup = null; private CAbility sourceAbil; protected CUnit sourceUnit; - public ABBuff(int handleId, War3ID code, War3ID alias, Map localStore, CAbility sourceAbility, + public ABBuff(int handleId, War3ID code, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit) { super(handleId, code, alias); this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java index dc7aae75d..524a4bf12 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; @@ -23,7 +22,7 @@ public class ABBuffSlow extends ABGenericTimedBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias, Map localStore, + public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, final float duration, boolean leveled) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, false, false); if (STANDARD_ATTACK_DEBUFF == null) { @@ -38,7 +37,7 @@ public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias this.moveSpeedDebuff = STANDARD_MOVE_DEBUFF; } - public ABBuffSlow(final int handleId, final War3ID alias, Map localStore, CAbility sourceAbility, + public ABBuffSlow(final int handleId, final War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, final float duration, final float attackSpeedReductionPercent, final float moveSpeedReductionPercent, boolean leveled) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, false, false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java index 71078d6c5..2ec44830f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -19,7 +18,7 @@ public class ABBuffStun extends ABGenericTimedBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABBuffStun(final int handleId, final War3ID alias, Map localStore, CAbility sourceAbility, + public ABBuffStun(final int handleId, final War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, final float duration, final boolean leveled) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, false, false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java index 279765793..a5f92557c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; @@ -10,9 +9,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABDestructableBuff implements CDestructableBuff { - + protected static int TIMEDLIFE = 0b1; protected static int NEGATIVE = 0b10; protected static int DISPELLABLE = 0b100; @@ -26,7 +26,7 @@ public class ABDestructableBuff implements CDestructableBuff { private War3ID alias; private int level; - protected Map localStore; + protected LocalDataStore localStore; protected int castId = 0; private CUnit caster; @@ -34,8 +34,9 @@ public class ABDestructableBuff implements CDestructableBuff { private List onRemoveActions; private List onDeathActions; - public ABDestructableBuff(int handleId, War3ID alias, int level, Map localStore, List onAddActions, - List onRemoveActions, List onDeathActions, final int castId, CUnit caster, boolean dispellable) { + public ABDestructableBuff(int handleId, War3ID alias, int level, LocalDataStore localStore, + List onAddActions, List onRemoveActions, List onDeathActions, + final int castId, CUnit caster, boolean dispellable) { this.handleId = handleId; this.alias = alias; this.level = level; @@ -61,35 +62,35 @@ public War3ID getAlias() { @Override public void onAdd(CSimulation game, CDestructable dest) { - localStore.put(ABLocalStoreKeys.BUFFEDDEST+castId, this); + localStore.put(ABLocalStoreKeys.BUFFEDDEST + castId, this); if (onAddActions != null) { for (ABAction action : onAddActions) { action.runAction(game, this.caster, localStore, castId); } } - localStore.remove(ABLocalStoreKeys.BUFFEDDEST+castId); + localStore.remove(ABLocalStoreKeys.BUFFEDDEST + castId); } @Override public void onRemove(CSimulation game, CDestructable dest) { - localStore.put(ABLocalStoreKeys.BUFFEDDEST+castId, this); + localStore.put(ABLocalStoreKeys.BUFFEDDEST + castId, this); if (onRemoveActions != null) { for (ABAction action : onRemoveActions) { action.runAction(game, this.caster, localStore, castId); } } - localStore.remove(ABLocalStoreKeys.BUFFEDDEST+castId); + localStore.remove(ABLocalStoreKeys.BUFFEDDEST + castId); } @Override public void onDeath(CSimulation game, CDestructable dest) { - localStore.put(ABLocalStoreKeys.BUFFEDDEST+castId, this); + localStore.put(ABLocalStoreKeys.BUFFEDDEST + castId, this); if (onDeathActions != null) { for (ABAction action : onDeathActions) { action.runAction(game, this.caster, localStore, castId); } } - localStore.remove(ABLocalStoreKeys.BUFFEDDEST+castId); + localStore.remove(ABLocalStoreKeys.BUFFEDDEST + castId); } @Override @@ -101,7 +102,7 @@ public int getLevel() { public void setLevel(int level) { this.level = level; } - + public void setTimedLife(boolean timedLife) { this.flags = timedLife ? this.flags | TIMEDLIFE : this.flags & ~TIMEDLIFE; } @@ -110,7 +111,7 @@ public void setTimedLife(boolean timedLife) { public boolean isTimedLife() { return ((this.flags & TIMEDLIFE) != 0); } - + public void setPositive(boolean positive) { this.flags = positive ? this.flags & ~NEGATIVE : this.flags | NEGATIVE; } @@ -119,16 +120,16 @@ public void setPositive(boolean positive) { public boolean isPositive() { return ((this.flags & NEGATIVE) == 0); } - + public void setDispellable(boolean dispellable) { this.flags = dispellable ? this.flags | DISPELLABLE : this.flags & ~DISPELLABLE; } @Override public boolean isDispellable() { - return ((this.flags & DISPELLABLE) != 0); + return ((this.flags & DISPELLABLE) != 0); } - + public void setHero(boolean hero) { this.flags = hero ? this.flags | HERO : this.flags & ~HERO; } @@ -137,32 +138,32 @@ public void setHero(boolean hero) { public boolean isHero() { return ((this.flags & HERO) != 0); } - + public void setMagic(boolean magic) { this.flags = magic ? this.flags | MAGIC : this.flags & ~MAGIC; } @Override public boolean isMagic() { - return ((this.flags & MAGIC) != 0); + return ((this.flags & MAGIC) != 0); } - + public void setPhysical(boolean physical) { this.flags = physical ? this.flags | PHYSICAL : this.flags & ~PHYSICAL; } @Override public boolean isPhysical() { - return ((this.flags & PHYSICAL) != 0); + return ((this.flags & PHYSICAL) != 0); } - + public void setAura(boolean aura) { this.flags = aura ? this.flags | AURA : this.flags & ~AURA; } @Override public boolean isAura() { - return ((this.flags & AURA) != 0); + return ((this.flags & AURA) != 0); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java index e2e0ab16f..323d0d69f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -14,7 +13,7 @@ public class ABGenericArtBuff extends ABBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABGenericArtBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABGenericArtBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit) { super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setIconShowing(false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java index a4af957f7..304562e25 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java @@ -7,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; @@ -15,7 +16,7 @@ public class ABGenericAuraBuff extends ABBuff { private CUnit caster; - public ABGenericAuraBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABGenericAuraBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit caster, boolean leveled, boolean positive) { super(handleId, alias, alias, localStore, sourceAbility, caster); this.caster = caster; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java index 7e1b7eddd..f861f1b5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java @@ -1,15 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABGenericPermanentBuff extends ABBuff { - public ABGenericPermanentBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABGenericPermanentBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, boolean showIcon, boolean leveled, boolean positive) { super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setIconShowing(showIcon); @@ -17,7 +16,7 @@ public ABGenericPermanentBuff(int handleId, War3ID alias, Map lo this.setPositive(positive); } - public ABGenericPermanentBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABGenericPermanentBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, boolean leveled, boolean positive) { super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setLeveled(leveled); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java index 060b83f9d..b11ee6d36 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABGenericTimedBuff extends ABBuff { private final float duration; private int currentTick = 0; private int expireTick; - public ABGenericTimedBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABGenericTimedBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, boolean leveled, boolean positive, boolean dispellable) { super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); @@ -33,7 +32,8 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) return false; ABGenericTimedBuff other = (ABGenericTimedBuff) obj; - return this.getAlias() == other.getAlias() && this.getLevel() == other.getLevel() && !this.isStacks() && !other.isStacks(); + return this.getAlias() == other.getAlias() && this.getLevel() == other.getLevel() && !this.isStacks() + && !other.isStacks(); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java index 32486399c..91c283de7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -28,16 +28,16 @@ public class ABPermanentPassiveBuff extends ABGenericPermanentBuff { protected int castId = 0; public ABPermanentPassiveBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, - Map localStore, List onAddActions, List onRemoveActions, - boolean showIcon, final int castId, boolean leveled, boolean positive) { + LocalDataStore localStore, List onAddActions, List onRemoveActions, boolean showIcon, + final int castId, boolean leveled, boolean positive) { this(handleId, alias, sourceAbility, sourceUnit, localStore, onAddActions, onRemoveActions, castId, leveled, positive); this.setIconShowing(showIcon); } public ABPermanentPassiveBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, - Map localStore, List onAddActions, List onRemoveActions, - final int castId, boolean leveled, boolean positive) { + LocalDataStore localStore, List onAddActions, List onRemoveActions, final int castId, + boolean leveled, boolean positive) { super(handleId, alias, localStore, sourceAbility, sourceUnit, leveled, positive); this.onAddActions = onAddActions; this.onRemoveActions = onRemoveActions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java index 0f981d1ef..a104923b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABTargetingBuff extends ABBuff { - public ABTargetingBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABTargetingBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit) { super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setIconShowing(false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java index 54a89e62c..bf2d70ff9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -16,14 +15,14 @@ public class ABTimedArtBuff extends ABGenericTimedBuff { private SimulationRenderComponent lsfx; private CEffectType artType = CEffectType.TARGET; - public ABTimedArtBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABTimedArtBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showIcon, boolean leveled, boolean positive, boolean dispellable) { this(handleId, alias, localStore, sourceAbility, sourceUnit, duration, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedArtBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABTimedArtBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean leveled, boolean positive, boolean dispellable) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, positive, dispellable); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java index 55479a858..2877f9b7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; @@ -30,7 +30,7 @@ public class ABTimedBuff extends ABGenericTimedBuff { private List stateMods = null; private List statBuffs = null; - public ABTimedBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABTimedBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { @@ -39,7 +39,7 @@ public ABTimedBuff(int handleId, War3ID alias, Map localStore, C this.setIconShowing(showIcon); } - public ABTimedBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABTimedBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java index 640662698..bf3be7368 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderPassiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.DelayInstantTransformationTimer; @@ -24,7 +23,7 @@ public class ABTimedInstantTransformationBuff extends ABGenericTimedBuff { private float dur; private float transTime; - public ABTimedInstantTransformationBuff(int handleId, Map localStore, CAbility sourceAbility, + public ABTimedInstantTransformationBuff(int handleId, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderPassiveAbility ability, CUnitType newType, final boolean keepRatios, boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java index e6c2a7873..d43c4b976 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java @@ -1,27 +1,26 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABTimedPausedExpirationBuff extends ABTimedBuff implements CPausedTickingBuff { - public ABTimedPausedExpirationBuff(int handleId, War3ID alias, Map localStore, - CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, - List onAddActions, List onRemoveActions, List onExpireActions, - boolean showIcon, final int castId, final boolean leveled, final boolean positive, - final boolean dispellable) { + public ABTimedPausedExpirationBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, + List onRemoveActions, List onExpireActions, boolean showIcon, final int castId, + final boolean leveled, final boolean positive, final boolean dispellable) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, onRemoveActions, onExpireActions, showIcon, castId, leveled, positive, dispellable); } - public ABTimedPausedExpirationBuff(int handleId, War3ID alias, Map localStore, - CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, - List onAddActions, List onRemoveActions, List onExpireActions, - final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { + public ABTimedPausedExpirationBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, + List onRemoveActions, List onExpireActions, final int castId, final boolean leveled, + final boolean positive, final boolean dispellable) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, onRemoveActions, onExpireActions, castId, leveled, positive, dispellable); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java index 120bac8ec..cea200725 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABTimedTargetingBuff extends ABGenericTimedBuff { - public ABTimedTargetingBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABTimedTargetingBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, false, true, false); this.setIconShowing(false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java index 88c593f7d..3a8528dc4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,12 +8,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABTimedTickingBuff extends ABTimedBuff { private List onTickActions; - public ABTimedTickingBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABTimedTickingBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, @@ -24,7 +24,7 @@ public ABTimedTickingBuff(int handleId, War3ID alias, Map localS this.setIconShowing(showIcon); } - public ABTimedTickingBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, + public ABTimedTickingBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java index 0e4b48449..1d5ad9a87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -9,24 +8,24 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABTimedTickingPausedBuff extends ABTimedBuff implements CPausedTickingBuff { private List onTickActions; - public ABTimedTickingPausedBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, CUnit sourceUnit, - float duration, boolean showTimedLifeBar, List onAddActions, + public ABTimedTickingPausedBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - this(handleId, alias, localStore, - sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, + this(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedTickingPausedBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, CUnit sourceUnit, - float duration, boolean showTimedLifeBar, List onAddActions, + public ABTimedTickingPausedBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java index ece23a0c3..474a26ce0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java @@ -1,18 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABTimedTickingPostDeathBuff extends ABTimedTickingBuff { - public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, CUnit sourceUnit, - float duration, boolean showTimedLifeBar, List onAddActions, + public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { @@ -21,12 +21,11 @@ public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, Map localStore, CAbility sourceAbility, CUnit sourceUnit, - float duration, boolean showTimedLifeBar, List onAddActions, + public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { - super(handleId, alias, localStore, - sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, + super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, showTimedLifeBar, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, leveled, positive, dispellable); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java index f8c091cf5..b6bf5a902 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java @@ -1,7 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -12,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorFinishTransformation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.COrderStartTransformation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.DelayInstantTransformationTimer; @@ -34,12 +33,11 @@ public class ABTimedTransformationBuff extends ABGenericTimedBuff { private boolean imTakeOff; private boolean instantTransformation; - public ABTimedTransformationBuff(int handleId, Map localStore, CAbility sourceAbility, - CUnit sourceUnit, OnTransformationActions actions, War3ID alias, float duration, - AbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, boolean addAlternateTagAfter, - boolean permanent, float transformationDuration, float transformationTime, float landingDelay, - float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, boolean immediateLanding, - boolean immediateTakeoff) { + public ABTimedTransformationBuff(int handleId, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, + OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderAbility ability, + CUnitType newType, final boolean keepRatios, boolean addAlternateTagAfter, boolean permanent, + float transformationDuration, float transformationTime, float landingDelay, float altitudeAdjustmentDelay, + float altitudeAdjustmentDuration, boolean immediateLanding, boolean immediateTakeoff) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, true, false, true, false); this.setIconShowing(false); this.actions = actions; @@ -58,10 +56,9 @@ public ABTimedTransformationBuff(int handleId, Map localStore, C this.instantTransformation = false; } - public ABTimedTransformationBuff(int handleId, Map localStore, CAbility sourceAbility, - CUnit sourceUnit, OnTransformationActions actions, War3ID alias, float duration, - AbilityBuilderAbility ability, CUnitType newType, boolean addAlternateTagAfter, boolean permanent, - float transformationDuration) { + public ABTimedTransformationBuff(int handleId, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, + OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderAbility ability, + CUnitType newType, boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, true, false, true, false); this.setIconShowing(false); this.actions = actions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java index d81f56134..6732ea729 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public interface ABAction extends JassTextGeneratorStmt { - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java index 30c2bce97..4b778e920 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGeneratorExpr; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public interface ABCallback extends JassTextGeneratorExpr { - public Object callback(final CSimulation game, final CUnit caster, final Map localStore, + public Object callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java index 5aba705a9..7b19b8eed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; -import java.util.Map; - import com.etheller.warsmash.parsers.jass.JassTextGeneratorExpr; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABCondition extends ABBooleanCallback implements JassTextGeneratorExpr { - abstract public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, final int castId); + abstract public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/DataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/DataStore.java new file mode 100644 index 000000000..34dd25a9c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/DataStore.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore; + +import java.util.Collection; +import java.util.Set; + +public interface DataStore { + + public boolean containsKey(String key); + + public boolean containsValue(Object value); + + public Object get(String key); + + public Object getOrDefault(String key, Object def); + + public T get(String key, Class D); + + public T getOrDefault(String key, T def, Class D); + + public Object put(String key, Object value); + + public Object remove(String key); + + public void clear(); + + public Set keySet(); + + public Collection values(); + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/GlobalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/GlobalDataStore.java new file mode 100644 index 000000000..dcaf6e125 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/GlobalDataStore.java @@ -0,0 +1,82 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +public class GlobalDataStore implements DataStore { + public static GlobalDataStore INSTANCE = new GlobalDataStore(); + + private Map store; + + private GlobalDataStore() { + this.store = new HashMap<>(); + } + + @Override + public boolean containsKey(String key) { + return store.containsKey(key); + } + + @Override + public boolean containsValue(Object value) { + return store.containsValue(value); + } + + @Override + public Object get(String key) { + return store.get(key); + } + + @Override + public Object getOrDefault(String key, Object def) { + return store.getOrDefault(key, def); + } + + @SuppressWarnings("unchecked") + @Override + public T get(String key, Class D) { + Object val = store.get(key); + if (val != null && D.isAssignableFrom(val.getClass())) { + return (T) val; + } + return null; + } + + @SuppressWarnings("unchecked") + @Override + public T getOrDefault(String key, T def, Class D) { + Object val = store.getOrDefault(key, def); + if (val != null && D.isAssignableFrom(val.getClass())) { + return (T) val; + } + return null; + } + + @Override + public Object put(String key, Object value) { + return store.put(key, value); + } + + @Override + public Object remove(String key) { + return store.remove(key); + } + + @Override + public void clear() { + store.clear(); + } + + @Override + public Set keySet() { + return store.keySet(); + } + + @Override + public Collection values() { + return store.values(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/LocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/LocalDataStore.java new file mode 100644 index 000000000..62444287d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/LocalDataStore.java @@ -0,0 +1,5 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore; + +public abstract class LocalDataStore implements DataStore { + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/MapLocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/MapLocalDataStore.java new file mode 100644 index 000000000..eff2b85cb --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/MapLocalDataStore.java @@ -0,0 +1,79 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +public class MapLocalDataStore extends LocalDataStore { + private Map store; + + public MapLocalDataStore() { + this.store = new HashMap<>(); + } + + @Override + public boolean containsKey(String key) { + return store.containsKey(key); + } + + @Override + public boolean containsValue(Object value) { + return store.containsValue(value); + } + + @Override + public Object get(String key) { + return store.get(key); + } + + @Override + public Object getOrDefault(String key, Object def) { + return store.getOrDefault(key, def); + } + + @SuppressWarnings("unchecked") + @Override + public T get(String key, Class D) { + Object val = store.get(key); + if (val != null && D.isAssignableFrom(val.getClass())) { + return (T) val; + } + return null; + } + + @SuppressWarnings("unchecked") + @Override + public T getOrDefault(String key, T def, Class D) { + Object val = store.getOrDefault(key, def); + if (val != null && D.isAssignableFrom(val.getClass())) { + return (T) val; + } + return null; + } + + @Override + public Object put(String key, Object value) { + return store.put(key, value); + } + + @Override + public Object remove(String key) { + return store.remove(key); + } + + @Override + public void clear() { + store.clear(); + } + + @Override + public Set keySet() { + return store.keySet(); + } + + @Override + public Collection values() { + return store.values(); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java index aeff12f31..a12b9fa59 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event; import java.util.List; -import java.util.Map; import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; @@ -12,19 +11,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABGlobalWidgetEvent extends CGlobalWidgetEvent { private CSimulation game; private CUnit caster; - private Map localStore; + private LocalDataStore localStore; private int castId; private ABCondition condition; private List actions; - public ABGlobalWidgetEvent(CSimulation game, CUnit caster, Map localStore, int castId, + public ABGlobalWidgetEvent(CSimulation game, CUnit caster, LocalDataStore localStore, int castId, CWidget widget, JassGameEventsWar3 eventType, ABCondition condition, List actions) { super(game, game.getGlobalScope(), null, eventType, null); this.game = game; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java index b666e7030..943b0223a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event; import java.util.List; -import java.util.Map; import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerJass; @@ -19,13 +19,13 @@ public class ABPlayerEvent extends CPlayerEvent { private CSimulation game; private CUnit caster; - private Map localStore; + private LocalDataStore localStore; private int castId; private ABCondition condition; private List actions; - public ABPlayerEvent(CSimulation game, CUnit caster, Map localStore, int castId, CPlayerJass player, + public ABPlayerEvent(CSimulation game, CUnit caster, LocalDataStore localStore, int castId, CPlayerJass player, JassGameEventsWar3 eventType, ABCondition condition, List actions) { super(game.getGlobalScope(), player, null, eventType, null); this.game = game; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java index d1973bb1b..f68124293 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java @@ -1,19 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event; import java.util.List; -import java.util.Map; import java.util.Objects; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation.TimeOfDayEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABTimeOfDayEvent implements TimeOfDayEvent { private CSimulation game; private CUnit caster; - private Map localStore; + private LocalDataStore localStore; private int castId; private List actions; @@ -22,7 +22,7 @@ public class ABTimeOfDayEvent implements TimeOfDayEvent { private String equalityId; - public ABTimeOfDayEvent(CSimulation game, CUnit caster, Map localStore, int castId, + public ABTimeOfDayEvent(CSimulation game, CUnit caster, LocalDataStore localStore, int castId, List actions, float startTime, float endTime, String equalityId) { super(); this.game = game; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java index fe3e95402..99688cd35 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event; import java.util.List; -import java.util.Map; import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; @@ -11,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CWidgetEvent; @@ -18,13 +18,13 @@ public class ABWidgetEvent extends CWidgetEvent { private CSimulation game; private CUnit caster; - private Map localStore; + private LocalDataStore localStore; private int castId; private ABCondition condition; private List actions; - public ABWidgetEvent(CSimulation game, CUnit caster, Map localStore, int castId, CWidget widget, + public ABWidgetEvent(CSimulation game, CUnit caster, LocalDataStore localStore, int castId, CWidget widget, JassGameEventsWar3 eventType, ABCondition condition, List actions) { super(game.getGlobalScope(), widget, null, eventType, null); this.game = game; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java index a3ffa3d0f..4c08ea571 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java @@ -2,7 +2,6 @@ import java.util.EnumSet; import java.util.List; -import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; @@ -18,6 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTransformationBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.AltitudeAdjustmentTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.DelayTimerTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.TransformationMorphAnimationTimer; @@ -26,13 +26,13 @@ public class TransformationHandler { - public static void setUnitID(final CSimulation game, final Map localStore, final CUnit unit, + public static void setUnitID(final CSimulation game, final LocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final boolean addAlternateTagAfter, final OnTransformationActions actions, final CAbility ability) { setUnitID(game, localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability, false); } - public static void setUnitID(final CSimulation game, final Map localStore, final CUnit unit, + public static void setUnitID(final CSimulation game, final LocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final boolean addAlternateTagAfter, final OnTransformationActions actions, final CAbility ability, final boolean updateArt) { final CPlayer pl = game.getPlayer(unit.getPlayerIndex()); @@ -99,7 +99,7 @@ public static void setTags(final CUnit unit, final boolean addAlternateTagAfter) addAlternateTagAfter ? EnumSet.of(SecondaryTag.ALTERNATE) : SequenceUtils.EMPTY, 1.0f, true); } - public static void beginTakingOff(final CSimulation game, final Map localStore, final CUnit unit, + public static void beginTakingOff(final CSimulation game, final LocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final CAbility ability, final boolean addAlternateTagAfter, final boolean immediateTakeoff, final float altitudeAdjustmentDelay, final float altitudeAdjustmentDuration) { @@ -124,7 +124,7 @@ public static void beginTakingOff(final CSimulation game, final Map localStore, final CUnit unit, + public static void beginLanding(final CSimulation game, final LocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean addAlternateTagAfter, final boolean immediateLanding, final float landingDelay, final float altitudeAdjustmentDuration) { unit.setFacing(225); @@ -144,7 +144,7 @@ public static void beginLanding(final CSimulation game, final Map localStore, + public static void startSlowTransformation(final CSimulation game, final LocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final CAbility ability, final boolean addAlternateTagAfter, final boolean takingOff, final boolean landing, final boolean immediateTakeoff, final boolean immediateLanding, final float altitudeAdjustmentDelay, @@ -171,7 +171,7 @@ public static void startSlowTransformation(final CSimulation game, final Map localStore, + public static void finishSlowTransformation(final CSimulation game, final LocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final boolean addAlternateTagAfter, final boolean permanent, final boolean takingOff) { @@ -184,7 +184,7 @@ public static void finishSlowTransformation(final CSimulation game, final Map localStore, + public static void instantTransformation(final CSimulation game, final LocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final boolean addAlternateTagAfter, final boolean permanent, final boolean playMorph) { @@ -200,7 +200,7 @@ public static void instantTransformation(final CSimulation game, final Map localStore, + public static void createSlowTransformBackBuff(final CSimulation game, CUnit sourceUnit, final LocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, final float transformationTime, final float duration, final boolean permanent, final boolean takingOff, @@ -215,7 +215,7 @@ public static void createSlowTransformBackBuff(final CSimulation game, CUnit sou } } - public static void createInstantTransformBackBuff(final CSimulation game, CUnit sourceUnit, final Map localStore, + public static void createInstantTransformBackBuff(final CSimulation game, CUnit sourceUnit, final LocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, final float transformationTime, final float duration, final boolean permanent) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java index 173d270f8..b0a559b39 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java @@ -1,22 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs; import java.util.Comparator; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABUnitComparator implements Comparator { private CSimulation game; private CUnit caster; - private Map localStore; + private LocalDataStore localStore; private int castId; private ABIntegerCallback comparison; - public ABUnitComparator(final CSimulation game, final CUnit caster, final Map localStore, + public ABUnitComparator(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId, ABIntegerCallback comparison) { this.game = game; this.caster = caster; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java index e9a9abd70..1ca497884 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java @@ -3,7 +3,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Map; import com.etheller.interpreter.ast.execution.JassThread; import com.etheller.interpreter.ast.scope.GlobalScope; @@ -13,6 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionJass implements ABAction { private final CodeJassValue jassFunction; @@ -22,7 +22,7 @@ public ABActionJass(final CodeJassValue jassFunction) { } @Override - public void runAction(final CSimulation game, final CUnit caster, final Map localStore, + public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { final GlobalScope globalScope = game.getGlobalScope(); final JassThread thread = globalScope.createThread(this.jassFunction, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java index 5d646b27a..2668334e3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java @@ -3,13 +3,13 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Map; import com.etheller.interpreter.ast.scope.trigger.TriggerBooleanExpression; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABConditionJass extends ABCondition { private final TriggerBooleanExpression boolExpr; @@ -19,7 +19,7 @@ public ABConditionJass(final TriggerBooleanExpression boolExpr) { } @Override - public Boolean callback(final CSimulation game, final CUnit caster, final Map localStore, + public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, final int castId) { return this.boolExpr.evaluate(game.getGlobalScope(), CommonTriggerExecutionScope.abilityBuilder(caster, localStore, castId)); @@ -28,8 +28,7 @@ public Boolean callback(final CSimulation game, final CUnit caster, final Map wrap(final TriggerBooleanExpression jassFunction) { if (jassFunction == null) { return Collections.emptyList(); - } - else { + } else { return Arrays.asList(new ABConditionJass(jassFunction)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java index c908db6cd..b31058b5f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,16 +8,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.listeners.CUnitAbilityEffectReactionListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABAbilityEffectReactionListener implements CUnitAbilityEffectReactionListener { - private Map localStore; + private LocalDataStore localStore; private List actions; private int triggerId = 0; private boolean useCastId; - public ABAbilityEffectReactionListener(Map localStore, List actions, int castId, boolean useCastId) { + public ABAbilityEffectReactionListener(LocalDataStore localStore, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java index da41fbf69..8bad56d43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java @@ -1,24 +1,24 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.listeners.CUnitAbilityProjReactionListener; public class ABAbilityProjReactionListener implements CUnitAbilityProjReactionListener { - private Map localStore; + private LocalDataStore localStore; private List actions; private int triggerId = 0; private boolean useCastId; - public ABAbilityProjReactionListener(Map localStore, List actions, int castId, boolean useCastId) { + public ABAbilityProjReactionListener(LocalDataStore localStore, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java index 9dbbf82f2..ed7adaabb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java @@ -1,24 +1,24 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackEvasionListener; public class ABAttackEvasionListener implements CUnitAttackEvasionListener { - private Map localStore; + private LocalDataStore localStore; private List conditions; private int triggerId = 0; private boolean useCastId; - public ABAttackEvasionListener(Map localStore, List conditions, int castId, boolean useCastId) { + public ABAttackEvasionListener(LocalDataStore localStore, List conditions, int castId, boolean useCastId) { this.localStore = localStore; this.conditions = conditions; this.useCastId = useCastId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java index 1de30fe7b..95af86483 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -10,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; @@ -22,11 +22,11 @@ public class ABAttackModifier implements CUnitAttackModifier { private ABCondition condition; private List modification; - private Map localStore; + private LocalDataStore localStore; private int castId = Integer.MAX_VALUE; private boolean useCastId; - public ABAttackModifier(Map localStore, int castId, ABIntegerCallback priority, + public ABAttackModifier(LocalDataStore localStore, int castId, ABIntegerCallback priority, ABCondition preLaunchCondition, List preLaunchModification, ABCondition condition, List modification, boolean useCastId) { this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java index 91c2be28e..0252559c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -9,20 +8,21 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPostDamageListener; public class ABAttackPostDamageListener implements CUnitAttackPostDamageListener { - private Map localStore; + private LocalDataStore localStore; private ABIntegerCallback priority; private List actions; private int triggerId = 0; private boolean useCastId; - public ABAttackPostDamageListener(Map localStore, ABIntegerCallback priority, List actions, int castId, boolean useCastId) { + public ABAttackPostDamageListener(LocalDataStore localStore, ABIntegerCallback priority, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.priority = priority; this.actions = actions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java index 1edd5b2dd..aeea044f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListener; @@ -15,13 +15,13 @@ public class ABAttackPreDamageListener implements CUnitAttackPreDamageListener { - private Map localStore; + private LocalDataStore localStore; private List actions; private int triggerId = 0; private boolean useCastId; - public ABAttackPreDamageListener(Map localStore, List actions, int castId, + public ABAttackPreDamageListener(LocalDataStore localStore, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.actions = actions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java index ab29993eb..1a8893602 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java @@ -1,24 +1,25 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.listeners.CUnitAttackProjReactionListener; public class ABAttackProjReactionListener implements CUnitAttackProjReactionListener { - private Map localStore; + private LocalDataStore localStore; private List actions; - + private int triggerId = 0; private boolean useCastId; - - public ABAttackProjReactionListener(Map localStore, List actions, int castId, boolean useCastId) { + + public ABAttackProjReactionListener(LocalDataStore localStore, List actions, int castId, + boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; @@ -26,25 +27,25 @@ public ABAttackProjReactionListener(Map localStore, List localStore; + private LocalDataStore localStore; private List actions; - + private int triggerId = 0; private boolean useCastId; - - public ABBehaviorChangeListener(Map localStore, List actions, int castId, boolean useCastId) { + + public ABBehaviorChangeListener(LocalDataStore localStore, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; @@ -26,20 +26,21 @@ public ABBehaviorChangeListener(Map localStore, List a this.triggerId = castId; } } - + @Override - public void onChange(CSimulation game, CUnit unit, CBehavior previousBehavior, CBehavior newBehavior, boolean ongoing) { - localStore.put(ABLocalStoreKeys.PRECHANGEBEHAVIOR+triggerId, previousBehavior); - localStore.put(ABLocalStoreKeys.POSTCHANGEBEHAVIOR+triggerId, newBehavior); - localStore.put(ABLocalStoreKeys.BEHAVIORONGOING+triggerId, ongoing); + public void onChange(CSimulation game, CUnit unit, CBehavior previousBehavior, CBehavior newBehavior, + boolean ongoing) { + localStore.put(ABLocalStoreKeys.PRECHANGEBEHAVIOR + triggerId, previousBehavior); + localStore.put(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + triggerId, newBehavior); + localStore.put(ABLocalStoreKeys.BEHAVIORONGOING + triggerId, ongoing); if (actions != null) { for (ABAction action : actions) { action.runAction(game, unit, localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.PRECHANGEBEHAVIOR+triggerId); - localStore.remove(ABLocalStoreKeys.POSTCHANGEBEHAVIOR+triggerId); - localStore.remove(ABLocalStoreKeys.BEHAVIORONGOING+triggerId); + localStore.remove(ABLocalStoreKeys.PRECHANGEBEHAVIOR + triggerId); + localStore.remove(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + triggerId); + localStore.remove(ABLocalStoreKeys.BEHAVIORONGOING + triggerId); if (!this.useCastId) { this.triggerId++; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java index e3c4390a5..3819f527a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java @@ -1,27 +1,27 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenListener; public class ABDamageTakenListener implements CUnitAttackDamageTakenListener { - private Map localStore; + private LocalDataStore localStore; private ABIntegerCallback priority; private List actions; - + private int triggerId = 0; private boolean useCastId; - - public ABDamageTakenListener(Map localStore, - ABIntegerCallback priority, List actions, int castId, boolean useCastId) { + + public ABDamageTakenListener(LocalDataStore localStore, ABIntegerCallback priority, List actions, + int castId, boolean useCastId) { this.localStore = localStore; this.priority = priority; this.actions = actions; @@ -36,29 +36,29 @@ public int getPriority(CSimulation simulation, CUnit target, CDamageCalculation if (priority == null) { return 0; } - localStore.put(ABLocalStoreKeys.DAMAGINGUNIT+triggerId, damage.getSource()); - localStore.put(ABLocalStoreKeys.DAMAGEDUNIT+triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGECALC+triggerId, damage); + localStore.put(ABLocalStoreKeys.DAMAGINGUNIT + triggerId, damage.getSource()); + localStore.put(ABLocalStoreKeys.DAMAGEDUNIT + triggerId, target); + localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); int prio = this.priority.callback(simulation, target, this.localStore, this.triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGECALC+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT + triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); return prio; } - + @Override public void onDamage(CSimulation simulation, CUnit target, CDamageCalculation damage) { - localStore.put(ABLocalStoreKeys.DAMAGINGUNIT+triggerId, damage.getSource()); - localStore.put(ABLocalStoreKeys.DAMAGEDUNIT+triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGECALC+triggerId, damage); + localStore.put(ABLocalStoreKeys.DAMAGINGUNIT + triggerId, damage.getSource()); + localStore.put(ABLocalStoreKeys.DAMAGEDUNIT + triggerId, target); + localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); if (actions != null) { for (ABAction action : actions) { action.runAction(simulation, target, localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGECALC+triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT + triggerId); + localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); if (!this.useCastId) { this.triggerId++; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java index e9508cf76..56b3e5366 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java @@ -1,26 +1,26 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListener; public class ABDamageTakenModificationListener implements CUnitAttackDamageTakenModificationListener { - private Map localStore; + private LocalDataStore localStore; private ABIntegerCallback priority; private List actions; private int triggerId = 0; private boolean useCastId; - public ABDamageTakenModificationListener(Map localStore, ABIntegerCallback priority, + public ABDamageTakenModificationListener(LocalDataStore localStore, ABIntegerCallback priority, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.priority = priority; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java index 5e898bb0e..75c3a8daf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java @@ -1,25 +1,25 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; public class ABDeathReplacementEffect implements CUnitDeathReplacementEffect { - private Map localStore; + private LocalDataStore localStore; private List actions; - + private int triggerId = 0; private boolean useCastId; - - public ABDeathReplacementEffect(Map localStore, List actions, int castId, boolean useCastId) { + + public ABDeathReplacementEffect(LocalDataStore localStore, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; @@ -31,20 +31,20 @@ public ABDeathReplacementEffect(Map localStore, List a @Override public CUnitDeathReplacementStacking onDeath(CSimulation simulation, CUnit unit, CUnit killer, CUnitDeathReplacementResult result) { - localStore.put(ABLocalStoreKeys.KILLINGUNIT+triggerId, killer); - localStore.put(ABLocalStoreKeys.DYINGUNIT+triggerId, unit); - localStore.put(ABLocalStoreKeys.DEATHRESULT+triggerId, result); + localStore.put(ABLocalStoreKeys.KILLINGUNIT + triggerId, killer); + localStore.put(ABLocalStoreKeys.DYINGUNIT + triggerId, unit); + localStore.put(ABLocalStoreKeys.DEATHRESULT + triggerId, result); CUnitDeathReplacementStacking stacking = new CUnitDeathReplacementStacking(); - localStore.put(ABLocalStoreKeys.DEATHSTACKING+triggerId, stacking); + localStore.put(ABLocalStoreKeys.DEATHSTACKING + triggerId, stacking); if (actions != null) { for (ABAction action : actions) { action.runAction(simulation, unit, localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.KILLINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.DYINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.DEATHRESULT+triggerId); - localStore.remove(ABLocalStoreKeys.DEATHSTACKING+triggerId); + localStore.remove(ABLocalStoreKeys.KILLINGUNIT + triggerId); + localStore.remove(ABLocalStoreKeys.DYINGUNIT + triggerId); + localStore.remove(ABLocalStoreKeys.DEATHRESULT + triggerId); + localStore.remove(ABLocalStoreKeys.DEATHSTACKING + triggerId); if (!this.useCastId) { this.triggerId++; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java index b8330082c..fc6d680c8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java @@ -1,19 +1,19 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitStateListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABUnitStateListener implements CUnitStateListener { private CSimulation game; private CUnit caster; - private Map localStore; + private LocalDataStore localStore; private int castId; - + private List onLifeChanged = null; private List onManaChanged = null; private List onOrdersChanged = null; @@ -26,8 +26,8 @@ public class ABUnitStateListener implements CUnitStateListener { private List onAbilitiesChanged = null; private List onUpgradesChanged = null; private List onHideStateChanged = null; - - public ABUnitStateListener(CSimulation game, CUnit caster, Map localStore, int castId, + + public ABUnitStateListener(CSimulation game, CUnit caster, LocalDataStore localStore, int castId, List onLifeChanged, List onManaChanged, List onOrdersChanged, List onQueueChanged, List onRallyPointChanged, List onWaypointsChanged, List onHeroStatsChanged, List onInventoryChanged, List onAttacksChanged, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java index 2f6f71ede..1aecb8c6d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java @@ -13,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -24,11 +25,11 @@ public class ABCollisionProjectileListener implements CAbilityCollisionProjectil private List onHit; private CUnit caster; - private Map localStore; + private LocalDataStore localStore; private int castId; public ABCollisionProjectileListener(List onLaunch, List onPreHits, List canHitTarget, List onHit, CUnit caster, - Map localStore, int castId) { + LocalDataStore localStore, int castId) { super(); this.onLaunch = onLaunch; this.onPreHits = onPreHits; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java index a285a3db1..c6ad63884 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -11,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -20,11 +20,11 @@ public class ABProjectileListener implements CAbilityProjectileListener { private List onHit; private CUnit caster; - private Map localStore; + private LocalDataStore localStore; private int castId; public ABProjectileListener(List onLaunch, List onHit, CUnit caster, - Map localStore, int castId) { + LocalDataStore localStore, int castId) { super(); this.onLaunch = onLaunch; this.onHit = onHit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java index 41196f97b..d82c4c559 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java @@ -1,23 +1,23 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABTimer extends CTimer { private CUnit caster; - private Map localStore; + private LocalDataStore localStore; private List actions; private int castId = 0; private boolean alive = true; - public ABTimer(CUnit caster, Map localStore, List actions, final int castId) { + public ABTimer(CUnit caster, LocalDataStore localStore, List actions, final int castId) { super(); this.caster = caster; this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java index df6428d43..23ac9eb6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java @@ -1,19 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer; -import java.util.Map; - import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class DelayInstantTransformationTimer extends CTimer { private CUnit sourceUnit; - private Map localStore; + private LocalDataStore localStore; private OnTransformationActions actions; private CUnit unit; private boolean addAlternateTagAfter; @@ -26,7 +25,7 @@ public class DelayInstantTransformationTimer extends CTimer { private float transTime; private float dur; - public DelayInstantTransformationTimer(CSimulation game, CUnit sourceUnit, Map localStore, CUnit unit, + public DelayInstantTransformationTimer(CSimulation game, CUnit sourceUnit, LocalDataStore localStore, CUnit unit, OnTransformationActions actions, boolean addAlternateTagAfter, float delay, CUnitType baseType, CUnitType targetType, final boolean keepRatios, AbilityBuilderAbility ability, War3ID buffId, float transformationTime, float duration) { @@ -51,8 +50,9 @@ public void onFire(CSimulation game) { TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, false); if (dur > 0) { - TransformationHandler.createInstantTransformBackBuff(game, sourceUnit, localStore, unit, baseType, keepRatios, - actions.createUntransformActions(), abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); + TransformationHandler.createInstantTransformBackBuff(game, sourceUnit, localStore, unit, baseType, + keepRatios, actions.createUntransformActions(), abil, theBuffId, addAlternateTagAfter, transTime, + dur, perm); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayTimerTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayTimerTimer.java index 310823b5b..6eef39e76 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayTimerTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayTimerTimer.java @@ -1,17 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer; -import java.util.Map; - import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class DelayTimerTimer extends CTimer { private CTimer timer; - Map localStore; + LocalDataStore localStore; - public DelayTimerTimer(CTimer timer, Map localStore, float delay) { + public DelayTimerTimer(CTimer timer, LocalDataStore localStore, float delay) { super(); this.timer = timer; this.localStore = localStore; @@ -23,5 +22,5 @@ public void onFire(CSimulation game) { localStore.put(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT, timer); timer.start(game); } - + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilder.java index c0ffdc913..6fda8b9da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilder.java @@ -1,8 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl; -import java.util.HashMap; import java.util.List; -import java.util.Map; import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.util.War3ID; @@ -14,6 +12,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.MapLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; public class CAbilityTypeAbilityBuilder extends CAbilityType { @@ -29,7 +29,7 @@ public CAbilityTypeAbilityBuilder(War3ID alias, War3ID code, GameObject abilityE @Override public CAbility createAbility(int handleId) { - Map localStore = new HashMap<>(); + LocalDataStore localStore = new MapLocalDataStore(); localStore.put(ABLocalStoreKeys.ABILITYEDITORDATA, this.abilityEditorData); localStore.put(ABLocalStoreKeys.LEVELDATA, getLevelData()); localStore.put(ABLocalStoreKeys.CURRENTLEVEL, 1); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityTemplateBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityTemplateBuilder.java index f5eedbca7..22e6413e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityTemplateBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityTemplateBuilder.java @@ -1,8 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl; -import java.util.HashMap; import java.util.List; -import java.util.Map; import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.util.War3ID; @@ -16,6 +14,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.CAbilityAbilityBuilderStatAuraTemplate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.CAbilityAbilityBuilderStatPassiveTemplate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.MapLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParser; public class CAbilityTypeAbilityTemplateBuilder extends CAbilityType { @@ -31,7 +31,7 @@ public CAbilityTypeAbilityTemplateBuilder(War3ID alias, War3ID code, GameObject @Override public CAbility createAbility(int handleId) { - Map localStore = new HashMap<>(); + LocalDataStore localStore = new MapLocalDataStore(); localStore.put(ABLocalStoreKeys.ABILITYEDITORDATA, this.abilityEditorData); localStore.put(ABLocalStoreKeys.LEVELDATA, getLevelData()); localStore.put(ABLocalStoreKeys.CURRENTLEVEL, 1); From 1878bfca67e8ceffab0eee91176bbc32ea6d4c45 Mon Sep 17 00:00:00 2001 From: Glasir Date: Fri, 12 Dec 2025 02:36:57 -0500 Subject: [PATCH 33/44] Major AB Refactor: Part 2 - CSimulation * With the LocalStore being a proper class, it can now hold extra data - in this case, the CSimulation * This allows for simplification of the AB method signatures --- .../etheller/warsmash/parsers/jass/Jass2.java | 4 +- ...AbilityAbilityBuilderActiveAutoTarget.java | 2 +- ...AbilityAbilityBuilderActiveFlexTarget.java | 6 +- .../CAbilityAbilityBuilderActiveNoTarget.java | 2 +- .../CAbilityAbilityBuilderActivePairing.java | 37 +++-- .../CAbilityAbilityBuilderGenericActive.java | 134 ++++++++---------- .../ability/CAbilityAbilityBuilderNoIcon.java | 29 ++-- .../CAbilityAbilityBuilderPassive.java | 33 ++--- .../CAbilityAbilityBuilderAuraTemplate.java | 6 +- .../CBehaviorFinishTransformation.java | 21 ++- .../behavior/action/ABActionAddAbility.java | 10 +- .../behavior/action/ABActionAddSlowBuff.java | 16 +-- .../behavior/action/ABActionAddStunBuff.java | 16 +-- .../action/ABActionCleanUpCastInstance.java | 4 +- .../action/ABActionCreateAbilityFromId.java | 10 +- .../action/ABActionDeleteStoredKey.java | 6 +- .../ABActionPrepUnownedAbilityForUse.java | 12 +- .../action/ABActionRemoveAbility.java | 10 +- .../ABActionAbilityAddUniqueFlag.java | 8 +- .../ABActionAbilityAttemptToApplyEffect.java | 20 ++- .../ABActionAbilityRemoveUniqueFlag.java | 8 +- .../ABActionAbilityRemoveUniqueValue.java | 8 +- .../ABActionAbilityRunEndCastingActions.java | 20 ++- .../abilities/ABActionAbilitySetShowIcon.java | 10 +- .../ABActionAbilityStoreUniqueValue.java | 10 +- .../ABActionActivateToggledAbility.java | 6 +- .../ability/ABActionAddTargetAllowed.java | 4 +- .../ability/ABActionBeginChanneling.java | 4 +- .../ability/ABActionClickDisableAbility.java | 6 +- .../ability/ABActionClickEnableAbility.java | 6 +- .../ABActionDeactivateToggledAbility.java | 6 +- .../ability/ABActionDisableAbility.java | 6 +- .../ability/ABActionDisableAbilityById.java | 8 +- .../action/ability/ABActionEnableAbility.java | 6 +- .../ability/ABActionEnableAbilityById.java | 8 +- .../ability/ABActionFinishChanneling.java | 4 +- .../ability/ABActionRemoveTargetAllowed.java | 4 +- .../action/ability/ABActionResetCooldown.java | 12 +- .../ABActionSendStartCastingEvents.java | 14 +- .../ability/ABActionSetAbilityCastRange.java | 6 +- .../ABActionSetAutoTargetDestructable.java | 6 +- .../ability/ABActionSetAutoTargetUnit.java | 6 +- .../ability/ABActionSetPreventEndEvents.java | 4 +- .../action/ability/ABActionStartCooldown.java | 16 +-- .../attack/ABActionAddAttackModifier.java | 8 +- .../attack/ABActionCreateAttackModifier.java | 6 +- .../attack/ABActionFireModifiedAttack.java | 28 ++-- .../attack/ABActionRemoveAttackModifier.java | 8 +- .../attack/ABActionStartModifiedAttack.java | 26 ++-- ...ABActionAttackModifierAddAnimationTag.java | 6 +- ...onAttackModifierAddPostDamageListener.java | 6 +- ...ionAttackModifierAddPreDamageListener.java | 6 +- ...ActionAttackModifierApplyAllArtFields.java | 6 +- .../ABActionAttackModifierApplyArt.java | 6 +- ...BActionAttackModifierApplyArtAndSpeed.java | 6 +- ...ActionAttackModifierApplyDefaultSpeed.java | 4 +- ...tackModifierPreventOtherModifications.java | 4 +- ...PreventOtherSamePriorityModifications.java | 4 +- ...ctionAttackModifierRemoveAnimationTag.java | 6 +- ...ttackModifierRemovePostDamageListener.java | 6 +- ...AttackModifierRemovePreDamageListener.java | 6 +- .../ABActionAttackModifierSetAttackArc.java | 6 +- ...ctionAttackModifierSetAttackDeathTime.java | 6 +- ...ABActionAttackModifierSetAttackHoming.java | 6 +- ...BActionAttackModifierSetAttackImpactZ.java | 6 +- ...ABActionAttackModifierSetAttackStartZ.java | 6 +- ...ABActionAttackModifierSetSplashFields.java | 14 +- ...ABCallbackGetModifiedAttackAttackType.java | 3 +- ...ABCallbackGetModifiedAttackDamageType.java | 3 +- ...ABCallbackGetModifiedAttackWeaponType.java | 3 +- ...ctionAttemptToReOrderPreviousBehavior.java | 9 +- ...ActionAttemptToResumePreviousBehavior.java | 5 +- .../behavior/action/buff/ABActionAddBuff.java | 9 +- .../ABActionAddNonStackingDisplayBuff.java | 10 +- .../buff/ABActionBuffAddUniqueFlag.java | 8 +- .../buff/ABActionBuffRemoveUniqueFlag.java | 8 +- .../buff/ABActionBuffRemoveUniqueValue.java | 8 +- .../buff/ABActionBuffStoreUniqueValue.java | 8 +- .../buff/ABActionCreatePassiveBuff.java | 31 ++-- .../buff/ABActionCreateTargetingBuff.java | 12 +- .../buff/ABActionCreateTimedArtBuff.java | 34 ++--- .../action/buff/ABActionCreateTimedBuff.java | 44 +++--- .../buff/ABActionCreateTimedLifeBuff.java | 11 +- ...ActionCreateTimedPausedExpirationBuff.java | 44 +++--- .../ABActionCreateTimedTargetingBuff.java | 16 +-- .../buff/ABActionCreateTimedTickingBuff.java | 47 +++--- .../ABActionCreateTimedTickingPausedBuff.java | 47 +++--- ...ActionCreateTimedTickingPostDeathBuff.java | 45 +++--- .../action/buff/ABActionRemoveBuff.java | 9 +- .../ABActionRemoveNonStackingDisplayBuff.java | 10 +- .../ABActionAddDestructableBuff.java | 8 +- .../ABActionCreateDestructable.java | 15 +- .../ABActionCreateDestructableBuff.java | 10 +- .../ABActionDamageDestructable.java | 18 ++- .../ABActionDispelDestructableBuffs.java | 11 +- ...IterateDestructablesInRangeOfLocation.java | 12 +- .../ABActionKillDestructable.java | 6 +- .../ABActionRemoveDestructable.java | 6 +- .../ABActionRemoveDestructableBuff.java | 8 +- .../ABActionCreateTimeOfDayEvent.java | 13 +- .../ABActionRegisterTimeOfDayEvent.java | 6 +- .../ABActionRegisterUniqueTimeOfDayEvent.java | 10 +- .../ABActionUnregisterTimeOfDayEvent.java | 6 +- .../widget/ABActionCreateWidgetEvent.java | 8 +- .../widget/ABActionRegisterWidgetEvent.java | 6 +- .../widget/ABActionUnregisterWidgetEvent.java | 6 +- .../ABActionCreateFloatingTextOnUnit.java | 8 +- ...ActionCreateNumericFloatingTextOnUnit.java | 8 +- .../ABActionCreateGroupEffectAtLocation.java | 12 +- .../fx/ABActionCreateLightningEffect.java | 22 ++- ...ionCreateLoopingSoundEffectAtLocation.java | 10 +- ...BActionCreateLoopingSoundEffectOnUnit.java | 9 +- .../ABActionCreateSoundEffectAtLocation.java | 10 +- .../fx/ABActionCreateSoundEffectOnUnit.java | 9 +- .../ABActionCreateSpellEffectAtLocation.java | 12 +- .../fx/ABActionCreateSpellEffectAtPoint.java | 12 +- .../fx/ABActionCreateSpellEffectOnUnit.java | 18 +-- ...nCreateTemporarySpellEffectAtLocation.java | 12 +- ...tionCreateTemporarySpellEffectAtPoint.java | 12 +- ...ctionCreateTemporarySpellEffectOnUnit.java | 8 +- .../ABActionCreateTerrainBowlAtLocation.java | 32 ++--- ...ABActionCreateTerrainRippleAtLocation.java | 32 ++--- .../ABActionCreateTerrainWaveAtLocation.java | 24 ++-- .../action/fx/ABActionCreateUberSplat.java | 9 +- .../fx/ABActionModifyTerrainVertex.java | 8 +- .../action/fx/ABActionRemoveEffect.java | 6 +- .../fx/ABActionRemoveLightningEffect.java | 6 +- .../gamestate/ABActionSetFalseTimeOfDay.java | 10 +- .../action/item/ABActionChargeItem.java | 12 +- .../action/item/ABActionTransformItem.java | 10 +- .../action/list/ABActionListRemove.java | 10 +- .../action/list/ABActionLocationListAdd.java | 12 +- .../list/ABActionSortableListRemove.java | 10 +- .../player/ABActionGiveResourcesToPlayer.java | 10 +- .../ABActionSetAbilityEnabledForPlayer.java | 10 +- ...teLocationTargetedCollisionProjectile.java | 34 +++-- ...ctionCreateLocationTargetedProjectile.java | 16 +-- ...reateLocationTargetedPseudoProjectile.java | 38 +++-- ...nCreateUnitTargetedBouncingProjectile.java | 70 +++++---- ...CreateUnitTargetedCollisionProjectile.java | 34 +++-- .../ABActionCreateUnitTargetedProjectile.java | 18 ++- ...ionCreateUnitTargetedPseudoProjectile.java | 45 +++--- .../ABActionSetAttackProjectileDamage.java | 8 +- .../projectile/ABActionSetProjectileDone.java | 8 +- .../ABActionSetProjectileReflected.java | 8 +- .../ABActionSetProjectileTarget.java | 8 +- .../action/stats/ABActionAddDefenseBonus.java | 12 +- .../stats/ABActionAddNonStackingStatBuff.java | 9 +- .../ABActionCreateNonStackingStatBuff.java | 10 +- .../ABActionRecomputeStatBuffsOnUnit.java | 10 +- .../stats/ABActionRemoveDefenseBonus.java | 12 +- .../ABActionRemoveNonStackingStatBuff.java | 8 +- .../ABActionUpdateNonStackingStatBuff.java | 8 +- .../action/structural/ABActionBreak.java | 4 +- .../structural/ABActionChainEffect.java | 55 ++++--- .../structural/ABActionCreateSubroutine.java | 10 +- .../action/structural/ABActionFor.java | 10 +- .../action/structural/ABActionIf.java | 10 +- .../ABActionIterateUnitsInGroup.java | 8 +- .../ABActionIterateUnitsInQueue.java | 8 +- ...itsInRangeOfLocationMatchingCondition.java | 19 ++- ...geOfLocationMatchingConditionWithSort.java | 16 +-- ...teUnitsInRangeOfUnitMatchingCondition.java | 14 +- ...nRangeOfUnitMatchingConditionWithSort.java | 16 +-- .../ABActionIterateUnitsInRect.java | 8 +- .../structural/ABActionPeriodicExecute.java | 18 ++- .../ABActionResetPeriodicExecute.java | 5 +- .../structural/ABActionRunReuseAction.java | 8 +- .../ABActionRunReuseActionWithArguments.java | 8 +- .../structural/ABActionRunSubroutine.java | 12 +- .../structural/ABActionStoreValueLocally.java | 14 +- .../action/structural/ABActionWhile.java | 8 +- .../action/timer/ABActionCreateTimer.java | 18 ++- .../action/timer/ABActionKillTimer.java | 6 +- .../action/timer/ABActionRemoveTimer.java | 6 +- .../action/timer/ABActionStartTimer.java | 8 +- .../timer/ABActionUpdateTimerTimeout.java | 8 +- .../behavior/action/unit/ABActionAddMp.java | 11 +- .../action/unit/ABActionAddNewAbility.java | 12 +- .../action/unit/ABActionAddRallyAbility.java | 8 +- .../ABActionChangeAttackActionToMovement.java | 9 +- .../ABActionCheckAbilityEffectReaction.java | 37 +++-- .../ABActionCheckAbilityProjReaction.java | 14 +- .../action/unit/ABActionCreateUnit.java | 21 ++- .../action/unit/ABActionDamageArea.java | 59 ++++---- .../unit/ABActionDamageAttackSplash.java | 112 +++++++-------- .../action/unit/ABActionDamageBurst.java | 87 ++++++------ .../action/unit/ABActionDamageSplash.java | 108 +++++++------- .../action/unit/ABActionDamageTarget.java | 29 ++-- .../unit/ABActionDisableWorkerAbilities.java | 7 +- .../action/unit/ABActionDispelBuffs.java | 11 +- .../unit/ABActionEnableWorkerAbilities.java | 7 +- .../ABActionForceBeginCreatedBehavior.java | 7 +- .../behavior/action/unit/ABActionHeal.java | 14 +- .../action/unit/ABActionHideUnit.java | 5 +- .../unit/ABActionInstantReturnResources.java | 13 +- .../action/unit/ABActionIssueStopOrder.java | 7 +- .../action/unit/ABActionKillUnit.java | 7 +- .../action/unit/ABActionMergeUnits.java | 27 ++-- .../unit/ABActionMultiplyUnitScale.java | 7 +- .../action/unit/ABActionRemoveUnit.java | 7 +- .../action/unit/ABActionResurrect.java | 7 +- .../unit/ABActionSendUnitBackToWork.java | 8 +- .../unit/ABActionSetExplodesOnDeath.java | 9 +- .../behavior/action/unit/ABActionSetHp.java | 15 +- .../behavior/action/unit/ABActionSetMp.java | 11 +- .../action/unit/ABActionSetSpeed.java | 7 +- .../unit/ABActionStartSacrificingUnit.java | 9 +- .../unit/ABActionStartTrainingUnit.java | 7 +- .../action/unit/ABActionSubtractMp.java | 11 +- .../action/unit/ABActionTransformUnit.java | 55 ++++--- .../unit/ABActionTransformUnitAppearance.java | 7 +- .../unit/ABActionTransformUnitInstant.java | 43 +++--- .../ABActionTransformedUnitAbilityAdd.java | 49 ++++--- .../ABActionTransformedUnitAbilityRemove.java | 21 ++- .../action/unit/ABActionUnhideUnit.java | 5 +- .../ABActionAddSecondaryAnimationTag.java | 8 +- .../unit/animation/ABActionPlayAnimation.java | 13 +- .../animation/ABActionQueueAnimation.java | 9 +- .../ABActionRemoveSecondaryAnimationTag.java | 8 +- .../unit/art/ABActionDivideUnitAlpha.java | 11 +- .../unit/art/ABActionMultiplyUnitAlpha.java | 11 +- .../action/unit/art/ABActionSetUnitAlpha.java | 11 +- .../movement/ABActionSetUnitFlyHeight.java | 7 +- ...BActionSetUnitMovementTypeNoCollision.java | 7 +- .../unitgroup/ABActionAddUnitToGroup.java | 8 +- .../unitgroup/ABActionCreateUnitGroup.java | 4 +- .../ABActionRemoveUnitFromGroup.java | 8 +- ...ctionAddAbilityEffectReactionListener.java | 8 +- ...BActionAddAbilityProjReactionListener.java | 8 +- .../ABActionAddAttackPostDamageListener.java | 9 +- .../ABActionAddAttackPreDamageListener.java | 10 +- ...ABActionAddAttackProjReactionListener.java | 9 +- .../ABActionAddBehaviorChangeListener.java | 9 +- .../ABActionAddDamageTakenListener.java | 9 +- ...ionAddDamageTakenModificationListener.java | 9 +- .../ABActionAddDeathReplacementEffect.java | 9 +- .../ABActionAddEvasionListener.java | 9 +- .../ABActionAddUnitStateListener.java | 9 +- ...onCreateAbilityEffectReactionListener.java | 6 +- ...tionCreateAbilityProjReactionListener.java | 6 +- ...BActionCreateAttackPostDamageListener.java | 6 +- ...ABActionCreateAttackPreDamageListener.java | 6 +- ...ctionCreateAttackProjReactionListener.java | 6 +- .../ABActionCreateBehaviorChangeListener.java | 6 +- .../ABActionCreateDamageTakenListener.java | 6 +- ...CreateDamageTakenModificationListener.java | 6 +- .../ABActionCreateDeathReplacementEffect.java | 6 +- .../ABActionCreateEvasionListener.java | 6 +- .../ABActionCreateUnitStateListener.java | 8 +- ...onRemoveAbilityEffectReactionListener.java | 9 +- ...tionRemoveAbilityProjReactionListener.java | 8 +- ...BActionRemoveAttackPostDamageListener.java | 9 +- ...ABActionRemoveAttackPreDamageListener.java | 10 +- ...ctionRemoveAttackProjReactionListener.java | 8 +- .../ABActionRemoveBehaviorChangeListener.java | 8 +- .../ABActionRemoveDamageTakenListener.java | 9 +- ...RemoveDamageTakenModificationListener.java | 9 +- .../ABActionRemoveDeathReplacementEffect.java | 9 +- .../ABActionRemoveEvasionListener.java | 9 +- .../ABActionRemoveUnitStateListener.java | 9 +- ...nModificationMultiplyDamageMultiplier.java | 6 +- ...eTakenModificationSetDamageMultiplier.java | 6 +- ...onDeathReplacementFinishReincarnating.java | 6 +- ...ctionDeathReplacementSetReincarnating.java | 7 +- .../ABActionDeathReplacementSetReviving.java | 5 +- ...ActionPreDamageListenerAddBonusDamage.java | 24 ++-- ...nPreDamageListenerAddDamageMultiplier.java | 6 +- ...DamageListenerLockDamageModifications.java | 4 +- .../ABActionPreDamageListenerSetMiss.java | 6 +- .../ABActionReactionPreventHit.java | 5 +- .../ABActionSetPreDamageStacking.java | 8 +- .../ABActionSubtractTotalDamageDealt.java | 9 +- .../ABCallbackGetAttackBaseDamage.java | 3 +- ...BCallbackGetAttackMaximumSplashRadius.java | 3 +- .../ABCallbackGetAttackType.java | 3 +- .../ABCallbackGetDamageType.java | 3 +- .../ABCallbackGetFinalTotalDamageDealt.java | 7 +- .../ABCallbackGetNewBehaviorTarget.java | 3 +- .../ABCallbackGetRawTotalDamageDealt.java | 3 +- ...GetReactionAttackProjectileAttackType.java | 3 +- ...backGetReactionAttackProjectileDamage.java | 3 +- .../ABCallbackGetTriggeringAttackType.java | 3 +- .../ABCallbackGetTriggeringDamageType.java | 3 +- .../ABCallbackGetWeaponType.java | 3 +- .../ABConditionIsAttackArtillery.java | 3 +- .../ABConditionIsAttackHoming.java | 3 +- ...BConditionIsNewBehaviorCategoryInList.java | 3 +- ...ABConditionIsTriggeringDamageAnAttack.java | 3 +- .../ABConditionIsTriggeringDamageRanged.java | 3 +- ...onditionIsUnitValidSplashDamageTarget.java | 11 +- .../unitqueue/ABActionAddUnitToQueue.java | 8 +- .../unitqueue/ABActionClearUnitQueue.java | 6 +- .../unitqueue/ABActionCreateUnitQueue.java | 4 +- .../ABActionRemoveUnitFromQueue.java | 8 +- .../unitstate/ABActionAddStateModBuff.java | 10 +- .../unitstate/ABActionCreateStateModBuff.java | 7 +- .../unitstate/ABActionRemoveStateModBuff.java | 10 +- .../unitstate/ABActionSetUnitFadeTimer.java | 8 +- .../unitstate/ABActionUpdateStateModBuff.java | 8 +- .../ABActionCreateLocationVisionModifier.java | 13 +- ...BActionCreateProjectileVisionModifier.java | 9 +- .../ABActionCreateUnitVisionModifier.java | 11 +- .../vision/ABActionRemoveVisionModifier.java | 6 +- .../vision/ABActionSetBurrowPlaceholder.java | 3 +- .../behavior/callback/ABCallbackNull.java | 3 +- .../abilitycallbacks/ABAbilityCallback.java | 4 +- .../ABCallbackArgumentAbility.java | 8 +- .../ABCallbackGetAbilityById.java | 7 +- .../ABCallbackGetBuffSourceAbility.java | 5 +- .../ABCallbackGetLastCreatedAbility.java | 3 +- .../ABCallbackGetMatchingAbility.java | 3 +- .../ABCallbackGetPartnerAbility.java | 3 +- .../ABCallbackGetReactionAbility.java | 3 +- .../ABCallbackGetStoredAbilityByKey.java | 9 +- .../ABCallbackGetThisAbility.java | 3 +- .../ABCallbackInlineConditionAbility.java | 9 +- .../ABCallbackReuseAbility.java | 8 +- .../ABCallbackReuseAbilityWithArguments.java | 8 +- .../attack/ABAttackModifierCallback.java | 5 +- ...BCallbackGetLastCreatedAttackModifier.java | 3 +- ...BCallbackGetStoredAttackModifierByKey.java | 9 +- .../ABAttackSettingsCallback.java | 5 +- .../ABCallbackGetCurrentAttackSettings.java | 3 +- ...BCallbackGetLastCreatedAttackSettings.java | 3 +- ...BCallbackGetStoredAttackSettingsByKey.java | 9 +- .../booleancallbacks/ABBooleanCallback.java | 4 +- .../ABCallbackGetAbilityDataAsBoolean.java | 3 +- ...BCallbackGetAbilityUniqueValueBoolean.java | 10 +- .../ABCallbackGetBuffUniqueValueBoolean.java | 10 +- ...CallbackGetParentAbilityDataAsBoolean.java | 5 +- .../ABCallbackGetStoredBooleanByKey.java | 9 +- .../ABCallbackInlineConditionBoolean.java | 9 +- .../ABCallbackIntegerToBoolean.java | 5 +- .../ABCallbackRawBoolean.java | 4 +- .../buffcallbacks/ABBuffCallback.java | 4 +- .../buffcallbacks/ABCallbackArgumentBuff.java | 8 +- .../buffcallbacks/ABCallbackEnumBuff.java | 4 +- .../buffcallbacks/ABCallbackGetBuffById.java | 7 +- .../ABCallbackGetLastCreatedBuff.java | 4 +- .../ABCallbackGetMatchingBuff.java | 4 +- .../ABCallbackGetStoredBuffByKey.java | 9 +- .../ABCallbackInlineConditionBuff.java | 9 +- .../buffcallbacks/ABCallbackReuseBuff.java | 8 +- .../ABCallbackReuseBuffWithArguments.java | 8 +- .../buffcallbacks/ABCallbackThisBuff.java | 4 +- .../ABCallbackArgumentDestructable.java | 8 +- ...allbackGetAbilityTargetedDestructable.java | 3 +- .../ABCallbackGetAttackedDestructable.java | 3 +- .../ABCallbackGetEnumDestructable.java | 3 +- .../ABCallbackGetLastCreatedDestructable.java | 3 +- ...BCallbackGetProjectileHitDestructable.java | 3 +- .../ABCallbackGetStoredDestructableByKey.java | 10 +- ...ABCallbackInlineConditionDestructable.java | 9 +- .../ABCallbackReuseDestructable.java | 8 +- ...allbackReuseDestructableWithArguments.java | 8 +- .../destructable/ABDestructableCallback.java | 4 +- .../ABCallbackArgumentDestructableBuff.java | 8 +- .../ABCallbackEnumDestructableBuff.java | 3 +- ...allbackGetLastCreatedDestructableBuff.java | 3 +- ...allbackGetStoredDestructableBuffByKey.java | 9 +- ...llbackInlineConditionDestructableBuff.java | 9 +- .../ABCallbackMatchingDestructableBuff.java | 3 +- .../ABCallbackReuseDestructableBuff.java | 8 +- ...ackReuseDestructableBuffWithArguments.java | 8 +- .../ABDestructableBuffCallback.java | 5 +- ...tackPreDamageListenerPriorityCallback.java | 5 +- .../enumcallbacks/ABAttackTypeCallback.java | 4 +- .../enumcallbacks/ABAutocastTypeCallback.java | 4 +- .../ABCallbackConditionalAutocastType.java | 9 +- .../ABCallbackGetAttackTypeFromString.java | 5 +- .../ABCallbackGetAutocastTypeFromString.java | 5 +- .../ABCallbackGetDamageTypeFromString.java | 6 +- .../ABCallbackGetDefenseTypeFromString.java | 6 +- .../ABCallbackGetMovementTypeFromString.java | 6 +- ...kGetNonStackingStatBuffTypeFromString.java | 7 +- .../ABCallbackGetStoredAttackTypeByKey.java | 10 +- .../ABCallbackGetStoredDamageTypeByKey.java | 10 +- .../ABCallbackGetStoredDefenseTypeByKey.java | 10 +- .../ABCallbackGetStoredMovementTypeByKey.java | 10 +- .../ABCallbackGetStoredTargetTypeByKey.java | 10 +- .../ABCallbackGetStoredWeaponTypeByKey.java | 10 +- .../ABCallbackGetTargetTypeFromString.java | 6 +- .../ABCallbackGetUnitDefenseType.java | 6 +- .../ABCallbackGetUnitMovementType.java | 6 +- .../ABCallbackGetUnitTypeMovementType.java | 8 +- .../ABCallbackGetWeaponTypeFromString.java | 6 +- .../ABCallbackRawDeathEffectPriority.java | 5 +- ...BCallbackRawPreDamageListenerPriority.java | 4 +- .../ABCallbackRawTargetType.java | 3 +- .../ABCallbackRawWeaponType.java | 3 +- .../enumcallbacks/ABDamageTypeCallback.java | 4 +- .../ABDeathReplacementPriorityCallback.java | 5 +- .../enumcallbacks/ABDefenseTypeCallback.java | 4 +- .../enumcallbacks/ABMovementTypeCallback.java | 4 +- .../ABNonStackingStatBuffTypeCallback.java | 5 +- .../enumcallbacks/ABTargetTypeCallback.java | 4 +- .../enumcallbacks/ABWeaponTypeCallback.java | 4 +- .../ABCallbackArgumentTimeOfDayEvent.java | 8 +- ...BCallbackGetLastCreatedTimeOfDayEvent.java | 3 +- ...BCallbackGetStoredTimeOfDayEventByKey.java | 9 +- ...CallbackInlineConditionTimeOfDayEvent.java | 9 +- .../ABCallbackReuseTimeOfDayEvent.java | 8 +- ...lbackReuseTimeOfDayEventWithArguments.java | 8 +- .../ABTimeOfDayEventCallback.java | 5 +- .../ABCallbackArgumentWidgetEvent.java | 8 +- .../ABCallbackGetLastCreatedWidgetEvent.java | 3 +- .../ABCallbackGetStoredWidgetEventByKey.java | 9 +- .../ABCallbackInlineConditionWidgetEvent.java | 9 +- .../ABCallbackReuseWidgetEvent.java | 8 +- ...CallbackReuseWidgetEventWithArguments.java | 8 +- .../ABWidgetEventCallback.java | 4 +- .../floatcallbacks/ABCallbackAddFloat.java | 5 +- .../ABCallbackArgumentFloat.java | 8 +- .../floatcallbacks/ABCallbackCeilFloat.java | 5 +- .../floatcallbacks/ABCallbackCos.java | 5 +- .../floatcallbacks/ABCallbackDegToRad.java | 5 +- .../floatcallbacks/ABCallbackDivideFloat.java | 8 +- .../floatcallbacks/ABCallbackFMaxValue.java | 3 +- .../floatcallbacks/ABCallbackFloorFloat.java | 5 +- .../ABCallbackGetAbilityArea.java | 5 +- .../ABCallbackGetAbilityCastRange.java | 5 +- .../ABCallbackGetAbilityCastTime.java | 4 +- .../ABCallbackGetAbilityCooldown.java | 5 +- .../ABCallbackGetAbilityDataAsFloat.java | 4 +- .../ABCallbackGetAbilityDuration.java | 6 +- .../ABCallbackGetAbilityHeroDuration.java | 3 +- .../ABCallbackGetAbilityProjectileSpeed.java | 4 +- .../ABCallbackGetAbilityUniqueValueFloat.java | 10 +- .../ABCallbackGetAngleBetweenLocations.java | 7 +- .../ABCallbackGetBuffDurationElapsed.java | 8 +- .../ABCallbackGetBuffUniqueValueFloat.java | 10 +- ...ABCallbackGetDistanceBetweenLocations.java | 7 +- .../ABCallbackGetDistanceBetweenUnits.java | 7 +- .../ABCallbackGetLocationX.java | 5 +- .../ABCallbackGetLocationY.java | 5 +- ...ABCallbackGetParentAbilityDataAsFloat.java | 3 +- .../ABCallbackGetStoredFloatByKey.java | 10 +- .../ABCallbackGetUnitAcquisitionRange.java | 5 +- .../ABCallbackGetUnitCastPoint.java | 5 +- .../ABCallbackGetUnitCurrentHp.java | 5 +- .../ABCallbackGetUnitCurrentMana.java | 5 +- .../ABCallbackGetUnitFacing.java | 5 +- .../ABCallbackGetUnitInitialMana.java | 5 +- .../ABCallbackGetUnitLocationX.java | 5 +- .../ABCallbackGetUnitLocationY.java | 5 +- .../ABCallbackInlineConditionFloat.java | 9 +- .../floatcallbacks/ABCallbackIntToFloat.java | 5 +- .../floatcallbacks/ABCallbackMaxFloat.java | 8 +- .../floatcallbacks/ABCallbackMinFloat.java | 8 +- .../ABCallbackMultiplyFloat.java | 5 +- .../ABCallbackNegativeFloat.java | 6 +- .../floatcallbacks/ABCallbackOneGameTick.java | 3 +- .../callback/floatcallbacks/ABCallbackPi.java | 3 +- .../ABCallbackRandomBoundedFloat.java | 7 +- .../floatcallbacks/ABCallbackRandomFloat.java | 5 +- .../floatcallbacks/ABCallbackRawFloat.java | 4 +- .../floatcallbacks/ABCallbackReuseFloat.java | 8 +- .../ABCallbackReuseFloatWithArguments.java | 8 +- .../floatcallbacks/ABCallbackSin.java | 5 +- .../ABCallbackSubtractFloat.java | 8 +- .../floatcallbacks/ABCallbackTan.java | 5 +- .../ABCallbackTicksForDuration.java | 5 +- .../floatcallbacks/ABFloatCallback.java | 4 +- .../fxcallbacks/ABCallbackArgumentFX.java | 8 +- .../ABCallbackGetLastCreatedFX.java | 5 +- ...CallbackGetLastCreatedLightningEffect.java | 4 +- .../ABCallbackGetStoredFXByKey.java | 11 +- .../ABCallbackGetStoredLightningByKey.java | 10 +- .../ABCallbackInlineConditionFX.java | 9 +- .../fxcallbacks/ABCallbackReuseFX.java | 9 +- .../ABCallbackReuseFXWithArguments.java | 9 +- .../callback/fxcallbacks/ABFXCallback.java | 5 +- .../fxcallbacks/ABLightningCallback.java | 5 +- .../idcallbacks/ABCallbackArgumentID.java | 8 +- .../ABCallbackGetAbilityDataAsID.java | 3 +- .../ABCallbackGetAbilityDataAsIDFromList.java | 5 +- ...lbackGetAbilityDataAsRandomIDFromList.java | 5 +- .../ABCallbackGetAbilityUniqueValueId.java | 10 +- .../ABCallbackGetAbilityUnitId.java | 3 +- .../idcallbacks/ABCallbackGetAlias.java | 4 +- .../idcallbacks/ABCallbackGetBuffAlias.java | 5 +- .../ABCallbackGetBuffIdFromCode.java | 4 +- .../idcallbacks/ABCallbackGetCode.java | 6 +- .../idcallbacks/ABCallbackGetFirstBuffId.java | 6 +- .../ABCallbackGetFirstEffectId.java | 3 +- .../idcallbacks/ABCallbackGetItemType.java | 5 +- .../ABCallbackGetNonCurrentTransformType.java | 9 +- .../idcallbacks/ABCallbackGetParentAlias.java | 3 +- .../ABCallbackGetSecondBuffId.java | 3 +- .../ABCallbackGetStoredIDByKey.java | 9 +- .../idcallbacks/ABCallbackGetUnitType.java | 5 +- .../ABCallbackGetWar3IDFromString.java | 3 +- .../ABCallbackInlineConditionID.java | 9 +- .../idcallbacks/ABCallbackNullIfFalse.java | 7 +- .../idcallbacks/ABCallbackRandomItemId.java | 16 +-- .../ABCallbackRandomMechanicalCritterId.java | 6 +- .../idcallbacks/ABCallbackReuseID.java | 8 +- .../ABCallbackReuseIDWithArguments.java | 8 +- .../callback/idcallbacks/ABIDCallback.java | 4 +- .../ABCallbackAddInteger.java | 5 +- .../ABCallbackAndInteger.java | 5 +- .../ABCallbackArgumentInteger.java | 8 +- ...backCountBuffsOnUnitMatchingCondition.java | 7 +- ...ABCallbackCountUnitsInRangeOfLocation.java | 9 +- .../ABCallbackCountUnitsInRangeOfUnit.java | 9 +- ...ABCallbackDetectionDropdownConversion.java | 5 +- .../ABCallbackDivideInteger.java | 5 +- ...ABCallbackGetAbilityCastTimeAsInteger.java | 3 +- .../ABCallbackGetAbilityDataAsInteger.java | 3 +- .../ABCallbackGetAbilityHandleAsInteger.java | 5 +- .../ABCallbackGetAbilityManaCost.java | 5 +- ...lbackGetAbilityTargetAttachmentPoints.java | 5 +- ...BCallbackGetAbilityUniqueValueInteger.java | 10 +- .../ABCallbackGetBuffHandleAsInteger.java | 5 +- .../ABCallbackGetBuffUniqueValueInteger.java | 10 +- .../integercallbacks/ABCallbackGetCastId.java | 3 +- .../ABCallbackGetIntegerFromList.java | 5 +- .../ABCallbackGetItemCharges.java | 5 +- .../ABCallbackGetItemLevel.java | 5 +- .../ABCallbackGetItemMaxCharges.java | 5 +- .../ABCallbackGetItemSlot.java | 5 +- .../ABCallbackGetListSize.java | 5 +- .../ABCallbackGetNeutralHostilePlayerId.java | 3 +- .../ABCallbackGetNeutralPassivePlayerId.java | 3 +- .../ABCallbackGetPlayerId.java | 5 +- ...lbackGetProjectileDestructableTargets.java | 3 +- .../ABCallbackGetProjectileUnitTargets.java | 3 +- .../ABCallbackGetSortableListSize.java | 5 +- .../ABCallbackGetSpellLevel.java | 3 +- .../ABCallbackGetStoredIntegerByKey.java | 9 +- .../ABCallbackGetUnitGroupSize.java | 5 +- .../ABCallbackGetUnitHandleAsInteger.java | 5 +- .../ABCallbackGetUnitMaximumHp.java | 5 +- .../ABCallbackGetUnitMaximumMp.java | 5 +- .../ABCallbackGetUnitQueueSize.java | 5 +- .../ABCallbackGetUnitTypeFoodCost.java | 5 +- .../ABCallbackGetUnitTypeGoldCost.java | 5 +- .../ABCallbackGetUnitTypeLumberCost.java | 5 +- .../ABCallbackGetUnitTypeSpeed.java | 7 +- .../ABCallbackInlineConditionInteger.java | 9 +- .../integercallbacks/ABCallbackIntegerIf.java | 9 +- .../ABCallbackIntegerZeroIfFalse.java | 7 +- .../ABCallbackIntegerZeroIfNull.java | 5 +- .../integercallbacks/ABCallbackIterator.java | 5 +- .../ABCallbackMaxInteger.java | 7 +- .../ABCallbackMinInteger.java | 7 +- .../ABCallbackMultiplyInteger.java | 5 +- .../integercallbacks/ABCallbackOrInteger.java | 5 +- .../ABCallbackPlayerToStateModValue.java | 5 +- .../ABCallbackRandomInteger.java | 11 +- .../ABCallbackRawInteger.java | 3 +- .../ABCallbackReuseInteger.java | 8 +- .../ABCallbackReuseIntegerWithArguments.java | 8 +- .../ABCallbackSubtractInteger.java | 5 +- .../ABCallbackTruncateFloatToInteger.java | 5 +- .../integercallbacks/ABIntegerCallback.java | 4 +- .../callback/item/ABCallbackArgumentItem.java | 8 +- .../ABCallbackGetAbilityTargetedItem.java | 3 +- .../item/ABCallbackGetAttackedItem.java | 3 +- .../item/ABCallbackGetLastCreatedItem.java | 3 +- .../item/ABCallbackGetStoredItemByKey.java | 9 +- .../item/ABCallbackInlineConditionItem.java | 9 +- .../callback/item/ABCallbackReuseItem.java | 8 +- .../ABCallbackReuseItemWithArguments.java | 8 +- .../callback/item/ABItemCallback.java | 4 +- .../callback/list/ABCallbackArgumentList.java | 8 +- .../list/ABCallbackArgumentSortableList.java | 8 +- .../list/ABCallbackGetStoredListByKey.java | 9 +- .../ABCallbackGetStoredSortableListByKey.java | 9 +- .../list/ABCallbackInlineConditionList.java | 9 +- ...ABCallbackInlineConditionSortableList.java | 9 +- .../callback/list/ABCallbackListSorted.java | 9 +- .../callback/list/ABCallbackReuseList.java | 8 +- .../ABCallbackReuseListWithArguments.java | 8 +- .../list/ABCallbackReuseSortableList.java | 8 +- ...allbackReuseSortableListWithArguments.java | 8 +- .../callback/list/ABListCallback.java | 4 +- .../callback/list/ABSortableListCallback.java | 4 +- .../integer/ABCallbackEmptyIntegerList.java | 3 +- .../integer/ABCallbackIntegerListOfRange.java | 11 +- .../list/integer/ABIntegerListCallback.java | 5 +- .../location/ABCallbackEmptyLocationList.java | 3 +- .../list/location/ABLocationListCallback.java | 5 +- ...AbilityEffectReactionListenerCallback.java | 5 +- ...ABAbilityProjReactionListenerCallback.java | 5 +- .../ABAttackPostDamageListenerCallback.java | 5 +- .../ABAttackPreDamageListenerCallback.java | 5 +- .../ABAttackProjReactionListenerCallback.java | 5 +- .../ABBehaviorChangeListenerCallback.java | 5 +- ...tCreatedAbilityEffectReactionListener.java | 5 +- ...astCreatedAbilityProjReactionListener.java | 4 +- ...etLastCreatedAttackPostDamageListener.java | 5 +- ...GetLastCreatedAttackPreDamageListener.java | 5 +- ...LastCreatedAttackProjReactionListener.java | 4 +- ...kGetLastCreatedBehaviorChangeListener.java | 4 +- ...backGetLastCreatedDamageTakenListener.java | 3 +- ...reatedDamageTakenModificationListener.java | 5 +- ...allbackGetLastCreatedDeathReplacement.java | 5 +- ...CallbackGetLastCreatedEvasionListener.java | 4 +- ...llbackGetLastCreatedUnitStateListener.java | 3 +- ...redAbilityEffectReactionListenerByKey.java | 10 +- ...toredAbilityProjReactionListenerByKey.java | 11 +- ...etStoredAttackPostDamageListenerByKey.java | 11 +- ...GetStoredAttackPreDamageListenerByKey.java | 10 +- ...StoredAttackProjReactionListenerByKey.java | 11 +- ...kGetStoredBehaviorChangeListenerByKey.java | 11 +- ...backGetStoredDamageTakenListenerByKey.java | 9 +- ...dDamageTakenModificationListenerByKey.java | 10 +- ...allbackGetStoredDeathReplacementByKey.java | 10 +- ...CallbackGetStoredEvasionListenerByKey.java | 11 +- ...llbackGetStoredUnitStateListenerByKey.java | 9 +- .../ABDamageTakenListenerCallback.java | 5 +- ...mageTakenModificationListenerCallback.java | 5 +- .../ABDeathReplacementCallback.java | 5 +- .../ABEvasionListenerCallback.java | 5 +- .../ABUnitStateListenerCallback.java | 5 +- .../ABCallbackArgumentLocation.java | 8 +- .../ABCallbackCreateLocationFromOffset.java | 12 +- .../ABCallbackCreateLocationFromTarget.java | 5 +- .../ABCallbackCreateLocationFromXY.java | 5 +- .../ABCallbackCreateLocationFromXYOffset.java | 9 +- .../ABCallbackGetAttackImpactLocation.java | 3 +- .../ABCallbackGetAttackTargetLocation.java | 3 +- .../ABCallbackGetGroundAttackedLocation.java | 3 +- .../ABCallbackGetLocationFromList.java | 5 +- ...BCallbackGetProjectileCurrentLocation.java | 3 +- .../ABCallbackGetStoredLocationByKey.java | 9 +- .../ABCallbackGetTargetedLocation.java | 3 +- .../ABCallbackGetUnitLocation.java | 5 +- .../ABCallbackInlineConditionLocation.java | 9 +- .../ABCallbackModifyLocationWithOffset.java | 12 +- .../ABCallbackModifyLocationWithXYOffset.java | 8 +- .../ABCallbackRandomLocationInRange.java | 9 +- .../ABCallbackReuseLocation.java | 8 +- .../ABCallbackReuseLocationWithArguments.java | 8 +- .../locationcallbacks/ABLocationCallback.java | 5 +- .../longcallbacks/ABCallbackAddLong.java | 5 +- .../longcallbacks/ABCallbackAndLong.java | 5 +- .../longcallbacks/ABCallbackArgumentLong.java | 8 +- .../ABCallbackCreateDetectedData.java | 7 +- .../ABCallbackCreateDetectorData.java | 7 +- .../ABCallbackCreateOwnershipData.java | 7 +- .../longcallbacks/ABCallbackDivideLong.java | 5 +- .../ABCallbackGetAbilityDataAsLong.java | 3 +- .../ABCallbackGetAbilityUniqueValueLong.java | 10 +- .../ABCallbackGetBuffUniqueValueLong.java | 10 +- .../ABCallbackGetStoredLongByKey.java | 9 +- .../ABCallbackInlineConditionLong.java | 9 +- .../longcallbacks/ABCallbackMaxLong.java | 7 +- .../longcallbacks/ABCallbackMinLong.java | 7 +- .../longcallbacks/ABCallbackMultiplyLong.java | 5 +- .../longcallbacks/ABCallbackOrLong.java | 5 +- .../ABCallbackPlayerMaskAllPlayers.java | 3 +- .../ABCallbackPlayerMaskExcludePlayers.java | 5 +- .../ABCallbackPlayerMaskIncludePlayers.java | 5 +- .../longcallbacks/ABCallbackRawLong.java | 3 +- .../longcallbacks/ABCallbackReuseLong.java | 8 +- .../ABCallbackReuseLongWithArguments.java | 8 +- .../longcallbacks/ABCallbackSubtractLong.java | 5 +- .../longcallbacks/ABLongCallback.java | 4 +- .../orderid/ABCallbackArgumentOrderId.java | 8 +- .../ABCallbackGetStoredOrderIdByKey.java | 10 +- .../callback/orderid/ABCallbackIdString.java | 5 +- .../ABCallbackInlineConditionOrderId.java | 9 +- .../callback/orderid/ABCallbackRawID.java | 3 +- .../orderid/ABCallbackReuseOrderId.java | 8 +- .../ABCallbackReuseOrderIdWithArguments.java | 8 +- .../callback/orderid/ABOrderIdCallback.java | 4 +- .../player/ABCallbackArgumentPlayer.java | 8 +- .../player/ABCallbackGetCastingPlayer.java | 5 +- .../player/ABCallbackGetOwnerOfUnit.java | 5 +- .../player/ABCallbackGetPlayerById.java | 5 +- .../ABCallbackGetStoredPlayerByKey.java | 9 +- .../ABCallbackInlineConditionPlayer.java | 9 +- .../player/ABCallbackReusePlayer.java | 8 +- .../ABCallbackReusePlayerWithArguments.java | 8 +- .../callback/player/ABPlayerCallback.java | 4 +- .../ABCallbackArgumentProjectile.java | 8 +- .../ABCallbackGetLastCreatedProjectile.java | 3 +- ...BCallbackGetReactionAbilityProjectile.java | 4 +- ...ABCallbackGetReactionAttackProjectile.java | 3 +- .../ABCallbackGetStoredProjectileByKey.java | 9 +- .../ABCallbackGetThisProjectile.java | 3 +- .../ABCallbackInlineConditionProjectile.java | 9 +- .../projectile/ABCallbackReuseProjectile.java | 8 +- ...BCallbackReuseProjectileWithArguments.java | 8 +- .../projectile/ABProjectileCallback.java | 4 +- ...ABCallbackArgumentNonStackingStatBuff.java | 8 +- ...backGetLastCreatedNonStackingStatBuff.java | 4 +- ...backGetStoredNonStackingStatBuffByKey.java | 11 +- ...ackInlineConditionNonStackingStatBuff.java | 9 +- .../ABCallbackReuseNonStackingStatBuff.java | 8 +- ...ReuseNonStackingStatBuffWithArguments.java | 8 +- .../ABNonStackingStatBuffCallback.java | 5 +- .../ABCallbackArgumentStateModBuff.java | 8 +- .../ABCallbackGetLastCreatedStateModBuff.java | 3 +- .../ABCallbackGetStoredStateModBuffByKey.java | 9 +- ...ABCallbackInlineConditionStateModBuff.java | 9 +- .../ABCallbackReuseStateModBuff.java | 8 +- ...allbackReuseStateModBuffWithArguments.java | 8 +- .../ABStateModBuffCallback.java | 4 +- .../ABCallbackArgumentString.java | 8 +- .../ABCallbackBooleanToString.java | 5 +- .../stringcallbacks/ABCallbackCatStrings.java | 5 +- .../ABCallbackFloatToString.java | 5 +- .../ABCallbackGetAbilityDataAsString.java | 3 +- .../ABCallbackGetAbilityHandleAsString.java | 5 +- ...ABCallbackGetAbilityUniqueValueString.java | 10 +- .../ABCallbackGetAliasAsString.java | 3 +- .../ABCallbackGetAllowStackingKey.java | 3 +- .../ABCallbackGetBuffHandleAsString.java | 5 +- .../ABCallbackGetBuffUniqueValueString.java | 10 +- .../ABCallbackGetCodeAsString.java | 3 +- .../ABCallbackGetStoredStringByKey.java | 10 +- .../ABCallbackGetUnitHandleAsString.java | 5 +- .../stringcallbacks/ABCallbackIdToString.java | 5 +- .../ABCallbackInlineConditionString.java | 9 +- .../ABCallbackIntegerToString.java | 5 +- .../ABCallbackLongToString.java | 5 +- .../stringcallbacks/ABCallbackRawString.java | 4 +- .../ABCallbackReuseString.java | 8 +- .../ABCallbackReuseStringWithArguments.java | 8 +- .../stringcallbacks/ABStringCallback.java | 4 +- .../ABCallbackArgumentTarget.java | 8 +- .../ABCallbackGetAbilityTarget.java | 3 +- .../ABCallbackGetStoredTargetByKey.java | 9 +- .../ABCallbackInlineConditionTarget.java | 9 +- .../ABCallbackReuseTarget.java | 8 +- .../ABCallbackReuseTargetWithArguments.java | 8 +- .../targetcallbacks/ABTargetCallback.java | 4 +- .../ABCallbackArgumentTimer.java | 8 +- .../ABCallbackGetFiringTimer.java | 3 +- .../ABCallbackGetLastCreatedTimer.java | 3 +- .../ABCallbackGetLastStartedTimer.java | 3 +- .../ABCallbackGetStoredTimerByKey.java | 9 +- .../ABCallbackInlineConditionTimer.java | 9 +- .../timercallbacks/ABCallbackReuseTimer.java | 8 +- .../ABCallbackReuseTimerWithArguments.java | 8 +- .../timercallbacks/ABTimerCallback.java | 4 +- .../unitcallbacks/ABCallbackArgumentUnit.java | 8 +- .../ABCallbackGetAbilityPairedUnit.java | 3 +- .../ABCallbackGetAbilityTargetedUnit.java | 4 +- .../ABCallbackGetAttackedUnit.java | 3 +- .../ABCallbackGetAttackingUnit.java | 3 +- .../ABCallbackGetBuffCastingUnit.java | 4 +- .../ABCallbackGetBuffedUnit.java | 4 +- .../ABCallbackGetCastingUnit.java | 4 +- .../unitcallbacks/ABCallbackGetChainUnit.java | 4 +- .../unitcallbacks/ABCallbackGetCompUnit1.java | 4 +- .../unitcallbacks/ABCallbackGetCompUnit2.java | 4 +- .../ABCallbackGetDamagedUnit.java | 3 +- .../ABCallbackGetDamagingUnit.java | 3 +- .../unitcallbacks/ABCallbackGetDyingUnit.java | 3 +- .../unitcallbacks/ABCallbackGetEnumUnit.java | 3 +- .../ABCallbackGetKillingUnit.java | 3 +- .../ABCallbackGetLastCreatedUnit.java | 3 +- .../ABCallbackGetListenerUnit.java | 3 +- .../ABCallbackGetMatchingUnit.java | 3 +- ...CallbackGetNearestCorpseInRangeOfUnit.java | 21 ++- ...ABCallbackGetNearestUnitInRangeOfUnit.java | 11 +- .../ABCallbackGetParentCastingUnit.java | 3 +- .../ABCallbackGetProjectileHitUnit.java | 4 +- .../ABCallbackGetProjectileSourceUnit.java | 6 +- ...CallbackGetReactionAbilityCastingUnit.java | 3 +- ...BCallbackGetReactionAbilityTargetUnit.java | 3 +- .../ABCallbackGetStoredUnitByKey.java | 9 +- .../ABCallbackInlineConditionUnit.java | 9 +- .../ABCallbackPollUnitQueue.java | 5 +- .../unitcallbacks/ABCallbackReuseUnit.java | 8 +- .../ABCallbackReuseUnitWithArguments.java | 8 +- .../unitcallbacks/ABUnitCallback.java | 4 +- .../ABCallbackArgumentUnitGroup.java | 8 +- .../ABCallbackGetLastCreatedUnitGroup.java | 3 +- .../ABCallbackGetStoredUnitGroupByKey.java | 10 +- .../ABCallbackGetUnitGroupByName.java | 3 +- .../ABCallbackInlineConditionUnitGroup.java | 9 +- .../ABCallbackReuseUnitGroup.java | 8 +- ...ABCallbackReuseUnitGroupWithArguments.java | 8 +- .../ABUnitGroupCallback.java | 4 +- .../ABCallbackArgumentUnitQueue.java | 8 +- .../ABCallbackGetLastCreatedUnitQueue.java | 3 +- .../ABCallbackGetStoredUnitQueueByKey.java | 10 +- .../ABCallbackGetUnitQueueByName.java | 3 +- .../ABCallbackInlineConditionUnitQueue.java | 9 +- .../unitqueue/ABCallbackReuseUnitQueue.java | 8 +- ...ABCallbackReuseUnitQueueWithArguments.java | 8 +- .../unitqueue/ABUnitQueueCallback.java | 4 +- .../ABCallbackArgumentVisionModifier.java | 8 +- ...BCallbackGetLastCreatedVisionModifier.java | 3 +- ...BCallbackGetStoredVisionModifierByKey.java | 9 +- ...CallbackInlineConditionVisionModifier.java | 9 +- .../ABCallbackReuseVisionModifier.java | 8 +- ...lbackReuseVisionModifierWithArguments.java | 8 +- .../ABVisionModifierCallback.java | 4 +- .../widget/ABCallbackArgumentWidget.java | 8 +- .../ABCallbackDestructableToWidget.java | 5 +- .../ABCallbackGetProjectileHitWidget.java | 3 +- .../ABCallbackGetStoredWidgetByKey.java | 10 +- .../ABCallbackInlineConditionWidget.java | 9 +- .../widget/ABCallbackItemToWidget.java | 5 +- .../widget/ABCallbackReuseWidget.java | 8 +- .../ABCallbackReuseWidgetWithArguments.java | 8 +- .../widget/ABCallbackUnitToWidget.java | 5 +- .../callback/widget/ABWidgetCallback.java | 4 +- .../condition/ABCallbackArgumentBoolean.java | 8 +- .../condition/ABCallbackReuseBoolean.java | 8 +- .../ABCallbackReuseBooleanWithArguments.java | 8 +- .../ABConditionIsDestructableValidTarget.java | 8 +- ...ConditionIsPassAllAbilityTargetChecks.java | 9 +- .../condition/ABConditionIsUnitInGroup.java | 7 +- .../ABConditionIsUnitInRangeOfUnit.java | 9 +- ...itionIsUnitPassAllAbilityTargetChecks.java | 9 +- .../ABConditionIsUnitValidTarget.java | 20 ++- .../condition/ABConditionIsValidTarget.java | 9 +- ...tionMatchingCorpseExistsInRangeOfUnit.java | 11 +- ...ditionMatchingUnitExistsInRangeOfUnit.java | 11 +- .../ABConditionSetCantUseReasonOnFailure.java | 5 +- .../ABConditionDoesAbilityHaveUniqueFlag.java | 7 +- .../ABConditionIsAutoCastCurrentlyActive.java | 3 +- .../ability/ABConditionIsDisabled.java | 3 +- ...BConditionIsFlexAbilityNonPointTarget.java | 3 +- .../ABConditionIsFlexAbilityNonTargeted.java | 3 +- .../ABConditionIsFlexAbilityPointTarget.java | 3 +- .../ABConditionIsFlexAbilityTargeted.java | 3 +- .../ability/ABConditionIsOnCooldown.java | 5 +- .../ABConditionIsToggleAbilityActive.java | 3 +- .../ABConditionIsTransformingToAlternate.java | 3 +- .../ability/ABConditionWasAutoCast.java | 3 +- ...BConditionWasAutoCastPreviouslyActive.java | 3 +- .../ABConditionWasCastingInterrupted.java | 3 +- .../attack/ABConditionIsAttackProjectile.java | 3 +- .../attack/ABConditionIsAttackRanged.java | 3 +- .../ABConditionDoesBuffHaveUniqueFlag.java | 7 +- .../condition/buff/ABConditionIsBuffAlly.java | 7 +- .../buff/ABConditionIsBuffEnemy.java | 7 +- .../buff/ABConditionIsBuffMagic.java | 5 +- .../buff/ABConditionIsBuffNegative.java | 5 +- .../buff/ABConditionIsBuffPositive.java | 5 +- .../ABConditionIsAttackTypeEqual.java | 7 +- .../ABConditionIsDamageTypeEqual.java | 7 +- .../ABConditionIsDefenseTypeEqual.java | 7 +- .../ABConditionIsDefenseTypeInList.java | 7 +- .../comparison/ABConditionIsIdEqual.java | 7 +- .../ABConditionIsMovementTypeEqual.java | 7 +- .../comparison/ABConditionIsUnitEqual.java | 7 +- .../ABConditionIsWeaponTypeEqual.java | 7 +- .../ABConditionDoesDestructableHaveBuff.java | 7 +- ...DestructableHaveBuffMatchingCondition.java | 7 +- .../destructable/ABConditionIsTree.java | 7 +- .../ABConditionIsDestructableBuffMagic.java | 5 +- ...ameplayConstantCanDisableDivineShield.java | 5 +- ...ionGameplayConstantIsDefendCanDeflect.java | 5 +- ...ameplayConstantIsRelativeUpgradeCosts.java | 5 +- ...tionGameplayConstantSmartAbolishMagic.java | 5 +- .../game/ABConditionIsTimeOfDayInRange.java | 13 +- .../item/ABConditionIsItemAbility.java | 3 +- .../item/ABConditionItemHasCharges.java | 5 +- .../item/ABConditionItemIsCharged.java | 5 +- .../ABConditionIsLocationDeepWater.java | 8 +- .../ABConditionIsLocationFlyingOnly.java | 11 +- .../ABConditionIsLocationShallowWater.java | 9 +- .../ABConditionIsLocationWalkable.java | 7 +- ...ABConditionIsLocationWalkableNonWater.java | 8 +- .../condition/logical/ABConditionAnd.java | 5 +- .../condition/logical/ABConditionBool.java | 5 +- .../condition/logical/ABConditionIsNull.java | 5 +- .../condition/logical/ABConditionNot.java | 5 +- .../condition/logical/ABConditionNotNull.java | 5 +- .../condition/logical/ABConditionOr.java | 5 +- .../numeric/ABConditionFloatEq0.java | 5 +- .../numeric/ABConditionFloatEqual.java | 7 +- .../condition/numeric/ABConditionFloatGt.java | 7 +- .../numeric/ABConditionFloatGt0.java | 5 +- .../numeric/ABConditionFloatGte.java | 7 +- .../condition/numeric/ABConditionFloatLt.java | 7 +- .../numeric/ABConditionFloatLte.java | 7 +- .../condition/numeric/ABConditionFloatNe.java | 7 +- .../numeric/ABConditionFloatNe0.java | 5 +- .../numeric/ABConditionIntegerEq.java | 7 +- .../numeric/ABConditionIntegerEq0.java | 5 +- .../numeric/ABConditionIntegerGt.java | 7 +- .../numeric/ABConditionIntegerGt0.java | 5 +- .../numeric/ABConditionIntegerGte.java | 7 +- .../numeric/ABConditionIntegerIsEven.java | 5 +- .../numeric/ABConditionIntegerIsOdd.java | 5 +- .../numeric/ABConditionIntegerLt.java | 7 +- .../numeric/ABConditionIntegerLte.java | 7 +- .../numeric/ABConditionIntegerNe.java | 7 +- .../numeric/ABConditionIntegerNe0.java | 5 +- .../ABConditionIsProjectileReflected.java | 5 +- .../timer/ABConditionIsTimerActive.java | 5 +- ...nDoesUnitHaveAbilityMatchingCondition.java | 7 +- .../unit/ABConditionDoesUnitHaveBuff.java | 7 +- ...tionDoesUnitHaveBuffMatchingCondition.java | 7 +- .../unit/ABConditionIsUnitAlive.java | 5 +- .../unit/ABConditionIsUnitBuilding.java | 5 +- .../unit/ABConditionIsUnitConstructing.java | 5 +- ...onditionIsUnitConstructingOrUpgrading.java | 5 +- .../condition/unit/ABConditionIsUnitDead.java | 5 +- .../unit/ABConditionIsUnitEnemy.java | 9 +- .../unit/ABConditionIsUnitFriend.java | 9 +- .../condition/unit/ABConditionIsUnitHero.java | 5 +- .../unit/ABConditionIsUnitHeroDuration.java | 5 +- .../unit/ABConditionIsUnitHidden.java | 5 +- .../unit/ABConditionIsUnitMagicImmune.java | 5 +- .../unit/ABConditionIsUnitMaxHp.java | 5 +- .../unit/ABConditionIsUnitMaxMp.java | 5 +- .../unit/ABConditionIsUnitMorphImmune.java | 5 +- .../unit/ABConditionIsUnitPolymorphed.java | 5 +- .../unit/ABConditionIsUnitShareSpells.java | 9 +- .../unit/ABConditionIsUnitSleeping.java | 5 +- .../unit/ABConditionIsUnitSummoned.java | 5 +- .../unit/ABConditionIsUnitTraining.java | 5 +- .../condition/unit/ABConditionIsUnitType.java | 7 +- .../unit/ABConditionIsUnitUpgrading.java | 5 +- .../unit/ABConditionIsUnitVisible.java | 12 +- ...BConditionSuccessfullyChargeResources.java | 17 ++- .../unit/ABConditionUnitHasResearch.java | 7 +- ...ditionIsCurrentBehaviorCategoryInList.java | 5 +- ...onditionIsLocationPathableForUnitType.java | 10 +- .../buff/ABDestructableBuff.java | 6 +- .../buff/ABPermanentPassiveBuff.java | 4 +- .../abilitybuilder/buff/ABTimedBuff.java | 6 +- .../ABTimedInstantTransformationBuff.java | 6 +- .../buff/ABTimedTickingBuff.java | 2 +- .../buff/ABTimedTickingPausedBuff.java | 2 +- .../buff/ABTimedTransformationBuff.java | 8 +- .../abilitybuilder/core/ABAction.java | 4 +- .../abilitybuilder/core/ABCallback.java | 4 +- .../abilitybuilder/core/ABCondition.java | 4 +- .../abilitybuilder/core/ABLocalStoreKeys.java | 1 - .../datastore/LocalDataStore.java | 8 ++ .../datastore/MapLocalDataStore.java | 7 + .../event/ABGlobalWidgetEvent.java | 13 +- .../abilitybuilder/event/ABPlayerEvent.java | 15 +- .../event/ABTimeOfDayEvent.java | 8 +- .../abilitybuilder/event/ABWidgetEvent.java | 11 +- .../handler/TransformationHandler.java | 118 ++++++++------- .../iterstructs/ABUnitComparator.java | 11 +- .../abilitybuilder/jass/ABActionJass.java | 6 +- .../abilitybuilder/jass/ABConditionJass.java | 6 +- .../ABAbilityEffectReactionListener.java | 2 +- .../ABAbilityProjReactionListener.java | 2 +- .../listener/ABAttackEvasionListener.java | 2 +- .../listener/ABAttackModifier.java | 10 +- .../listener/ABAttackPostDamageListener.java | 4 +- .../listener/ABAttackPreDamageListener.java | 2 +- .../ABAttackProjReactionListener.java | 2 +- .../listener/ABBehaviorChangeListener.java | 2 +- .../listener/ABDamageTakenListener.java | 4 +- .../ABDamageTakenModificationListener.java | 4 +- .../listener/ABDeathReplacementEffect.java | 2 +- .../listener/ABUnitStateListener.java | 24 ++-- .../parser/template/DataFieldLetter.java | 1 - .../ABCollisionProjectileListener.java | 51 ++++--- .../projectile/ABProjectileListener.java | 34 ++--- .../abilitybuilder/timer/ABTimer.java | 2 +- .../timer/AltitudeAdjustmentTimer.java | 8 +- .../DelayInstantTransformationTimer.java | 9 +- .../TransformationMorphAnimationTimer.java | 9 +- 961 files changed, 3376 insertions(+), 4734 deletions(-) diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index fddefe594..655d8ab07 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -6789,7 +6789,7 @@ public HandleJassValue accept(final CItem target) { // ===== local store ===== jassProgramVisitor.getJassNativeManager().createNative("CreateLocalStore", (arguments, globalScope, triggerScope) -> { - return new HandleJassValue(localstoreType, new MapLocalDataStore()); + return new HandleJassValue(localstoreType, new MapLocalDataStore(CommonEnvironment.this.simulation)); }); jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreString", (arguments, globalScope, triggerScope) -> { @@ -8190,7 +8190,7 @@ public void remove() { ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(6).visit(IntegerJassValueVisitor.getInstance()); - final ABTimeOfDayEvent abTimeOfDayEvent = new ABTimeOfDayEvent(this.simulation, casterUnit, + final ABTimeOfDayEvent abTimeOfDayEvent = new ABTimeOfDayEvent(casterUnit, localStore, castId, ABActionJass.wrap(actions), startTime, endTime, equalityId); return new HandleJassValue(abtimeofdayeventType, abTimeOfDayEvent); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java index c929af621..631a1addd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java @@ -86,7 +86,7 @@ public CWidget autoTarget(CSimulation game, CUnit caster) { this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); for (ABAction action : this.config.getSpecialFields().getAutoAquireTarget()) { - action.runAction(game, caster, this.localStore, castId); + action.runAction(caster, this.localStore, castId); } target = (CWidget) this.localStore.get(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java index 94850058d..56c577e12 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java @@ -38,7 +38,7 @@ private void setTargeted(CSimulation game, CUnit unit) { if (config.getSpecialFields() != null && config.getSpecialFields().getTargetedSpell() != null) { boolean result = true; for (ABCondition condition : config.getSpecialFields().getTargetedSpell()) { - result = result && condition.callback(game, unit, localStore, castId); + result = result && condition.callback(unit, localStore, castId); } this.targetedSpell = result; } @@ -47,14 +47,14 @@ private void setPointTarget(CSimulation game, CUnit unit) { if (config.getSpecialFields() != null && config.getSpecialFields().getPointTargeted() != null) { boolean result = true; for (ABCondition condition : config.getSpecialFields().getPointTargeted()) { - result = result && condition.callback(game, unit, localStore, castId); + result = result && condition.callback(unit, localStore, castId); } this.pointTarget = result; } } protected void determineCastless(CUnit unit) { if (this.item != null || this.config.getDisplayFields() != null && this.config.getDisplayFields().getCastlessNoTarget() != null - && this.config.getDisplayFields().getCastlessNoTarget().callback(null, unit, localStore, castId)) { + && this.config.getDisplayFields().getCastlessNoTarget().callback(unit, localStore, castId)) { this.castless = true; this.behavior = null; } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java index ed8cea36a..f81f8fe49 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java @@ -45,7 +45,7 @@ public void setLevel(CSimulation game, CUnit unit, int level) { protected void determineCastless(CUnit unit) { if (this.item != null || this.config.getDisplayFields() != null && this.config.getDisplayFields().getCastlessNoTarget() != null - && this.config.getDisplayFields().getCastlessNoTarget().callback(null, unit, localStore, castId)) { + && this.config.getDisplayFields().getCastlessNoTarget().callback(unit, localStore, castId)) { this.castless = true; this.behavior = null; } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java index 2d3c4e953..a4f5dbf07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java @@ -64,47 +64,44 @@ private void setPairingValues(CSimulation game, CUnit unit) { if (this.config.getSpecialFields() != null) { if (this.config.getSpecialFields().getPairAbilityId() != null) { - this.pairAbilityId = this.config.getSpecialFields().getPairAbilityId().callback(game, unit, localStore, - castId); + this.pairAbilityId = this.config.getSpecialFields().getPairAbilityId().callback(unit, localStore, castId); } if (this.config.getSpecialFields().getPairUnitId() != null) { - this.pairUnitId = this.config.getSpecialFields().getPairUnitId().callback(game, unit, localStore, - castId); + this.pairUnitId = this.config.getSpecialFields().getPairUnitId().callback(unit, localStore, castId); } if (this.config.getSpecialFields().getAutoTargetPartner() != null) { - this.autoTargetPartner = this.config.getSpecialFields().getAutoTargetPartner().callback(game, unit, - localStore, castId); + this.autoTargetPartner = this.config.getSpecialFields().getAutoTargetPartner().callback(unit, localStore, + castId); } if (this.config.getSpecialFields().getPairSearchRadius() != null) { - this.pairSearchRadius = this.config.getSpecialFields().getPairSearchRadius().callback(game, unit, - localStore, castId); + this.pairSearchRadius = this.config.getSpecialFields().getPairSearchRadius().callback(unit, localStore, + castId); } if (this.config.getSpecialFields().getPairingOrderId() != null) { - this.internalOrderId = this.config.getSpecialFields().getPairingOrderId().callback(game, unit, - localStore, castId); + this.internalOrderId = this.config.getSpecialFields().getPairingOrderId().callback(unit, localStore, + castId); } if (this.config.getSpecialFields().getPairingOffOrderId() != null) { - this.internalOffOrderId = this.config.getSpecialFields().getPairingOffOrderId().callback(game, unit, - localStore, castId); + this.internalOffOrderId = this.config.getSpecialFields().getPairingOffOrderId().callback(unit, localStore, + castId); } if (this.config.getSpecialFields().getMaxPartners() != null) { - this.maxPartners = this.config.getSpecialFields().getMaxPartners().callback(game, unit, localStore, - castId); + this.maxPartners = this.config.getSpecialFields().getMaxPartners().callback(unit, localStore, castId); } if (this.config.getSpecialFields().getOrderPairedUnit() != null) { - this.orderPairedUnit = this.config.getSpecialFields().getOrderPairedUnit().callback(game, unit, - localStore, castId); + this.orderPairedUnit = this.config.getSpecialFields().getOrderPairedUnit().callback(unit, localStore, + castId); } if (this.config.getSpecialFields().getOrderPairedUnitOrderId() != null) { - this.orderPairedUnitOrderId = this.config.getSpecialFields().getOrderPairedUnitOrderId().callback(game, - unit, localStore, castId); + this.orderPairedUnitOrderId = this.config.getSpecialFields().getOrderPairedUnitOrderId().callback(unit, + localStore, castId); } if (this.config.getSpecialFields().getOrderPairedUnitOffOrderId() != null) { - this.orderPairedUnitOffOrderId = this.config.getSpecialFields().getOrderPairedUnitOffOrderId().callback(game, - unit, localStore, castId); + this.orderPairedUnitOffOrderId = this.config.getSpecialFields().getOrderPairedUnitOffOrderId().callback(unit, + localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index 35e6e12e7..6ba27a6e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -176,7 +176,7 @@ public void setLevel(CSimulation game, CUnit unit, int level) { determineToggleableFields(game, unit); if (config.getOnLevelChange() != null) { for (ABAction action : config.getOnLevelChange()) { - action.runAction(game, unit, this.localStore, castId); + action.runAction(unit, this.localStore, castId); } } } @@ -187,21 +187,21 @@ public void onAdd(CSimulation game, CUnit unit) { determineToggleableFields(game, unit); if (config.getOnAddAbility() != null) { for (ABAction action : config.getOnAddAbility()) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } } } @Override public void onAddDisabled(CSimulation game, CUnit unit) { - localStore.put(ABLocalStoreKeys.GAME, game); + localStore.game = game; localStore.put(ABLocalStoreKeys.THISUNIT, unit); addInitialUniqueFlags(game, unit); setSpellFields(game, unit); determineToggleableFields(game, unit); if (config.getOnAddDisabledAbility() != null) { for (ABAction action : config.getOnAddDisabledAbility()) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } } } @@ -210,7 +210,7 @@ public void onAddDisabled(CSimulation game, CUnit unit) { public void onRemoveDisabled(CSimulation game, CUnit unit) { if (config.getOnRemoveDisabledAbility() != null) { for (ABAction action : config.getOnRemoveDisabledAbility()) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } } } @@ -219,39 +219,36 @@ private void addInitialUniqueFlags(CSimulation game, CUnit unit) { if (this.config.getInitialUniqueFlags() != null && !this.config.getInitialUniqueFlags().isEmpty()) { this.uniqueFlags = new HashSet<>(); for (ABStringCallback flag : this.config.getInitialUniqueFlags()) { - this.uniqueFlags.add(flag.callback(game, unit, localStore, 0)); + this.uniqueFlags.add(flag.callback(unit, localStore, 0)); } } } private void determineToggleableFields(CSimulation game, CUnit unit) { if (config.getDisplayFields() != null && config.getDisplayFields().getSeparateOnAndOff() != null) { - this.separateOnAndOff = config.getDisplayFields().getSeparateOnAndOff().callback(game, unit, localStore, - castId); + this.separateOnAndOff = config.getDisplayFields().getSeparateOnAndOff().callback(unit, localStore, castId); } if (config.getDisplayFields() != null && config.getDisplayFields().getToggleable() != null) { - this.toggleable = config.getDisplayFields().getToggleable().callback(game, unit, localStore, castId); + this.toggleable = config.getDisplayFields().getToggleable().callback(unit, localStore, castId); } if (config.getDisplayFields() != null && config.getDisplayFields().getCastToggleOff() != null) { - this.allowCastlessDeactivate = !config.getDisplayFields().getCastToggleOff().callback(game, unit, - localStore, castId); + this.allowCastlessDeactivate = !config.getDisplayFields().getCastToggleOff().callback(unit, localStore, + castId); } if (config.getDisplayFields() != null && config.getDisplayFields().getAlternateUnitId() != null) { if (unit.getTypeId() - .equals(config.getDisplayFields().getAlternateUnitId().callback(game, unit, localStore, castId))) { + .equals(config.getDisplayFields().getAlternateUnitId().callback(unit, localStore, castId))) { this.active = true; } } if (config.getSpecialFields() != null && config.getSpecialFields().getBufferManaRequired() != null) { - this.bufferMana = config.getSpecialFields().getBufferManaRequired().callback(game, unit, localStore, - castId); + this.bufferMana = config.getSpecialFields().getBufferManaRequired().callback(unit, localStore, castId); } if (this.toggleable) { localStore.put(ABLocalStoreKeys.ISTOGGLEDABILITY, this); int manaPerSec = 0; if (config.getSpecialFields() != null && config.getSpecialFields().getManaDrainedPerSecond() != null) { - manaPerSec = config.getSpecialFields().getManaDrainedPerSecond().callback(game, unit, localStore, - castId); + manaPerSec = config.getSpecialFields().getManaDrainedPerSecond().callback(unit, localStore, castId); } if (manaPerSec != 0) { if (manaDrain == null) { @@ -270,7 +267,7 @@ private void determineToggleableFields(CSimulation game, CUnit unit) { if (config.getDisplayFields() != null && config.getDisplayFields().getAlternateUnitId() != null) { if (unit.getTypeId().equals( - config.getDisplayFields().getAlternateUnitId().callback(game, unit, localStore, castId))) { + config.getDisplayFields().getAlternateUnitId().callback(unit, localStore, castId))) { this.active = true; } } @@ -286,56 +283,50 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.castTime = levelDataLevel.getCastTime(); if (this.config.getOverrideFields() != null) { if (this.config.getOverrideFields().getAreaOverride() != null) { - this.area = this.config.getOverrideFields().getAreaOverride().callback(game, unit, localStore, castId); + this.area = this.config.getOverrideFields().getAreaOverride().callback(unit, localStore, castId); } if (this.config.getOverrideFields().getRangeOverride() != null) { - this.range = this.config.getOverrideFields().getRangeOverride().callback(game, unit, localStore, - castId); + this.range = this.config.getOverrideFields().getRangeOverride().callback(unit, localStore, castId); } if (this.config.getOverrideFields().getCastTimeOverride() != null) { - this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(game, unit, localStore, - castId); + this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(unit, localStore, castId); } if (this.config.getOverrideFields().getIgnoreCastTime() != null) { - this.ignoreCastTime = this.config.getOverrideFields().getIgnoreCastTime().callback(game, unit, - localStore, castId); + this.ignoreCastTime = this.config.getOverrideFields().getIgnoreCastTime().callback(unit, localStore, + castId); } if (this.config.getOverrideFields().getCooldownOverride() != null) { - this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(game, unit, localStore, - castId); + this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(unit, localStore, castId); } if (this.config.getOverrideFields().getManaCostOverride() != null) { - this.manaCost = this.config.getOverrideFields().getManaCostOverride().callback(game, unit, localStore, - castId); + this.manaCost = this.config.getOverrideFields().getManaCostOverride().callback(unit, localStore, castId); } if (this.config.getOverrideFields().getAutocastTypeOverride() != null) { - this.autocastType = this.config.getOverrideFields().getAutocastTypeOverride().callback(game, unit, - localStore, castId); + this.autocastType = this.config.getOverrideFields().getAutocastTypeOverride().callback(unit, localStore, + castId); } if (this.config.getOverrideFields().getOnTooltipOverride() != null) { - this.onTooltipOverride = this.config.getOverrideFields().getOnTooltipOverride().callback(game, unit, - localStore, castId); + this.onTooltipOverride = this.config.getOverrideFields().getOnTooltipOverride().callback(unit, localStore, + castId); } if (this.config.getOverrideFields().getOffTooltipOverride() != null) { - this.offTooltipOverride = this.config.getOverrideFields().getOffTooltipOverride().callback(game, unit, - localStore, castId); + this.offTooltipOverride = this.config.getOverrideFields().getOffTooltipOverride().callback(unit, localStore, + castId); } if (this.config.getOverrideFields().getPhysicalSpell() != null) { - this.physical = this.config.getOverrideFields().getPhysicalSpell().callback(game, unit, localStore, - castId); + this.physical = this.config.getOverrideFields().getPhysicalSpell().callback(unit, localStore, castId); this.magic = this.physical ? false : this.magic; // Spells that just declare physical:true default to // magic:false } if (this.config.getOverrideFields().getMagicSpell() != null) { - this.magic = this.config.getOverrideFields().getMagicSpell().callback(game, unit, localStore, castId); + this.magic = this.config.getOverrideFields().getMagicSpell().callback(unit, localStore, castId); } if (this.config.getOverrideFields().getDispel() != null) { - this.dispel = this.config.getOverrideFields().getDispel().callback(game, unit, localStore, castId); + this.dispel = this.config.getOverrideFields().getDispel().callback(unit, localStore, castId); } if (this.config.getOverrideFields().getUniversalSpell() != null) { - this.universal = this.config.getOverrideFields().getUniversalSpell().callback(game, unit, localStore, - castId); + this.universal = this.config.getOverrideFields().getUniversalSpell().callback(unit, localStore, castId); } } @@ -355,28 +346,27 @@ protected void setSpellFields(CSimulation game, CUnit unit) { if (this.config.getOverrideFields() != null && this.config.getOverrideFields().getExtraTargetsAllowed() != null) { for(ABTargetTypeCallback target : this.config.getOverrideFields().getExtraTargetsAllowed()) { - this.targetsAllowed.add(target.callback(game, unit, localStore, requiredLevel)); + this.targetsAllowed.add(target.callback(unit, localStore, requiredLevel)); } } if (this.config.getOverrideFields() != null && this.config.getOverrideFields().getExcludedTargetsAllowed() != null) { for(ABTargetTypeCallback target : this.config.getOverrideFields().getExcludedTargetsAllowed()) { - this.targetsAllowed.remove(target.callback(game, unit, localStore, requiredLevel)); + this.targetsAllowed.remove(target.callback(unit, localStore, requiredLevel)); } } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getHideAreaCursor() != null) { - this.hideAreaCursor = this.config.getDisplayFields().getHideAreaCursor().callback(game, unit, localStore, - castId); + this.hideAreaCursor = this.config.getDisplayFields().getHideAreaCursor().callback(unit, localStore, castId); } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getAreaCursorOverride() != null) { - this.areaCursorOverride = this.config.getDisplayFields().getAreaCursorOverride().callback(game, unit, - localStore, castId); + this.areaCursorOverride = this.config.getDisplayFields().getAreaCursorOverride().callback(unit, localStore, + castId); } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getIsMenu() != null) { - this.isMenu = this.config.getDisplayFields().getIsMenu().callback(game, unit, localStore, this.getLevel()); + this.isMenu = this.config.getDisplayFields().getIsMenu().callback(unit, localStore, this.getLevel()); if (this.isMenu) { if (this.config.getDisplayFields().getMenuId() != null) { - this.orderId = this.config.getDisplayFields().getMenuId().callback(game, unit, localStore, castId); + this.orderId = this.config.getDisplayFields().getMenuId().callback(unit, localStore, castId); } else { if (this.orderId == 0) { this.orderId = this.getHandleId(); @@ -621,7 +611,7 @@ public void setAutoCastOn(final CSimulation simulation, final CUnit caster, fina this.localStore.put(ABLocalStoreKeys.ISAUTOCASTON, autoCastOn); if (this.config.getOnChangeAutoCast() != null) { for (ABAction action : this.config.getOnChangeAutoCast()) { - action.runAction(simulation, caster, localStore, -1); + action.runAction(caster, localStore, -1); } } this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTON); @@ -637,7 +627,7 @@ protected ABBehavior createNoTargetBehavior(CUnit unit) { ABBehavior beh = new CBehaviorAbilityBuilderNoTarget(unit, localStore, this); if (this.item != null || (this.config.getDisplayFields() != null && this.config.getDisplayFields().getInstantCast() != null - && this.config.getDisplayFields().getInstantCast().callback(null, unit, localStore, castId))) { + && this.config.getDisplayFields().getInstantCast().callback(unit, localStore, castId))) { beh.setInstant(true); } if (this.config.getSpecialFields() != null && this.config.getSpecialFields().getBehaviorCategory() != null) { @@ -650,7 +640,7 @@ protected ABBehavior createRangedBehavior(CUnit unit) { ABBehavior beh = new CBehaviorAbilityBuilderBase(unit, localStore, this); if (this.item != null || (this.config.getDisplayFields() != null && this.config.getDisplayFields().getInstantCast() != null - && this.config.getDisplayFields().getInstantCast().callback(null, unit, localStore, castId))) { + && this.config.getDisplayFields().getInstantCast().callback(unit, localStore, castId))) { beh.setInstant(true); } if (this.config.getSpecialFields() != null && this.config.getSpecialFields().getBehaviorCategory() != null) { @@ -725,7 +715,7 @@ protected void innerCheckExtraCastConditions(CSimulation game, CUnit unit, int o if (config.getExtraCastConditions() != null) { boolean result = true; for (ABCondition condition : config.getExtraCastConditions()) { - result = result && condition.callback(game, unit, localStore, -1); + result = result && condition.callback(unit, localStore, -1); } if (result) { receiver.useOk(); @@ -950,7 +940,7 @@ protected String innerCheckExtraTargetConditions(CSimulation game, CUnit unit, i if (config.getExtraTargetConditions() != null) { boolean result = true; for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.callback(game, unit, localStore, -1); + result = result && condition.callback(unit, localStore, -1); } if (result) { return null; @@ -972,12 +962,12 @@ protected String innerCheckExtraAutoTargetConditions(CSimulation game, CUnit uni boolean result = true; if (config.getExtraTargetConditions() != null) { for (ABCondition condition : config.getExtraTargetConditions()) { - result = result && condition.callback(game, unit, localStore, -1); + result = result && condition.callback(unit, localStore, -1); } } if (config.getExtraAutoTargetConditions() != null) { for (ABCondition condition : config.getExtraAutoTargetConditions()) { - result = result && condition.callback(game, unit, localStore, -1); + result = result && condition.callback(unit, localStore, -1); } } if (result) { @@ -1001,7 +991,7 @@ protected String innerCheckExtraAutoNoTargetConditions(CSimulation game, CUnit u boolean result = true; if (config.getExtraAutoNoTargetConditions() != null) { for (ABCondition condition : config.getExtraAutoNoTargetConditions()) { - result = result && condition.callback(game, unit, localStore, -1); + result = result && condition.callback(unit, localStore, -1); } } if (result) { @@ -1034,9 +1024,9 @@ public int getUIFoodCost() { return 0; } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getFoodCost() != null) { - CSimulation game = (CSimulation) this.localStore.get(ABLocalStoreKeys.GAME); + CSimulation game = this.localStore.game; CUnit unit = (CUnit) this.localStore.get(ABLocalStoreKeys.THISUNIT); - return this.config.getDisplayFields().getFoodCost().callback(game, unit, localStore, castId); + return this.config.getDisplayFields().getFoodCost().callback(unit, localStore, castId); } return 0; } @@ -1047,9 +1037,9 @@ public int getUIGoldCost() { return 0; } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getGoldCost() != null) { - CSimulation game = (CSimulation) this.localStore.get(ABLocalStoreKeys.GAME); + CSimulation game = this.localStore.game; CUnit unit = (CUnit) this.localStore.get(ABLocalStoreKeys.THISUNIT); - return this.config.getDisplayFields().getGoldCost().callback(game, unit, localStore, castId); + return this.config.getDisplayFields().getGoldCost().callback(unit, localStore, castId); } return 0; } @@ -1060,9 +1050,9 @@ public int getUILumberCost() { return 0; } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getLumberCost() != null) { - CSimulation game = (CSimulation) this.localStore.get(ABLocalStoreKeys.GAME); + CSimulation game = this.localStore.game; CUnit unit = (CUnit) this.localStore.get(ABLocalStoreKeys.THISUNIT); - return this.config.getDisplayFields().getLumberCost().callback(game, unit, localStore, castId); + return this.config.getDisplayFields().getLumberCost().callback(unit, localStore, castId); } return 0; } @@ -1074,7 +1064,7 @@ public void onRemove(CSimulation game, CUnit unit) { } if (config.getOnRemoveAbility() != null) { for (ABAction action : config.getOnRemoveAbility()) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } } } @@ -1086,7 +1076,7 @@ public void onDeath(CSimulation game, CUnit unit) { } if (config.getOnDeathPreCast() != null) { for (ABAction action : config.getOnDeathPreCast()) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } } } @@ -1095,7 +1085,7 @@ public void onDeath(CSimulation game, CUnit unit) { public void runOnOrderIssuedActions(final CSimulation game, final CUnit caster, int orderId) { if (config.getOnOrderIssued() != null) { for (ABAction action : config.getOnOrderIssued()) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -1104,7 +1094,7 @@ public void runOnOrderIssuedActions(final CSimulation game, final CUnit caster, public void runBeginCastingActions(final CSimulation game, final CUnit caster, int orderId) { if (config.getOnBeginCasting() != null) { for (ABAction action : config.getOnBeginCasting()) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -1113,7 +1103,7 @@ public void runBeginCastingActions(final CSimulation game, final CUnit caster, i public void runEndCastingActions(final CSimulation game, final CUnit caster, int orderId) { if (config.getOnEndCasting() != null) { for (ABAction action : config.getOnEndCasting()) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (this.toggleable) { @@ -1130,7 +1120,7 @@ public void runEndCastingActions(final CSimulation game, final CUnit caster, int public void runChannelTickActions(final CSimulation game, final CUnit caster, int orderId) { if (config.getOnChannelTick() != null) { for (ABAction action : config.getOnChannelTick()) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -1139,7 +1129,7 @@ public void runChannelTickActions(final CSimulation game, final CUnit caster, in public void runEndChannelActions(final CSimulation game, final CUnit caster, int orderId) { if (config.getOnEndChannel() != null) { for (ABAction action : config.getOnEndChannel()) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -1148,7 +1138,7 @@ public void runEndChannelActions(final CSimulation game, final CUnit caster, int public void runCancelPreCastActions(final CSimulation game, final CUnit caster, int orderId) { if (config.getOnCancelPreCast() != null) { for (ABAction action : config.getOnCancelPreCast()) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -1168,7 +1158,7 @@ public void activate(final CSimulation game, final CUnit caster) { } if (config.getOnActivate() != null) { for (ABAction action : config.getOnActivate()) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -1188,7 +1178,7 @@ public void deactivate(final CSimulation game, final CUnit caster) { } if (config.getOnDeactivate() != null) { for (ABAction action : config.getOnDeactivate()) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java index af5192061..32503a989 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java @@ -61,7 +61,7 @@ private void addInitialUniqueFlags(CSimulation game, CUnit unit) { if (this.config.getInitialUniqueFlags() != null && !this.config.getInitialUniqueFlags().isEmpty()) { this.uniqueFlags = new HashSet<>(); for (ABStringCallback flag : this.config.getInitialUniqueFlags()) { - this.uniqueFlags.add(flag.callback(game, unit, localStore, 0)); + this.uniqueFlags.add(flag.callback(unit, localStore, 0)); } } } @@ -73,19 +73,16 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.range = levelDataLevel.getCastRange(); if (this.config.getOverrideFields() != null) { if (this.config.getOverrideFields().getAreaOverride() != null) { - this.area = this.config.getOverrideFields().getAreaOverride().callback(game, unit, localStore, 0); + this.area = this.config.getOverrideFields().getAreaOverride().callback(unit, localStore, 0); } if (this.config.getOverrideFields().getRangeOverride() != null) { - this.range = this.config.getOverrideFields().getRangeOverride().callback(game, unit, localStore, - 0); + this.range = this.config.getOverrideFields().getRangeOverride().callback(unit, localStore, 0); } if (this.config.getOverrideFields().getCastTimeOverride() != null) { - this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(game, unit, localStore, - 0); + this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(unit, localStore, 0); } if (this.config.getOverrideFields().getCooldownOverride() != null) { - this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(game, unit, localStore, - 0); + this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(unit, localStore, 0); } } } @@ -244,31 +241,31 @@ public void setLevel(CSimulation game, CUnit unit, int level) { setSpellFields(game, unit); if (config.getOnLevelChange() != null) { for (ABAction action : config.getOnLevelChange()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } @Override public void onAdd(CSimulation game, CUnit unit) { - localStore.put(ABLocalStoreKeys.GAME, game); + localStore.game = game; localStore.put(ABLocalStoreKeys.THISUNIT, unit); if (config.getOnAddAbility() != null) { for (ABAction action : config.getOnAddAbility()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } @Override public void onAddDisabled(CSimulation game, CUnit unit) { - localStore.put(ABLocalStoreKeys.GAME, game); + localStore.game = game; localStore.put(ABLocalStoreKeys.THISUNIT, unit); addInitialUniqueFlags(game, unit); setSpellFields(game, unit); if (config.getOnAddDisabledAbility() != null) { for (ABAction action : config.getOnAddDisabledAbility()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } @@ -277,7 +274,7 @@ public void onAddDisabled(CSimulation game, CUnit unit) { public void onRemove(CSimulation game, CUnit unit) { if (config.getOnRemoveAbility() != null) { for (ABAction action : config.getOnRemoveAbility()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } @@ -286,7 +283,7 @@ public void onRemove(CSimulation game, CUnit unit) { public void onRemoveDisabled(CSimulation game, CUnit unit) { if (config.getOnRemoveDisabledAbility() != null) { for (ABAction action : config.getOnRemoveDisabledAbility()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } @@ -299,7 +296,7 @@ public void onTick(CSimulation game, CUnit unit) { public void onDeath(CSimulation game, CUnit unit) { if (config.getOnDeathPreCast() != null) { for (ABAction action : config.getOnDeathPreCast()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java index 191c244c6..c6bec5361 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java @@ -61,7 +61,7 @@ private void addInitialUniqueFlags(CSimulation game, CUnit unit) { if (this.config.getInitialUniqueFlags() != null && !this.config.getInitialUniqueFlags().isEmpty()) { this.uniqueFlags = new HashSet<>(); for (ABStringCallback flag : this.config.getInitialUniqueFlags()) { - this.uniqueFlags.add(flag.callback(game, unit, localStore, 0)); + this.uniqueFlags.add(flag.callback(unit, localStore, 0)); } } } @@ -75,23 +75,20 @@ protected void setSpellFields(CSimulation game, CUnit unit) { } if (this.config.getOverrideFields() != null) { if (this.config.getOverrideFields().getAreaOverride() != null) { - this.area = this.config.getOverrideFields().getAreaOverride().callback(game, unit, localStore, 0); + this.area = this.config.getOverrideFields().getAreaOverride().callback(unit, localStore, 0); } if (this.config.getOverrideFields().getRangeOverride() != null) { - this.range = this.config.getOverrideFields().getRangeOverride().callback(game, unit, localStore, - 0); + this.range = this.config.getOverrideFields().getRangeOverride().callback(unit, localStore, 0); } if (this.config.getOverrideFields().getCastTimeOverride() != null) { - this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(game, unit, localStore, - 0); + this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(unit, localStore, 0); } if (this.config.getOverrideFields().getCooldownOverride() != null) { - this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(game, unit, localStore, - 0); + this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(unit, localStore, 0); } if (this.config.getOverrideFields().getOnTooltipOverride() != null) { - this.onTooltipOverride = this.config.getOverrideFields().getOnTooltipOverride().callback(game, unit, - localStore, 0); + this.onTooltipOverride = this.config.getOverrideFields().getOnTooltipOverride().callback(unit, localStore, + 0); } } } @@ -257,31 +254,31 @@ public void setLevel(CSimulation game, CUnit unit, int level) { setSpellFields(game, unit); if (config.getOnLevelChange() != null) { for (ABAction action : config.getOnLevelChange()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } @Override public void onAdd(CSimulation game, CUnit unit) { - localStore.put(ABLocalStoreKeys.GAME, game); + localStore.game = game; localStore.put(ABLocalStoreKeys.THISUNIT, unit); if (config.getOnAddAbility() != null) { for (ABAction action : config.getOnAddAbility()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } @Override public void onAddDisabled(CSimulation game, CUnit unit) { - localStore.put(ABLocalStoreKeys.GAME, game); + localStore.game = game; localStore.put(ABLocalStoreKeys.THISUNIT, unit); addInitialUniqueFlags(game, unit); setSpellFields(game, unit); if (config.getOnAddDisabledAbility() != null) { for (ABAction action : config.getOnAddDisabledAbility()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } @@ -290,7 +287,7 @@ public void onAddDisabled(CSimulation game, CUnit unit) { public void onRemove(CSimulation game, CUnit unit) { if (config.getOnRemoveAbility() != null) { for (ABAction action : config.getOnRemoveAbility()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } @@ -299,7 +296,7 @@ public void onRemove(CSimulation game, CUnit unit) { public void onRemoveDisabled(CSimulation game, CUnit unit) { if (config.getOnRemoveDisabledAbility() != null) { for (ABAction action : config.getOnRemoveDisabledAbility()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } @@ -312,7 +309,7 @@ public void onTick(CSimulation game, CUnit unit) { public void onDeath(CSimulation game, CUnit unit) { if (config.getOnDeathPreCast() != null) { for (ABAction action : config.getOnDeathPreCast()) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderAuraTemplate.java index 405b64ec1..d14454b32 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderAuraTemplate.java @@ -124,7 +124,7 @@ public void addUnitToAura(CSimulation game, CUnit unit) { auraGroup.add(unit); if (addToAuraActions != null) { for (ABAction action : addToAuraActions) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } unit.add(game, buff); @@ -133,7 +133,7 @@ public void addUnitToAura(CSimulation game, CUnit unit) { public void updateLevelOfAura(CSimulation game, CUnit unit, int prevLevel, int curLevel) { if (updateAuraLevelActions != null) { for (ABAction action : updateAuraLevelActions) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } } @@ -142,7 +142,7 @@ public void removeUnitFromAura(CSimulation game, CUnit unit) { unit.remove(game, buff); if (removeFromAuraActions != null) { for (ABAction action : removeFromAuraActions) { - action.runAction(game, unit, localStore, 0); + action.runAction(unit, localStore, 0); } } auraGroup.remove(unit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java index 31e6973b9..8a01b19bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java @@ -94,26 +94,25 @@ public CBehaviorFinishTransformation(CUnit sourceUnit, LocalDataStore localStore public CBehavior update(CSimulation game) { if (this.castStartTick == 0) { this.castStartTick = game.getGameTurnTick(); - TransformationHandler.startSlowTransformation(game, localStore, unit, newType, keepRatios, actions, ability, + TransformationHandler.startSlowTransformation(localStore, unit, newType, keepRatios, actions, ability, addAlternateTagAfter, takingOff, landing, immediateTakeoff, immediateLanding, altitudeAdjustmentDelay, landingDelay, altitudeAdjustmentDuration); } final int ticksSinceCast = game.getGameTurnTick() - this.castStartTick; if (ticksSinceCast >= this.transformationTickDuration) { - TransformationHandler.finishSlowTransformation(game, localStore, unit, newType, keepRatios, actions, - ability, addAlternateTagAfter, permanent, takingOff); + TransformationHandler.finishSlowTransformation(localStore, unit, newType, keepRatios, actions, ability, + addAlternateTagAfter, permanent, takingOff); if (instantTransformAtDurationEnd) { - TransformationHandler.createInstantTransformBackBuff(game, sourceUnit, localStore, unit, - baseTypeForDuration, keepRatios, actions.createUntransformActions(), ability, buffId, - addAlternateTagAfter, transformationTime, duration, permanent); + TransformationHandler.createInstantTransformBackBuff(sourceUnit, localStore, unit, baseTypeForDuration, + keepRatios, actions.createUntransformActions(), ability, buffId, addAlternateTagAfter, + transformationTime, duration, permanent); } else { - TransformationHandler.createSlowTransformBackBuff(game, sourceUnit, localStore, unit, - baseTypeForDuration, keepRatios, actions.createUntransformActions(), ability, buffId, - addAlternateTagAfter, transformationTime, duration, permanent, takingOff, landing, - immediateTakeoff, immediateLanding, altitudeAdjustmentDelay, landingDelay, - altitudeAdjustmentDuration); + TransformationHandler.createSlowTransformBackBuff(sourceUnit, localStore, unit, baseTypeForDuration, + keepRatios, actions.createUntransformActions(), ability, buffId, addAlternateTagAfter, + transformationTime, duration, permanent, takingOff, landing, immediateTakeoff, immediateLanding, + altitudeAdjustmentDelay, landingDelay, altitudeAdjustmentDuration); } this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java index c6dbac5a0..1d5590711 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; @@ -16,15 +15,14 @@ public class ABActionAddAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CAbility theAbility = this.ability.callback(caster, localStore, castId); CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theAbility != null) { - theUnit.add(game, theAbility); + theUnit.add(localStore.game, theAbility); localStore.put(ABLocalStoreKeys.LASTADDEDABILITY, theAbility); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java index 3210f96ed..e8c4380e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -24,8 +23,7 @@ public class ABActionAddSlowBuff implements ABSingleAction { private ABBooleanCallback leveled; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { War3ID alias = null; boolean isLeveled = false; @@ -33,24 +31,24 @@ public void runAction(final CSimulation game, final CUnit caster, if (buffId == null) { alias = War3ID.fromString("Bfro"); } else { - alias = buffId.callback(game, caster, localStore, castId); + alias = buffId.callback(caster, localStore, castId); } if (leveled != null) { - isLeveled = leveled.callback(game, caster, localStore, castId); + isLeveled = leveled.callback(caster, localStore, castId); } else { isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } if (showIcon != null) { - isShowIcon = showIcon.callback(game, caster, localStore, castId); + isShowIcon = showIcon.callback(caster, localStore, castId); } - final ABBuffSlow ability = new ABBuffSlow(game, game.getHandleIdAllocator().createId(), alias, localStore, + final ABBuffSlow ability = new ABBuffSlow(localStore.game, localStore.game.getHandleIdAllocator().createId(), alias, localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - this.duration.callback(game, caster, localStore, castId), isLeveled); + this.duration.callback(caster, localStore, castId), isLeveled); ability.setIconShowing(isShowIcon); - this.unit.callback(game, caster, localStore, castId).add(game, ability); + this.unit.callback(caster, localStore, castId).add(localStore.game, ability); localStore.put(ABLocalStoreKeys.LASTADDEDBUFF, ability); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java index cfc84b636..1439579f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -24,30 +23,29 @@ public class ABActionAddStunBuff implements ABSingleAction { private ABBooleanCallback leveled; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { War3ID alias = null; boolean isLeveled = false; boolean isShowIcon = true; if (buffId == null) { alias = War3ID.fromString("BSTN"); } else { - alias = buffId.callback(game, caster, localStore, castId); + alias = buffId.callback(caster, localStore, castId); } if (leveled != null) { - isLeveled = leveled.callback(game, caster, localStore, castId); + isLeveled = leveled.callback(caster, localStore, castId); } else { isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } if (showIcon != null) { - isShowIcon = showIcon.callback(game, caster, localStore, castId); + isShowIcon = showIcon.callback(caster, localStore, castId); } - final ABBuffStun ability = new ABBuffStun(game.getHandleIdAllocator().createId(), alias, localStore, + final ABBuffStun ability = new ABBuffStun(localStore.game.getHandleIdAllocator().createId(), alias, localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - this.duration.callback(game, caster, localStore, castId), isLeveled); + this.duration.callback(caster, localStore, castId), isLeveled); ability.setIconShowing(isShowIcon); - this.unit.callback(game, caster, localStore, castId).add(game, ability); + this.unit.callback(caster, localStore, castId).add(localStore.game, ability); localStore.put(ABLocalStoreKeys.LASTADDEDBUFF, ability); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCleanUpCastInstance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCleanUpCastInstance.java index 98abe4403..f2f5c3a0c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCleanUpCastInstance.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCleanUpCastInstance.java @@ -4,7 +4,6 @@ import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,8 +11,7 @@ public class ABActionCleanUpCastInstance implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { final Set keySet = new HashSet<>(localStore.keySet()); for (final String key : keySet) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java index f6b6e58ad..4a5b048fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; @@ -16,13 +15,12 @@ public class ABActionCreateAbilityFromId implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - War3ID theId = this.id.callback(game, caster, localStore, castId); - CAbilityType type = game.getAbilityData().getAbilityType(theId); + War3ID theId = this.id.callback(caster, localStore, castId); + CAbilityType type = localStore.game.getAbilityData().getAbilityType(theId); if (type != null) { - final CAbility ability = type.createAbility(game.getHandleIdAllocator().createId()); + final CAbility ability = type.createAbility(localStore.game.getHandleIdAllocator().createId()); localStore.put(ABLocalStoreKeys.LASTCREATEDABILITY, ability); } else { System.err.println("Failed to find an ability type definition for ability " + theId.asStringValue()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java index 937226ca8..eebacf4dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -11,8 +10,7 @@ public class ABActionDeleteStoredKey implements ABAction { private ABStringCallback key; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - localStore.remove(key.callback(game, caster, localStore, castId)); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + localStore.remove(key.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java index a7503b28f..dbb1d9250 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; @@ -15,16 +14,15 @@ public class ABActionPrepUnownedAbilityForUse implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CAbility theAbility = this.ability.callback(caster, localStore, castId); CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theAbility != null) { - theAbility.onAddDisabled(game, theUnit); - theAbility.onAdd(game, theUnit); + theAbility.onAddDisabled(localStore.game, theUnit); + theAbility.onAdd(localStore.game, theUnit); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java index 7164058c2..c2aa9add5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; @@ -15,15 +14,14 @@ public class ABActionRemoveAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } - CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + CAbility theAbility = this.ability.callback(caster, localStore, castId); if (theAbility != null) { - theUnit.remove(game, theAbility); + theUnit.remove(localStore.game, theAbility); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java index 13a6acb75..757408e44 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -16,11 +15,10 @@ public class ABActionAbilityAddUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CAbility theAbility = this.ability.callback(caster, localStore, castId); if (theAbility instanceof AbilityBuilderAbility) { - ((AbilityBuilderAbility) theAbility).addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ((AbilityBuilderAbility) theAbility).addUniqueFlag(flag.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java index efb670a9e..4fbf9a4eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; @@ -21,30 +20,29 @@ public class ABActionAbilityAttemptToApplyEffect implements ABSingleAction { private ABUnitCallback target; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theCaster = caster; if (source != null) { - theCaster = source.callback(game, theCaster, localStore, castId); + theCaster = source.callback(theCaster, localStore, castId); } - CUnit theTarget = target.callback(game, theCaster, localStore, castId); - final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + CUnit theTarget = target.callback(theCaster, localStore, castId); + final CAbility theAbility = this.ability.callback(caster, localStore, castId); if (theAbility instanceof AbilityBuilderActiveAbility) { AbilityBuilderActiveAbility active = ((AbilityBuilderActiveAbility) theAbility); int orderId = active.getBaseOrderId(); final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; - active.checkCanUse(game, theCaster, orderId, false, activationReceiver); + active.checkCanUse(localStore.game, theCaster, orderId, false, activationReceiver); if (activationReceiver.isOk()) { final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - active.checkCanTarget(game, theCaster, orderId, + active.checkCanTarget(localStore.game, theCaster, orderId, ((Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId))), theTarget, booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { if (theCaster.chargeMana(active.getChargedManaCost())) { - active.internalBegin(game, theCaster, orderId, false, theTarget); - active.startCooldown(game, theCaster); - active.runEndCastingActions(game, theCaster, orderId); + active.internalBegin(localStore.game, theCaster, orderId, false, theTarget); + active.startCooldown(localStore.game, theCaster); + active.runEndCastingActions(localStore.game, theCaster, orderId); active.cleanupInputs(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java index d06b1ec78..30666f6fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -16,11 +15,10 @@ public class ABActionAbilityRemoveUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CAbility theAbility = this.ability.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CAbility theAbility = this.ability.callback(caster, localStore, castId); if (theAbility instanceof AbilityBuilderAbility) { - ((AbilityBuilderAbility) theAbility).removeUniqueFlag(flag.callback(game, caster, localStore, castId)); + ((AbilityBuilderAbility) theAbility).removeUniqueFlag(flag.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java index 573c1c5f3..29bab45e3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -16,15 +15,14 @@ public class ABActionAbilityRemoveUniqueValue implements ABAction { private ABStringCallback key; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CAbility theAbility = null; if (ability != null) { - theAbility = ability.callback(game, caster, localStore, castId); + theAbility = ability.callback(caster, localStore, castId); } else { theAbility = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); } - theAbility.removeUniqueValue(key.callback(game, caster, localStore, castId)); + theAbility.removeUniqueValue(key.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java index 3287a3aba..6d830665e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; @@ -25,31 +24,30 @@ public class ABActionAbilityRunEndCastingActions implements ABSingleAction { private ABDestructableCallback targetDest; @Override - public void runAction(final CSimulation game, final CUnit originalCaster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit originalCaster, final LocalDataStore localStore, final int castId) { CUnit theCaster = originalCaster; if (caster != null) { - theCaster = caster.callback(game, originalCaster, localStore, castId); + theCaster = caster.callback(originalCaster, localStore, castId); } AbilityTarget tar = null; if (targetLoc != null) { - tar = targetLoc.callback(game, originalCaster, localStore, castId); + tar = targetLoc.callback(originalCaster, localStore, castId); } else if (targetUnit != null) { - tar = targetUnit.callback(game, originalCaster, localStore, castId); + tar = targetUnit.callback(originalCaster, localStore, castId); } else if (targetItem != null) { - tar = targetItem.callback(game, originalCaster, localStore, castId); + tar = targetItem.callback(originalCaster, localStore, castId); } else if (targetDest != null) { - tar = targetDest.callback(game, originalCaster, localStore, castId); + tar = targetDest.callback(originalCaster, localStore, castId); } - final CAbility theAbility = this.ability.callback(game, originalCaster, localStore, castId); + final CAbility theAbility = this.ability.callback(originalCaster, localStore, castId); if (theAbility instanceof AbilityBuilderActiveAbility) { AbilityBuilderActiveAbility active = ((AbilityBuilderActiveAbility) theAbility); int orderId = active.getBaseOrderId(); - active.internalBegin(game, theCaster, orderId, false, tar); - active.runEndCastingActions(game, theCaster, orderId); + active.internalBegin(localStore.game, theCaster, orderId, false, tar); + active.runEndCastingActions(localStore.game, theCaster, orderId); active.cleanupInputs(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java index 5de130293..8e593e8fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -17,16 +16,15 @@ public class ABActionAbilitySetShowIcon implements ABSingleAction { private ABBooleanCallback show; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { if (this.ability != null) { - final CAbility abil = ability.callback(game, caster, localStore, castId); + final CAbility abil = ability.callback(caster, localStore, castId); if (abil != null) { - abil.setIconShowing(show.callback(game, caster, localStore, castId)); + abil.setIconShowing(show.callback(caster, localStore, castId)); } } else { final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - abil.setIconShowing(show.callback(game, caster, localStore, castId)); + abil.setIconShowing(show.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java index 4dc0370bc..0b6063790 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -18,16 +17,15 @@ public class ABActionAbilityStoreUniqueValue implements ABAction { private ABCallback valueToStore; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CAbility theAbility = null; if (ability != null) { - theAbility = ability.callback(game, caster, localStore, castId); + theAbility = ability.callback(caster, localStore, castId); } else { theAbility = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); } - theAbility.addUniqueValue(valueToStore.callback(game, caster, localStore, castId), - key.callback(game, caster, localStore, castId)); + theAbility.addUniqueValue(valueToStore.callback(caster, localStore, castId), + key.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java index ad195f411..c8aac7255 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -12,12 +11,11 @@ public class ABActionActivateToggledAbility implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore .get(ABLocalStoreKeys.ABILITY); - ability.activate(game, caster); + ability.activate(localStore.game, caster); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java index bc1137c3b..dcabfb6eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; @@ -21,8 +20,7 @@ public class ABActionAddTargetAllowed implements ABSingleAction { @Override @SuppressWarnings("unchecked") - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (ability != null && ability instanceof AbilityBuilderActiveAbility) { ((AbilityBuilderActiveAbility)ability).getTargetsAllowed().add(this.targetType); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java index a21766202..a8893fb77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -11,8 +10,7 @@ public class ABActionBeginChanneling implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.CHANNELING, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java index 60e4becce..753e9ae45 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; @@ -16,10 +15,9 @@ public class ABActionClickDisableAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { if (this.ability != null) { - final CAbility abil = ability.callback(game, caster, localStore, castId); + final CAbility abil = ability.callback(caster, localStore, castId); if (abil != null) { abil.setClickDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java index 602464f14..bdb2f82b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; @@ -16,10 +15,9 @@ public class ABActionClickEnableAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { if (this.ability != null) { - final CAbility abil = ability.callback(game, caster, localStore, castId); + final CAbility abil = ability.callback(caster, localStore, castId); if (abil != null) { abil.setClickDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java index 459339d4b..f959c5f6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -12,12 +11,11 @@ public class ABActionDeactivateToggledAbility implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore .get(ABLocalStoreKeys.ABILITY); - ability.deactivate(game, caster); + ability.deactivate(localStore.game, caster); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java index b297186a1..b8ef58438 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; @@ -16,10 +15,9 @@ public class ABActionDisableAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { if (this.ability != null) { - final CAbility abil = ability.callback(game, caster, localStore, castId); + final CAbility abil = ability.callback(caster, localStore, castId); if (abil != null) { abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbilityById.java index 7cee5b35c..5c4a04843 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbilityById.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -19,15 +18,14 @@ public class ABActionDisableAbilityById implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { - theUnit = this.unit.callback(game, caster, localStore, castId); + theUnit = this.unit.callback(caster, localStore, castId); } if (this.alias != null) { - final War3ID aliasId = this.alias.callback(game, caster, localStore, castId); + final War3ID aliasId = this.alias.callback(caster, localStore, castId); final AbilityBuilderAbility abil = theUnit .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); if (abil != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java index cb5da27e5..57bd94970 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; @@ -16,10 +15,9 @@ public class ABActionEnableAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { if (this.ability != null) { - final CAbility abil = ability.callback(game, caster, localStore, castId); + final CAbility abil = ability.callback(caster, localStore, castId); if (abil != null) { abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbilityById.java index d44994aeb..362f2b9cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbilityById.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -19,15 +18,14 @@ public class ABActionEnableAbilityById implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { - theUnit = this.unit.callback(game, caster, localStore, castId); + theUnit = this.unit.callback(caster, localStore, castId); } if (this.alias != null) { - final War3ID aliasId = this.alias.callback(game, caster, localStore, castId); + final War3ID aliasId = this.alias.callback(caster, localStore, castId); final AbilityBuilderAbility abil = theUnit .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); if (abil != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java index 93be03a80..cd432b22a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -11,8 +10,7 @@ public class ABActionFinishChanneling implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.CHANNELING, false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java index 0015f2bbb..672d9c088 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; @@ -21,8 +20,7 @@ public class ABActionRemoveTargetAllowed implements ABSingleAction { @Override @SuppressWarnings("unchecked") - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (ability != null && ability instanceof AbilityBuilderActiveAbility) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java index b1ff823fb..bdf4d40bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java @@ -3,7 +3,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; @@ -19,24 +18,23 @@ public class ABActionResetCooldown implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { - theUnit = this.unit.callback(game, caster, localStore, castId); + theUnit = this.unit.callback(caster, localStore, castId); } if (this.alias != null) { - final War3ID aliasId = this.alias.callback(game, caster, localStore, castId); + final War3ID aliasId = this.alias.callback(caster, localStore, castId); final AbilityBuilderAbility abil = theUnit .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); if (abil != null) { - abil.resetCooldown(game, theUnit); + abil.resetCooldown(localStore.game, theUnit); } } else { final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - abil.resetCooldown(game, theUnit); + abil.resetCooldown(localStore.game, theUnit); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java index cd47027e6..1a81ad1c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; @@ -16,20 +15,19 @@ public class ABActionSendStartCastingEvents implements ABAction { private ABUnitCallback caster; private ABWidgetCallback target; @Override - public void runAction(final CSimulation game, final CUnit basecaster, - final LocalDataStore localStore, + public void runAction(final CUnit basecaster, final LocalDataStore localStore, final int castId) { CUnit theUnit = basecaster; CWidget theTarget = null; if (caster != null) { - theUnit = caster.callback(game, basecaster, localStore, castId); + theUnit = caster.callback(basecaster, localStore, castId); } if (target != null) { - theTarget = target.callback(game, basecaster, localStore, castId); + theTarget = target.callback(basecaster, localStore, castId); } CAbility theAbility = (CAbility) localStore.get(ABLocalStoreKeys.ABILITY); - theUnit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, theAbility, theTarget); - theUnit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, theAbility, theTarget); - theUnit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, theAbility, theTarget); + theUnit.fireSpellEvents(localStore.game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, theAbility, theTarget); + theUnit.fireSpellEvents(localStore.game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, theAbility, theTarget); + theUnit.fireSpellEvents(localStore.game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, theAbility, theTarget); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java index 49d7b7cd3..932cd6e3c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -15,12 +14,11 @@ public class ABActionSetAbilityCastRange implements ABSingleAction { private ABFloatCallback range; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore .get(ABLocalStoreKeys.ISTOGGLEDABILITY); - ability.setCastRange(range.callback(game, caster, localStore, castId)); + ability.setCastRange(range.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetDestructable.java index d75d769d0..41ad80365 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetDestructable.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -14,11 +13,10 @@ public class ABActionSetAutoTargetDestructable implements ABSingleAction { private ABDestructableCallback dest; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, - this.dest.callback(game, caster, localStore, castId)); + this.dest.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetUnit.java index 42a3cc118..30eab19f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetUnit.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -14,10 +13,9 @@ public class ABActionSetAutoTargetUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, - this.unit.callback(game, caster, localStore, castId)); + this.unit.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java index 60e3ac524..20245e6f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -11,8 +10,7 @@ public class ABActionSetPreventEndEvents implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.PREVENTENDEVENTS+castId, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java index 4be26a23c..2cc12510a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java @@ -3,7 +3,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; @@ -21,31 +20,30 @@ public class ABActionStartCooldown implements ABSingleAction { private ABFloatCallback cooldown; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { - theUnit = this.unit.callback(game, caster, localStore, castId); + theUnit = this.unit.callback(caster, localStore, castId); } if (this.alias != null) { - final War3ID aliasId = this.alias.callback(game, caster, localStore, castId); + final War3ID aliasId = this.alias.callback(caster, localStore, castId); if (this.cooldown != null) { - theUnit.beginCooldown(game, aliasId, this.cooldown.callback(game, caster, localStore, castId)); + theUnit.beginCooldown(localStore.game, aliasId, this.cooldown.callback(caster, localStore, castId)); } else { final AbilityBuilderAbility abil = theUnit .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); if (abil != null) { - abil.startCooldown(game, theUnit); + abil.startCooldown(localStore.game, theUnit); } } } else { if (this.cooldown != null) { final War3ID aliasId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); - theUnit.beginCooldown(game, aliasId, this.cooldown.callback(game, caster, localStore, castId)); + theUnit.beginCooldown(localStore.game, aliasId, this.cooldown.callback(caster, localStore, castId)); } else { final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - abil.startCooldown(game, theUnit); + abil.startCooldown(localStore.game, theUnit); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionAddAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionAddAttackModifier.java index 8cf38e91f..90d63d683 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionAddAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionAddAttackModifier.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,9 @@ public class ABActionAddAttackModifier implements ABAction { private ABUnitCallback unit; private ABAttackModifierCallback modifier; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CUnit target = unit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + CUnit target = unit.callback(caster, localStore, castId); - target.addAttackModifier(modifier.callback(game, caster, localStore, castId)); + target.addAttackModifier(modifier.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java index 5b199ea2d..3e1b3500c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -23,11 +22,10 @@ public class ABActionCreateAttackModifier implements ABAction { private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean isUseCastId = true; if (useCastId != null) { - isUseCastId = useCastId.callback(game, caster, localStore, castId); + isUseCastId = useCastId.callback(caster, localStore, castId); } ABAttackModifier modifier = new ABAttackModifier(localStore, castId, priority, preLaunchCondition, preLaunchModification, condition, modification, isUseCastId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java index 7ca6a323c..9442a6433 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -22,39 +21,38 @@ public class ABActionFireModifiedAttack implements ABAction { private ABBooleanCallback showMissOnFailure; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } - CUnit theTarget = target.callback(game, caster, localStore, castId); + CUnit theTarget = target.callback(caster, localStore, castId); for (final CUnitAttack attack : theUnit.getCurrentAttacks()) { if (theUnit.canReach(theTarget, attack.getRange() + attack.getRangeMotionBuffer()) - && theTarget.canBeTargetedBy(game, theUnit, attack.getTargetsAllowed()) + && theTarget.canBeTargetedBy(localStore.game, theUnit, attack.getTargetsAllowed()) && (theUnit.getUnitType().getMinimumAttackRange() == 0 || theUnit.distance(theTarget) >= theUnit.getUnitType().getMinimumAttackRange())) { - if (!theTarget.isImmuneToDamage(game, null, attack.getAttackType(), + if (!theTarget.isImmuneToDamage(localStore.game, null, attack.getAttackType(), attack.getWeaponType().getDamageType())) { ABAttackModifier mod = null; if (modifier != null) { - mod = modifier.callback(game, caster, localStore, castId); + mod = modifier.callback(caster, localStore, castId); } CUnitAttackSettings settings = attack.initialSettings(); if (mod != null) { - if (mod.checkPreLaunchApplication(game, theUnit, theTarget, attack)) { - mod.applyPreLaunchModification(game, theUnit, theTarget, attack, settings, null); + if (mod.checkPreLaunchApplication(localStore.game, theUnit, theTarget, attack)) { + mod.applyPreLaunchModification(localStore.game, theUnit, theTarget, attack, settings, null); } - if (mod.checkApplication(game, theUnit, theTarget, attack)) { - mod.applyModification(game, theUnit, theTarget, attack, settings, null); + if (mod.checkApplication(localStore.game, theUnit, theTarget, attack)) { + mod.applyModification(localStore.game, theUnit, theTarget, attack, settings, null); } } if (settings.getPreDamageListeners() == null) { settings.setEmptyPreDamageListeners(); } - attack.launch(game, theUnit, theTarget, attack.roll(game.getSeededRandom()), + attack.launch(localStore.game, theUnit, theTarget, attack.roll(localStore.game.getSeededRandom()), CBehaviorAttackListener.DO_NOTHING); return; } @@ -62,10 +60,10 @@ public void runAction(final CSimulation game, final CUnit caster, final LocalDat } boolean show = false; if (showMissOnFailure != null) { - show = showMissOnFailure.callback(game, caster, localStore, castId); + show = showMissOnFailure.callback(caster, localStore, castId); } if (show) { - game.spawnTextTag(theUnit, theUnit.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, "miss"); + localStore.game.spawnTextTag(theUnit, theUnit.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, "miss"); } } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java index 4b4da1317..4c272692b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,9 @@ public class ABActionRemoveAttackModifier implements ABAction { private ABUnitCallback unit; private ABAttackModifierCallback modifier; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CUnit target = unit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + CUnit target = unit.callback(caster, localStore, castId); - target.removeAttackModifier(modifier.callback(game, caster, localStore, castId)); + target.removeAttackModifier(modifier.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java index 94b190061..2022b0790 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -23,41 +22,40 @@ public class ABActionStartModifiedAttack implements ABAction { private ABBooleanCallback stopOnFailure; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } - CUnit theTarget = target.callback(game, caster, localStore, castId); + CUnit theTarget = target.callback(caster, localStore, castId); boolean isDisableMove = false; if (disableMove != null) { - isDisableMove = disableMove.callback(game, caster, localStore, castId); + isDisableMove = disableMove.callback(caster, localStore, castId); } for (final CUnitAttack attack : theUnit.getCurrentAttacks()) { if (theUnit.canReach(theTarget, theUnit.getAcquisitionRange()) - && theTarget.canBeTargetedBy(game, theUnit, attack.getTargetsAllowed()) + && theTarget.canBeTargetedBy(localStore.game, theUnit, attack.getTargetsAllowed()) && (theUnit.distance(theTarget) >= theUnit.getUnitType().getMinimumAttackRange())) { - if (!theTarget.isImmuneToDamage(game, null, attack.getAttackType(), + if (!theTarget.isImmuneToDamage(localStore.game, null, attack.getAttackType(), attack.getWeaponType().getDamageType())) { - theUnit.beginBehavior(game, - theUnit.getAttackBehavior().reset(game, OrderIds.attack, attack, theTarget, isDisableMove, + theUnit.beginBehavior(localStore.game, + theUnit.getAttackBehavior().reset(localStore.game, OrderIds.attack, attack, theTarget, isDisableMove, CBehaviorAttackListener.DO_NOTHING, - modifier.callback(game, caster, localStore, castId)), true); + modifier.callback(caster, localStore, castId)), true); return; } } } boolean stop = true; if (stopOnFailure != null) { - stop = stopOnFailure.callback(game, caster, localStore, castId); + stop = stopOnFailure.callback(caster, localStore, castId); } if (stop) { - theUnit.performDefaultBehavior(game); - game.spawnTextTag(theUnit, theUnit.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, "miss"); + theUnit.performDefaultBehavior(localStore.game); + localStore.game.spawnTextTag(theUnit, theUnit.getPlayerIndex(), TextTagConfigType.CRITICAL_STRIKE, "miss"); } } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java index b47c0d904..bda950ef3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -14,9 +13,8 @@ public class ABActionAttackModifierAddAnimationTag implements ABAction { private ABStringCallback tag; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - settings.addAnimationName(SecondaryTag.valueOf(tag.callback(game, caster, localStore, castId))); + settings.addAnimationName(SecondaryTag.valueOf(tag.callback(caster, localStore, castId))); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java index 87a88f5f6..5017f5369 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,9 +12,8 @@ public class ABActionAttackModifierAddPostDamageListener implements ABAction { private ABAttackPostDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - settings.addPostDamageListener(listener.callback(game, caster, localStore, castId)); + settings.addPostDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java index 51ecb51a1..df7d29085 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,9 +12,8 @@ public class ABActionAttackModifierAddPreDamageListener implements ABAction { private ABAttackPreDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - settings.addPreDamageListener(listener.callback(game, caster, localStore, castId)); + settings.addPreDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java index 3498c9d63..9bbef1ca4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -14,13 +13,12 @@ public class ABActionAttackModifierApplyAllArtFields implements ABAction { private ABBooleanCallback applyArtIfMissing; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); String art = abil.getAbilityStringField("Missileart"); - if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(game, caster, localStore, castId))) { + if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { settings.setProjectileArt(art); } settings.setProjectileSpeed(abil.getAbilityIntField("Missilespeed")); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java index 448d80da5..b0f45d099 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -14,13 +13,12 @@ public class ABActionAttackModifierApplyArt implements ABAction { private ABBooleanCallback applyArtIfMissing; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); String art = abil.getAbilityStringField("Missileart"); - if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(game, caster, localStore, castId))) { + if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { settings.setProjectileArt(art); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java index 98580e181..f77c0a665 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -14,13 +13,12 @@ public class ABActionAttackModifierApplyArtAndSpeed implements ABAction { private ABBooleanCallback applyArtIfMissing; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); String art = abil.getAbilityStringField("Missileart"); - if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(game, caster, localStore, castId))) { + if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { settings.setProjectileArt(art); } settings.setProjectileSpeed(abil.getAbilityIntField("Missilespeed")); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java index 121183fd9..8fb776ed9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,8 +9,7 @@ public class ABActionAttackModifierApplyDefaultSpeed implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (settings.getProjectileSpeed() == 0) { settings.setProjectileSpeed(900); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java index adfaa7209..ce1e73df4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,8 +9,7 @@ public class ABActionAttackModifierPreventOtherModifications implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore.get(ABLocalStoreKeys.ATTACKMODLOOP + castId); if (loop != null) loop.preventAllOtherModifications(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java index 8b419a235..ecb853d9e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,8 +9,7 @@ public class ABActionAttackModifierPreventOtherSamePriorityModifications implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore.get(ABLocalStoreKeys.ATTACKMODLOOP + castId); if (loop != null) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java index 7852fe27c..5147d234c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -14,9 +13,8 @@ public class ABActionAttackModifierRemoveAnimationTag implements ABAction { private ABStringCallback tag; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - settings.removeAnimationName(SecondaryTag.valueOf(tag.callback(game, caster, localStore, castId))); + settings.removeAnimationName(SecondaryTag.valueOf(tag.callback(caster, localStore, castId))); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java index b76cb4c9e..929c0b610 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,9 +12,8 @@ public class ABActionAttackModifierRemovePostDamageListener implements ABAction private ABAttackPostDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - settings.removePostDamageListener(listener.callback(game, caster, localStore, castId)); + settings.removePostDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java index b6308c640..92e64c7c9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,9 +12,8 @@ public class ABActionAttackModifierRemovePreDamageListener implements ABAction { private ABAttackPreDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - settings.removePreDamageListener(listener.callback(game, caster, localStore, castId)); + settings.removePreDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java index e4af8583e..04c6d2f91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,11 +12,10 @@ public class ABActionAttackModifierSetAttackArc implements ABAction { private ABFloatCallback arc; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (arc != null) { - settings.setProjectileArc(arc.callback(game, caster, localStore, castId)); + settings.setProjectileArc(arc.callback(caster, localStore, castId)); } } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java index ad6219443..fcb5ff43f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,12 +12,11 @@ public class ABActionAttackModifierSetAttackDeathTime implements ABAction { private ABFloatCallback deathTime; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (deathTime != null) { - settings.setArtDeathTime(deathTime.callback(game, caster, localStore, castId)); + settings.setArtDeathTime(deathTime.callback(caster, localStore, castId)); } } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java index 75f5fe73e..0aa3e3598 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,11 +12,10 @@ public class ABActionAttackModifierSetAttackHoming implements ABAction { private ABBooleanCallback homing; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (homing != null) { - settings.setProjectileHomingEnabled(homing.callback(game, caster, localStore, castId)); } + settings.setProjectileHomingEnabled(homing.callback(caster, localStore, castId)); } } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java index f7c1c5d51..88a5a4a3f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,11 +12,10 @@ public class ABActionAttackModifierSetAttackImpactZ implements ABAction { private ABFloatCallback impactZ; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (impactZ != null) { - settings.setImpactZ(impactZ.callback(game, caster, localStore, castId)); + settings.setImpactZ(impactZ.callback(caster, localStore, castId)); } } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java index e0b51773c..de6224bbd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,12 +12,11 @@ public class ABActionAttackModifierSetAttackStartZ implements ABAction { private ABFloatCallback z; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (z != null) { - settings.setZ(z.callback(game, caster, localStore, castId)); + settings.setZ(z.callback(caster, localStore, castId)); } } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java index db9c688db..dd285eb0b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -18,23 +17,22 @@ public class ABActionAttackModifierSetSplashFields implements ABAction { private ABFloatCallback damageFactorMedium; private ABFloatCallback damageFactorSmall; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (areaOfEffectFullDamage != null) { - settings.setAreaOfEffectFullDamage(areaOfEffectFullDamage.callback(game, caster, localStore, castId)); + settings.setAreaOfEffectFullDamage(areaOfEffectFullDamage.callback(caster, localStore, castId)); } if (areaOfEffectMediumDamage != null) { - settings.setAreaOfEffectMediumDamage(areaOfEffectMediumDamage.callback(game, caster, localStore, castId)); + settings.setAreaOfEffectMediumDamage(areaOfEffectMediumDamage.callback(caster, localStore, castId)); } if (areaOfEffectSmallDamage != null) { - settings.setAreaOfEffectSmallDamage(areaOfEffectSmallDamage.callback(game, caster, localStore, castId)); + settings.setAreaOfEffectSmallDamage(areaOfEffectSmallDamage.callback(caster, localStore, castId)); } if (damageFactorMedium != null) { - settings.setDamageFactorMedium(damageFactorMedium.callback(game, caster, localStore, castId)); + settings.setDamageFactorMedium(damageFactorMedium.callback(caster, localStore, castId)); } if (damageFactorSmall != null) { - settings.setDamageFactorSmall(damageFactorSmall.callback(game, caster, localStore, castId)); + settings.setDamageFactorSmall(damageFactorSmall.callback(caster, localStore, castId)); } } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java index 7d0e62f82..7331fc9db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetModifiedAttackAttackType extends ABAttackTypeCallback { @Override - public CAttackType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CAttackType callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java index 9fbf232ea..db0890fd9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetModifiedAttackDamageType extends ABDamageTypeCallback { @Override - public CDamageType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CDamageType callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().getDamageType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java index be6844af5..9f4dd4469 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetModifiedAttackWeaponType extends ABWeaponTypeCallback { @Override - public CWeaponType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CWeaponType callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java index 11e71801e..487970ce6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -14,18 +13,18 @@ public class ABActionAttemptToReOrderPreviousBehavior implements ABAction { private ABBooleanCallback checkForOrders; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, int castId) { CBehavior b = (CBehavior) localStore.get(ABLocalStoreKeys.PREVIOUSBEHAVIOR); if (b != null && b != caster.getCurrentBehavior()) { - if (checkForOrders == null || checkForOrders.callback(game, caster, localStore, castId)) { + if (checkForOrders == null || checkForOrders.callback(caster, localStore, castId)) { if (caster.getOrderQueue().isEmpty()) { - if (caster.order(game, b.getHighlightOrderId(), b.visit(BehaviorTargetVisitor.INSTANCE)) + if (caster.order(localStore.game, b.getHighlightOrderId(), b.visit(BehaviorTargetVisitor.INSTANCE)) && caster.getOrderQueue().isEmpty()) { localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, caster.getCurrentBehavior()); } } } else { - if (caster.order(game, b.getHighlightOrderId(), b.visit(BehaviorTargetVisitor.INSTANCE)) + if (caster.order(localStore.game, b.getHighlightOrderId(), b.visit(BehaviorTargetVisitor.INSTANCE)) && caster.getOrderQueue().isEmpty()) { localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, caster.getCurrentBehavior()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java index c1c883284..4806377d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -12,8 +11,8 @@ public class ABActionAttemptToResumePreviousBehavior implements ABAction { private ABBooleanCallback checkForOrders; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (checkForOrders == null || checkForOrders.callback(game, caster, localStore, castId)) { + public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + if (checkForOrders == null || checkForOrders.callback(caster, localStore, castId)) { if (caster.getOrderQueue().isEmpty()) { localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, localStore.get(ABLocalStoreKeys.PREVIOUSBEHAVIOR)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java index b5ce6c4bd..d96e47d4f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -16,12 +15,10 @@ public class ABActionAddBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { - final CBuff ability = this.buff.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CBuff ability = this.buff.callback(caster, localStore, castId); if (ability != null) { - this.target.callback(game, caster, localStore, castId).add(game, ability); + this.target.callback(caster, localStore, castId).add(localStore.game, ability); localStore.put(ABLocalStoreKeys.LASTADDEDBUFF, ability); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java index 4f711799e..e91ce7907 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -18,11 +17,10 @@ public class ABActionAddNonStackingDisplayBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CBuff ability = this.buff.callback(game, caster, localStore, castId); - this.target.callback(game, caster, localStore, castId).addNonStackingDisplayBuff(game, - this.key.callback(game, caster, localStore, castId), ability); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CBuff ability = this.buff.callback(caster, localStore, castId); + this.target.callback(caster, localStore, castId).addNonStackingDisplayBuff(localStore.game, + this.key.callback(caster, localStore, castId), ability); localStore.put(ABLocalStoreKeys.LASTADDEDBUFF, ability); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java index 1bce46969..d52d86b7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -16,12 +15,11 @@ public class ABActionBuffAddUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CBuff theBuff = this.buff.callback(game, caster, localStore, castId); + final CBuff theBuff = this.buff.callback(caster, localStore, castId); if (theBuff instanceof ABBuff) { - ((ABBuff)theBuff).addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ((ABBuff)theBuff).addUniqueFlag(flag.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java index 14df47659..a0279cf2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -16,12 +15,11 @@ public class ABActionBuffRemoveUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CBuff theBuff = this.buff.callback(game, caster, localStore, castId); + final CBuff theBuff = this.buff.callback(caster, localStore, castId); if (theBuff instanceof ABBuff) { - ((ABBuff)theBuff).removeUniqueFlag(flag.callback(game, caster, localStore, castId)); + ((ABBuff)theBuff).removeUniqueFlag(flag.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java index f2dd85bff..04eb11c7e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -14,11 +13,10 @@ public class ABActionBuffRemoveUniqueValue implements ABAction { private ABStringCallback key; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - CBuff theAbility = buff.callback(game, caster, localStore, castId); - theAbility.removeUniqueValue(key.callback(game, caster, localStore, castId)); + CBuff theAbility = buff.callback(caster, localStore, castId); + theAbility.removeUniqueValue(key.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java index 7029ce34f..3975b9c1f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -16,11 +15,10 @@ public class ABActionBuffStoreUniqueValue implements ABAction { private ABCallback valueToStore; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - CBuff theAbility = buff.callback(game, caster, localStore, castId); - theAbility.addUniqueValue(valueToStore.callback(game, caster, localStore, castId), key.callback(game, caster, localStore, castId)); + CBuff theAbility = buff.callback(caster, localStore, castId); + theAbility.addUniqueValue(valueToStore.callback(caster, localStore, castId), key.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java index 380709a84..65ccf2347 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -4,7 +4,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -38,56 +37,54 @@ public class ABActionCreatePassiveBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { ABPermanentPassiveBuff ability = null; boolean isLeveled = false; if (leveled != null) { - isLeveled = leveled.callback(game, caster, localStore, castId); + isLeveled = leveled.callback(caster, localStore, castId); } else { isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { - isPositive = positive.callback(game, caster, localStore, castId); + isPositive = positive.callback(caster, localStore, castId); } if (showIcon != null) { - ability = new ABPermanentPassiveBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), + ability = new ABPermanentPassiveBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, localStore, onAddActions, - onRemoveActions, showIcon.callback(game, caster, localStore, castId), castId, isLeveled, + onRemoveActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, isPositive); localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); } else { - ability = new ABPermanentPassiveBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, localStore, onAddActions, - onRemoveActions, true, castId, isLeveled, isPositive); + ability = new ABPermanentPassiveBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), + caster, localStore, onAddActions, onRemoveActions, true, castId, isLeveled, isPositive); localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); } if (this.artType != null) { ability.setArtType(this.artType); } if (this.showFx != null) { - ability.setShowFx(this.showFx.callback(game, caster, localStore, castId)); + ability.setShowFx(this.showFx.callback(caster, localStore, castId)); } if (this.playSfx != null) { - ability.setPlaySfx(this.playSfx.callback(game, caster, localStore, castId)); + ability.setPlaySfx(this.playSfx.callback(caster, localStore, castId)); } if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { - ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ability.addUniqueFlag(flag.callback(caster, localStore, castId)); } } if (uniqueValues != null) { for (String key : uniqueValues.keySet()) { - ability.addUniqueValue(uniqueValues.get(key).callback(game, caster, localStore, castId), key); + ability.addUniqueValue(uniqueValues.get(key).callback(caster, localStore, castId), key); } } if (visibilityGroup != null) { - ability.setVisibilityGroup(visibilityGroup.callback(game, caster, localStore, castId)); + ability.setVisibilityGroup(visibilityGroup.callback(caster, localStore, castId)); } if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { localStore.put(ABLocalStoreKeys.BUFFCASTINGUNIT, caster); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java index a3fd032f9..5cd6797b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java @@ -4,7 +4,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -23,19 +22,18 @@ public class ABActionCreateTargetingBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final ABTargetingBuff ability = new ABTargetingBuff(game.getHandleIdAllocator().createId(), - this.buffId.callback(game, caster, localStore, castId), localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final ABTargetingBuff ability = new ABTargetingBuff(localStore.game.getHandleIdAllocator().createId(), + this.buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { - ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ability.addUniqueFlag(flag.callback(caster, localStore, castId)); } } if (uniqueValues != null) { for (String key : uniqueValues.keySet()) { - ability.addUniqueValue(uniqueValues.get(key).callback(game, caster, localStore, castId), key); + ability.addUniqueValue(uniqueValues.get(key).callback(caster, localStore, castId), key); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java index 99e693667..84d72af39 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -4,7 +4,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -35,60 +34,57 @@ public class ABActionCreateTimedArtBuff implements ABSingleAction { private List uniqueFlags; private Map uniqueValues; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean isLeveled = false; if (leveled != null) { - isLeveled = leveled.callback(game, caster, localStore, castId); + isLeveled = leveled.callback(caster, localStore, castId); } else { isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { - isPositive = positive.callback(game, caster, localStore, castId); + isPositive = positive.callback(caster, localStore, castId); } boolean isDispellable = true; if (dispellable != null) { - isDispellable = dispellable.callback(game, caster, localStore, castId); + isDispellable = dispellable.callback(caster, localStore, castId); } else { isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); } ABTimedArtBuff ability; if (showIcon != null) { - ability = new ABTimedArtBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, - localStore, castId), localStore, + ability = new ABTimedArtBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), - showIcon.callback(game, caster, localStore, castId), isLeveled, isPositive, isDispellable); + duration.callback(caster, localStore, castId), showIcon.callback(caster, localStore, castId), + isLeveled, isPositive, isDispellable); } else { - ability = new ABTimedArtBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, + ability = new ABTimedArtBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), isLeveled, isPositive, isDispellable); + duration.callback(caster, localStore, castId), isLeveled, isPositive, isDispellable); } if (artType != null) { ability.setArtType(artType); } boolean isStacks = false; if (stacks != null) { - isStacks = stacks.callback(game, caster, localStore, castId); + isStacks = stacks.callback(caster, localStore, castId); } ability.setStacks(isStacks); if (visibilityGroup != null) { - ability.setVisibilityGroup(visibilityGroup.callback(game, caster, localStore, castId)); + ability.setVisibilityGroup(visibilityGroup.callback(caster, localStore, castId)); } localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { - ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ability.addUniqueFlag(flag.callback(caster, localStore, castId)); } } if (uniqueValues != null) { for (String key : uniqueValues.keySet()) { - ability.addUniqueValue(uniqueValues.get(key).callback(game, caster, localStore, castId), key); + ability.addUniqueValue(uniqueValues.get(key).callback(caster, localStore, castId), key); } } if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java index 51d70eda1..12d5294f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java @@ -5,7 +5,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -53,26 +52,25 @@ public class ABActionCreateTimedBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { - showTimedLife = this.showTimedLifeBar.callback(game, caster, localStore, castId); + showTimedLife = this.showTimedLifeBar.callback(caster, localStore, castId); } boolean isLeveled = false; if (leveled != null) { - isLeveled = leveled.callback(game, caster, localStore, castId); + isLeveled = leveled.callback(caster, localStore, castId); } else { isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { - isPositive = positive.callback(game, caster, localStore, castId); + isPositive = positive.callback(caster, localStore, castId); } boolean isDispellable = true; if (dispellable != null) { - isDispellable = dispellable.callback(game, caster, localStore, castId); + isDispellable = dispellable.callback(caster, localStore, castId); } else { isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); } @@ -80,40 +78,40 @@ public void runAction(final CSimulation game, final CUnit caster, boolean isMagic = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); boolean isPhysical = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); if (magic != null) { - isMagic = magic.callback(game, caster, localStore, castId); + isMagic = magic.callback(caster, localStore, castId); } if (physical != null) { - isPhysical = physical.callback(game, caster, localStore, castId); + isPhysical = physical.callback(caster, localStore, castId); } ABTimedBuff ability; if (showIcon != null) { - ability = new ABTimedBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, + ability = new ABTimedBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, - onExpireActions, showIcon.callback(game, caster, localStore, castId), castId, isLeveled, isPositive, + duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, + onExpireActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, isPositive, isDispellable); } else { - ability = new ABTimedBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, + ability = new ABTimedBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, + duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, castId, isLeveled, isPositive, isDispellable); } if (stateMods != null) { List buffMods = new ArrayList<>(); for (ABStateModBuffCallback mod : stateMods) { - buffMods.add(mod.callback(game, caster, localStore, castId)); + buffMods.add(mod.callback(caster, localStore, castId)); } ability.setStateMods(buffMods); } if (statBuffs != null) { List buffStats = new ArrayList<>(); for (ABNonStackingStatBuffCallback mod : statBuffs) { - buffStats.add(mod.callback(game, caster, localStore, castId)); + buffStats.add(mod.callback(caster, localStore, castId)); } ability.setStatBuffs(buffStats); } @@ -121,29 +119,29 @@ public void runAction(final CSimulation game, final CUnit caster, if (artType != null) { ability.setArtType(artType); } - if ((this.hideArt != null) && this.hideArt.callback(game, caster, localStore, castId)) { + if ((this.hideArt != null) && this.hideArt.callback(caster, localStore, castId)) { ability.setArtType(null); } ability.setMagic(isMagic); ability.setPhysical(isPhysical); boolean isStacks = false; if (stacks != null) { - isStacks = stacks.callback(game, caster, localStore, castId); + isStacks = stacks.callback(caster, localStore, castId); } ability.setStacks(isStacks); if (visibilityGroup != null) { - ability.setVisibilityGroup(visibilityGroup.callback(game, caster, localStore, castId)); + ability.setVisibilityGroup(visibilityGroup.callback(caster, localStore, castId)); } localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { - ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ability.addUniqueFlag(flag.callback(caster, localStore, castId)); } } if (uniqueValues != null) { for (String key : uniqueValues.keySet()) { - ability.addUniqueValue(uniqueValues.get(key).callback(game, caster, localStore, castId), key); + ability.addUniqueValue(uniqueValues.get(key).callback(caster, localStore, castId), key); } } if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java index ff64a0f16..665f6926a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.util.CBuffTimedLife; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -18,12 +17,10 @@ public class ABActionCreateTimedLifeBuff implements ABSingleAction { private ABBooleanCallback explode; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CBuffTimedLife ability = new CBuffTimedLife(game.getHandleIdAllocator().createId(), - this.buffId.callback(game, caster, localStore, castId), - this.duration.callback(game, caster, localStore, castId), - this.explode.callback(game, caster, localStore, castId)); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CBuffTimedLife ability = new CBuffTimedLife(localStore.game.getHandleIdAllocator().createId(), + this.buffId.callback(caster, localStore, castId), this.duration.callback(caster, localStore, castId), + this.explode.callback(caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { localStore.put(ABLocalStoreKeys.BUFFCASTINGUNIT, caster); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java index aacc89da9..167630789 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Map; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -52,25 +51,24 @@ public class ABActionCreateTimedPausedExpirationBuff implements ABAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { - showTimedLife = this.showTimedLifeBar.callback(game, caster, localStore, castId); + showTimedLife = this.showTimedLifeBar.callback(caster, localStore, castId); } boolean isLeveled = false; if (leveled != null) { - isLeveled = leveled.callback(game, caster, localStore, castId); + isLeveled = leveled.callback(caster, localStore, castId); } else { isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { - isPositive = positive.callback(game, caster, localStore, castId); + isPositive = positive.callback(caster, localStore, castId); } boolean isDispellable = true; if (dispellable != null) { - isDispellable = dispellable.callback(game, caster, localStore, castId); + isDispellable = dispellable.callback(caster, localStore, castId); } else { isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); } @@ -78,40 +76,40 @@ public void runAction(final CSimulation game, final CUnit caster, final LocalDat boolean isMagic = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); boolean isPhysical = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); if (magic != null) { - isMagic = magic.callback(game, caster, localStore, castId); + isMagic = magic.callback(caster, localStore, castId); } if (physical != null) { - isPhysical = physical.callback(game, caster, localStore, castId); + isPhysical = physical.callback(caster, localStore, castId); } ABTimedBuff ability; if (showIcon != null) { - ability = new ABTimedPausedExpirationBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, + ability = new ABTimedPausedExpirationBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, - onExpireActions, showIcon.callback(game, caster, localStore, castId), castId, isLeveled, isPositive, + duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, + onExpireActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, isPositive, isDispellable); } else { - ability = new ABTimedPausedExpirationBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, + ability = new ABTimedPausedExpirationBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, + duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, castId, isLeveled, isPositive, isDispellable); } if (stateMods != null) { List buffMods = new ArrayList<>(); for (ABStateModBuffCallback mod : stateMods) { - buffMods.add(mod.callback(game, caster, localStore, castId)); + buffMods.add(mod.callback(caster, localStore, castId)); } ability.setStateMods(buffMods); } if (statBuffs != null) { List buffStats = new ArrayList<>(); for (ABNonStackingStatBuffCallback mod : statBuffs) { - buffStats.add(mod.callback(game, caster, localStore, castId)); + buffStats.add(mod.callback(caster, localStore, castId)); } ability.setStatBuffs(buffStats); } @@ -119,29 +117,29 @@ public void runAction(final CSimulation game, final CUnit caster, final LocalDat if (artType != null) { ability.setArtType(artType); } - if ((this.hideArt != null) && this.hideArt.callback(game, caster, localStore, castId)) { + if ((this.hideArt != null) && this.hideArt.callback(caster, localStore, castId)) { ability.setArtType(null); } ability.setMagic(isMagic); ability.setPhysical(isPhysical); boolean isStacks = false; if (stacks != null) { - isStacks = stacks.callback(game, caster, localStore, castId); + isStacks = stacks.callback(caster, localStore, castId); } ability.setStacks(isStacks); if (visibilityGroup != null) { - ability.setVisibilityGroup(visibilityGroup.callback(game, caster, localStore, castId)); + ability.setVisibilityGroup(visibilityGroup.callback(caster, localStore, castId)); } localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { - ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ability.addUniqueFlag(flag.callback(caster, localStore, castId)); } } if (uniqueValues != null) { for (String key : uniqueValues.keySet()) { - ability.addUniqueValue(uniqueValues.get(key).callback(game, caster, localStore, castId), key); + ability.addUniqueValue(uniqueValues.get(key).callback(caster, localStore, castId), key); } } if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java index 39533c5c7..f9b3b5537 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java @@ -4,7 +4,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -28,25 +27,24 @@ public class ABActionCreateTimedTargetingBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final ABTimedTargetingBuff ability = new ABTimedTargetingBuff(game.getHandleIdAllocator().createId(), - this.buffId.callback(game, caster, localStore, castId), localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final ABTimedTargetingBuff ability = new ABTimedTargetingBuff(localStore.game.getHandleIdAllocator().createId(), + this.buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - this.duration.callback(game, caster, localStore, castId)); + this.duration.callback(caster, localStore, castId)); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { - ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ability.addUniqueFlag(flag.callback(caster, localStore, castId)); } } if (uniqueValues != null) { for (String key : uniqueValues.keySet()) { - ability.addUniqueValue(uniqueValues.get(key).callback(game, caster, localStore, castId), key); + ability.addUniqueValue(uniqueValues.get(key).callback(caster, localStore, castId), key); } } boolean isStacks = false; if (stacks != null) { - isStacks = stacks.callback(game, caster, localStore, castId); + isStacks = stacks.callback(caster, localStore, castId); } ability.setStacks(isStacks); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java index 8e9022493..4877991c8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java @@ -5,7 +5,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -53,26 +52,25 @@ public class ABActionCreateTimedTickingBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { - showTimedLife = this.showTimedLifeBar.callback(game, caster, localStore, castId); + showTimedLife = this.showTimedLifeBar.callback(caster, localStore, castId); } boolean isLeveled = false; if (leveled != null) { - isLeveled = leveled.callback(game, caster, localStore, castId); + isLeveled = leveled.callback(caster, localStore, castId); } else { isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { - isPositive = positive.callback(game, caster, localStore, castId); + isPositive = positive.callback(caster, localStore, castId); } boolean isDispellable = true; if (dispellable != null) { - isDispellable = dispellable.callback(game, caster, localStore, castId); + isDispellable = dispellable.callback(caster, localStore, castId); } else { isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); } @@ -80,40 +78,39 @@ public void runAction(final CSimulation game, final CUnit caster, boolean isMagic = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); boolean isPhysical = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); if (magic != null) { - isMagic = magic.callback(game, caster, localStore, castId); + isMagic = magic.callback(caster, localStore, castId); } if (physical != null) { - isPhysical = physical.callback(game, caster, localStore, castId); + isPhysical = physical.callback(caster, localStore, castId); } ABTimedTickingBuff ability; if (showIcon != null) { - ability = new ABTimedTickingBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, + ability = new ABTimedTickingBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, - onExpireActions, onTickActions, showIcon.callback(game, caster, localStore, castId), castId, + duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, + onExpireActions, onTickActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, isPositive, isDispellable); } else { - ability = new ABTimedTickingBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, - (CAbility) localStore.get( - ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, + ability = new ABTimedTickingBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, + (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, isLeveled, isPositive, isDispellable); } if (stateMods != null) { List buffMods = new ArrayList<>(); for (ABStateModBuffCallback mod : stateMods) { - buffMods.add(mod.callback(game, caster, localStore, castId)); + buffMods.add(mod.callback(caster, localStore, castId)); } ability.setStateMods(buffMods); } if (statBuffs != null) { List buffStats = new ArrayList<>(); for (ABNonStackingStatBuffCallback mod : statBuffs) { - buffStats.add(mod.callback(game, caster, localStore, castId)); + buffStats.add(mod.callback(caster, localStore, castId)); } ability.setStatBuffs(buffStats); } @@ -125,23 +122,23 @@ public void runAction(final CSimulation game, final CUnit caster, ability.setPhysical(isPhysical); boolean isStacks = false; if (stacks != null) { - isStacks = stacks.callback(game, caster, localStore, castId); + isStacks = stacks.callback(caster, localStore, castId); } ability.setStacks(isStacks); if (visibilityGroup != null) { - ability.setVisibilityGroup(visibilityGroup.callback(game, caster, localStore, castId)); + ability.setVisibilityGroup(visibilityGroup.callback(caster, localStore, castId)); } localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { - ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ability.addUniqueFlag(flag.callback(caster, localStore, castId)); } } if (uniqueValues != null) { for (ABStringCallback key : uniqueValues.keySet()) { - ability.addUniqueValue(uniqueValues.get(key).callback(game, caster, localStore, castId), - key.callback(game, caster, localStore, castId)); + ability.addUniqueValue(uniqueValues.get(key).callback(caster, localStore, castId), + key.callback(caster, localStore, castId)); } } if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java index f8ee2da68..415cba55c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java @@ -5,7 +5,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -53,26 +52,24 @@ public class ABActionCreateTimedTickingPausedBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { - showTimedLife = this.showTimedLifeBar.callback(game, caster, localStore, castId); + showTimedLife = this.showTimedLifeBar.callback(caster, localStore, castId); } boolean isLeveled = false; if (leveled != null) { - isLeveled = leveled.callback(game, caster, localStore, castId); + isLeveled = leveled.callback(caster, localStore, castId); } else { isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { - isPositive = positive.callback(game, caster, localStore, castId); + isPositive = positive.callback(caster, localStore, castId); } boolean isDispellable = true; if (dispellable != null) { - isDispellable = dispellable.callback(game, caster, localStore, castId); + isDispellable = dispellable.callback(caster, localStore, castId); } else { isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); } @@ -80,39 +77,39 @@ public void runAction(final CSimulation game, final CUnit caster, boolean isMagic = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); boolean isPhysical = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); if (magic != null) { - isMagic = magic.callback(game, caster, localStore, castId); + isMagic = magic.callback(caster, localStore, castId); } if (physical != null) { - isPhysical = physical.callback(game, caster, localStore, castId); + isPhysical = physical.callback(caster, localStore, castId); } ABTimedTickingPausedBuff ability; if (showIcon != null) { - ability = new ABTimedTickingPausedBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, + ability = new ABTimedTickingPausedBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, - onExpireActions, onTickActions, showIcon.callback(game, caster, localStore, castId), castId, - isLeveled, isPositive, isDispellable); + duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, + onExpireActions, onTickActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, + isPositive, isDispellable); } else { - ability = new ABTimedTickingPausedBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, + ability = new ABTimedTickingPausedBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, + duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, isLeveled, isPositive, isDispellable); } if (stateMods != null) { List buffMods = new ArrayList<>(); for (ABStateModBuffCallback mod : stateMods) { - buffMods.add(mod.callback(game, caster, localStore, castId)); + buffMods.add(mod.callback(caster, localStore, castId)); } ability.setStateMods(buffMods); } if (statBuffs != null) { List buffStats = new ArrayList<>(); for (ABNonStackingStatBuffCallback mod : statBuffs) { - buffStats.add(mod.callback(game, caster, localStore, castId)); + buffStats.add(mod.callback(caster, localStore, castId)); } ability.setStatBuffs(buffStats); } @@ -124,23 +121,23 @@ public void runAction(final CSimulation game, final CUnit caster, ability.setPhysical(isPhysical); boolean isStacks = false; if (stacks != null) { - isStacks = stacks.callback(game, caster, localStore, castId); + isStacks = stacks.callback(caster, localStore, castId); } ability.setStacks(isStacks); if (visibilityGroup != null) { - ability.setVisibilityGroup(visibilityGroup.callback(game, caster, localStore, castId)); + ability.setVisibilityGroup(visibilityGroup.callback(caster, localStore, castId)); } localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { - ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ability.addUniqueFlag(flag.callback(caster, localStore, castId)); } } if (uniqueValues != null) { for (ABStringCallback key : uniqueValues.keySet()) { - ability.addUniqueValue(uniqueValues.get(key).callback(game, caster, localStore, castId), - key.callback(game, caster, localStore, castId)); + ability.addUniqueValue(uniqueValues.get(key).callback(caster, localStore, castId), + key.callback(caster, localStore, castId)); } } if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java index 1e71a5cc7..7daf66e07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java @@ -5,7 +5,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -53,26 +52,24 @@ public class ABActionCreateTimedTickingPostDeathBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { - showTimedLife = this.showTimedLifeBar.callback(game, caster, localStore, castId); + showTimedLife = this.showTimedLifeBar.callback(caster, localStore, castId); } boolean isLeveled = false; if (leveled != null) { - isLeveled = leveled.callback(game, caster, localStore, castId); + isLeveled = leveled.callback(caster, localStore, castId); } else { isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { - isPositive = positive.callback(game, caster, localStore, castId); + isPositive = positive.callback(caster, localStore, castId); } boolean isDispellable = true; if (dispellable != null) { - isDispellable = dispellable.callback(game, caster, localStore, castId); + isDispellable = dispellable.callback(caster, localStore, castId); } else { isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); } @@ -80,28 +77,28 @@ public void runAction(final CSimulation game, final CUnit caster, boolean isMagic = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); boolean isPhysical = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); if (magic != null) { - isMagic = magic.callback(game, caster, localStore, castId); + isMagic = magic.callback(caster, localStore, castId); } if (physical != null) { - isPhysical = physical.callback(game, caster, localStore, castId); + isPhysical = physical.callback(caster, localStore, castId); } ABTimedTickingPostDeathBuff ability; if (showIcon != null) { - ability = new ABTimedTickingPostDeathBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, + ability = new ABTimedTickingPostDeathBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, - onExpireActions, onTickActions, showIcon.callback(game, caster, localStore, castId), castId, - isLeveled, isPositive, isDispellable); + duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, + onExpireActions, onTickActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, + isPositive, isDispellable); if (artType != null) { ability.setArtType(artType); } } else { - ability = new ABTimedTickingPostDeathBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), localStore, + ability = new ABTimedTickingPostDeathBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - duration.callback(game, caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, + duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, isLeveled, isPositive, isDispellable); if (artType != null) { ability.setArtType(artType); @@ -111,14 +108,14 @@ public void runAction(final CSimulation game, final CUnit caster, if (stateMods != null) { List buffMods = new ArrayList<>(); for (ABStateModBuffCallback mod : stateMods) { - buffMods.add(mod.callback(game, caster, localStore, castId)); + buffMods.add(mod.callback(caster, localStore, castId)); } ability.setStateMods(buffMods); } if (statBuffs != null) { List buffStats = new ArrayList<>(); for (ABNonStackingStatBuffCallback mod : statBuffs) { - buffStats.add(mod.callback(game, caster, localStore, castId)); + buffStats.add(mod.callback(caster, localStore, castId)); } ability.setStatBuffs(buffStats); } @@ -127,22 +124,22 @@ public void runAction(final CSimulation game, final CUnit caster, ability.setPhysical(isPhysical); boolean isStacks = false; if (stacks != null) { - isStacks = stacks.callback(game, caster, localStore, castId); + isStacks = stacks.callback(caster, localStore, castId); } ability.setStacks(isStacks); if (visibilityGroup != null) { - ability.setVisibilityGroup(visibilityGroup.callback(game, caster, localStore, castId)); + ability.setVisibilityGroup(visibilityGroup.callback(caster, localStore, castId)); } localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { - ability.addUniqueFlag(flag.callback(game, caster, localStore, castId)); + ability.addUniqueFlag(flag.callback(caster, localStore, castId)); } } if (uniqueValues != null) { for (String key : uniqueValues.keySet()) { - ability.addUniqueValue(uniqueValues.get(key).callback(game, caster, localStore, castId), key); + ability.addUniqueValue(uniqueValues.get(key).callback(caster, localStore, castId), key); } } if (!localStore.containsKey(ABLocalStoreKeys.BUFFCASTINGUNIT)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java index e5a270aa0..c7f18e1da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -15,12 +14,10 @@ public class ABActionRemoveBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { - final CBuff theBuff = this.buff.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CBuff theBuff = this.buff.callback(caster, localStore, castId); if (theBuff != null) { - (this.target.callback(game, caster, localStore, castId)).remove(game, theBuff); + (this.target.callback(caster, localStore, castId)).remove(localStore.game, theBuff); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java index 28f4fd6bf..5fae71a26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -17,12 +16,11 @@ public class ABActionRemoveNonStackingDisplayBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CBuff ability = this.buff.callback(game, caster, localStore, castId); - this.target.callback(game, caster, localStore, castId).removeNonStackingDisplayBuff(game, - this.key.callback(game, caster, localStore, castId), ability); + final CBuff ability = this.buff.callback(caster, localStore, castId); + this.target.callback(caster, localStore, castId).removeNonStackingDisplayBuff(localStore.game, + this.key.callback(caster, localStore, castId), ability); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionAddDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionAddDestructableBuff.java index bf7831b52..78167f085 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionAddDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionAddDestructableBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; @@ -15,11 +14,10 @@ public class ABActionAddDestructableBuff implements ABSingleAction { private ABDestructableBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CDestructableBuff ability = this.buff.callback(game, caster, localStore, castId); - this.target.callback(game, caster, localStore, castId).add(game, ability); + final CDestructableBuff ability = this.buff.callback(caster, localStore, castId); + this.target.callback(caster, localStore, castId).add(localStore.game, ability); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java index ece055293..4c3955f8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java @@ -3,7 +3,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -26,25 +25,25 @@ public class ABActionCreateDestructable implements ABAction { private ABBooleanCallback playBirthAnim; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { float theFacing = 0; float theScale = 1; int theVariation = 0; boolean play = true; if (this.facing != null) { - theFacing = this.facing.callback(game, caster, localStore, castId); + theFacing = this.facing.callback(caster, localStore, castId); } if (this.scale != null) { - theScale = this.scale.callback(game, caster, localStore, castId); + theScale = this.scale.callback(caster, localStore, castId); } if (this.variation != null) { - theVariation = this.variation.callback(game, caster, localStore, castId); + theVariation = this.variation.callback(caster, localStore, castId); } if (this.playBirthAnim != null) { - play = this.playBirthAnim.callback(game, caster, localStore, castId); + play = this.playBirthAnim.callback(caster, localStore, castId); } - final AbilityPointTarget location = this.location.callback(game, caster, localStore, castId); - final CDestructable createdDest = game.createDestructable(this.id.callback(game, caster, localStore, castId), + final AbilityPointTarget location = this.location.callback(caster, localStore, castId); + final CDestructable createdDest = localStore.game.createDestructable(this.id.callback(caster, localStore, castId), location.getX(), location.getY(), theFacing, theScale, theVariation); if (play) { createdDest.getUnitAnimationListener().playAnimation(true, PrimaryTag.BIRTH, SequenceUtils.EMPTY, 1.0f, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java index f17b59b47..e9d511c5a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -23,14 +22,13 @@ public class ABActionCreateDestructableBuff implements ABSingleAction { private ABBooleanCallback dispellable; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean isDispellable = false; if (dispellable != null) { - isDispellable = dispellable.callback(game, caster, localStore, castId); + isDispellable = dispellable.callback(caster, localStore, castId); } - CDestructableBuff ability = new ABDestructableBuff(game.getHandleIdAllocator().createId(), - buffId.callback(game, caster, localStore, castId), (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL), + CDestructableBuff ability = new ABDestructableBuff(localStore.game.getHandleIdAllocator().createId(), + buffId.callback(caster, localStore, castId), (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL), localStore, onAddActions, onRemoveActions, onDeathActions, castId, caster, isDispellable); localStore.put(ABLocalStoreKeys.LASTCREATEDDESTBUFF, ability); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java index 37e7cd279..cee2156b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; @@ -27,8 +26,7 @@ public class ABActionDamageDestructable implements ABSingleAction { private ABFloatCallback damage; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean isItAttack = false; boolean isItRanged = true; @@ -36,21 +34,21 @@ public void runAction(final CSimulation game, final CUnit caster, CDamageType theDamageType = CDamageType.MAGIC; if (this.isAttack != null) { - isItAttack = this.isAttack.callback(game, caster, localStore, castId); + isItAttack = this.isAttack.callback(caster, localStore, castId); } if (this.isRanged != null) { - isItRanged = this.isRanged.callback(game, caster, localStore, castId); + isItRanged = this.isRanged.callback(caster, localStore, castId); } if (this.attackType != null) { - theAttackType = this.attackType.callback(game, caster, localStore, castId); + theAttackType = this.attackType.callback(caster, localStore, castId); } if (this.damageType != null) { - theDamageType = this.damageType.callback(game, caster, localStore, castId); + theDamageType = this.damageType.callback(caster, localStore, castId); } - target.callback(game, caster, localStore, castId).damage(game, source.callback(game, caster, localStore, castId), new CGenericDamageFlags(isItAttack, - isItRanged), theAttackType, theDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - damage.callback(game, caster, localStore, castId)); + target.callback(caster, localStore, castId).damage(localStore.game, source.callback(caster, localStore, castId), + new CGenericDamageFlags(isItAttack, isItRanged), theAttackType, theDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damage.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java index 112b33d91..13c794dad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java @@ -4,7 +4,6 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; @@ -21,25 +20,25 @@ public class ABActionDispelDestructableBuffs implements ABAction { private ABCondition filter; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theCaster = caster; if (source != null) { - theCaster = source.callback(game, theCaster, localStore, castId); + theCaster = source.callback(theCaster, localStore, castId); } - CDestructable theTarget = dest.callback(game, theCaster, localStore, castId); + CDestructable theTarget = dest.callback(theCaster, localStore, castId); if (theTarget != null && theTarget.getBuffs() != null) { List toRemove = new ArrayList<>(); for (CDestructableBuff buff : theTarget.getBuffs()) { localStore.put(ABLocalStoreKeys.ENUMDESTBUFF, buff); - if (filter != null && filter.callback(game, theCaster, localStore, castId)) { + if (filter != null && filter.callback(theCaster, localStore, castId)) { toRemove.add(buff); } } localStore.remove(ABLocalStoreKeys.ENUMDESTBUFF); for (CDestructableBuff buff : toRemove) { - theTarget.remove(game, buff); + theTarget.remove(localStore.game, buff); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionIterateDestructablesInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionIterateDestructablesInRangeOfLocation.java index 03ff8eb83..47bfda491 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionIterateDestructablesInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionIterateDestructablesInRangeOfLocation.java @@ -9,7 +9,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructableEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -27,20 +26,19 @@ public class ABActionIterateDestructablesInRangeOfLocation implements ABAction { private List iterationActions; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityPointTarget target = this.location.callback(game, caster, localStore, castId); - final Float rangeVal = this.range.callback(game, caster, localStore, castId); + final AbilityPointTarget target = this.location.callback(caster, localStore, castId); + final Float rangeVal = this.range.callback(caster, localStore, castId); recycleRect.set(target.getX() - rangeVal, target.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - game.getWorldCollision().enumDestructablesInRect(recycleRect, new CDestructableEnumFunction() { + localStore.game.getWorldCollision().enumDestructablesInRect(recycleRect, new CDestructableEnumFunction() { @Override public boolean call(final CDestructable enumDest) { if (enumDest.distance(target.getX(), target.getY()) < rangeVal) { localStore.put(ABLocalStoreKeys.ENUMDESTRUCTABLE + castId, enumDest); for (final ABAction iterationAction : ABActionIterateDestructablesInRangeOfLocation.this.iterationActions) { - iterationAction.runAction(game, caster, localStore, castId); + iterationAction.runAction(caster, localStore, castId); } } return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java index f9b6280d9..560a3b040 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -11,9 +10,8 @@ public class ABActionKillDestructable implements ABAction { private ABDestructableCallback dest; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - dest.callback(game, caster, localStore, castId).setLife(game, 0); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + dest.callback(caster, localStore, castId).setLife(localStore.game, 0); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java index d0be97222..97c8fe037 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -11,10 +10,9 @@ public class ABActionRemoveDestructable implements ABAction { private ABDestructableCallback dest; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - game.removeDestructable(dest.callback(game, caster, localStore, castId)); + localStore.game.removeDestructable(dest.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructableBuff.java index 697b8838a..11809ccbe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructableBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; @@ -15,10 +14,9 @@ public class ABActionRemoveDestructableBuff implements ABSingleAction { private ABDestructableBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CDestructableBuff ability = this.buff.callback(game, caster, localStore, castId); - this.target.callback(game, caster, localStore, castId).remove(game, ability); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CDestructableBuff ability = this.buff.callback(caster, localStore, castId); + this.target.callback(caster, localStore, castId).remove(localStore.game, ability); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java index 6ec20dced..67c9fbdfb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -22,23 +21,21 @@ public class ABActionCreateTimeOfDayEvent implements ABSingleAction { private ABStringCallback equalityId; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { String eqId = null; float st = 0; float et = Float.MAX_VALUE; if (this.equalityId != null) { - eqId = this.equalityId.callback(game, caster, localStore, castId); + eqId = this.equalityId.callback(caster, localStore, castId); } if (this.startTime != null) { - st = this.startTime.callback(game, caster, localStore, castId); + st = this.startTime.callback(caster, localStore, castId); } if (this.endTime != null) { - et = this.endTime.callback(game, caster, localStore, castId); + et = this.endTime.callback(caster, localStore, castId); } - final ABTimeOfDayEvent event = new ABTimeOfDayEvent(game, caster, localStore, castId, this.actions, st, et, - eqId); + final ABTimeOfDayEvent event = new ABTimeOfDayEvent(caster, localStore, castId, this.actions, st, et, eqId); localStore.put(ABLocalStoreKeys.LASTCREATEDTODEVENT, event); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java index cbb2fe8a5..8ddc033ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -12,9 +11,8 @@ public class ABActionRegisterTimeOfDayEvent implements ABSingleAction { private ABTimeOfDayEventCallback event; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - game.registerTimeOfDayEvent(this.event.callback(game, caster, localStore, castId)); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + localStore.game.registerTimeOfDayEvent(this.event.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java index 2737db431..6581dc076 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -13,12 +12,11 @@ public class ABActionRegisterUniqueTimeOfDayEvent implements ABSingleAction { private ABTimeOfDayEventCallback event; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final ABTimeOfDayEvent ev = this.event.callback(game, caster, localStore, castId); - if (!game.isTimeOfDayEventRegistered(ev)) { - game.registerTimeOfDayEvent(ev); + final ABTimeOfDayEvent ev = this.event.callback(caster, localStore, castId); + if (!localStore.game.isTimeOfDayEventRegistered(ev)) { + localStore.game.registerTimeOfDayEvent(ev); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java index d938fbbec..cf983d0ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -12,10 +11,9 @@ public class ABActionUnregisterTimeOfDayEvent implements ABSingleAction { private ABTimeOfDayEventCallback event; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - game.unregisterTimeOfDayEvent(this.event.callback(game, caster, localStore, castId)); + localStore.game.unregisterTimeOfDayEvent(this.event.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java index 23c38b78a..7330a2a4a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -21,11 +20,10 @@ public class ABActionCreateWidgetEvent implements ABAction { private JassGameEventsWar3 eventType; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final ABWidgetEvent event = new ABWidgetEvent(game, caster, localStore, castId, - this.widget.callback(game, caster, localStore, castId), this.eventType, this.condition, this.actions); + final ABWidgetEvent event = new ABWidgetEvent(caster, localStore, castId, + this.widget.callback(caster, localStore, castId), this.eventType, this.condition, this.actions); localStore.put(ABLocalStoreKeys.LASTCREATEDWIDEVENT, event); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java index fcc3024eb..9d23e40cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks.ABWidgetEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -13,10 +12,9 @@ public class ABActionRegisterWidgetEvent implements ABSingleAction { private ABWidgetEventCallback event; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - ABWidgetEvent theEvent = event.callback(game, caster, localStore, castId); + ABWidgetEvent theEvent = event.callback(caster, localStore, castId); theEvent.getWidget().addEvent(theEvent); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java index 1ba26eadc..392156481 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks.ABWidgetEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -13,9 +12,8 @@ public class ABActionUnregisterWidgetEvent implements ABSingleAction { private ABWidgetEventCallback event; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - ABWidgetEvent theEvent = event.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + ABWidgetEvent theEvent = event.callback(caster, localStore, castId); theEvent.remove(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java index 0e8cc83eb..68f843ca7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.floatingtext; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -16,10 +15,9 @@ public class ABActionCreateFloatingTextOnUnit implements ABSingleAction { private ABStringCallback message; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - game.spawnTextTag(this.target.callback(game, caster, localStore, castId), caster.getPlayerIndex(), - this.textType, this.message.callback(game, caster, localStore, castId)); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + localStore.game.spawnTextTag(this.target.callback(caster, localStore, castId), caster.getPlayerIndex(), + this.textType, this.message.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java index 5094f90fc..895c5781d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.floatingtext; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -16,14 +15,13 @@ public class ABActionCreateNumericFloatingTextOnUnit implements ABSingleAction { private ABFloatCallback amount; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { float theAmount = 0; if (this.amount != null) { - theAmount = this.amount.callback(game, caster, localStore, castId); + theAmount = this.amount.callback(caster, localStore, castId); } - game.spawnTextTag(this.target.callback(game, caster, localStore, castId), caster.getPlayerIndex(), + localStore.game.spawnTextTag(this.target.callback(caster, localStore, castId), caster.getPlayerIndex(), this.textType, (int) (theAmount)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java index 7c4452f89..aebd9c639 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -21,19 +20,18 @@ public class ABActionCreateGroupEffectAtLocation implements ABAction { private CEffectType effectType; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); - float rad = radius.callback(game, caster, localStore, castId); + final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); + float rad = radius.callback(caster, localStore, castId); War3ID theId = null; if (id == null) { theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); } else { - theId = id.callback(game, caster, localStore, castId); + theId = id.callback(caster, localStore, castId); } final ABGroupEffect ret = new ABGroupEffect(loc, rad, theId, effectType); - game.registerTimer(ret); + localStore.game.registerTimer(ret); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java index c48a47133..ca923b021 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -20,28 +19,27 @@ public class ABActionCreateLightningEffect implements ABAction { private ABFloatCallback duration; private ABIntegerCallback index; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { int i = 0; if (index != null) { - i = index.callback(game, caster, localStore, castId); + i = index.callback(caster, localStore, castId); } War3ID theId = null; if (id == null) { theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); } else { - theId = id.callback(game, caster, localStore, castId); + theId = id.callback(caster, localStore, castId); } if (duration != null) { - SimulationRenderComponentLightning ret = game.createAbilityLightning( - origin.callback(game, caster, localStore, castId), theId, i, - target.callback(game, caster, localStore, castId), - duration.callback(game, caster, localStore, castId)); + SimulationRenderComponentLightning ret = localStore.game.createAbilityLightning( + origin.callback(caster, localStore, castId), theId, i, + target.callback(caster, localStore, castId), + duration.callback(caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDLIGHTNING, ret); } else { - SimulationRenderComponentLightning ret = game.createAbilityLightning( - origin.callback(game, caster, localStore, castId), theId, i, - target.callback(game, caster, localStore, castId)); + SimulationRenderComponentLightning ret = localStore.game.createAbilityLightning( + origin.callback(caster, localStore, castId), theId, i, + target.callback(caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDLIGHTNING, ret); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java index b039b785a..f5b84288f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -15,12 +14,11 @@ public class ABActionCreateLoopingSoundEffectAtLocation implements ABAction { private ABLocationCallback location; private ABIDCallback id; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - AbilityPointTarget loc = location.callback(game, caster, localStore, castId); - SimulationRenderComponent ret = game.locationSoundEffectEvent(loc.getX(), loc.getY(), - this.id.callback(game, caster, localStore, castId), true); + AbilityPointTarget loc = location.callback(caster, localStore, castId); + SimulationRenderComponent ret = localStore.game.locationSoundEffectEvent(loc.getX(), loc.getY(), + this.id.callback(caster, localStore, castId), true); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java index cc9c38011..d81c11441 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,11 +13,9 @@ public class ABActionCreateLoopingSoundEffectOnUnit implements ABAction { private ABUnitCallback unit; private ABIDCallback id; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { - SimulationRenderComponent ret = game.unitLoopSoundEffectEvent((unit.callback(game, caster, localStore, castId)), - this.id.callback(game, caster, localStore, castId)); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + SimulationRenderComponent ret = localStore.game.unitLoopSoundEffectEvent( + (unit.callback(caster, localStore, castId)), this.id.callback(caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java index 1668e9ea5..322dbc8bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -15,11 +14,10 @@ public class ABActionCreateSoundEffectAtLocation implements ABAction { private ABLocationCallback location; private ABIDCallback id; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - AbilityPointTarget loc = location.callback(game, caster, localStore, castId); - SimulationRenderComponent ret = game.locationSoundEffectEvent(loc.getX(), loc.getY(), - this.id.callback(game, caster, localStore, castId), false); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + AbilityPointTarget loc = location.callback(caster, localStore, castId); + SimulationRenderComponent ret = localStore.game.locationSoundEffectEvent(loc.getX(), loc.getY(), + this.id.callback(caster, localStore, castId), false); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java index c63b4c89a..77a2a5589 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,11 +13,9 @@ public class ABActionCreateSoundEffectOnUnit implements ABAction { private ABUnitCallback unit; private ABIDCallback id; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { - SimulationRenderComponent ret = game.unitSoundEffectEvent( - (unit.callback(game, caster, localStore, castId)), this.id.callback(game, caster, localStore, castId)); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + SimulationRenderComponent ret = localStore.game.unitSoundEffectEvent( + (unit.callback(caster, localStore, castId)), this.id.callback(caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java index 824bf0748..a64fbc868 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -21,21 +20,20 @@ public class ABActionCreateSpellEffectAtLocation implements ABAction { private CEffectType effectType; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); + final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); float dir = 0; if (this.facing != null) { - dir = this.facing.callback(game, caster, localStore, castId); + dir = this.facing.callback(caster, localStore, castId); } War3ID theId = null; if (id == null) { theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); } else { - theId = id.callback(game, caster, localStore, castId); + theId = id.callback(caster, localStore, castId); } - final SimulationRenderComponent ret = game.spawnSpellEffectOnPoint(loc.getX(), loc.getY(), dir, theId, + final SimulationRenderComponent ret = localStore.game.spawnSpellEffectOnPoint(loc.getX(), loc.getY(), dir, theId, this.effectType, 0); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java index 3d6b6a3fb..2adcb2cf6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -19,21 +18,20 @@ public class ABActionCreateSpellEffectAtPoint implements ABAction { private ABIDCallback id; private CEffectType effectType; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { float dir = 0; if (facing != null) { - dir = facing.callback(game, caster, localStore, castId); + dir = facing.callback(caster, localStore, castId); } War3ID theId = null; if (id == null) { theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); } else { - theId = id.callback(game, caster, localStore, castId); + theId = id.callback(caster, localStore, castId); } - SimulationRenderComponent ret = game.spawnSpellEffectOnPoint(x.callback(game, caster, localStore, castId), - y.callback(game, caster, localStore, castId), dir, theId, effectType, 0); + SimulationRenderComponent ret = localStore.game.spawnSpellEffectOnPoint(x.callback(caster, localStore, castId), + y.callback(caster, localStore, castId), dir, theId, effectType, 0); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java index b4580bfa7..bbe8dd547 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -19,24 +18,21 @@ public class ABActionCreateSpellEffectOnUnit implements ABAction { private CEffectType effectType; private ABIntegerCallback index; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { War3ID theId = null; if (id == null) { theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); } else { - theId = id.callback(game, caster, localStore, castId); + theId = id.callback(caster, localStore, castId); } if (index == null) { - SimulationRenderComponent ret = game.createPersistentSpellEffectOnUnit( - (target.callback(game, caster, localStore, castId)), theId, this.effectType); + SimulationRenderComponent ret = localStore.game.createPersistentSpellEffectOnUnit( + (target.callback(caster, localStore, castId)), theId, this.effectType); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } else { - SimulationRenderComponent ret = game.createPersistentSpellEffectOnUnit( - (target.callback(game, caster, localStore, castId)), - this.id.callback(game, caster, localStore, castId), this.effectType, - this.index.callback(game, caster, localStore, castId)); + SimulationRenderComponent ret = localStore.game.createPersistentSpellEffectOnUnit( + (target.callback(caster, localStore, castId)), this.id.callback(caster, localStore, castId), + this.effectType, this.index.callback(caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java index bcc0802d2..0218655be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -21,20 +20,19 @@ public class ABActionCreateTemporarySpellEffectAtLocation implements ABSingleAct private CEffectType effectType; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); float dir = 0; if (this.facing != null) { - dir = this.facing.callback(game, caster, localStore, castId); + dir = this.facing.callback(caster, localStore, castId); } War3ID theId = null; if (id == null) { theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); } else { - theId = id.callback(game, caster, localStore, castId); + theId = id.callback(caster, localStore, castId); } - game.spawnTemporarySpellEffectOnPoint(loc.getX(), loc.getY(), dir, theId, this.effectType, 0); + localStore.game.spawnTemporarySpellEffectOnPoint(loc.getX(), loc.getY(), dir, theId, this.effectType, 0); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java index 82ba506c9..2bb665d94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -20,21 +19,20 @@ public class ABActionCreateTemporarySpellEffectAtPoint implements ABSingleAction private CEffectType effectType; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { float dir = 0; if (this.facing != null) { - dir = this.facing.callback(game, caster, localStore, castId); + dir = this.facing.callback(caster, localStore, castId); } War3ID theId = null; if (id == null) { theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); } else { - theId = id.callback(game, caster, localStore, castId); + theId = id.callback(caster, localStore, castId); } - game.spawnTemporarySpellEffectOnPoint(this.x.callback(game, caster, localStore, castId), - this.y.callback(game, caster, localStore, castId), dir, + localStore.game.spawnTemporarySpellEffectOnPoint(this.x.callback(caster, localStore, castId), + this.y.callback(caster, localStore, castId), dir, theId, this.effectType, 0); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java index c63a8e25e..fdd9aaf4a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -18,15 +17,14 @@ public class ABActionCreateTemporarySpellEffectOnUnit implements ABSingleAction private CEffectType effectType; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { War3ID theId = null; if (id == null) { theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); } else { - theId = id.callback(game, caster, localStore, castId); + theId = id.callback(caster, localStore, castId); } - game.createTemporarySpellEffectOnUnit((this.target.callback(game, caster, localStore, castId)), theId, + localStore.game.createTemporarySpellEffectOnUnit((this.target.callback(caster, localStore, castId)), theId, this.effectType); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainBowlAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainBowlAtLocation.java index 28296a1ce..baca1de96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainBowlAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainBowlAtLocation.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -19,41 +18,40 @@ public class ABActionCreateTerrainBowlAtLocation implements ABAction { private ABFloatCallback sinkTime; private ABFloatCallback staticTime; private ABFloatCallback fillTime; - + private ABFloatCallback stopDuration; private ABFloatCallback startDepth; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { - final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); - final float rad = radius.callback(game, caster, localStore, castId); - final float theDepth = -1 * depth.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); + final float rad = radius.callback(caster, localStore, castId); + final float theDepth = -1 * depth.callback(caster, localStore, castId); float startDep = 0; if (startDepth != null) { - startDep = startDepth.callback(game, caster, localStore, castId); + startDep = startDepth.callback(caster, localStore, castId); } - + float snkTm = 0; float sttTm = 0; float fllTm = 0; float stpTm = 0; if (sinkTime != null) { - snkTm = sinkTime.callback(game, caster, localStore, castId); + snkTm = sinkTime.callback(caster, localStore, castId); } if (staticTime != null) { - sttTm = staticTime.callback(game, caster, localStore, castId); + sttTm = staticTime.callback(caster, localStore, castId); } if (fillTime != null) { - fllTm = fillTime.callback(game, caster, localStore, castId); + fllTm = fillTime.callback(caster, localStore, castId); } if (stopDuration != null) { - stpTm = stopDuration.callback(game, caster, localStore, castId); + stpTm = stopDuration.callback(caster, localStore, castId); } - - ABTerrainEffect fx = new ABTerrainBowlEffect(game, loc, rad, theDepth, snkTm, sttTm, fllTm, stpTm, startDep); - game.registerTimer(fx); + + ABTerrainEffect fx = new ABTerrainBowlEffect(localStore.game, loc, rad, theDepth, snkTm, sttTm, fllTm, stpTm, + startDep); + localStore.game.registerTimer(fx); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, fx); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java index d73fc81ce..de5417585 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -33,36 +32,35 @@ public class ABActionCreateTerrainRippleAtLocation implements ABAction { private ABBooleanCallback onlyNegative; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); float startRad = 0; float endRad = 0; if (radius != null) { - startRad = radius.callback(game, caster, localStore, castId); + startRad = radius.callback(caster, localStore, castId); endRad = startRad; } else { - startRad = startRadius.callback(game, caster, localStore, castId); - endRad = finalRadius.callback(game, caster, localStore, castId); + startRad = startRadius.callback(caster, localStore, castId); + endRad = finalRadius.callback(caster, localStore, castId); } - final float theDepth = depth.callback(game, caster, localStore, castId); - final float thePeriod = period.callback(game, caster, localStore, castId); - final int swaves = spaceWaves.callback(game, caster, localStore, castId); - final int twaves = timeWaves.callback(game, caster, localStore, castId); - final boolean onlyNeg = onlyNegative.callback(game, caster, localStore, castId); + final float theDepth = depth.callback(caster, localStore, castId); + final float thePeriod = period.callback(caster, localStore, castId); + final int swaves = spaceWaves.callback(caster, localStore, castId); + final int twaves = timeWaves.callback(caster, localStore, castId); + final boolean onlyNeg = onlyNegative.callback(caster, localStore, castId); int intervals = 0; if (rippleCount != null) { - intervals = rippleCount.callback(game, caster, localStore, castId); + intervals = rippleCount.callback(caster, localStore, castId); } else { - final float dur = duration.callback(game, caster, localStore, castId); + final float dur = duration.callback(caster, localStore, castId); intervals = ((int) dur) * 2; } - ABTerrainEffect fx = new ABTerrainRippleEffect(game, loc, startRad, endRad, theDepth, thePeriod, intervals, - swaves, twaves, onlyNeg); - game.registerTimer(fx); + ABTerrainEffect fx = new ABTerrainRippleEffect(localStore.game, loc, startRad, endRad, theDepth, thePeriod, + intervals, swaves, twaves, onlyNeg); + localStore.game.registerTimer(fx); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, fx); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java index 21df1083f..42810c78e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -24,23 +23,22 @@ public class ABActionCreateTerrainWaveAtLocation implements ABAction { private ABIntegerCallback count; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityPointTarget loc = this.startLocation.callback(game, caster, localStore, castId); - final AbilityPointTarget tarloc = this.targetLocation.callback(game, caster, localStore, castId); - final float rad = radius.callback(game, caster, localStore, castId); - final float theDepth = depth.callback(game, caster, localStore, castId); - final float dist = distance.callback(game, caster, localStore, castId); - final float spd = speed.callback(game, caster, localStore, castId); - final int trlTime = trailTime.callback(game, caster, localStore, castId); + final AbilityPointTarget loc = this.startLocation.callback(caster, localStore, castId); + final AbilityPointTarget tarloc = this.targetLocation.callback(caster, localStore, castId); + final float rad = radius.callback(caster, localStore, castId); + final float theDepth = depth.callback(caster, localStore, castId); + final float dist = distance.callback(caster, localStore, castId); + final float spd = speed.callback(caster, localStore, castId); + final int trlTime = trailTime.callback(caster, localStore, castId); int cnt = 1; if (count != null) { - cnt = count.callback(game, caster, localStore, castId); + cnt = count.callback(caster, localStore, castId); } - ABTerrainEffect fx = new ABTerrainWaveEffect(game, loc, tarloc, rad, theDepth, dist, spd, trlTime, cnt); - game.registerTimer(fx); + ABTerrainEffect fx = new ABTerrainWaveEffect(localStore.game, loc, tarloc, rad, theDepth, dist, spd, trlTime, cnt); + localStore.game.registerTimer(fx); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, fx); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java index 433b23691..ad859f92d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -16,10 +15,10 @@ public class ABActionCreateUberSplat implements ABAction { private ABLocationCallback location; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - AbilityPointTarget loc = location.callback(game, caster, localStore, castId); - SimulationRenderComponent splat = game.createStaticUberSplat(loc.getX(), loc.getY(), - id.callback(game, caster, localStore, castId)); + public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + AbilityPointTarget loc = location.callback(caster, localStore, castId); + SimulationRenderComponent splat = localStore.game.createStaticUberSplat(loc.getX(), loc.getY(), + id.callback(caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, splat); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java index 482d4765f..a39239204 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -14,9 +13,8 @@ public class ABActionModifyTerrainVertex implements ABAction { private ABFloatCallback dz; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); - game.adjustTerrain(loc.x, loc.y, dz.callback(game, caster, localStore, castId)); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); + localStore.game.adjustTerrain(loc.x, loc.y, dz.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java index 6ffe04a1b..e1f67b58e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks.ABFXCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -12,10 +11,9 @@ public class ABActionRemoveEffect implements ABSingleAction { private ABFXCallback effect; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - this.effect.callback(game, caster, localStore, castId).remove(); + this.effect.callback(caster, localStore, castId).remove(); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java index ef8794756..d1a3dd290 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks.ABLightningCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -10,8 +9,7 @@ public class ABActionRemoveLightningEffect implements ABAction { private ABLightningCallback effect; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - effect.callback(game, caster, localStore, castId).remove(); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + effect.callback(caster, localStore, castId).remove(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java index 84c3f7ef3..5bed1c73e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.gamestate; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -15,12 +14,11 @@ public class ABActionSetFalseTimeOfDay implements ABSingleAction { private ABFloatCallback duration; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - game.addFalseTimeOfDay(this.hour.callback(game, caster, localStore, castId), - this.minute.callback(game, caster, localStore, castId), - this.duration.callback(game, caster, localStore, castId)); + localStore.game.addFalseTimeOfDay(this.hour.callback(caster, localStore, castId), + this.minute.callback(caster, localStore, castId), + this.duration.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java index be3083c4d..b4098b946 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -17,22 +16,21 @@ public class ABActionChargeItem implements ABSingleAction { private ABBooleanCallback checkForPerish; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CItem it = null; if (this.item == null) { final AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); it = ability.getItem(); } else { - it = this.item.callback(game, caster, localStore, castId); + it = this.item.callback(caster, localStore, castId); } it.setCharges(it.getCharges() - 1); - if ((this.checkForPerish != null) && this.checkForPerish.callback(game, caster, localStore, castId) + if ((this.checkForPerish != null) && this.checkForPerish.callback(caster, localStore, castId) && it.getItemType().isPerishable() && (it.getCharges() == 0)) { - it.forceDropIfHeld(game); - game.removeItem(it); + it.forceDropIfHeld(localStore.game); + localStore.game.removeItem(it); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java index fd88c53e0..584ddcd66 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; @@ -15,11 +14,10 @@ public class ABActionTransformItem implements ABAction { private ABIDCallback newType; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - CItem it = this.item.callback(game, caster, localStore, castId); - War3ID type = newType.callback(game, caster, localStore, castId); - it.setTypeId(game, type); + CItem it = this.item.callback(caster, localStore, castId); + War3ID type = newType.callback(caster, localStore, castId); + it.setTypeId(localStore.game, type); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java index ab72a1b22..d99cd58d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; @@ -17,14 +16,13 @@ public class ABActionListRemove implements ABAction { private ABCallback object; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final List l = this.list.callback(game, caster, localStore, castId); + final List l = this.list.callback(caster, localStore, castId); if (object != null) { - l.remove(object.callback(game, caster, localStore, castId)); + l.remove(object.callback(caster, localStore, castId)); } else { - l.remove(index.callback(game, caster, localStore, castId).intValue()); + l.remove(index.callback(caster, localStore, castId).intValue()); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java index 16c85b915..2241dbc87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -18,14 +17,13 @@ public class ABActionLocationListAdd implements ABAction { private ABIntegerCallback index; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final List l = this.list.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final List l = this.list.callback(caster, localStore, castId); if (index != null) { - l.add(index.callback(game, caster, localStore, castId), - location.callback(game, caster, localStore, castId)); + l.add(index.callback(caster, localStore, castId), + location.callback(caster, localStore, castId)); } else { - l.add(location.callback(game, caster, localStore, castId)); + l.add(location.callback(caster, localStore, castId)); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java index 0c7837d81..69e0771d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; @@ -17,14 +16,13 @@ public class ABActionSortableListRemove implements ABAction { private ABCallback object; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final List l = this.list.callback(game, caster, localStore, castId); + final List l = this.list.callback(caster, localStore, castId); if (object != null) { - l.remove(object.callback(game, caster, localStore, castId)); + l.remove(object.callback(caster, localStore, castId)); } else { - l.remove(index.callback(game, caster, localStore, castId).intValue()); + l.remove(index.callback(caster, localStore, castId).intValue()); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java index 261a3ff10..c27b329f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; @@ -16,15 +15,14 @@ public class ABActionGiveResourcesToPlayer implements ABSingleAction { private ABIntegerCallback lumber; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CPlayer p = this.player.callback(game, caster, localStore, castId); + final CPlayer p = this.player.callback(caster, localStore, castId); if (this.gold != null) { - p.addGold(this.gold.callback(game, caster, localStore, castId)); + p.addGold(this.gold.callback(caster, localStore, castId)); } if (this.lumber != null) { - p.addLumber(this.lumber.callback(game, caster, localStore, castId)); + p.addLumber(this.lumber.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java index 79d23b8e1..327e3494f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -17,15 +16,14 @@ public class ABActionSetAbilityEnabledForPlayer implements ABSingleAction { private ABBooleanCallback enabled; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CPlayer p = this.player.callback(game, caster, localStore, castId); + final CPlayer p = this.player.callback(caster, localStore, castId); boolean e = true; if (this.enabled != null) { - e = this.enabled.callback(game, caster, localStore, castId); + e = this.enabled.callback(caster, localStore, castId); } - p.setAbilityEnabled(game, this.abilityId.callback(game, caster, localStore, castId), e); + p.setAbilityEnabled(localStore.game, this.abilityId.callback(caster, localStore, castId), e); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java index 0c7b9519f..080fc2d39 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; @@ -44,8 +43,7 @@ public class ABActionCreateLocationTargetedCollisionProjectile implements ABSing private ABBooleanCallback provideCounts; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { Float theSpeed = null; Boolean isHoming = null; int theMaxHits = 0; @@ -54,53 +52,53 @@ public void runAction(final CSimulation game, final CUnit caster, final LocalDat float theEndingRadius = 0; float theCollisionInterval = 0.05f; boolean isProvideCounts = false; - final CUnit theSource = this.source.callback(game, caster, localStore, castId); + final CUnit theSource = this.source.callback(caster, localStore, castId); AbilityTarget sourceLocation = theSource; if (this.sourceLoc != null) { - sourceLocation = this.sourceLoc.callback(game, caster, localStore, castId); + sourceLocation = this.sourceLoc.callback(caster, localStore, castId); } if (this.maxHits != null) { - theMaxHits = this.maxHits.callback(game, caster, localStore, castId); + theMaxHits = this.maxHits.callback(caster, localStore, castId); } if (this.hitsPerTarget != null) { - theHitsPerTarget = this.hitsPerTarget.callback(game, caster, localStore, castId); + theHitsPerTarget = this.hitsPerTarget.callback(caster, localStore, castId); } if (this.radius != null) { - final float rad = this.radius.callback(game, caster, localStore, castId); + final float rad = this.radius.callback(caster, localStore, castId); theStartingRadius = rad; theEndingRadius = rad; } else { if (this.endingRadius != null) { - theStartingRadius = this.startingRadius.callback(game, caster, localStore, castId); - theEndingRadius = this.endingRadius.callback(game, caster, localStore, castId); + theStartingRadius = this.startingRadius.callback(caster, localStore, castId); + theEndingRadius = this.endingRadius.callback(caster, localStore, castId); } else { - final float rad = this.startingRadius.callback(game, caster, localStore, castId); + final float rad = this.startingRadius.callback(caster, localStore, castId); theStartingRadius = rad; theEndingRadius = rad; } } if (this.collisionInterval != null) { - theCollisionInterval = this.collisionInterval.callback(game, caster, localStore, castId); + theCollisionInterval = this.collisionInterval.callback(caster, localStore, castId); } if (this.provideCounts != null) { - isProvideCounts = this.provideCounts.callback(game, caster, localStore, castId); + isProvideCounts = this.provideCounts.callback(caster, localStore, castId); } if (this.speed != null) { - theSpeed = this.speed.callback(game, caster, localStore, castId); + theSpeed = this.speed.callback(caster, localStore, castId); } if (this.homing != null) { - isHoming = this.homing.callback(game, caster, localStore, castId); + isHoming = this.homing.callback(caster, localStore, castId); } - final AbilityPointTarget theTarget = this.target.callback(game, caster, localStore, castId); + final AbilityPointTarget theTarget = this.target.callback(caster, localStore, castId); final ABCollisionProjectileListener listener = new ABCollisionProjectileListener(this.onLaunch, this.onPreHits, this.canHitTarget, this.onHit, caster, localStore, castId); - final CProjectile proj = game.createCollisionProjectile(theSource, - this.id.callback(game, caster, localStore, castId), sourceLocation.getX(), sourceLocation.getY(), + final CProjectile proj = localStore.game.createCollisionProjectile(theSource, + this.id.callback(caster, localStore, castId), sourceLocation.getX(), sourceLocation.getY(), (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, isHoming, theTarget, theMaxHits, theHitsPerTarget, theStartingRadius, theEndingRadius, theCollisionInterval, listener, isProvideCounts); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java index 251b07426..e6ba33be1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; @@ -33,29 +32,28 @@ public class ABActionCreateLocationTargetedProjectile implements ABSingleAction private List onHit; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { Float theSpeed = null; Boolean isHoming = null; - final CUnit theSource = this.source.callback(game, caster, localStore, castId); + final CUnit theSource = this.source.callback(caster, localStore, castId); AbilityTarget sourceLocation = theSource; if (this.sourceLoc != null) { - sourceLocation = this.sourceLoc.callback(game, caster, localStore, castId); + sourceLocation = this.sourceLoc.callback(caster, localStore, castId); } if (this.speed != null) { - theSpeed = this.speed.callback(game, caster, localStore, castId); + theSpeed = this.speed.callback(caster, localStore, castId); } if (this.homing != null) { - isHoming = this.homing.callback(game, caster, localStore, castId); + isHoming = this.homing.callback(caster, localStore, castId); } - final AbilityPointTarget theTarget = this.target.callback(game, caster, localStore, castId); + final AbilityPointTarget theTarget = this.target.callback(caster, localStore, castId); final CAbilityProjectileListener listener = new ABProjectileListener(this.onLaunch, this.onHit, caster, localStore, castId); - final CProjectile proj = game.createProjectile(theSource, this.id.callback(game, caster, localStore, castId), + final CProjectile proj = localStore.game.createProjectile(theSource, this.id.callback(caster, localStore, castId), sourceLocation.getX(), sourceLocation.getY(), (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, isHoming, theTarget, listener); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java index 2eacb1e1c..53a85be3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.units.GameObject; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; @@ -50,8 +49,7 @@ public class ABActionCreateLocationTargetedPseudoProjectile implements ABSingleA private ABBooleanCallback provideCounts; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { float theSpeed = 0; boolean isHoming = false; int theMaxHits = 0; @@ -62,70 +60,70 @@ public void runAction(final CSimulation game, final CUnit caster, final LocalDat CEffectType theEffectType = CEffectType.SPECIAL; int theEffectArtIndex = 0; boolean isProvideCounts = false; - final CUnit theSource = this.source.callback(game, caster, localStore, castId); + final CUnit theSource = this.source.callback(caster, localStore, castId); AbilityTarget sourceLocation = theSource; int theArtSkip = 1; if (this.sourceLoc != null) { - sourceLocation = this.sourceLoc.callback(game, caster, localStore, castId); + sourceLocation = this.sourceLoc.callback(caster, localStore, castId); } if (this.effectType != null) { theEffectType = this.effectType; } if (this.effectArtIndex != null) { - theEffectArtIndex = this.effectArtIndex.callback(game, caster, localStore, castId); + theEffectArtIndex = this.effectArtIndex.callback(caster, localStore, castId); } if (this.maxHits != null) { - theMaxHits = this.maxHits.callback(game, caster, localStore, castId); + theMaxHits = this.maxHits.callback(caster, localStore, castId); } if (this.hitsPerTarget != null) { - theHitsPerTarget = this.hitsPerTarget.callback(game, caster, localStore, castId); + theHitsPerTarget = this.hitsPerTarget.callback(caster, localStore, castId); } if (this.radius != null) { - final float rad = this.radius.callback(game, caster, localStore, castId); + final float rad = this.radius.callback(caster, localStore, castId); theStartingRadius = rad; theEndingRadius = rad; } else { if (this.endingRadius != null) { - theStartingRadius = this.startingRadius.callback(game, caster, localStore, castId); - theEndingRadius = this.endingRadius.callback(game, caster, localStore, castId); + theStartingRadius = this.startingRadius.callback(caster, localStore, castId); + theEndingRadius = this.endingRadius.callback(caster, localStore, castId); } else { - final float rad = this.startingRadius.callback(game, caster, localStore, castId); + final float rad = this.startingRadius.callback(caster, localStore, castId); theStartingRadius = rad; theEndingRadius = rad; } } if (this.projectileStepInterval != null) { - theCollisionInterval = this.projectileStepInterval.callback(game, caster, localStore, castId); + theCollisionInterval = this.projectileStepInterval.callback(caster, localStore, castId); } if (this.projectileArtSkip != null) { - theArtSkip = this.projectileArtSkip.callback(game, caster, localStore, castId); + theArtSkip = this.projectileArtSkip.callback(caster, localStore, castId); } if (this.provideCounts != null) { - isProvideCounts = this.provideCounts.callback(game, caster, localStore, castId); + isProvideCounts = this.provideCounts.callback(caster, localStore, castId); } final GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); if (this.speed != null) { - theSpeed = this.speed.callback(game, caster, localStore, castId); + theSpeed = this.speed.callback(caster, localStore, castId); } else { theSpeed = editorData.getFieldAsFloat(AbilityFields.PROJECTILE_SPEED, 0); } if (this.homing != null) { - isHoming = this.homing.callback(game, caster, localStore, castId); + isHoming = this.homing.callback(caster, localStore, castId); } else { isHoming = editorData.getFieldAsBoolean(AbilityFields.PROJECTILE_HOMING_ENABLED, 0); } - final AbilityPointTarget theTarget = this.target.callback(game, caster, localStore, castId); + final AbilityPointTarget theTarget = this.target.callback(caster, localStore, castId); final ABCollisionProjectileListener listener = new ABCollisionProjectileListener(this.onLaunch, this.onPreHits, this.canHitTarget, this.onHit, caster, localStore, castId); - final CProjectile proj = game.createPseudoProjectile(theSource, - this.id.callback(game, caster, localStore, castId), theEffectType, theEffectArtIndex, + final CProjectile proj = localStore.game.createPseudoProjectile(theSource, + this.id.callback(caster, localStore, castId), theEffectType, theEffectArtIndex, sourceLocation.getX(), sourceLocation.getY(), (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, theCollisionInterval, theArtSkip, isHoming, theTarget, theMaxHits, theHitsPerTarget, theStartingRadius, theEndingRadius, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java index ad76df787..9fb0c6f6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java @@ -56,25 +56,24 @@ public class ABActionCreateUnitTargetedBouncingProjectile implements ABAction { private ABBooleanCallback allowMultipleBouncesPerUnit; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit theSource = caster; if (source != null) { - theSource = this.source.callback(game, caster, localStore, castId); + theSource = this.source.callback(caster, localStore, castId); } AbilityTarget sourceLocation = theSource; if (this.sourceLoc != null) { - sourceLocation = this.sourceLoc.callback(game, caster, localStore, castId); + sourceLocation = this.sourceLoc.callback(caster, localStore, castId); } - final CUnit theTarget = this.target.callback(game, caster, localStore, castId); + final CUnit theTarget = this.target.callback(caster, localStore, castId); final boolean multiBounce; if (allowMultipleBouncesPerUnit != null) { - multiBounce = allowMultipleBouncesPerUnit.callback(game, caster, localStore, castId); + multiBounce = allowMultipleBouncesPerUnit.callback(caster, localStore, castId); } else { - multiBounce = game.getGameplayConstants().isAllowMultiBounce(); + multiBounce = localStore.game.getGameplayConstants().isAllowMultiBounce(); } final Set hitUnits; if (!multiBounce) { @@ -91,7 +90,7 @@ public void onLaunch(CSimulation game, CProjectile projectile, AbilityTarget tar if (onLaunch != null) { localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); for (ABAction action : onLaunch) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); } @@ -108,15 +107,15 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId, new AbilityPointTarget(projectile.getX(), projectile.getY())); for (ABAction action : onHit) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); localStore.remove(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); } - startPerformJump(game, caster, localStore, castId, theTarget, multiBounce, hitUnits, - bounces.callback(game, caster, localStore, castId)); + startPerformJump(caster, localStore, castId, theTarget, multiBounce, hitUnits, + bounces.callback(caster, localStore, castId)); } }; @@ -125,17 +124,17 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target Float theSpeed = null; Boolean isHoming = null; if (this.speed != null) { - theSpeed = this.speed.callback(game, caster, localStore, castId); + theSpeed = this.speed.callback(caster, localStore, castId); } if (this.homing != null) { - isHoming = this.homing.callback(game, caster, localStore, castId); + isHoming = this.homing.callback(caster, localStore, castId); } - proj = game.createProjectile(theSource, this.id.callback(game, caster, localStore, castId), + proj = localStore.game.createProjectile(theSource, this.id.callback(caster, localStore, castId), sourceLocation.getX(), sourceLocation.getY(), (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, isHoming, theTarget, listener); } else if (settings != null) { - proj = game.createProjectile(theSource, this.settings.callback(game, caster, localStore, castId), + proj = localStore.game.createProjectile(theSource, this.settings.callback(caster, localStore, castId), sourceLocation.getX(), sourceLocation.getY(), (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theTarget, listener); } @@ -143,49 +142,48 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); } - private void startPerformJump(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, + private void startPerformJump(final CUnit caster, final LocalDataStore localStore, final int castId, + final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (remainingJumps <= 0) { return; } float delay = 0; if (bounceDelay != null) { - delay = bounceDelay.callback(game, caster, localStore, castId); + delay = bounceDelay.callback(caster, localStore, castId); } if (delay > 0) { CTimer runner = new CTimer() { @Override public void onFire(CSimulation simulation) { - performJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, - remainingJumps); + performJump(caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, remainingJumps); } }; runner.setTimeoutTime(delay); - runner.start(game); + runner.start(localStore.game); } else { - performJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, remainingJumps); + performJump(caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, remainingJumps); } } - private void performJump(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, + private void performJump(final CUnit caster, final LocalDataStore localStore, final int castId, + final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (originUnitTarget == null) { return; } - final Float rangeVal = this.range.callback(game, caster, localStore, castId); + final Float rangeVal = this.range.callback(caster, localStore, castId); List foundUnits = new ArrayList<>(); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal) && (multiBounce || !hitUnits.contains(enumUnit))) { localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); - if (condition == null || condition.callback(game, caster, localStore, castId)) { + if (condition == null || condition.callback(caster, localStore, castId)) { foundUnits.add(enumUnit); } } @@ -197,7 +195,7 @@ public boolean call(final CUnit enumUnit) { final CUnit jumpUnit; if (foundUnits.size() > 0) { if (sort != null) { - ABUnitComparator comp = new ABUnitComparator(game, caster, localStore, castId, sort); + ABUnitComparator comp = new ABUnitComparator(caster, localStore, castId, sort); foundUnits.sort(comp); } else { foundUnits.sort(ABNearestUnitComparator.INSTANCE); @@ -221,7 +219,7 @@ public void onLaunch(CSimulation game, CProjectile projectile, AbilityTarget tar if (onLaunch != null) { localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); for (ABAction action : onLaunch) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); } @@ -238,15 +236,15 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId, new AbilityPointTarget(projectile.getX(), projectile.getY())); for (ABAction action : onHit) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); localStore.remove(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); } - startPerformJump(game, caster, localStore, castId, jumpUnit, multiBounce, hitUnits, - bounces.callback(game, caster, localStore, castId)); + startPerformJump(caster, localStore, castId, jumpUnit, multiBounce, hitUnits, + bounces.callback(caster, localStore, castId)); } }; @@ -255,17 +253,17 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target Float theSpeed = null; Boolean isHoming = null; if (this.speed != null) { - theSpeed = this.speed.callback(game, caster, localStore, castId); + theSpeed = this.speed.callback(caster, localStore, castId); } if (this.homing != null) { - isHoming = this.homing.callback(game, caster, localStore, castId); + isHoming = this.homing.callback(caster, localStore, castId); } - proj = game.createProjectile(caster, this.id.callback(game, caster, localStore, castId), + proj = localStore.game.createProjectile(caster, this.id.callback(caster, localStore, castId), originUnitTarget.getX(), originUnitTarget.getY(), (float) AbilityTarget.angleBetween(originUnitTarget, jumpUnit), theSpeed, isHoming, jumpUnit, listener); } else if (settings != null) { - proj = game.createProjectile(caster, this.settings.callback(game, caster, localStore, castId), + proj = localStore.game.createProjectile(caster, this.settings.callback(caster, localStore, castId), originUnitTarget.getX(), originUnitTarget.getY(), (float) AbilityTarget.angleBetween(originUnitTarget, jumpUnit), jumpUnit, listener); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java index 66ec417ad..3be33adf3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -43,8 +42,7 @@ public class ABActionCreateUnitTargetedCollisionProjectile implements ABSingleAc private ABBooleanCallback provideCounts; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { Float theSpeed = null; Boolean isHoming = null; int theMaxHits = 0; @@ -53,53 +51,53 @@ public void runAction(final CSimulation game, final CUnit caster, final LocalDat float theEndingRadius = 0; float theCollisionInterval = 0.05f; boolean isProvideCounts = false; - final CUnit theSource = this.source.callback(game, caster, localStore, castId); + final CUnit theSource = this.source.callback(caster, localStore, castId); AbilityTarget sourceLocation = theSource; if (this.sourceLoc != null) { - sourceLocation = this.sourceLoc.callback(game, caster, localStore, castId); + sourceLocation = this.sourceLoc.callback(caster, localStore, castId); } if (this.maxHits != null) { - theMaxHits = this.maxHits.callback(game, caster, localStore, castId); + theMaxHits = this.maxHits.callback(caster, localStore, castId); } if (this.hitsPerTarget != null) { - theHitsPerTarget = this.hitsPerTarget.callback(game, caster, localStore, castId); + theHitsPerTarget = this.hitsPerTarget.callback(caster, localStore, castId); } if (this.radius != null) { - final float rad = this.radius.callback(game, caster, localStore, castId); + final float rad = this.radius.callback(caster, localStore, castId); theStartingRadius = rad; theEndingRadius = rad; } else { if (this.endingRadius != null) { - theStartingRadius = this.startingRadius.callback(game, caster, localStore, castId); - theEndingRadius = this.endingRadius.callback(game, caster, localStore, castId); + theStartingRadius = this.startingRadius.callback(caster, localStore, castId); + theEndingRadius = this.endingRadius.callback(caster, localStore, castId); } else { - final float rad = this.startingRadius.callback(game, caster, localStore, castId); + final float rad = this.startingRadius.callback(caster, localStore, castId); theStartingRadius = rad; theEndingRadius = rad; } } if (this.collisionInterval != null) { - theCollisionInterval = this.collisionInterval.callback(game, caster, localStore, castId); + theCollisionInterval = this.collisionInterval.callback(caster, localStore, castId); } if (this.provideCounts != null) { - isProvideCounts = this.provideCounts.callback(game, caster, localStore, castId); + isProvideCounts = this.provideCounts.callback(caster, localStore, castId); } if (this.speed != null) { - theSpeed = this.speed.callback(game, caster, localStore, castId); + theSpeed = this.speed.callback(caster, localStore, castId); } if (this.homing != null) { - isHoming = this.homing.callback(game, caster, localStore, castId); + isHoming = this.homing.callback(caster, localStore, castId); } - final CUnit theTarget = this.target.callback(game, caster, localStore, castId); + final CUnit theTarget = this.target.callback(caster, localStore, castId); final ABCollisionProjectileListener listener = new ABCollisionProjectileListener(this.onLaunch, this.onPreHits, this.canHitTarget, this.onHit, caster, localStore, castId); - final CProjectile proj = game.createCollisionProjectile(theSource, - this.id.callback(game, caster, localStore, castId), sourceLocation.getX(), sourceLocation.getY(), + final CProjectile proj = localStore.game.createCollisionProjectile(theSource, + this.id.callback(caster, localStore, castId), sourceLocation.getX(), sourceLocation.getY(), (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, isHoming, theTarget, theMaxHits, theHitsPerTarget, theStartingRadius, theEndingRadius, theCollisionInterval, listener, isProvideCounts); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java index 54b36d9d6..77438e007 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.ABAttackSettingsCallback; @@ -34,16 +33,15 @@ public class ABActionCreateUnitTargetedProjectile implements ABSingleAction { private List onHit; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CUnit theSource = this.source.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CUnit theSource = this.source.callback(caster, localStore, castId); AbilityTarget sourceLocation = theSource; if (this.sourceLoc != null) { - sourceLocation = this.sourceLoc.callback(game, caster, localStore, castId); + sourceLocation = this.sourceLoc.callback(caster, localStore, castId); } - final CUnit theTarget = this.target.callback(game, caster, localStore, castId); + final CUnit theTarget = this.target.callback(caster, localStore, castId); final CAbilityProjectileListener listener = new ABProjectileListener(this.onLaunch, this.onHit, caster, localStore, castId); @@ -53,17 +51,17 @@ public void runAction(final CSimulation game, final CUnit caster, final LocalDat Float theSpeed = null; Boolean isHoming = null; if (this.speed != null) { - theSpeed = this.speed.callback(game, caster, localStore, castId); + theSpeed = this.speed.callback(caster, localStore, castId); } if (this.homing != null) { - isHoming = this.homing.callback(game, caster, localStore, castId); + isHoming = this.homing.callback(caster, localStore, castId); } - proj = game.createProjectile(theSource, this.id.callback(game, caster, localStore, castId), + proj = localStore.game.createProjectile(theSource, this.id.callback(caster, localStore, castId), sourceLocation.getX(), sourceLocation.getY(), (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, isHoming, theTarget, listener); } else if (settings != null) { - proj = game.createProjectile(theSource, this.settings.callback(game, caster, localStore, castId), + proj = localStore.game.createProjectile(theSource, this.settings.callback(caster, localStore, castId), sourceLocation.getX(), sourceLocation.getY(), (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theTarget, listener); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java index 0a1b4a96b..78efc6aff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.units.GameObject; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; @@ -49,8 +48,7 @@ public class ABActionCreateUnitTargetedPseudoProjectile implements ABSingleActio private ABBooleanCallback provideCounts; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { float theSpeed = 0; boolean isHoming = false; int theMaxHits = 0; @@ -61,74 +59,73 @@ public void runAction(final CSimulation game, final CUnit caster, final LocalDat CEffectType theEffectType = CEffectType.SPECIAL; int theEffectArtIndex = 0; boolean isProvideCounts = false; - final CUnit theSource = this.source.callback(game, caster, localStore, castId); + final CUnit theSource = this.source.callback(caster, localStore, castId); AbilityTarget sourceLocation = theSource; int theArtSkip = 1; if (this.sourceLoc != null) { - sourceLocation = this.sourceLoc.callback(game, caster, localStore, castId); + sourceLocation = this.sourceLoc.callback(caster, localStore, castId); } if (this.effectType != null) { theEffectType = this.effectType; } if (this.effectArtIndex != null) { - theEffectArtIndex = this.effectArtIndex.callback(game, caster, localStore, castId); + theEffectArtIndex = this.effectArtIndex.callback(caster, localStore, castId); } if (this.maxHits != null) { - theMaxHits = this.maxHits.callback(game, caster, localStore, castId); + theMaxHits = this.maxHits.callback(caster, localStore, castId); } if (this.hitsPerTarget != null) { - theHitsPerTarget = this.hitsPerTarget.callback(game, caster, localStore, castId); + theHitsPerTarget = this.hitsPerTarget.callback(caster, localStore, castId); } if (this.radius != null) { - final float rad = this.radius.callback(game, caster, localStore, castId); + final float rad = this.radius.callback(caster, localStore, castId); theStartingRadius = rad; theEndingRadius = rad; } else { if (this.endingRadius != null) { - theStartingRadius = this.startingRadius.callback(game, caster, localStore, castId); - theEndingRadius = this.endingRadius.callback(game, caster, localStore, castId); + theStartingRadius = this.startingRadius.callback(caster, localStore, castId); + theEndingRadius = this.endingRadius.callback(caster, localStore, castId); } else { - final float rad = this.startingRadius.callback(game, caster, localStore, castId); + final float rad = this.startingRadius.callback(caster, localStore, castId); theStartingRadius = rad; theEndingRadius = rad; } } if (this.projectileStepInterval != null) { - theCollisionInterval = this.projectileStepInterval.callback(game, caster, localStore, castId); + theCollisionInterval = this.projectileStepInterval.callback(caster, localStore, castId); } if (this.projectileArtSkip != null) { - theArtSkip = this.projectileArtSkip.callback(game, caster, localStore, castId); + theArtSkip = this.projectileArtSkip.callback(caster, localStore, castId); } if (this.provideCounts != null) { - isProvideCounts = this.provideCounts.callback(game, caster, localStore, castId); + isProvideCounts = this.provideCounts.callback(caster, localStore, castId); } final GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); if (this.speed != null) { - theSpeed = this.speed.callback(game, caster, localStore, castId); + theSpeed = this.speed.callback(caster, localStore, castId); } else { theSpeed = editorData.getFieldAsFloat(AbilityFields.PROJECTILE_SPEED, 0); } if (this.homing != null) { - isHoming = this.homing.callback(game, caster, localStore, castId); + isHoming = this.homing.callback(caster, localStore, castId); } else { isHoming = editorData.getFieldAsBoolean(AbilityFields.PROJECTILE_HOMING_ENABLED, 0); } - final CUnit theTarget = this.target.callback(game, caster, localStore, castId); + final CUnit theTarget = this.target.callback(caster, localStore, castId); final ABCollisionProjectileListener listener = new ABCollisionProjectileListener(this.onLaunch, this.onPreHits, this.canHitTarget, this.onHit, caster, localStore, castId); - final CProjectile proj = game.createPseudoProjectile(theSource, - this.id.callback(game, caster, localStore, castId), theEffectType, theEffectArtIndex, - sourceLocation.getX(), sourceLocation.getY(), - (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, theCollisionInterval, - theArtSkip, isHoming, theTarget, theMaxHits, theHitsPerTarget, theStartingRadius, theEndingRadius, - listener, isProvideCounts); + final CProjectile proj = localStore.game.createPseudoProjectile(theSource, + this.id.callback(caster, localStore, castId), theEffectType, theEffectArtIndex, sourceLocation.getX(), + sourceLocation.getY(), (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, + theCollisionInterval, theArtSkip, isHoming, theTarget, theMaxHits, theHitsPerTarget, theStartingRadius, + theEndingRadius, listener, isProvideCounts); localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java index c117fe35a..f3547c590 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; @@ -16,14 +15,13 @@ public class ABActionSetAttackProjectileDamage implements ABSingleAction { private ABFloatCallback damage; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CProjectile proj = this.projectile.callback(game, caster, localStore, castId); + final CProjectile proj = this.projectile.callback(caster, localStore, castId); if ((proj != null) && (proj instanceof CAttackProjectile)) { - final float dm = this.damage.callback(game, caster, localStore, castId); + final float dm = this.damage.callback(caster, localStore, castId); System.err.println("Setting proj damage from " + ((CAttackProjectile) proj).getDamage() + " to " + dm); ((CAttackProjectile) proj).setDamage(dm); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java index 3d25ccd24..6ee290a3e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; @@ -15,12 +14,11 @@ public class ABActionSetProjectileDone implements ABSingleAction { private ABBooleanCallback done; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CProjectile proj = this.projectile.callback(game, caster, localStore, castId); + final CProjectile proj = this.projectile.callback(caster, localStore, castId); - proj.setDone(this.done.callback(game, caster, localStore, castId)); + proj.setDone(this.done.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java index 405bf2ec8..1f69e512f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; @@ -15,14 +14,13 @@ public class ABActionSetProjectileReflected implements ABSingleAction { private ABBooleanCallback reflected; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CProjectile proj = this.projectile.callback(game, caster, localStore, castId); + final CProjectile proj = this.projectile.callback(caster, localStore, castId); if (this.reflected != null) { - proj.setReflected(this.reflected.callback(game, caster, localStore, castId)); + proj.setReflected(this.reflected.callback(caster, localStore, castId)); } else { proj.setReflected(true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java index d446d2a60..c04180090 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -15,13 +14,12 @@ public class ABActionSetProjectileTarget implements ABSingleAction { private ABUnitCallback target; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CProjectile proj = this.projectile.callback(game, caster, localStore, castId); + final CProjectile proj = this.projectile.callback(caster, localStore, castId); - proj.setTarget(this.target.callback(game, caster, localStore, castId)); + proj.setTarget(this.target.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java index b092a0bd3..9179719e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -16,17 +15,16 @@ public class ABActionAddDefenseBonus implements ABSingleAction { private ABBooleanCallback percentage; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CUnit target = this.targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CUnit target = this.targetUnit.callback(caster, localStore, castId); - if (this.percentage.callback(game, caster, localStore, castId)) { + if (this.percentage.callback(caster, localStore, castId)) { // TODO need to fix percents target.setTemporaryDefenseBonus( - target.getTemporaryDefenseBonus() + this.defenseValue.callback(game, caster, localStore, castId)); + target.getTemporaryDefenseBonus() + this.defenseValue.callback(caster, localStore, castId)); } else { target.setTemporaryDefenseBonus( - target.getTemporaryDefenseBonus() + this.defenseValue.callback(game, caster, localStore, castId)); + target.getTemporaryDefenseBonus() + this.defenseValue.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java index f6239e855..134978641 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -15,12 +14,10 @@ public class ABActionAddNonStackingStatBuff implements ABSingleAction { private ABNonStackingStatBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { - final CUnit target = this.targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CUnit target = this.targetUnit.callback(caster, localStore, castId); - target.addNonStackingStatBuff(game, this.buff.callback(game, caster, localStore, castId)); + target.addNonStackingStatBuff(localStore.game, this.buff.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java index f5583d5ea..1b7fb5833 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABNonStackingStatBuffTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -19,13 +18,12 @@ public class ABActionCreateNonStackingStatBuff implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { final NonStackingStatBuff buff = new NonStackingStatBuff( - this.buffType.callback(game, caster, localStore, castId), - this.stackingKey.callback(game, caster, localStore, castId), - this.value.callback(game, caster, localStore, castId)); + this.buffType.callback(caster, localStore, castId), + this.stackingKey.callback(caster, localStore, castId), + this.value.callback(caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDNSSB, buff); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java index c281748e1..484c00d6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABNonStackingStatBuffTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -16,13 +15,12 @@ public class ABActionRecomputeStatBuffsOnUnit implements ABSingleAction { private ABNonStackingStatBuffTypeCallback buffType; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CUnit unit = this.targetUnit.callback(game, caster, localStore, castId); - NonStackingStatBuffType btype = this.buffType.callback(game, caster, localStore, castId); + final CUnit unit = this.targetUnit.callback(caster, localStore, castId); + NonStackingStatBuffType btype = this.buffType.callback(caster, localStore, castId); if (btype.isHeroStat()) { - unit.computeDerivedHeroFields(game, btype); + unit.computeDerivedHeroFields(localStore.game, btype); } else { unit.computeDerivedFields(btype); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java index 3f4160a03..70db204e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -16,17 +15,16 @@ public class ABActionRemoveDefenseBonus implements ABSingleAction { private ABBooleanCallback percentage; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CUnit target = this.targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CUnit target = this.targetUnit.callback(caster, localStore, castId); - if (this.percentage.callback(game, caster, localStore, castId)) { + if (this.percentage.callback(caster, localStore, castId)) { // TODO need to fix percents target.setTemporaryDefenseBonus( - target.getTemporaryDefenseBonus() - this.defenseValue.callback(game, caster, localStore, castId)); + target.getTemporaryDefenseBonus() - this.defenseValue.callback(caster, localStore, castId)); } else { target.setTemporaryDefenseBonus( - target.getTemporaryDefenseBonus() - this.defenseValue.callback(game, caster, localStore, castId)); + target.getTemporaryDefenseBonus() - this.defenseValue.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java index c466e4c06..7dc625dc1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -15,12 +14,11 @@ public class ABActionRemoveNonStackingStatBuff implements ABSingleAction { private ABNonStackingStatBuffCallback buff; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CUnit target = this.targetUnit.callback(game, caster, localStore, castId); + final CUnit target = this.targetUnit.callback(caster, localStore, castId); - target.removeNonStackingStatBuff(game, this.buff.callback(game, caster, localStore, castId)); + target.removeNonStackingStatBuff(localStore.game, this.buff.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java index 7393c33dd..04267470a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java @@ -2,7 +2,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; @@ -16,10 +15,9 @@ public class ABActionUpdateNonStackingStatBuff implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final NonStackingStatBuff buffObj = this.buff.callback(game, caster, localStore, castId); - buffObj.setValue(this.value.callback(game, caster, localStore, castId)); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final NonStackingStatBuff buffObj = this.buff.callback(caster, localStore, castId); + buffObj.setValue(this.value.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java index e4c145f89..d607d4b4e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -11,8 +10,7 @@ public class ABActionBreak implements ABSingleAction { @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.BREAK, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java index 6512d2501..faf6b931b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java @@ -42,12 +42,11 @@ public class ABActionChainEffect implements ABAction { private ABBooleanCallback allowMultipleBouncesPerUnit; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CUnit originUnitTarget = this.target.callback(game, caster, localStore, castId); - boolean multiBounce = game.getGameplayConstants().isAllowMultiBounce(); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CUnit originUnitTarget = this.target.callback(caster, localStore, castId); + boolean multiBounce = localStore.game.getGameplayConstants().isAllowMultiBounce(); if (allowMultipleBouncesPerUnit != null) { - multiBounce = allowMultipleBouncesPerUnit.callback(game, caster, localStore, castId); + multiBounce = allowMultipleBouncesPerUnit.callback(caster, localStore, castId); } Set hitUnits = null; if (!multiBounce) { @@ -55,72 +54,72 @@ public void runAction(final CSimulation game, final CUnit caster, final LocalDat hitUnits.add(originUnitTarget); } - if (lightningFromCaster == null || lightningFromCaster.callback(game, caster, localStore, castId)) { + if (lightningFromCaster == null || lightningFromCaster.callback(caster, localStore, castId)) { if (lightningId != null) { int lidx = 0; if (lightningIndex != null) { - lidx = lightningIndex.callback(game, caster, localStore, castId); + lidx = lightningIndex.callback(caster, localStore, castId); } - game.createAbilityLightning(caster, lightningId.callback(game, caster, localStore, castId), lidx, + localStore.game.createAbilityLightning(caster, lightningId.callback(caster, localStore, castId), lidx, originUnitTarget, 2f); } } localStore.put(ABLocalStoreKeys.CHAINUNIT + castId, originUnitTarget); for (ABAction iterationAction : actions) { - iterationAction.runAction(game, caster, localStore, castId); + iterationAction.runAction(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.CHAINUNIT + castId); - startPerformJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, - bounces.callback(game, caster, localStore, castId)); + startPerformJump(caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, + bounces.callback(caster, localStore, castId)); } - private void startPerformJump(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, + private void startPerformJump(final CUnit caster, final LocalDataStore localStore, final int castId, + final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (remainingJumps <= 0) { return; } float delay = 0; if (bounceDelay != null) { - delay = bounceDelay.callback(game, caster, localStore, castId); + delay = bounceDelay.callback(caster, localStore, castId); } if (delay > 0) { CTimer runner = new CTimer() { @Override public void onFire(CSimulation simulation) { - performJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, + performJump(caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, remainingJumps - 1); } }; runner.setTimeoutTime(delay); - runner.start(game); + runner.start(localStore.game); } else { - performJump(game, caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, remainingJumps - 1); + performJump(caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, remainingJumps - 1); } } - private void performJump(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, + private void performJump(final CUnit caster, final LocalDataStore localStore, final int castId, + final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (originUnitTarget == null) { return; } - final Float rangeVal = this.range.callback(game, caster, localStore, castId); + final Float rangeVal = this.range.callback(caster, localStore, castId); List foundUnits = new ArrayList<>(); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget != enumUnit && originUnitTarget.canReach(enumUnit, rangeVal) && (multiBounce || !hitUnits.contains(enumUnit))) { localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); - if (condition == null || condition.callback(game, caster, localStore, castId)) { + if (condition == null || condition.callback(caster, localStore, castId)) { foundUnits.add(enumUnit); } } @@ -132,7 +131,7 @@ public boolean call(final CUnit enumUnit) { CUnit jumpUnit = null; if (foundUnits.size() > 0) { if (sort != null) { - ABUnitComparator comp = new ABUnitComparator(game, caster, localStore, castId, sort); + ABUnitComparator comp = new ABUnitComparator(caster, localStore, castId, sort); foundUnits.sort(comp); } else { foundUnits.sort(ABNearestUnitComparator.INSTANCE); @@ -145,10 +144,10 @@ public boolean call(final CUnit enumUnit) { if (lightningId != null) { int lidx = 0; if (lightningIndex != null) { - lidx = lightningIndex.callback(game, caster, localStore, castId); + lidx = lightningIndex.callback(caster, localStore, castId); } - game.createAbilityLightning(originUnitTarget, lightningId.callback(game, caster, localStore, castId), - lidx, jumpUnit, 2f); + localStore.game.createAbilityLightning(originUnitTarget, + lightningId.callback(caster, localStore, castId), lidx, jumpUnit, 2f); } if (!multiBounce) { @@ -156,13 +155,13 @@ public boolean call(final CUnit enumUnit) { } localStore.put(ABLocalStoreKeys.CHAINUNIT + castId, jumpUnit); for (ABAction iterationAction : actions) { - iterationAction.runAction(game, caster, localStore, castId); + iterationAction.runAction(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.CHAINUNIT + castId); } if (remainingJumps > 0) { - startPerformJump(game, caster, localStore, castId, jumpUnit, multiBounce, hitUnits, remainingJumps); + startPerformJump(caster, localStore, castId, jumpUnit, multiBounce, hitUnits, remainingJumps); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java index e281b5a2d..b598f36c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,16 +18,15 @@ public class ABActionCreateSubroutine implements ABSingleAction { private List actions; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { localStore.put(ABLocalStoreKeys.combineSubroutineInstanceKey( - this.name.callback(game, caster, localStore, castId), castId), this.actions); + this.name.callback(caster, localStore, castId), castId), this.actions); } else { localStore.put( - ABLocalStoreKeys.combineSubroutineKey(this.name.callback(game, caster, localStore, castId), castId), + ABLocalStoreKeys.combineSubroutineKey(this.name.callback(caster, localStore, castId), castId), this.actions); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java index 94a91bdb8..bea52dec4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -20,20 +19,19 @@ public class ABActionFor implements ABAction { private ABCallback unique; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final int max = this.times.callback(game, caster, localStore, castId); + final int max = this.times.callback(caster, localStore, castId); for (int i = 0; i < max; i++) { if (this.unique != null) { localStore.put(ABLocalStoreKeys.combineKey( - ABLocalStoreKeys.ITERATORCOUNT + "$" + this.unique.callback(game, caster, localStore, castId), + ABLocalStoreKeys.ITERATORCOUNT + "$" + this.unique.callback(caster, localStore, castId), castId), i); } else { localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT, castId), i); } for (final ABAction iterationAction : this.actions) { - iterationAction.runAction(game, caster, localStore, castId); + iterationAction.runAction(caster, localStore, castId); } final Boolean brk = (Boolean) localStore.remove(ABLocalStoreKeys.BREAK); if ((brk != null) && brk) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java index 00d4c20f1..965c78151 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -16,19 +15,18 @@ public class ABActionIf implements ABAction { private List elseActions; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - if (condition.callback(game, caster, localStore, castId)) { + if (condition.callback(caster, localStore, castId)) { if (this.thenActions != null) { for (ABAction periodicAction : thenActions) { - periodicAction.runAction(game, caster, localStore, castId); + periodicAction.runAction(caster, localStore, castId); } } } else { if (this.elseActions != null) { for (final ABAction periodicAction : this.elseActions) { - periodicAction.runAction(game, caster, localStore, castId); + periodicAction.runAction(caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInGroup.java index 1d3fb1d9e..53dce1ee5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInGroup.java @@ -8,7 +8,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorCallStmt; import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -22,15 +21,14 @@ public class ABActionIterateUnitsInGroup implements ABAction { private List iterationActions; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final Set unitSet = this.unitGroup.callback(game, caster, localStore, castId); + final Set unitSet = this.unitGroup.callback(caster, localStore, castId); final List unitList = new ArrayList<>(unitSet); for (final CUnit enumUnit : unitList) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); for (final ABAction iterationAction : this.iterationActions) { - iterationAction.runAction(game, caster, localStore, castId); + iterationAction.runAction(caster, localStore, castId); } final Boolean brk = (Boolean) localStore.remove(ABLocalStoreKeys.BREAK); if ((brk != null) && brk) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInQueue.java index 09bf78546..e78d21652 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInQueue.java @@ -6,7 +6,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -19,15 +18,14 @@ public class ABActionIterateUnitsInQueue implements ABAction { private List iterationActions; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final Queue unitQueue = this.queue.callback(game, caster, localStore, castId); + final Queue unitQueue = this.queue.callback(caster, localStore, castId); final List unitList = new ArrayList<>(unitQueue); for (final CUnit enumUnit : unitList) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); for (final ABAction iterationAction : this.iterationActions) { - iterationAction.runAction(game, caster, localStore, castId); + iterationAction.runAction(caster, localStore, castId); } final Boolean brk = (Boolean) localStore.remove(ABLocalStoreKeys.BREAK); if ((brk != null) && brk) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java index b1c1e62fe..118e27160 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java @@ -7,7 +7,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorCallStmt; import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -28,22 +27,20 @@ public class ABActionIterateUnitsInRangeOfLocationMatchingCondition implements A private ABCondition condition; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { - final AbilityPointTarget target = this.location.callback(game, caster, localStore, castId); - final Float rangeVal = this.range.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final AbilityPointTarget target = this.location.callback(caster, localStore, castId); + final Float rangeVal = this.range.callback(caster, localStore, castId); recycleRect.set(target.getX() - rangeVal, target.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (enumUnit.canReach(target, rangeVal)) { - localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); - if (condition == null || condition.callback(game, caster, localStore, castId)) { - localStore.put(ABLocalStoreKeys.ENUMUNIT+castId, enumUnit); + localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); + if (condition == null || condition.callback(caster, localStore, castId)) { + localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); for (ABAction iterationAction : iterationActions) { - iterationAction.runAction(game, caster, localStore, castId); + iterationAction.runAction(caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java index 82757ab23..6a7b15fee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java @@ -7,7 +7,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorCallStmt; import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -32,19 +31,18 @@ public class ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort impl private ABIntegerCallback sort; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final AbilityPointTarget target = this.location.callback(game, caster, localStore, castId); - final Float rangeVal = this.range.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final AbilityPointTarget target = this.location.callback(caster, localStore, castId); + final Float rangeVal = this.range.callback(caster, localStore, castId); List foundUnits = new ArrayList<>(); recycleRect.set(target.getX() - rangeVal, target.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (enumUnit.canReach(target, rangeVal)) { localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); - if (condition == null || condition.callback(game, caster, localStore, castId)) { + if (condition == null || condition.callback(caster, localStore, castId)) { foundUnits.add(enumUnit); } } @@ -52,14 +50,14 @@ public boolean call(final CUnit enumUnit) { } }); if (sort != null) { - ABUnitComparator comp = new ABUnitComparator(game, caster, localStore, castId, sort); + ABUnitComparator comp = new ABUnitComparator(caster, localStore, castId, sort); foundUnits.sort(comp); } for (CUnit unit : foundUnits) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, unit); for (ABAction iterationAction : iterationActions) { - iterationAction.runAction(game, caster, localStore, castId); + iterationAction.runAction(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java index 6cfe8ea5c..fdf7a2e2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java @@ -7,7 +7,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorCallStmt; import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -27,22 +26,21 @@ public class ABActionIterateUnitsInRangeOfUnitMatchingCondition implements ABAct private ABFloatCallback range; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CUnit originUnitTarget = this.originUnit.callback(game, caster, localStore, castId); - final Float rangeVal = this.range.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CUnit originUnitTarget = this.originUnit.callback(caster, localStore, castId); + final Float rangeVal = this.range.callback(caster, localStore, castId); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); - if (condition == null || condition.callback(game, caster, localStore, castId)) { + if (condition == null || condition.callback(caster, localStore, castId)) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); for (ABAction iterationAction : iterationActions) { - iterationAction.runAction(game, caster, localStore, castId); + iterationAction.runAction(caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java index 7976f046d..931031a70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java @@ -7,7 +7,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorCallStmt; import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -31,20 +30,19 @@ public class ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort implemen private ABFloatCallback range; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CUnit originUnitTarget = this.originUnit.callback(game, caster, localStore, castId); - final Float rangeVal = this.range.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CUnit originUnitTarget = this.originUnit.callback(caster, localStore, castId); + final Float rangeVal = this.range.callback(caster, localStore, castId); List foundUnits = new ArrayList<>(); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); - if (condition == null || condition.callback(game, caster, localStore, castId)) { + if (condition == null || condition.callback(caster, localStore, castId)) { foundUnits.add(enumUnit); } } @@ -52,14 +50,14 @@ public boolean call(final CUnit enumUnit) { } }); if (sort != null) { - ABUnitComparator comp = new ABUnitComparator(game, caster, localStore, castId, sort); + ABUnitComparator comp = new ABUnitComparator(caster, localStore, castId, sort); foundUnits.sort(comp); } for (CUnit unit : foundUnits) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, unit); for (ABAction iterationAction : iterationActions) { - iterationAction.runAction(game, caster, localStore, castId); + iterationAction.runAction(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRect.java index 6ea7707f2..a16e1fb9c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRect.java @@ -7,7 +7,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorCallStmt; import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -24,15 +23,14 @@ public class ABActionIterateUnitsInRect implements ABAction { private List iterationActions; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { recycleRect.set(this.x1, this.y1, this.x2 - this.x1, this.y2 - this.y1); - game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); for (final ABAction iterationAction : ABActionIterateUnitsInRect.this.iterationActions) { - iterationAction.runAction(game, caster, localStore, castId); + iterationAction.runAction(caster, localStore, castId); } return false; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java index 959d17b6a..bfcb38cc5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.WarsmashConstants; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -23,13 +22,12 @@ public class ABActionPeriodicExecute implements ABAction { private ABCallback unique; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { float nextActiveTick = 0; Object u = null; if (this.unique != null) { - u = this.unique.callback(game, caster, localStore, castId); + u = this.unique.callback(caster, localStore, castId); if (localStore.containsKey(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + u)) { nextActiveTick = (float) localStore.get(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + u); } @@ -40,14 +38,14 @@ public void runAction(final CSimulation game, final CUnit caster, } } - final int currentTick = game.getGameTurnTick(); + final int currentTick = localStore.game.getGameTurnTick(); int iter = 0; boolean run = true; while (run && currentTick >= (int)nextActiveTick && iter < HARD_LOOP_CAP) { if (nextActiveTick <= 0) { - if ((this.initialTick != null) && this.initialTick.callback(game, caster, localStore, castId)) { + if ((this.initialTick != null) && this.initialTick.callback(caster, localStore, castId)) { for (final ABAction periodicAction : this.periodicActions) { - periodicAction.runAction(game, caster, localStore, castId); + periodicAction.runAction(caster, localStore, castId); final Boolean brk = (Boolean) localStore.remove(ABLocalStoreKeys.BREAK); if ((brk != null) && brk) { run = false; @@ -55,19 +53,19 @@ public void runAction(final CSimulation game, final CUnit caster, } } } - nextActiveTick = currentTick + (this.delaySeconds.callback(game, caster, localStore, castId) + nextActiveTick = currentTick + (this.delaySeconds.callback(caster, localStore, castId) / WarsmashConstants.SIMULATION_STEP_TIME); } else { for (final ABAction periodicAction : this.periodicActions) { - periodicAction.runAction(game, caster, localStore, castId); + periodicAction.runAction(caster, localStore, castId); final Boolean brk = (Boolean) localStore.remove(ABLocalStoreKeys.BREAK); if ((brk != null) && brk) { run = false; break; } } - nextActiveTick += (this.delaySeconds.callback(game, caster, localStore, castId) + nextActiveTick += (this.delaySeconds.callback(caster, localStore, castId) / WarsmashConstants.SIMULATION_STEP_TIME); } iter++; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java index d2b1bfab3..834afb4a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -12,10 +11,10 @@ public class ABActionResetPeriodicExecute implements ABAction { private ABCallback unique; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, int castId) { if (this.unique != null) { localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" - + this.unique.callback(game, caster, localStore, castId)); + + this.unique.callback(caster, localStore, castId)); } else { localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java index f6ee91166..f6c3e0d1b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -18,17 +17,16 @@ public class ABActionRunReuseAction implements ABSingleAction { private ABStringCallback name; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseActions() != null) { List actions = config.getReuseActions().get(keyS); if (actions != null && !actions.isEmpty()) { for (final ABAction action : actions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } else { // System.err.println("Trying to run ReuseAction, but key is missing or empty: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java index 7c4a8d499..a4e4dbf5d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java @@ -4,7 +4,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -21,11 +20,10 @@ public class ABActionRunReuseActionWithArguments implements ABSingleAction { private Map arguments; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseActions() != null) { List actions = config.getReuseActions().get(keyS); if (actions != null && !actions.isEmpty()) { @@ -35,7 +33,7 @@ public void runAction(final CSimulation game, final CUnit caster, final LocalDat } } for (final ABAction action : actions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } else { // System.err.println("Trying to run ReuseAction with args, but key is missing or empty: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java index 52f3a28b8..0ae212259 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,19 +18,18 @@ public class ABActionRunSubroutine implements ABSingleAction { @Override @SuppressWarnings("unchecked") - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { List actions; - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { actions = (List) localStore.get(ABLocalStoreKeys - .combineSubroutineInstanceKey(this.name.callback(game, caster, localStore, castId), castId)); + .combineSubroutineInstanceKey(this.name.callback(caster, localStore, castId), castId)); } else { actions = (List) localStore.get(ABLocalStoreKeys - .combineSubroutineKey(this.name.callback(game, caster, localStore, castId), castId)); + .combineSubroutineKey(this.name.callback(caster, localStore, castId), castId)); } if (actions != null) { for (final ABAction action : actions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionStoreValueLocally.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionStoreValueLocally.java index b62f260c6..8e582c655 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionStoreValueLocally.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionStoreValueLocally.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -20,14 +19,13 @@ public class ABActionStoreValueLocally implements ABSingleAction { private ABCallback valueToStore; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { - localStore.put(ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), - castId), this.valueToStore.callback(game, caster, localStore, castId)); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { + localStore.put(ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), + castId), this.valueToStore.callback(caster, localStore, castId)); } else { - localStore.put(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId), - this.valueToStore.callback(game, caster, localStore, castId)); + localStore.put(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + this.valueToStore.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java index b50c72787..a03380c7c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -17,12 +16,11 @@ public class ABActionWhile implements ABAction { private List loopActions; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - while (condition.callback(game, caster, localStore, castId)) { + while (condition.callback(caster, localStore, castId)) { for (ABAction periodicAction : loopActions) { - periodicAction.runAction(game, caster, localStore, castId); + periodicAction.runAction(caster, localStore, castId); } final Boolean brk = (Boolean) localStore.remove(ABLocalStoreKeys.BREAK); if ((brk != null) && brk) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java index d30c34513..7d8e70cac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -23,26 +22,25 @@ public class ABActionCreateTimer implements ABSingleAction { private ABFloatCallback delay; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { final CTimer timer = new ABTimer(caster, localStore, this.actions, castId); - timer.setTimeoutTime(this.timeout.callback(game, caster, localStore, castId)); + timer.setTimeoutTime(this.timeout.callback(caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDTIMER, timer); - if ((this.repeats != null) && this.repeats.callback(game, caster, localStore, castId)) { + if ((this.repeats != null) && this.repeats.callback(caster, localStore, castId)) { timer.setRepeats(true); - if ((this.startTimer == null) || this.startTimer.callback(game, caster, localStore, castId)) { + if ((this.startTimer == null) || this.startTimer.callback(caster, localStore, castId)) { if (this.delay != null) { - timer.startRepeatingTimerWithDelay(game, this.delay.callback(game, caster, localStore, castId)); + timer.startRepeatingTimerWithDelay(localStore.game, this.delay.callback(caster, localStore, castId)); } else { - timer.start(game); + timer.start(localStore.game); } localStore.put(ABLocalStoreKeys.LASTSTARTEDTIMER, timer); } } else { - if ((this.startTimer == null) || this.startTimer.callback(game, caster, localStore, castId)) { - timer.start(game); + if ((this.startTimer == null) || this.startTimer.callback(caster, localStore, castId)) { + timer.start(localStore.game); localStore.put(ABLocalStoreKeys.LASTSTARTEDTIMER, timer); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java index 22a87f304..1d86732a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -12,9 +11,8 @@ public class ABActionKillTimer implements ABSingleAction { private ABTimerCallback timer; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - this.timer.callback(game, caster, localStore, castId).kill(game); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + this.timer.callback(caster, localStore, castId).kill(localStore.game); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java index e26054794..efa1a5b8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -12,9 +11,8 @@ public class ABActionRemoveTimer implements ABSingleAction { private ABTimerCallback timer; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - this.timer.callback(game, caster, localStore, castId).pause(game); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + this.timer.callback(caster, localStore, castId).pause(localStore.game); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java index c5ac5bf80..8ae16520d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -14,10 +13,9 @@ public class ABActionStartTimer implements ABSingleAction { private ABTimerCallback timer; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CTimer t = this.timer.callback(game, caster, localStore, castId); - t.start(game); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CTimer t = this.timer.callback(caster, localStore, castId); + t.start(localStore.game); localStore.put(ABLocalStoreKeys.LASTSTARTEDTIMER, t); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java index d63194d5c..efe56d8fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; @@ -15,11 +14,10 @@ public class ABActionUpdateTimerTimeout implements ABSingleAction { private ABFloatCallback timeout; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - CTimer theT = this.timer.callback(game, caster, localStore, castId); - theT.resetTimeoutTime(this.timeout.callback(game, caster, localStore, castId)); + CTimer theT = this.timer.callback(caster, localStore, castId); + theT.resetTimeoutTime(this.timeout.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddMp.java index 5e97d4cbe..6f15f8d70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddMp.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -16,21 +15,21 @@ public class ABActionAddMp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { - percent = this.isPercent.callback(game, caster, localStore, castId); + percent = this.isPercent.callback(caster, localStore, castId); } - final CUnit targetUnit = this.target.callback(game, caster, localStore, castId); + final CUnit targetUnit = this.target.callback(caster, localStore, castId); if (percent) { targetUnit.setMana(Math.max(Math.min( targetUnit.getMana() - + (this.amount.callback(game, caster, localStore, castId) * targetUnit.getMaximumMana()), + + (this.amount.callback(caster, localStore, castId) * targetUnit.getMaximumMana()), targetUnit.getMaximumMana()), 0)); } else { targetUnit.setMana( - Math.max(Math.min(targetUnit.getMana() + this.amount.callback(game, caster, localStore, castId), + Math.max(Math.min(targetUnit.getMana() + this.amount.callback(caster, localStore, castId), targetUnit.getMaximumMana()), 0)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddNewAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddNewAbility.java index 83c014b19..30345ef6c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddNewAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddNewAbility.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -16,14 +15,13 @@ public class ABActionAddNewAbility implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CAbility ability = game.getAbilityData() - .getAbilityType(this.id.callback(game, caster, localStore, castId)) - .createAbility(game.getHandleIdAllocator().createId()); + final CAbility ability = localStore.game.getAbilityData() + .getAbilityType(this.id.callback(caster, localStore, castId)) + .createAbility(localStore.game.getHandleIdAllocator().createId()); localStore.put(ABLocalStoreKeys.LASTCREATEDABILITY, ability); - this.unit.callback(game, caster, localStore, castId).add(game, ability); + this.unit.callback(caster, localStore, castId).add(localStore.game, ability); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddRallyAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddRallyAbility.java index b32add295..2f01e9432 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddRallyAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddRallyAbility.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; @@ -14,10 +13,9 @@ public class ABActionAddRallyAbility implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CAbility ability = new CAbilityRally(game.getHandleIdAllocator().createId()); - this.unit.callback(game, caster, localStore, castId).add(game, ability); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CAbility ability = new CAbilityRally(localStore.game.getHandleIdAllocator().createId()); + this.unit.callback(caster, localStore, castId).add(localStore.game, ability); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java index ced6a3a14..5b80600af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -15,20 +14,20 @@ public class ABActionChangeAttackActionToMovement implements ABAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (unit != null) { - targetUnit = this.unit.callback(game, caster, localStore, castId); + targetUnit = this.unit.callback(caster, localStore, castId); } if (targetUnit.getCurrentBehavior().getBehaviorCategory() == CBehaviorCategory.ATTACK) { - targetUnit.beginBehavior(game, + targetUnit.beginBehavior(localStore.game, targetUnit.getMoveBehavior().reset(targetUnit.getMoveBehavior().getHighlightOrderId(), targetUnit.getCurrentBehavior().visit(BehaviorTargetVisitor.INSTANCE)), true); } else if (targetUnit.getCurrentBehavior().getBehaviorCategory() == CBehaviorCategory.MOVEMENT) { CRangedBehavior next = targetUnit.getCurrentBehavior().visit(BehaviorNextBehaviorVisitor.INSTANCE); if (next != null && next.getBehaviorCategory() == CBehaviorCategory.ATTACK) { - targetUnit.beginBehavior(game, + targetUnit.beginBehavior(localStore.game, targetUnit.getMoveBehavior().reset(targetUnit.getMoveBehavior().getHighlightOrderId(), next.visit(BehaviorTargetVisitor.INSTANCE)), true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityEffectReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityEffectReaction.java index 830d91d97..d817cbe8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityEffectReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityEffectReaction.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -20,24 +19,22 @@ public class ABActionCheckAbilityEffectReaction implements ABSingleAction { private List onBlockActions; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit tarU = caster; if (this.target != null) { - tarU = this.target.callback(game, caster, localStore, castId); + tarU = this.target.callback(caster, localStore, castId); } - if (tarU.checkForAbilityEffectReaction(game, caster, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY))) { + if (tarU.checkForAbilityEffectReaction(localStore.game, caster, + (CAbility) localStore.get(ABLocalStoreKeys.ABILITY))) { if (this.onHitActions != null) { for (final ABAction periodicAction : this.onHitActions) { - periodicAction.runAction(game, caster, localStore, castId); + periodicAction.runAction(caster, localStore, castId); } } - } - else { + } else { if (this.onBlockActions != null) { for (final ABAction periodicAction : this.onBlockActions) { - periodicAction.runAction(game, caster, localStore, castId); + periodicAction.runAction(caster, localStore, castId); } } } @@ -52,14 +49,13 @@ public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) String tarU; if (this.target != null) { tarU = this.target.generateJassEquivalent(jassTextGenerator); - } - else { + } else { tarU = jassTextGenerator.getCaster(); } return "CheckAbilityEffectReactionAU(" + jassTextGenerator.getCaster() + ", " + jassTextGenerator.getTriggerLocalStore() + ", " + jassTextGenerator.getCastId() + ", " + tarU + ", " - + jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ABILITY", JassTextGeneratorType.AbilityHandle) + ", " - + jassTextGenerator.functionPointerByName(onHitFunc) + ", " + + jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ABILITY", JassTextGeneratorType.AbilityHandle) + + ", " + jassTextGenerator.functionPointerByName(onHitFunc) + ", " + jassTextGenerator.functionPointerByName(onBlockFunc) + ")"; } @@ -68,8 +64,7 @@ public void generateJassEquivalent(final int indent, final JassTextGenerator jas String tarU; if (this.target != null) { tarU = this.target.generateJassEquivalent(jassTextGenerator); - } - else { + } else { tarU = jassTextGenerator.getCaster(); } @@ -82,8 +77,8 @@ public void generateJassEquivalent(final int indent, final JassTextGenerator jas sb.append(", "); sb.append(jassTextGenerator.getCaster()); sb.append(", "); - sb.append( - jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ABILITY", JassTextGeneratorType.AbilityHandle)); + sb.append(jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ABILITY", + JassTextGeneratorType.AbilityHandle)); sb.append(") then"); jassTextGenerator.println(sb.toString()); @@ -96,15 +91,15 @@ public void generateJassEquivalent(final int indent, final JassTextGenerator jas sb.append("endif"); jassTextGenerator.println(sb.toString()); } - } - else { + } else { JassTextGenerator.Util.indent(indent, sb); sb.append("if CheckUnitForAbilityEffectReaction("); sb.append(tarU); sb.append(", "); sb.append(jassTextGenerator.getCaster()); sb.append(", "); - sb.append(jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ABILITY", JassTextGeneratorType.AbilityHandle)); + sb.append(jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ABILITY", + JassTextGeneratorType.AbilityHandle)); sb.append(") then"); jassTextGenerator.println(sb.toString()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityProjReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityProjReaction.java index d265d88e9..9d4c407d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityProjReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityProjReaction.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -19,25 +18,24 @@ public class ABActionCheckAbilityProjReaction implements ABSingleAction { private List onBlockActions; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CUnit tarU = caster; if (this.target != null) { - tarU = this.target.callback(game, caster, localStore, castId); + tarU = this.target.callback(caster, localStore, castId); } - if (tarU.checkForAbilityProjReaction(game, caster, - this.projectile.callback(game, caster, localStore, castId))) { + if (tarU.checkForAbilityProjReaction(localStore.game, caster, + this.projectile.callback(caster, localStore, castId))) { if (this.onHitActions != null) { for (final ABAction periodicAction : this.onHitActions) { - periodicAction.runAction(game, caster, localStore, castId); + periodicAction.runAction(caster, localStore, castId); } } } else { if (this.onBlockActions != null) { for (final ABAction periodicAction : this.onBlockActions) { - periodicAction.runAction(game, caster, localStore, castId); + periodicAction.runAction(caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java index c1443e73c..2a7222ff4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitClassification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -27,8 +26,8 @@ public class ABActionCreateUnit implements ABSingleAction { private ABBooleanCallback removeFood; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - War3ID theId = id.callback(game, caster, localStore, castId); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + War3ID theId = id.callback(caster, localStore, castId); if (theId == null) { return; } @@ -36,22 +35,22 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, CPlayer thePlayer = null; float theFacing = 0; if (this.owner != null) { - thePlayer = this.owner.callback(game, caster, localStore, castId); + thePlayer = this.owner.callback(caster, localStore, castId); } else { - thePlayer = game.getPlayer(caster.getPlayerIndex()); + thePlayer = localStore.game.getPlayer(caster.getPlayerIndex()); } if (this.facing != null) { - theFacing = this.facing.callback(game, caster, localStore, castId); + theFacing = this.facing.callback(caster, localStore, castId); } - final AbilityPointTarget location = this.loc.callback(game, caster, localStore, castId); - final CUnit createdUnit = game.createUnitSimple(theId, thePlayer.getId(), location.getX(), location.getY(), - theFacing); + final AbilityPointTarget location = this.loc.callback(caster, localStore, castId); + final CUnit createdUnit = localStore.game.createUnitSimple(theId, thePlayer.getId(), location.getX(), + location.getY(), theFacing); - if (addSummonedTag == null || addSummonedTag.callback(game, caster, localStore, castId)) { + if (addSummonedTag == null || addSummonedTag.callback(caster, localStore, castId)) { createdUnit.addClassification(CUnitClassification.SUMMONED); } - if (removeFood != null && removeFood.callback(game, caster, localStore, castId)) { + if (removeFood != null && removeFood.callback(caster, localStore, castId)) { thePlayer.setUnitFoodUsed(createdUnit, 0); thePlayer.setUnitFoodMade(createdUnit, 0); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java index a191f2b65..145644da1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -47,68 +46,68 @@ public class ABActionDamageArea implements ABAction { private List extraActions; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); - float theDamage = damage.callback(game, caster, localStore, castId); + float theDamage = damage.callback(caster, localStore, castId); if (isAttack != null) { - flags.setAttack(isAttack.callback(game, caster, localStore, castId)); + flags.setAttack(isAttack.callback(caster, localStore, castId)); } if (isRanged != null) { - flags.setRanged(isRanged.callback(game, caster, localStore, castId)); + flags.setRanged(isRanged.callback(caster, localStore, castId)); } if (damageInvulnerable != null) { - flags.setIgnoreInvulnerable(damageInvulnerable.callback(game, caster, localStore, castId)); + flags.setIgnoreInvulnerable(damageInvulnerable.callback(caster, localStore, castId)); } if (explodeOnDeath != null) { - flags.setExplode(explodeOnDeath.callback(game, caster, localStore, castId)); + flags.setExplode(explodeOnDeath.callback(caster, localStore, castId)); } if (onlyDamageSummons != null) { - flags.setOnlyDamageSummons(onlyDamageSummons.callback(game, caster, localStore, castId)); + flags.setOnlyDamageSummons(onlyDamageSummons.callback(caster, localStore, castId)); } if (nonlethal != null) { - flags.setNonlethal(nonlethal.callback(game, caster, localStore, castId)); + flags.setNonlethal(nonlethal.callback(caster, localStore, castId)); } if (this.attackType != null) { - theAttackType = this.attackType.callback(game, caster, localStore, castId); + theAttackType = this.attackType.callback(caster, localStore, castId); } if (this.damageType != null) { - theDamageType = this.damageType.callback(game, caster, localStore, castId); + theDamageType = this.damageType.callback(caster, localStore, castId); } - if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId)) { - AbilityPointTarget loc = target.callback(game, caster, localStore, castId); + if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(caster, localStore, castId)) { + AbilityPointTarget loc = target.callback(caster, localStore, castId); float pfullRad = 0; float theMaxDamage = 0; CUnit theSource = caster; if (this.radius != null) { - pfullRad = this.radius.callback(game, caster, localStore, castId); + pfullRad = this.radius.callback(caster, localStore, castId); } if (this.maxDamage != null) { - theMaxDamage = this.maxDamage.callback(game, caster, localStore, castId); + theMaxDamage = this.maxDamage.callback(caster, localStore, castId); } if (this.source != null) { - theSource = this.source.callback(game, caster, localStore, castId); + theSource = this.source.callback(caster, localStore, castId); } final CAttackType ftheAttackType = theAttackType; final CDamageType ftheDamageType = theDamageType; final CUnit ftheSource = theSource; - final float baseDamage = damage.callback(game, caster, localStore, castId); + final float baseDamage = damage.callback(caster, localStore, castId); if (theMaxDamage > 0) { List hits = new ArrayList<>(); List counts = new ArrayList<>(); - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (validTarget == null || validTarget.callback(caster, localStore, castId)) { hits.add(enumUnit); if (unitSpecificDamageMod != null) { - counts.add(unitSpecificDamageMod.callback(game, caster, localStore, castId)); + counts.add(unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(1f); } @@ -127,37 +126,37 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - damPerTar * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + damPerTar * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); } localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); } } else { - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - baseDamage * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + baseDamage * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java index 8692e2795..c1c9039b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -51,39 +50,39 @@ public class ABActionDamageAttackSplash implements ABAction { private List extraActions; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); - float theDamage = damage.callback(game, caster, localStore, castId); + float theDamage = damage.callback(caster, localStore, castId); if (isAttack != null) { - flags.setAttack(isAttack.callback(game, caster, localStore, castId)); + flags.setAttack(isAttack.callback(caster, localStore, castId)); } if (isRanged != null) { - flags.setRanged(isRanged.callback(game, caster, localStore, castId)); + flags.setRanged(isRanged.callback(caster, localStore, castId)); } if (damageInvulnerable != null) { - flags.setIgnoreInvulnerable(damageInvulnerable.callback(game, caster, localStore, castId)); + flags.setIgnoreInvulnerable(damageInvulnerable.callback(caster, localStore, castId)); } if (explodeOnDeath != null) { - flags.setExplode(explodeOnDeath.callback(game, caster, localStore, castId)); + flags.setExplode(explodeOnDeath.callback(caster, localStore, castId)); } if (onlyDamageSummons != null) { - flags.setOnlyDamageSummons(onlyDamageSummons.callback(game, caster, localStore, castId)); + flags.setOnlyDamageSummons(onlyDamageSummons.callback(caster, localStore, castId)); } if (nonlethal != null) { - flags.setNonlethal(nonlethal.callback(game, caster, localStore, castId)); + flags.setNonlethal(nonlethal.callback(caster, localStore, castId)); } if (this.attackType != null) { - theAttackType = this.attackType.callback(game, caster, localStore, castId); + theAttackType = this.attackType.callback(caster, localStore, castId); } if (this.damageType != null) { - theDamageType = this.damageType.callback(game, caster, localStore, castId); + theDamageType = this.damageType.callback(caster, localStore, castId); } - if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId)) { - AbilityPointTarget loc = target.callback(game, caster, localStore, castId); + if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(caster, localStore, castId)) { + AbilityPointTarget loc = target.callback(caster, localStore, castId); float pfullRad = 0; float pmedRad = 0; float psmallRad = 0; @@ -92,25 +91,25 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, float theMaxDamage = 0; CUnit theSource = caster; if (this.fullDamageRadius != null) { - pfullRad = this.fullDamageRadius.callback(game, caster, localStore, castId); + pfullRad = this.fullDamageRadius.callback(caster, localStore, castId); } if (this.mediumDamageRadius != null) { - pmedRad = this.mediumDamageRadius.callback(game, caster, localStore, castId); + pmedRad = this.mediumDamageRadius.callback(caster, localStore, castId); } if (this.smallDamageRadius != null) { - psmallRad = this.smallDamageRadius.callback(game, caster, localStore, castId); + psmallRad = this.smallDamageRadius.callback(caster, localStore, castId); } if (this.damageFactorMedium != null) { - pmedDam = this.damageFactorMedium.callback(game, caster, localStore, castId); + pmedDam = this.damageFactorMedium.callback(caster, localStore, castId); } if (this.damageFactorSmall != null) { - psmallDam = this.damageFactorSmall.callback(game, caster, localStore, castId); + psmallDam = this.damageFactorSmall.callback(caster, localStore, castId); } if (this.maxDamage != null) { - theMaxDamage = this.maxDamage.callback(game, caster, localStore, castId); + theMaxDamage = this.maxDamage.callback(caster, localStore, castId); } if (this.source != null) { - theSource = this.source.callback(game, caster, localStore, castId); + theSource = this.source.callback(caster, localStore, castId); } final float fullRad = pfullRad; @@ -121,24 +120,24 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final CAttackType ftheAttackType = theAttackType; final CDamageType ftheDamageType = theDamageType; final CUnit ftheSource = theSource; - final float baseDamage = damage.callback(game, caster, localStore, castId); + final float baseDamage = damage.callback(caster, localStore, castId); if (theMaxDamage > 0) { List fullhits = new ArrayList<>(); List medhits = new ArrayList<>(); List smallhits = new ArrayList<>(); List counts = new ArrayList<>(); - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, Math.max(medRad, smallRad)), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { fullhits.add(enumUnit); if (unitSpecificDamageMod != null) { counts.add( - unitSpecificDamageMod.callback(game, caster, localStore, castId)); + unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(1f); } @@ -146,7 +145,7 @@ public boolean call(final CUnit enumUnit) { medhits.add(enumUnit); if (unitSpecificDamageMod != null) { counts.add(medDam - * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(medDam); } @@ -154,7 +153,7 @@ public boolean call(final CUnit enumUnit) { smallhits.add(enumUnit); if (unitSpecificDamageMod != null) { counts.add(smallDam - * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(smallDam); } @@ -176,15 +175,15 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - damPerTar * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + damPerTar * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); } } @@ -192,15 +191,15 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - damPerTar * medDam * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + damPerTar * medDam * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medDam); } } @@ -208,71 +207,72 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallDam - * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallDam); } } localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); } else { - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(Math.max(pfullRad, pmedRad), psmallRad), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - baseDamage * unitSpecificDamageMod.callback(game, caster, - localStore, castId)); + baseDamage * unitSpecificDamageMod.callback(caster, localStore, + castId)); } else { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); } } else if (enumUnit.canReach(loc, medRad)) { if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - baseDamage * medDam * unitSpecificDamageMod.callback(game, caster, - localStore, castId)); + baseDamage * medDam * unitSpecificDamageMod.callback(caster, localStore, + castId)); } else { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * medDam); } } else if (enumUnit.canReach(loc, smallRad)) { if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - baseDamage * smallDam * unitSpecificDamageMod.callback(game, caster, - localStore, castId)); + baseDamage * smallDam * unitSpecificDamageMod.callback(caster, localStore, + castId)); } else { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * smallDam); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), + baseDamage * smallDam); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java index 3abf344c1..f02fd775d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -49,58 +48,58 @@ public class ABActionDamageBurst implements ABAction { private List extraActions; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); - float theDamage = damage.callback(game, caster, localStore, castId); + float theDamage = damage.callback(caster, localStore, castId); if (isAttack != null) { - flags.setAttack(isAttack.callback(game, caster, localStore, castId)); + flags.setAttack(isAttack.callback(caster, localStore, castId)); } if (isRanged != null) { - flags.setRanged(isRanged.callback(game, caster, localStore, castId)); + flags.setRanged(isRanged.callback(caster, localStore, castId)); } if (damageInvulnerable != null) { - flags.setIgnoreInvulnerable(damageInvulnerable.callback(game, caster, localStore, castId)); + flags.setIgnoreInvulnerable(damageInvulnerable.callback(caster, localStore, castId)); } if (explodeOnDeath != null) { - flags.setExplode(explodeOnDeath.callback(game, caster, localStore, castId)); + flags.setExplode(explodeOnDeath.callback(caster, localStore, castId)); } if (onlyDamageSummons != null) { - flags.setOnlyDamageSummons(onlyDamageSummons.callback(game, caster, localStore, castId)); + flags.setOnlyDamageSummons(onlyDamageSummons.callback(caster, localStore, castId)); } if (nonlethal != null) { - flags.setNonlethal(nonlethal.callback(game, caster, localStore, castId)); + flags.setNonlethal(nonlethal.callback(caster, localStore, castId)); } if (this.attackType != null) { - theAttackType = this.attackType.callback(game, caster, localStore, castId); + theAttackType = this.attackType.callback(caster, localStore, castId); } if (this.damageType != null) { - theDamageType = this.damageType.callback(game, caster, localStore, castId); + theDamageType = this.damageType.callback(caster, localStore, castId); } - if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId)) { - AbilityPointTarget loc = target.callback(game, caster, localStore, castId); + if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(caster, localStore, castId)) { + AbilityPointTarget loc = target.callback(caster, localStore, castId); float pfullRad = 0; float parRad = 0; float parDam = 0; float theMaxDamage = 0; CUnit theSource = caster; if (this.fullDamageRadius != null) { - pfullRad = this.fullDamageRadius.callback(game, caster, localStore, castId); + pfullRad = this.fullDamageRadius.callback(caster, localStore, castId); } if (this.partialDamageRadius != null) { - parRad = this.partialDamageRadius.callback(game, caster, localStore, castId); + parRad = this.partialDamageRadius.callback(caster, localStore, castId); } if (this.partialDamage != null) { - parDam = this.partialDamage.callback(game, caster, localStore, castId); + parDam = this.partialDamage.callback(caster, localStore, castId); } if (this.maxDamage != null) { - theMaxDamage = this.maxDamage.callback(game, caster, localStore, castId); + theMaxDamage = this.maxDamage.callback(caster, localStore, castId); } if (this.source != null) { - theSource = this.source.callback(game, caster, localStore, castId); + theSource = this.source.callback(caster, localStore, castId); } final float fullRad = pfullRad; @@ -109,24 +108,24 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final CAttackType ftheAttackType = theAttackType; final CDamageType ftheDamageType = theDamageType; final CUnit ftheSource = theSource; - final float baseDamage = damage.callback(game, caster, localStore, castId); + final float baseDamage = damage.callback(caster, localStore, castId); if (theMaxDamage > 0) { List fullhits = new ArrayList<>(); List partialhits = new ArrayList<>(); List counts = new ArrayList<>(); float partialRatio = partialDam / baseDamage; - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, partialRad), + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, partialRad), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { fullhits.add(enumUnit); if (unitSpecificDamageMod != null) { counts.add( - unitSpecificDamageMod.callback(game, caster, localStore, castId)); + unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(1f); } @@ -134,7 +133,7 @@ public boolean call(final CUnit enumUnit) { partialhits.add(enumUnit); if (unitSpecificDamageMod != null) { counts.add(partialRatio - * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(partialRatio); } @@ -156,15 +155,15 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - damPerTar * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + damPerTar * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); } } @@ -172,56 +171,56 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * partialRatio - * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * partialRatio); } } localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); } else { - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, partialRad), + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, partialRad), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - baseDamage * unitSpecificDamageMod.callback(game, caster, - localStore, castId)); + baseDamage * unitSpecificDamageMod.callback(caster, localStore, + castId)); } else { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); } } else if (enumUnit.canReach(loc, partialRad)) { if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - partialDam * unitSpecificDamageMod.callback(game, caster, - localStore, castId)); + partialDam * unitSpecificDamageMod.callback(caster, localStore, + castId)); } else { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), partialDam); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), partialDam); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java index 64f13cb09..a5cef0822 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -51,39 +50,39 @@ public class ABActionDamageSplash implements ABAction { private List extraActions; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); - float theDamage = fullDamage.callback(game, caster, localStore, castId); + float theDamage = fullDamage.callback(caster, localStore, castId); if (isAttack != null) { - flags.setAttack(isAttack.callback(game, caster, localStore, castId)); + flags.setAttack(isAttack.callback(caster, localStore, castId)); } if (isRanged != null) { - flags.setRanged(isRanged.callback(game, caster, localStore, castId)); + flags.setRanged(isRanged.callback(caster, localStore, castId)); } if (damageInvulnerable != null) { - flags.setIgnoreInvulnerable(damageInvulnerable.callback(game, caster, localStore, castId)); + flags.setIgnoreInvulnerable(damageInvulnerable.callback(caster, localStore, castId)); } if (explodeOnDeath != null) { - flags.setExplode(explodeOnDeath.callback(game, caster, localStore, castId)); + flags.setExplode(explodeOnDeath.callback(caster, localStore, castId)); } if (onlyDamageSummons != null) { - flags.setOnlyDamageSummons(onlyDamageSummons.callback(game, caster, localStore, castId)); + flags.setOnlyDamageSummons(onlyDamageSummons.callback(caster, localStore, castId)); } if (nonlethal != null) { - flags.setNonlethal(nonlethal.callback(game, caster, localStore, castId)); + flags.setNonlethal(nonlethal.callback(caster, localStore, castId)); } if (this.attackType != null) { - theAttackType = this.attackType.callback(game, caster, localStore, castId); + theAttackType = this.attackType.callback(caster, localStore, castId); } if (this.damageType != null) { - theDamageType = this.damageType.callback(game, caster, localStore, castId); + theDamageType = this.damageType.callback(caster, localStore, castId); } - if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId)) { - AbilityPointTarget loc = target.callback(game, caster, localStore, castId); + if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(caster, localStore, castId)) { + AbilityPointTarget loc = target.callback(caster, localStore, castId); float pfullRad = 0; float pmedRad = 0; float psmallRad = 0; @@ -92,25 +91,25 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, float theMaxDamage = 0; CUnit theSource = caster; if (this.fullDamageRadius != null) { - pfullRad = this.fullDamageRadius.callback(game, caster, localStore, castId); + pfullRad = this.fullDamageRadius.callback(caster, localStore, castId); } if (this.mediumDamageRadius != null) { - pmedRad = this.mediumDamageRadius.callback(game, caster, localStore, castId); + pmedRad = this.mediumDamageRadius.callback(caster, localStore, castId); } if (this.smallDamageRadius != null) { - psmallRad = this.smallDamageRadius.callback(game, caster, localStore, castId); + psmallRad = this.smallDamageRadius.callback(caster, localStore, castId); } if (this.mediumDamage != null) { - pmedDam = this.mediumDamage.callback(game, caster, localStore, castId); + pmedDam = this.mediumDamage.callback(caster, localStore, castId); } if (this.smallDamage != null) { - psmallDam = this.smallDamage.callback(game, caster, localStore, castId); + psmallDam = this.smallDamage.callback(caster, localStore, castId); } if (this.maxDamage != null) { - theMaxDamage = this.maxDamage.callback(game, caster, localStore, castId); + theMaxDamage = this.maxDamage.callback(caster, localStore, castId); } if (this.source != null) { - theSource = this.source.callback(game, caster, localStore, castId); + theSource = this.source.callback(caster, localStore, castId); } final float fullRad = pfullRad; @@ -121,7 +120,7 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final CAttackType ftheAttackType = theAttackType; final CDamageType ftheDamageType = theDamageType; final CUnit ftheSource = theSource; - final float baseDamage = fullDamage.callback(game, caster, localStore, castId); + final float baseDamage = fullDamage.callback(caster, localStore, castId); if (theMaxDamage > 0) { List fullhits = new ArrayList<>(); @@ -130,17 +129,17 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, List counts = new ArrayList<>(); float medRatio = medDam / baseDamage; float smallRatio = smallDam / baseDamage; - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, Math.max(medRad, smallRad)), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { fullhits.add(enumUnit); if (unitSpecificDamageMod != null) { counts.add( - unitSpecificDamageMod.callback(game, caster, localStore, castId)); + unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(1f); } @@ -148,7 +147,7 @@ public boolean call(final CUnit enumUnit) { medhits.add(enumUnit); if (unitSpecificDamageMod != null) { counts.add(medRatio - * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(medRatio); } @@ -156,7 +155,7 @@ public boolean call(final CUnit enumUnit) { smallhits.add(enumUnit); if (unitSpecificDamageMod != null) { counts.add(smallRatio - * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(smallRatio); } @@ -179,15 +178,15 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - damPerTar * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + damPerTar * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); } } @@ -195,15 +194,15 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medRatio - * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medRatio); } } @@ -211,71 +210,70 @@ public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallRatio - * unitSpecificDamageMod.callback(game, caster, localStore, castId)); + * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - hit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallRatio); } } localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); } else { - game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(Math.max(pfullRad, pmedRad), psmallRad), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(game, caster, localStore, castId)) { + if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - baseDamage * unitSpecificDamageMod.callback(game, caster, - localStore, castId)); + baseDamage * unitSpecificDamageMod.callback(caster, localStore, + castId)); } else { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); } } else if (enumUnit.canReach(loc, medRad)) { if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), medDam * unitSpecificDamageMod - .callback(game, caster, localStore, castId)); + .callback(caster, localStore, castId)); } else { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), medDam); } } else if (enumUnit.canReach(loc, smallRad)) { if (extraActions != null) { for (ABAction action : extraActions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (unitSpecificDamageMod != null) { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), - smallDam * unitSpecificDamageMod.callback(game, caster, localStore, - castId)); + smallDam * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - enumUnit.damage(game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), smallDam); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), smallDam); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java index 77fbce542..5cf208550 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; @@ -33,41 +32,41 @@ public class ABActionDamageTarget implements ABSingleAction { private ABBooleanCallback nonlethal; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; CDamageFlags flags = new CGenericDamageFlags(false, true); - float theDamage = damage.callback(game, caster, localStore, castId); + float theDamage = damage.callback(caster, localStore, castId); if (isAttack != null) { - flags.setAttack(isAttack.callback(game, caster, localStore, castId)); + flags.setAttack(isAttack.callback(caster, localStore, castId)); } if (isRanged != null) { - flags.setRanged(isRanged.callback(game, caster, localStore, castId)); + flags.setRanged(isRanged.callback(caster, localStore, castId)); } if (damageInvulnerable != null) { - flags.setIgnoreInvulnerable(damageInvulnerable.callback(game, caster, localStore, castId)); + flags.setIgnoreInvulnerable(damageInvulnerable.callback(caster, localStore, castId)); } if (explodeOnDeath != null) { - flags.setExplode(explodeOnDeath.callback(game, caster, localStore, castId)); + flags.setExplode(explodeOnDeath.callback(caster, localStore, castId)); } if (onlyDamageSummons != null) { - flags.setOnlyDamageSummons(onlyDamageSummons.callback(game, caster, localStore, castId)); + flags.setOnlyDamageSummons(onlyDamageSummons.callback(caster, localStore, castId)); } if (nonlethal != null) { - flags.setNonlethal(nonlethal.callback(game, caster, localStore, castId)); + flags.setNonlethal(nonlethal.callback(caster, localStore, castId)); } if (this.attackType != null) { - theAttackType = this.attackType.callback(game, caster, localStore, castId); + theAttackType = this.attackType.callback(caster, localStore, castId); } if (this.damageType != null) { - theDamageType = this.damageType.callback(game, caster, localStore, castId); + theDamageType = this.damageType.callback(caster, localStore, castId); } - if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(game, caster, localStore, castId)) { - target.callback(game, caster, localStore, castId).damage(game, - source.callback(game, caster, localStore, castId), flags, theAttackType, theDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), damage.callback(game, caster, localStore, castId)); + if (theDamage > 0 || ignoreLTEZero == null || !ignoreLTEZero.callback(caster, localStore, castId)) { + target.callback(caster, localStore, castId).damage(localStore.game, + source.callback(caster, localStore, castId), flags, theAttackType, theDamageType, + CWeaponSoundTypeJass.WHOKNOWS.name(), damage.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDisableWorkerAbilities.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDisableWorkerAbilities.java index eb3634acf..e56d10905 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDisableWorkerAbilities.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDisableWorkerAbilities.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; @@ -26,10 +25,10 @@ public class ABActionDisableWorkerAbilities implements ABSingleAction { @SuppressWarnings({ "rawtypes", "unchecked" }) @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (this.unit != null) { - targetUnit = this.unit.callback(game, caster, localStore, castId); + targetUnit = this.unit.callback(caster, localStore, castId); } final Class[] workerAbils = { CAbilityAcolyteHarvest.class, CAbilityHarvest.class, CAbilityWispHarvest.class, @@ -41,7 +40,7 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, if (abil != null) { abil.setDisabled(true, CAbilityDisableType.TRANSFORMATION); abil.setIconShowing(false); - targetUnit.checkDisabledAbilities(game, true); + targetUnit.checkDisabledAbilities(localStore.game, true); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java index 4e2750b8e..8ba7fa66f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; @@ -21,14 +20,14 @@ public class ABActionDispelBuffs implements ABAction { private ABCondition filter; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theCaster = caster; if (source != null) { - theCaster = source.callback(game, theCaster, localStore, castId); + theCaster = source.callback(theCaster, localStore, castId); } CUnit theTarget = caster; if (unit != null) { - theTarget = unit.callback(game, theCaster, localStore, castId); + theTarget = unit.callback(theCaster, localStore, castId); } if (theTarget != null) { @@ -37,14 +36,14 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, if (ability.getAbilityCategory() == CAbilityCategory.BUFF) { CBuff buff = (CBuff) ability; localStore.put(ABLocalStoreKeys.ENUMBUFF, buff); - if (filter != null && filter.callback(game, theCaster, localStore, castId)) { + if (filter != null && filter.callback(theCaster, localStore, castId)) { toRemove.add(buff); } } } for (CBuff buff : toRemove) { - theTarget.remove(game, buff); + theTarget.remove(localStore.game, buff); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionEnableWorkerAbilities.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionEnableWorkerAbilities.java index 92f33b623..9aea0b4a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionEnableWorkerAbilities.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionEnableWorkerAbilities.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; @@ -26,10 +25,10 @@ public class ABActionEnableWorkerAbilities implements ABSingleAction { @SuppressWarnings({ "rawtypes", "unchecked" }) @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (this.unit != null) { - targetUnit = this.unit.callback(game, caster, localStore, castId); + targetUnit = this.unit.callback(caster, localStore, castId); } final Class[] workerAbils = { CAbilityAcolyteHarvest.class, CAbilityHarvest.class, CAbilityWispHarvest.class, @@ -41,7 +40,7 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, if (abil != null) { abil.setDisabled(false, CAbilityDisableType.TRANSFORMATION); abil.setIconShowing(true); - targetUnit.checkDisabledAbilities(game, false); + targetUnit.checkDisabledAbilities(localStore.game, false); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java index dbe84482d..8739a030f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,15 +12,15 @@ public class ABActionForceBeginCreatedBehavior implements ABAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (unit != null) { - targetUnit = this.unit.callback(game, caster, localStore, castId); + targetUnit = this.unit.callback(caster, localStore, castId); } CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); if (newBehavior != null) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); - targetUnit.beginBehavior(game, newBehavior, true); + targetUnit.beginBehavior(localStore.game, newBehavior, true); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHeal.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHeal.java index fdb286b9c..a744c35e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHeal.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHeal.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -16,17 +15,18 @@ public class ABActionHeal implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { - percent = this.isPercent.callback(game, caster, localStore, castId); + percent = this.isPercent.callback(caster, localStore, castId); } if (percent) { - final CUnit targetUnit = this.target.callback(game, caster, localStore, castId); - targetUnit.heal(game, this.amount.callback(game, caster, localStore, castId) * targetUnit.getMaximumLife()); + final CUnit targetUnit = this.target.callback(caster, localStore, castId); + targetUnit.heal(localStore.game, + this.amount.callback(caster, localStore, castId) * targetUnit.getMaximumLife()); } else { - this.target.callback(game, caster, localStore, castId).heal(game, - this.amount.callback(game, caster, localStore, castId)); + this.target.callback(caster, localStore, castId).heal(localStore.game, + this.amount.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java index 96c8be299..055f5f0e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -12,8 +11,8 @@ public class ABActionHideUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); targetUnit.setHidden(true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionInstantReturnResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionInstantReturnResources.java index 6dcbc2715..3880bbd1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionInstantReturnResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionInstantReturnResources.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -15,32 +14,32 @@ public class ABActionInstantReturnResources implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (this.unit != null) { - targetUnit = this.unit.callback(game, caster, localStore, castId); + targetUnit = this.unit.callback(caster, localStore, castId); } final CAbilityHarvest harv = targetUnit.getFirstAbilityOfType(CAbilityHarvest.class); if ((harv != null) && (harv.getCarriedResourceType() != null) && (harv.getCarriedResourceAmount() > 0)) { - final CPlayer pl = game.getPlayer(targetUnit.getPlayerIndex()); + final CPlayer pl = localStore.game.getPlayer(targetUnit.getPlayerIndex()); switch (harv.getCarriedResourceType()) { case FOOD: // This might be a bad idea? Not sure it will ever matter pl.setFoodCap(Math.min(pl.getFoodCap() + harv.getCarriedResourceAmount(), pl.getFoodCapCeiling())); - game.unitGainResourceEvent(targetUnit, pl.getId(), harv.getCarriedResourceType(), + localStore.game.unitGainResourceEvent(targetUnit, pl.getId(), harv.getCarriedResourceType(), harv.getCarriedResourceAmount()); harv.setCarriedResources(ResourceType.FOOD, 0); break; case GOLD: pl.addGold(harv.getCarriedResourceAmount()); - game.unitGainResourceEvent(targetUnit, pl.getId(), harv.getCarriedResourceType(), + localStore.game.unitGainResourceEvent(targetUnit, pl.getId(), harv.getCarriedResourceType(), harv.getCarriedResourceAmount()); harv.setCarriedResources(ResourceType.GOLD, 0); break; case LUMBER: pl.addLumber(harv.getCarriedResourceAmount()); - game.unitGainResourceEvent(targetUnit, pl.getId(), harv.getCarriedResourceType(), + localStore.game.unitGainResourceEvent(targetUnit, pl.getId(), harv.getCarriedResourceType(), harv.getCarriedResourceAmount()); harv.setCarriedResources(ResourceType.LUMBER, 0); break; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionIssueStopOrder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionIssueStopOrder.java index 8b798774e..4b5b3bbd3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionIssueStopOrder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionIssueStopOrder.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -12,9 +11,9 @@ public class ABActionIssueStopOrder implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); - targetUnit.performDefaultBehavior(game); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + targetUnit.performDefaultBehavior(localStore.game); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java index d5587aa5b..6856f13d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -12,9 +11,9 @@ public class ABActionKillUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); - targetUnit.kill(game); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + targetUnit.kill(localStore.game); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMergeUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMergeUnits.java index 7a131e4c6..151d059d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMergeUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMergeUnits.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -26,39 +25,39 @@ public class ABActionMergeUnits implements ABSingleAction { private ABBooleanCallback resetHpMp; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { int thePlayerId = caster.getPlayerIndex(); float theFacing = caster.getFacing(); AbilityPointTarget loc = null; if (this.playerIndex != null) { - thePlayerId = this.playerIndex.callback(game, caster, localStore, castId); + thePlayerId = this.playerIndex.callback(caster, localStore, castId); } if (this.facing != null) { - theFacing = this.facing.callback(game, caster, localStore, castId); + theFacing = this.facing.callback(caster, localStore, castId); } if (this.location != null) { - loc = this.location.callback(game, caster, localStore, castId); + loc = this.location.callback(caster, localStore, castId); } else { loc = new AbilityPointTarget(caster.getX(), caster.getY()); } - final CUnit u1 = this.unit1.callback(game, caster, localStore, castId); - final CUnit u2 = this.unit2.callback(game, caster, localStore, castId); + final CUnit u1 = this.unit1.callback(caster, localStore, castId); + final CUnit u2 = this.unit2.callback(caster, localStore, castId); final float newHPPcnt = ((u1.getLife() / u1.getMaximumLife()) + (u2.getLife() / u2.getMaximumLife())) / 2; final float newMPPcnt = ((u1.getMana() / u1.getMaximumMana()) + (u2.getMana() / u2.getMaximumMana())) / 2; - final CUnit createdUnit = game.createUnit(this.newUnitId.callback(game, caster, localStore, castId), + final CUnit createdUnit = localStore.game.createUnit(this.newUnitId.callback(caster, localStore, castId), thePlayerId, loc.getX(), loc.getY(), theFacing); - if ((this.resetHpMp == null) || !this.resetHpMp.callback(game, caster, localStore, castId)) { - createdUnit.setLife(game, newHPPcnt * createdUnit.getMaximumLife()); + if ((this.resetHpMp == null) || !this.resetHpMp.callback(caster, localStore, castId)) { + createdUnit.setLife(localStore.game, newHPPcnt * createdUnit.getMaximumLife()); createdUnit.setMana(newMPPcnt * createdUnit.getMaximumMana()); } - game.unitPreferredSelectionReplacement(u1, createdUnit); - game.unitPreferredSelectionReplacement(u2, createdUnit); + localStore.game.unitPreferredSelectionReplacement(u1, createdUnit); + localStore.game.unitPreferredSelectionReplacement(u2, createdUnit); - game.removeUnit(u1); - game.removeUnit(u2); + localStore.game.removeUnit(u1); + localStore.game.removeUnit(u2); localStore.put(ABLocalStoreKeys.LASTCREATEDUNIT, createdUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java index 11c988152..320ee763a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,9 +13,9 @@ public class ABActionMultiplyUnitScale implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); - game.changeUnitScale(targetUnit, value.callback(game, caster, localStore, castId), true); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + localStore.game.changeUnitScale(targetUnit, value.callback(caster, localStore, castId), true); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java index 8976cce50..33067dcc7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -12,9 +11,9 @@ public class ABActionRemoveUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); - game.removeUnit(targetUnit); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + localStore.game.removeUnit(targetUnit); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java index bada86354..3f870a3f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -12,10 +11,10 @@ public class ABActionResurrect implements ABSingleAction { private ABUnitCallback target; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.target.callback(game, caster, localStore, castId); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.target.callback(caster, localStore, castId); if (targetUnit.isDead()) { - targetUnit.resurrect(game); + targetUnit.resurrect(localStore.game); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSendUnitBackToWork.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSendUnitBackToWork.java index 8b8b1a42a..927d48393 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSendUnitBackToWork.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSendUnitBackToWork.java @@ -13,10 +13,10 @@ public class ABActionSendUnitBackToWork implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { final CUnit targetUnit; if (this.unit != null) { - targetUnit = this.unit.callback(game, caster, localStore, castId); + targetUnit = this.unit.callback(caster, localStore, castId); } else { targetUnit = caster; } @@ -24,12 +24,12 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final ABTimer timer = new ABTimer(caster, localStore, null, castId) { @Override public void onFire(CSimulation simulation) { - targetUnit.backToWork(game, null); + targetUnit.backToWork(localStore.game, null); } }; timer.setRepeats(false); timer.setTimeoutTime(0f); - timer.start(game); + timer.start(localStore.game); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java index 317e28304..e0f0a06e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -16,11 +15,11 @@ public class ABActionSetExplodesOnDeath implements ABAction { private ABIDCallback buffId; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); - targetUnit.setExplodesOnDeath(this.explodes.callback(game, caster, localStore, castId)); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + targetUnit.setExplodesOnDeath(this.explodes.callback(caster, localStore, castId)); if (this.buffId != null) { - targetUnit.setExplodesOnDeathBuffId(this.buffId.callback(game, caster, localStore, castId)); + targetUnit.setExplodesOnDeathBuffId(this.buffId.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetHp.java index b69b8b486..4f15b3672 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetHp.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -16,19 +15,19 @@ public class ABActionSetHp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { - percent = this.isPercent.callback(game, caster, localStore, castId); + percent = this.isPercent.callback(caster, localStore, castId); } if (percent) { - final CUnit targetUnit = this.target.callback(game, caster, localStore, castId); - targetUnit.setCurrentHp(game, - this.amount.callback(game, caster, localStore, castId) * targetUnit.getMaximumLife()); + final CUnit targetUnit = this.target.callback(caster, localStore, castId); + targetUnit.setCurrentHp(localStore.game, + this.amount.callback(caster, localStore, castId) * targetUnit.getMaximumLife()); } else { - this.target.callback(game, caster, localStore, castId).setCurrentHp(game, - this.amount.callback(game, caster, localStore, castId)); + this.target.callback(caster, localStore, castId).setCurrentHp(localStore.game, + this.amount.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetMp.java index 979f8c610..2d5dbdc41 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetMp.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -16,19 +15,19 @@ public class ABActionSetMp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { - percent = this.isPercent.callback(game, caster, localStore, castId); + percent = this.isPercent.callback(caster, localStore, castId); } - final CUnit targetUnit = this.target.callback(game, caster, localStore, castId); + final CUnit targetUnit = this.target.callback(caster, localStore, castId); if (percent) { targetUnit.setMana(Math - .max(Math.min(this.amount.callback(game, caster, localStore, castId) * targetUnit.getMaximumMana(), + .max(Math.min(this.amount.callback(caster, localStore, castId) * targetUnit.getMaximumMana(), targetUnit.getMaximumMana()), 0)); } else { targetUnit.setMana(Math.max( - Math.min(this.amount.callback(game, caster, localStore, castId), targetUnit.getMaximumMana()), 0)); + Math.min(this.amount.callback(caster, localStore, castId), targetUnit.getMaximumMana()), 0)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java index 41639c2d2..07ae480ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,9 +12,9 @@ public class ABActionSetSpeed implements ABAction { private ABIntegerCallback value; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); - targetUnit.setSpeed(value.callback(game, caster, localStore, castId)); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + targetUnit.setSpeed(value.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java index f539c88aa..a5860a9f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -15,10 +14,10 @@ public class ABActionStartSacrificingUnit implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit theUnit = this.unit.callback(game, caster, localStore, castId); - theUnit.queueSacrificingUnit(game, this.id.callback(game, caster, localStore, castId), - this.sacrifice.callback(game, caster, localStore, castId)); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit theUnit = this.unit.callback(caster, localStore, castId); + theUnit.queueSacrificingUnit(localStore.game, this.id.callback(caster, localStore, castId), + this.sacrifice.callback(caster, localStore, castId)); theUnit.notifyOrdersChanged(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java index 87a472223..ef732bed8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,9 +13,9 @@ public class ABActionStartTrainingUnit implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit theUnit = this.unit.callback(game, caster, localStore, castId); - theUnit.queueTrainingUnit(game, this.id.callback(game, caster, localStore, castId)); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit theUnit = this.unit.callback(caster, localStore, castId); + theUnit.queueTrainingUnit(localStore.game, this.id.callback(caster, localStore, castId)); theUnit.notifyOrdersChanged(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java index 9dd2f96a4..d63f5f735 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -16,21 +15,21 @@ public class ABActionSubtractMp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { - percent = this.isPercent.callback(game, caster, localStore, castId); + percent = this.isPercent.callback(caster, localStore, castId); } - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); if (percent) { targetUnit.setMana(Math.max(Math.min( targetUnit.getMana() - - (this.amount.callback(game, caster, localStore, castId) * targetUnit.getMaximumMana()), + - (this.amount.callback(caster, localStore, castId) * targetUnit.getMaximumMana()), targetUnit.getMaximumMana()), 0)); } else { targetUnit.setMana( - Math.max(Math.min(targetUnit.getMana() - this.amount.callback(game, caster, localStore, castId), + Math.max(Math.min(targetUnit.getMana() - this.amount.callback(caster, localStore, castId), targetUnit.getMaximumMana()), 0)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java index bfe6bb87b..8cbebcea7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -53,18 +52,18 @@ public class ABActionTransformUnit implements ABAction { private List onUntransformActions; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { - u1 = unit.callback(game, caster, localStore, castId); + u1 = unit.callback(caster, localStore, castId); } - War3ID baseId = baseUnitId.callback(game, caster, localStore, castId); - War3ID altId = alternateUnitId.callback(game, caster, localStore, castId); - CPlayer pl = game.getPlayer(u1.getPlayerIndex()); + War3ID baseId = baseUnitId.callback(caster, localStore, castId); + War3ID altId = alternateUnitId.callback(caster, localStore, castId); + CPlayer pl = localStore.game.getPlayer(u1.getPlayerIndex()); boolean charge = false; boolean addAlternateTagAfter = false; if (this.requiresPayment != null) { - charge = this.requiresPayment.callback(game, caster, localStore, castId); + charge = this.requiresPayment.callback(caster, localStore, castId); } AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); @@ -77,12 +76,12 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, boolean onlyToAlt = false; if (onlyTransformToAlternate != null) { - onlyToAlt = onlyTransformToAlternate.callback(game, caster, localStore, castId); + onlyToAlt = onlyTransformToAlternate.callback(caster, localStore, castId); } if (!onlyToAlt && u1.getTypeId().equals(altId)) { // Transforming back - targetType = game.getUnitData().getUnitType(baseId); + targetType = localStore.game.getUnitData().getUnitType(baseId); if (targetType.equals(u1.getUnitType())) { // No need to do anything return; @@ -90,14 +89,14 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, } else { // Transforming to alt addAlternateTagAfter = true; - targetType = game.getUnitData().getUnitType(altId); + targetType = localStore.game.getUnitData().getUnitType(altId); } int goldCost = 0; int lumberCost = 0; Integer foodCost = null; if (charge) { - if (game.getGameplayConstants().isRelativeUpgradeCosts()) { + if (localStore.game.getGameplayConstants().isRelativeUpgradeCosts()) { goldCost = targetType.getGoldCost() - u1.getUnitType().getGoldCost(); lumberCost = targetType.getLumberCost() - u1.getUnitType().getLumberCost(); if (goldCost > pl.getGold() || lumberCost > pl.getLumber()) { @@ -133,37 +132,37 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, War3ID theBuffId = null; boolean instant = false; if (permanent != null) { - perm = permanent.callback(game, caster, localStore, castId); + perm = permanent.callback(caster, localStore, castId); } if (keepRatios != null) { - isKeepRatios = keepRatios.callback(game, caster, localStore, castId); + isKeepRatios = keepRatios.callback(caster, localStore, castId); } if (duration != null) { - dur = duration.callback(game, caster, localStore, castId); + dur = duration.callback(caster, localStore, castId); } if (transformTime != null) { - transTime = transformTime.callback(game, caster, localStore, castId); + transTime = transformTime.callback(caster, localStore, castId); } if (landingDelayTime != null) { - landTime = landingDelayTime.callback(game, caster, localStore, castId); + landTime = landingDelayTime.callback(caster, localStore, castId); } if (altitudeAdjustmentDelay != null) { - atlAdDelay = altitudeAdjustmentDelay.callback(game, caster, localStore, castId); + atlAdDelay = altitudeAdjustmentDelay.callback(caster, localStore, castId); } if (altitudeAdjustmentTime != null) { - altAdTime = altitudeAdjustmentTime.callback(game, caster, localStore, castId); + altAdTime = altitudeAdjustmentTime.callback(caster, localStore, castId); } if (immediateLanding != null) { - imLand = immediateLanding.callback(game, caster, localStore, castId); + imLand = immediateLanding.callback(caster, localStore, castId); } if (immediateTakeOff != null) { - imTakeOff = immediateTakeOff.callback(game, caster, localStore, castId); + imTakeOff = immediateTakeOff.callback(caster, localStore, castId); } if (buffId != null) { - theBuffId = buffId.callback(game, caster, localStore, castId); + theBuffId = buffId.callback(caster, localStore, castId); } if (instantTransformAtDurationEnd != null) { - instant = instantTransformAtDurationEnd.callback(game, caster, localStore, castId); + instant = instantTransformAtDurationEnd.callback(caster, localStore, castId); } if (transTime > 0) { @@ -177,19 +176,19 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, new CBehaviorFinishTransformation(caster, localStore, u1, abil, targetType, isKeepRatios, actions, addAlternateTagAfter, orderId, perm, dur, transTime, landTime, atlAdDelay, altAdTime, - imLand, imTakeOff, theBuffId, game.getUnitData().getUnitType(baseId), instant)); + imLand, imTakeOff, theBuffId, localStore.game.getUnitData().getUnitType(baseId), instant)); } else { - TransformationHandler.instantTransformation(game, localStore, u1, targetType, isKeepRatios, actions, abil, + TransformationHandler.instantTransformation(localStore, u1, targetType, isKeepRatios, actions, abil, addAlternateTagAfter, perm, true); if (dur > 0) { OnTransformationActions unActions = new OnTransformationActions(-goldCost, -lumberCost, null, null, onUntransformActions, castId); - TransformationHandler.createInstantTransformBackBuff(game, caster, localStore, u1, - game.getUnitData().getUnitType(baseId), isKeepRatios, unActions, abil, theBuffId, + TransformationHandler.createInstantTransformBackBuff(caster, localStore, u1, + localStore.game.getUnitData().getUnitType(baseId), isKeepRatios, unActions, abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); } - u1.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, abil, null); - u1.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, abil, null); + u1.fireSpellEvents(localStore.game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, abil, null); + u1.fireSpellEvents(localStore.game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, abil, null); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java index 4d7fcb485..1858e1a20 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,9 +12,9 @@ public class ABActionTransformUnitAppearance implements ABAction { private ABIDCallback id; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); - game.unitUpdatedType(targetUnit, id.callback(game, caster, localStore, castId), false); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + localStore.game.unitUpdatedType(targetUnit, id.callback(caster, localStore, castId), false); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java index 58ed327c7..043f0e75d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -41,22 +40,22 @@ public class ABActionTransformUnitInstant implements ABAction { private List onUntransformActions; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { - u1 = unit.callback(game, caster, localStore, castId); + u1 = unit.callback(caster, localStore, castId); } War3ID baseId = null; - War3ID altId = alternateUnitId.callback(game, caster, localStore, castId); - CPlayer pl = game.getPlayer(u1.getPlayerIndex()); + War3ID altId = alternateUnitId.callback(caster, localStore, castId); + CPlayer pl = localStore.game.getPlayer(u1.getPlayerIndex()); boolean charge = false; boolean addAlternateTagAfter = false; boolean perm = false; if (permanent != null) { - perm = permanent.callback(game, caster, localStore, castId); + perm = permanent.callback(caster, localStore, castId); } if (this.requiresPayment != null) { - charge = this.requiresPayment.callback(game, caster, localStore, castId); + charge = this.requiresPayment.callback(caster, localStore, castId); } AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); @@ -65,8 +64,8 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, baseId = u1.getUnitType().getTypeId(); baseType = u1.getUnitType(); } else { - baseId = baseUnitId.callback(game, caster, localStore, castId); - baseType = game.getUnitData().getUnitType(baseId); + baseId = baseUnitId.callback(caster, localStore, castId); + baseType = localStore.game.getUnitData().getUnitType(baseId); } @@ -79,7 +78,7 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, boolean onlyToAlt = false; if (onlyTransformToAlternate != null) { - onlyToAlt = onlyTransformToAlternate.callback(game, caster, localStore, castId); + onlyToAlt = onlyTransformToAlternate.callback(caster, localStore, castId); } if (!onlyToAlt && u1.getTypeId().equals(altId)) { @@ -93,14 +92,14 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, } else { // Transforming to alt addAlternateTagAfter = true; - targetType = game.getUnitData().getUnitType(altId); + targetType = localStore.game.getUnitData().getUnitType(altId); } int goldCost = 0; int lumberCost = 0; Integer foodCost = null; if (charge) { - if (game.getGameplayConstants().isRelativeUpgradeCosts()) { + if (localStore.game.getGameplayConstants().isRelativeUpgradeCosts()) { goldCost = targetType.getGoldCost() - u1.getUnitType().getGoldCost(); lumberCost = targetType.getLumberCost() - u1.getUnitType().getLumberCost(); if (goldCost > pl.getGold() || lumberCost > pl.getLumber()) { @@ -131,32 +130,32 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, float transTime = 0; War3ID theBuffId = null; if (keepRatios != null) { - isKeepRatios = keepRatios.callback(game, caster, localStore, castId); + isKeepRatios = keepRatios.callback(caster, localStore, castId); } if (permanent != null) { - perm = permanent.callback(game, caster, localStore, castId); + perm = permanent.callback(caster, localStore, castId); } if (duration != null) { - dur = duration.callback(game, caster, localStore, castId); + dur = duration.callback(caster, localStore, castId); } if (transformTime != null) { - transTime = transformTime.callback(game, caster, localStore, castId); + transTime = transformTime.callback(caster, localStore, castId); } if (buffId != null) { - theBuffId = buffId.callback(game, caster, localStore, castId); + theBuffId = buffId.callback(caster, localStore, castId); } localStore.put(ABLocalStoreKeys.TRANSFORMINGTOALT + castId, addAlternateTagAfter); if (transTime > 0) { TransformationHandler.playMorphAnimation(u1, addAlternateTagAfter); - new DelayInstantTransformationTimer(game, caster, localStore, u1, actions, addAlternateTagAfter, transTime, - baseType, targetType, isKeepRatios, abil, theBuffId, transTime, dur).start(game); + new DelayInstantTransformationTimer(caster, localStore, u1, actions, addAlternateTagAfter, transTime, + baseType, targetType, isKeepRatios, abil, theBuffId, transTime, dur).start(localStore.game); } else { - TransformationHandler.instantTransformation(game, localStore, u1, targetType, isKeepRatios, actions, abil, + TransformationHandler.instantTransformation(localStore, u1, targetType, isKeepRatios, actions, abil, addAlternateTagAfter, perm, true); if (dur > 0) { - TransformationHandler.createInstantTransformBackBuff(game, caster, localStore, u1, baseType, - isKeepRatios, unActions, abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); + TransformationHandler.createInstantTransformBackBuff(caster, localStore, u1, baseType, isKeepRatios, + unActions, abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java index 0e9473bcc..b28216b1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -48,13 +47,13 @@ public class ABActionTransformedUnitAbilityAdd implements ABAction { private List onUntransformActions; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { - u1 = unit.callback(game, caster, localStore, castId); + u1 = unit.callback(caster, localStore, castId); } - War3ID baseId = baseUnitId.callback(game, caster, localStore, castId); - War3ID altId = alternateUnitId.callback(game, caster, localStore, castId); + War3ID baseId = baseUnitId.callback(caster, localStore, castId); + War3ID altId = alternateUnitId.callback(caster, localStore, castId); AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (baseId == null || altId == null) { @@ -62,7 +61,7 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, return; } - CUnitType baseType = game.getUnitData().getUnitType(baseId); + CUnitType baseType = localStore.game.getUnitData().getUnitType(baseId); // Always Transforming back CUnitType targetType = baseType; @@ -84,49 +83,49 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, boolean imTakeOff = false; War3ID theBuffId = null; if (instantTransformAtDurationEnd != null) { - instant = instantTransformAtDurationEnd.callback(game, caster, localStore, castId); + instant = instantTransformAtDurationEnd.callback(caster, localStore, castId); } if (permanent != null) { - perm = permanent.callback(game, caster, localStore, castId); + perm = permanent.callback(caster, localStore, castId); } if (this.requiresPayment != null) { - charge = this.requiresPayment.callback(game, caster, localStore, castId); + charge = this.requiresPayment.callback(caster, localStore, castId); } if (keepRatios != null) { - isKeepRatios = keepRatios.callback(game, caster, localStore, castId); + isKeepRatios = keepRatios.callback(caster, localStore, castId); } if (duration != null) { - dur = duration.callback(game, caster, localStore, castId); + dur = duration.callback(caster, localStore, castId); } if (transformTime != null) { - transTime = transformTime.callback(game, caster, localStore, castId); + transTime = transformTime.callback(caster, localStore, castId); } if (landingDelayTime != null) { - landTime = landingDelayTime.callback(game, caster, localStore, castId); + landTime = landingDelayTime.callback(caster, localStore, castId); } if (altitudeAdjustmentDelay != null) { - atlAdDelay = altitudeAdjustmentDelay.callback(game, caster, localStore, castId); + atlAdDelay = altitudeAdjustmentDelay.callback(caster, localStore, castId); } if (altitudeAdjustmentTime != null) { - altAdTime = altitudeAdjustmentTime.callback(game, caster, localStore, castId); + altAdTime = altitudeAdjustmentTime.callback(caster, localStore, castId); } if (immediateLanding != null) { - imLand = immediateLanding.callback(game, caster, localStore, castId); + imLand = immediateLanding.callback(caster, localStore, castId); } if (immediateTakeOff != null) { - imTakeOff = immediateTakeOff.callback(game, caster, localStore, castId); + imTakeOff = immediateTakeOff.callback(caster, localStore, castId); } if (buffId != null) { - theBuffId = buffId.callback(game, caster, localStore, castId); + theBuffId = buffId.callback(caster, localStore, castId); } TransformationHandler.setTags(u1, true); if (perm) { - u1.remove(game, abil); + u1.remove(localStore.game, abil); } if (onTransformActions != null) { for (ABAction action : onTransformActions) { - action.runAction(game, u1, localStore, castId); + action.runAction(u1, localStore, castId); } } @@ -136,7 +135,7 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int goldCost = 0; int lumberCost = 0; Integer foodCost = null; - if (game.getGameplayConstants().isRelativeUpgradeCosts()) { + if (localStore.game.getGameplayConstants().isRelativeUpgradeCosts()) { goldCost = baseType.getGoldCost() - u1.getUnitType().getGoldCost(); lumberCost = baseType.getLumberCost() - u1.getUnitType().getLumberCost(); @@ -151,16 +150,16 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, } if (instant) { - TransformationHandler.createInstantTransformBackBuff(game, caster, localStore, u1, baseType, isKeepRatios, + TransformationHandler.createInstantTransformBackBuff(caster, localStore, u1, baseType, isKeepRatios, actions, abil, theBuffId, true, transTime, dur, perm); } else { boolean takingOff = u1.getMovementType() != MovementType.FLY && baseType.getMovementType() == MovementType.FLY; boolean landing = u1.getMovementType() == MovementType.FLY && baseType.getMovementType() != MovementType.FLY; - TransformationHandler.createSlowTransformBackBuff(game, caster, localStore, u1, baseType, isKeepRatios, actions, - abil, theBuffId, true, transTime, dur, perm, takingOff, landing, imTakeOff, imLand, atlAdDelay, - landTime, altAdTime); + TransformationHandler.createSlowTransformBackBuff(caster, localStore, u1, baseType, isKeepRatios, + actions, abil, theBuffId, true, transTime, dur, perm, takingOff, landing, imTakeOff, imLand, + atlAdDelay, landTime, altAdTime); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java index 697362714..b47a0925e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -28,18 +27,18 @@ public class ABActionTransformedUnitAbilityRemove implements ABAction { private List onUntransformActions; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { boolean perm = false; if (permanent != null) { - perm = permanent.callback(game, caster, localStore, castId); + perm = permanent.callback(caster, localStore, castId); } if (!perm) { CUnit u1 = caster; if (unit != null) { - u1 = unit.callback(game, caster, localStore, castId); + u1 = unit.callback(caster, localStore, castId); } - War3ID baseId = baseUnitId.callback(game, caster, localStore, castId); - War3ID altId = alternateUnitId.callback(game, caster, localStore, castId); + War3ID baseId = baseUnitId.callback(caster, localStore, castId); + War3ID altId = alternateUnitId.callback(caster, localStore, castId); AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (baseId == null || altId == null) { @@ -47,7 +46,7 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, } // Only care if already transformed - CUnitType targetType = game.getUnitData().getUnitType(altId); + CUnitType targetType = localStore.game.getUnitData().getUnitType(altId); if (!targetType.equals(u1.getUnitType())) { // No need to do anything return; @@ -55,16 +54,16 @@ public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, boolean isKeepRatios = true; if (keepRatios != null) { - isKeepRatios = keepRatios.callback(game, caster, localStore, castId); + isKeepRatios = keepRatios.callback(caster, localStore, castId); } - CUnitType baseType = game.getUnitData().getUnitType(baseId); + CUnitType baseType = localStore.game.getUnitData().getUnitType(baseId); if (onUntransformActions != null) { for (ABAction action : onUntransformActions) { - action.runAction(game, u1, localStore, castId); + action.runAction(u1, localStore, castId); } } - TransformationHandler.setUnitID(game, localStore, u1, baseType, isKeepRatios, perm, null, abil, true); + TransformationHandler.setUnitID(localStore, u1, baseType, isKeepRatios, perm, null, abil, true); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java index 178bb6f48..701a4b12d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -12,8 +11,8 @@ public class ABActionUnhideUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); targetUnit.setHidden(false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java index d0d7a8815..602afa014 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -15,11 +14,10 @@ public class ABActionAddSecondaryAnimationTag implements ABSingleAction { private ABStringCallback tag; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); if (targetUnit.getUnitAnimationListener() - .addSecondaryTag(SecondaryTag.valueOf(this.tag.callback(game, caster, localStore, castId)))) { + .addSecondaryTag(SecondaryTag.valueOf(this.tag.callback(caster, localStore, castId)))) { targetUnit.getUnitAnimationListener().forceResetCurrentAnimation(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java index 51b1d80ab..757861dfd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java @@ -3,7 +3,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -22,23 +21,23 @@ public class ABActionPlayAnimation implements ABSingleAction { private ABBooleanCallback allowVariations; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); boolean f = true; float s = 1f; boolean av = false; if (this.force != null) { - f = this.force.callback(game, caster, localStore, castId); + f = this.force.callback(caster, localStore, castId); } if (this.speed != null) { - s = this.speed.callback(game, caster, localStore, castId); + s = this.speed.callback(caster, localStore, castId); } if (this.allowVariations != null) { - av = this.allowVariations.callback(game, caster, localStore, castId); + av = this.allowVariations.callback(caster, localStore, castId); } targetUnit.getUnitAnimationListener().playAnimation(f, - PrimaryTag.valueOf(this.tag.callback(game, caster, localStore, castId)), SequenceUtils.EMPTY, s, av); + PrimaryTag.valueOf(this.tag.callback(caster, localStore, castId)), SequenceUtils.EMPTY, s, av); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java index 146378974..c95b1463e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -18,15 +17,15 @@ public class ABActionQueueAnimation implements ABAction { private ABBooleanCallback allowVariations; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); boolean av = false; if (this.allowVariations != null) { - av = this.allowVariations.callback(game, caster, localStore, castId); + av = this.allowVariations.callback(caster, localStore, castId); } targetUnit.getUnitAnimationListener().queueAnimation( - PrimaryTag.valueOf(this.tag.callback(game, caster, localStore, castId)), SequenceUtils.EMPTY, av); + PrimaryTag.valueOf(this.tag.callback(caster, localStore, castId)), SequenceUtils.EMPTY, av); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java index c47634d9d..0f0141165 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -15,12 +14,11 @@ public class ABActionRemoveSecondaryAnimationTag implements ABSingleAction { private ABStringCallback tag; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); if (targetUnit.getUnitAnimationListener() - .removeSecondaryTag(SecondaryTag.valueOf(this.tag.callback(game, caster, localStore, castId)))) { + .removeSecondaryTag(SecondaryTag.valueOf(this.tag.callback(caster, localStore, castId)))) { targetUnit.getUnitAnimationListener().forceResetCurrentAnimation(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java index ce50b4c14..822758341 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,12 +13,12 @@ public class ABActionDivideUnitAlpha implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); - final float[] color = game.getUnitVertexColor(targetUnit); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + final float[] color = localStore.game.getUnitVertexColor(targetUnit); - game.changeUnitVertexColor(targetUnit, color[0], color[1], color[2], - color[3] / this.value.callback(game, caster, localStore, castId)); + localStore.game.changeUnitVertexColor(targetUnit, color[0], color[1], color[2], + color[3] / this.value.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java index 5a008f541..904cfccc6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,12 +13,12 @@ public class ABActionMultiplyUnitAlpha implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); - final float[] color = game.getUnitVertexColor(targetUnit); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + final float[] color = localStore.game.getUnitVertexColor(targetUnit); - game.changeUnitVertexColor(targetUnit, color[0], color[1], color[2], - color[3] * this.value.callback(game, caster, localStore, castId)); + localStore.game.changeUnitVertexColor(targetUnit, color[0], color[1], color[2], + color[3] * this.value.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java index 9dd860691..5d9cec697 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,12 +13,12 @@ public class ABActionSetUnitAlpha implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); - final float[] color = game.getUnitVertexColor(targetUnit); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + final float[] color = localStore.game.getUnitVertexColor(targetUnit); - game.changeUnitVertexColor(targetUnit, color[0], color[1], color[2], - this.value.callback(game, caster, localStore, castId)); + localStore.game.changeUnitVertexColor(targetUnit, color[0], color[1], color[2], + this.value.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java index 7f7f40a87..f177fd95d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.movement; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,9 +13,9 @@ public class ABActionSetUnitFlyHeight implements ABSingleAction { private ABFloatCallback height; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); - targetUnit.setFlyHeight(this.height.callback(game, caster, localStore, castId)); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + targetUnit.setFlyHeight(this.height.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java index 1ce6d0160..c0a911d6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.movement; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,10 +13,10 @@ public class ABActionSetUnitMovementTypeNoCollision implements ABSingleAction { private ABBooleanCallback active; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(game, caster, localStore, castId); + public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); if (this.active != null) { - targetUnit.setNoCollisionMovementType(this.active.callback(game, caster, localStore, castId)); + targetUnit.setNoCollisionMovementType(this.active.callback(caster, localStore, castId)); } else { targetUnit.setNoCollisionMovementType(true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java index 59db03bda..4bc14c026 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java @@ -3,7 +3,6 @@ import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; @@ -17,10 +16,9 @@ public class ABActionAddUnitToGroup implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final Set groupSet = this.group.callback(game, caster, localStore, castId); - final CUnit rUnit = this.unit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final Set groupSet = this.group.callback(caster, localStore, castId); + final CUnit rUnit = this.unit.callback(caster, localStore, castId); groupSet.add(rUnit); localStore.put(ABLocalStoreKeys.LASTADDEDUNIT, rUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java index a73079404..e0219534a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java @@ -4,7 +4,6 @@ import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -15,8 +14,7 @@ public class ABActionCreateUnitGroup implements ABSingleAction { private String name; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { final Set group = new HashSet<>(); if (this.name != null) { localStore.put("_unitgroup_" + this.name, group); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java index d068253df..ce2c8c867 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java @@ -3,7 +3,6 @@ import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; @@ -17,10 +16,9 @@ public class ABActionRemoveUnitFromGroup implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final Set groupSet = this.group.callback(game, caster, localStore, castId); - final CUnit rUnit = this.unit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final Set groupSet = this.group.callback(caster, localStore, castId); + final CUnit rUnit = this.unit.callback(caster, localStore, castId); groupSet.remove(rUnit); localStore.put(ABLocalStoreKeys.LASTREMOVEDDUNIT, rUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityEffectReactionListener.java index 60f48fc86..6fa5adb4f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityEffectReactionListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityEffectReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,9 @@ public class ABActionAddAbilityEffectReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityEffectReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.addAbilityEffectReactionListener(listener.callback(game, caster, localStore, castId)); + target.addAbilityEffectReactionListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityProjReactionListener.java index ee9c0ba9d..aebf1b7cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityProjReactionListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,9 @@ public class ABActionAddAbilityProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityProjReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.addAbilityProjReactionListener(listener.callback(game, caster, localStore, castId)); + target.addAbilityProjReactionListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java index 531dde276..37d8925d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionAddAttackPostDamageListener implements ABAction { private ABUnitCallback unit; private ABAttackPostDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = unit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = unit.callback(caster, localStore, castId); - target.addPostDamageListener(listener.callback(game, caster, localStore, castId)); + target.addPostDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPreDamageListener.java index 028af9dfc..bba1cdc18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPreDamageListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackPreDamageListenerPriorityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; @@ -15,11 +14,10 @@ public class ABActionAddAttackPreDamageListener implements ABAction { private ABAttackPreDamageListenerPriorityCallback priority; private ABAttackPreDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.addPreDamageListener(priority.callback(game, caster, localStore, castId), - listener.callback(game, caster, localStore, castId)); + target.addPreDamageListener(priority.callback(caster, localStore, castId), + listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackProjReactionListener.java index 5b733270a..bd4b476c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackProjReactionListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionAddAttackProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAttackProjReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.addAttackProjReactionListener(listener.callback(game, caster, localStore, castId)); + target.addAttackProjReactionListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddBehaviorChangeListener.java index 115af6bf9..4b047efe7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddBehaviorChangeListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABBehaviorChangeListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionAddBehaviorChangeListener implements ABAction { private ABUnitCallback unit; private ABBehaviorChangeListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = unit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = unit.callback(caster, localStore, castId); - target.addBehaviorChangeListener(listener.callback(game, caster, localStore, castId)); + target.addBehaviorChangeListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenListener.java index ad2522652..a8e767638 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionAddDamageTakenListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.addDamageTakenListener(listener.callback(game, caster, localStore, castId)); + target.addDamageTakenListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenModificationListener.java index 2995880a6..99e3a9818 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenModificationListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenModificationListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionAddDamageTakenModificationListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenModificationListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.addDamageTakenModificationListener(listener.callback(game, caster, localStore, castId)); + target.addDamageTakenModificationListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDeathReplacementEffect.java index 7fd9a7e63..bbe0063f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDeathReplacementEffect.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDeathReplacementPriorityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDeathReplacementCallback; @@ -15,10 +14,10 @@ public class ABActionAddDeathReplacementEffect implements ABAction { private ABDeathReplacementPriorityCallback priority; private ABDeathReplacementCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit targetUnit = target.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit targetUnit = target.callback(caster, localStore, castId); - targetUnit.addDeathReplacementEffect(priority.callback(game, caster, localStore, castId), listener.callback(game, caster, localStore, castId)); + targetUnit.addDeathReplacementEffect(priority.callback(caster, localStore, castId), listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddEvasionListener.java index 866b27212..8c0f0fdb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddEvasionListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABEvasionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionAddEvasionListener implements ABAction { private ABUnitCallback targetUnit; private ABEvasionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.addEvasionListener(listener.callback(game, caster, localStore, castId)); + target.addEvasionListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java index f08f8c9f3..375595bed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABUnitStateListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,11 +13,11 @@ public class ABActionAddUnitStateListener implements ABAction { private ABUnitCallback unit; private ABUnitStateListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = unit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = unit.callback(caster, localStore, castId); localStore.put(ABLocalStoreKeys.LASTSTATELISTENERADDEDUNIT, target); - target.addStateListener(listener.callback(game, caster, localStore, castId)); + target.addStateListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityEffectReactionListener.java index 6330f4f28..dd134ad05 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityEffectReactionListener.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -16,11 +15,10 @@ public class ABActionCreateAbilityEffectReactionListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { - ucid = useCastId.callback(game, caster, localStore, castId); + ucid = useCastId.callback(caster, localStore, castId); } ABAbilityEffectReactionListener listener = new ABAbilityEffectReactionListener(localStore, actions, castId, ucid); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityProjReactionListener.java index 3f33ff0e5..75bae8c56 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityProjReactionListener.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -16,11 +15,10 @@ public class ABActionCreateAbilityProjReactionListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { - ucid = useCastId.callback(game, caster, localStore, castId); + ucid = useCastId.callback(caster, localStore, castId); } ABAbilityProjReactionListener listener = new ABAbilityProjReactionListener(localStore, actions, castId, ucid); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java index 9524709ad..9d2f10632 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -18,11 +17,10 @@ public class ABActionCreateAttackPostDamageListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { - ucid = useCastId.callback(game, caster, localStore, castId); + ucid = useCastId.callback(caster, localStore, castId); } ABAttackPostDamageListener listener = new ABAttackPostDamageListener(localStore, priority, actions, castId, ucid); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPreDamageListener.java index ce244ae4d..6f50a88c8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPreDamageListener.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -16,11 +15,10 @@ public class ABActionCreateAttackPreDamageListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { - ucid = useCastId.callback(game, caster, localStore, castId); + ucid = useCastId.callback(caster, localStore, castId); } ABAttackPreDamageListener listener = new ABAttackPreDamageListener(localStore, actions, castId, ucid); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackProjReactionListener.java index 88ecf51c5..3243092c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackProjReactionListener.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -16,11 +15,10 @@ public class ABActionCreateAttackProjReactionListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { - ucid = useCastId.callback(game, caster, localStore, castId); + ucid = useCastId.callback(caster, localStore, castId); } ABAttackProjReactionListener listener = new ABAttackProjReactionListener(localStore, actions, castId, ucid); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateBehaviorChangeListener.java index 7e0301a5e..831db1546 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateBehaviorChangeListener.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -16,11 +15,10 @@ public class ABActionCreateBehaviorChangeListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { - ucid = useCastId.callback(game, caster, localStore, castId); + ucid = useCastId.callback(caster, localStore, castId); } ABBehaviorChangeListener listener = new ABBehaviorChangeListener(localStore, actions, castId, ucid); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java index ec83f4270..a367958b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -18,11 +17,10 @@ public class ABActionCreateDamageTakenListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { - ucid = useCastId.callback(game, caster, localStore, castId); + ucid = useCastId.callback(caster, localStore, castId); } ABDamageTakenListener listener = new ABDamageTakenListener(localStore, priority, actions, castId, ucid); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenModificationListener.java index b6187f839..052fce4ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenModificationListener.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -18,11 +17,10 @@ public class ABActionCreateDamageTakenModificationListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { - ucid = useCastId.callback(game, caster, localStore, castId); + ucid = useCastId.callback(caster, localStore, castId); } ABDamageTakenModificationListener listener = new ABDamageTakenModificationListener(localStore, priority, actions, castId, ucid); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDeathReplacementEffect.java index eb026a868..629cad50b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDeathReplacementEffect.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -16,11 +15,10 @@ public class ABActionCreateDeathReplacementEffect implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { - ucid = useCastId.callback(game, caster, localStore, castId); + ucid = useCastId.callback(caster, localStore, castId); } ABDeathReplacementEffect listener = new ABDeathReplacementEffect(localStore, actions, castId, ucid); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateEvasionListener.java index 334ed2e2f..01244132d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateEvasionListener.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -17,11 +16,10 @@ public class ABActionCreateEvasionListener implements ABAction { private List conditions; private ABBooleanCallback useCastId; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { - ucid = useCastId.callback(game, caster, localStore, castId); + ucid = useCastId.callback(caster, localStore, castId); } ABAttackEvasionListener listener = new ABAttackEvasionListener(localStore, conditions, castId, ucid); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java index 6026bcc27..b44eea6cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java @@ -3,7 +3,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -25,10 +24,9 @@ public class ABActionCreateUnitStateListener implements ABAction { private List onUpgradesChanged; private List onHideStateChanged; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - ABUnitStateListener modifier = new ABUnitStateListener(game, caster, localStore, castId, onLifeChanged, - onManaChanged, onOrdersChanged, onQueueChanged, onRallyPointChanged, onWaypointsChanged, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + ABUnitStateListener modifier = new ABUnitStateListener(localStore.game, caster, localStore, castId, + onLifeChanged, onManaChanged, onOrdersChanged, onQueueChanged, onRallyPointChanged, onWaypointsChanged, onHeroStatsChanged, onInventoryChanged, onAttacksChanged, onAbilitiesChanged, onUpgradesChanged, onHideStateChanged); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityEffectReactionListener.java index ef2a423c2..3bcfaf104 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityEffectReactionListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityEffectReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionRemoveAbilityEffectReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityEffectReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.removeAbilityEffectReactionListener(listener.callback(game, caster, localStore, castId)); + target.removeAbilityEffectReactionListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityProjReactionListener.java index 4f932c303..3857e8073 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityProjReactionListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,9 @@ public class ABActionRemoveAbilityProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityProjReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.removeAbilityProjReactionListener(listener.callback(game, caster, localStore, castId)); + target.removeAbilityProjReactionListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java index 3c4922a68..cbf0d3f63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionRemoveAttackPostDamageListener implements ABAction { private ABUnitCallback unit; private ABAttackPostDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = unit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = unit.callback(caster, localStore, castId); - target.removePostDamageListener(listener.callback(game, caster, localStore, castId)); + target.removePostDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java index d4e336fa8..a2d555925 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackPreDamageListenerPriorityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; @@ -15,11 +14,10 @@ public class ABActionRemoveAttackPreDamageListener implements ABAction { private ABAttackPreDamageListenerPriorityCallback priority; private ABAttackPreDamageListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.removePreDamageListener(priority.callback(game, caster, localStore, castId), - listener.callback(game, caster, localStore, castId)); + target.removePreDamageListener(priority.callback(caster, localStore, castId), + listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackProjReactionListener.java index 172c7f40a..088f358ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackProjReactionListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,9 @@ public class ABActionRemoveAttackProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAttackProjReactionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.removeAttackProjReactionListener(listener.callback(game, caster, localStore, castId)); + target.removeAttackProjReactionListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveBehaviorChangeListener.java index 10197c6b0..567f68d3d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveBehaviorChangeListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABBehaviorChangeListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,9 @@ public class ABActionRemoveBehaviorChangeListener implements ABAction { private ABUnitCallback unit; private ABBehaviorChangeListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CUnit target = unit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + CUnit target = unit.callback(caster, localStore, castId); - target.removeBehaviorChangeListener(listener.callback(game, caster, localStore, castId)); + target.removeBehaviorChangeListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java index 5c91985c5..8104e93a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionRemoveDamageTakenListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.removeDamageTakenListener(listener.callback(game, caster, localStore, castId)); + target.removeDamageTakenListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java index a57a771ab..a7b87b5a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenModificationListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionRemoveDamageTakenModificationListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenModificationListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.removeDamageTakenModificationListener(listener.callback(game, caster, localStore, castId)); + target.removeDamageTakenModificationListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDeathReplacementEffect.java index f5321f123..32e58fa48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDeathReplacementEffect.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDeathReplacementPriorityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDeathReplacementCallback; @@ -15,9 +14,9 @@ public class ABActionRemoveDeathReplacementEffect implements ABAction { private ABDeathReplacementPriorityCallback priority; private ABDeathReplacementCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - target.callback(game, caster, localStore, castId).removeDeathReplacementEffect( - priority.callback(game, caster, localStore, castId), listener.callback(game, caster, localStore, castId)); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + target.callback(caster, localStore, castId).removeDeathReplacementEffect( + priority.callback(caster, localStore, castId), listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java index 488c67f26..c7b784630 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABEvasionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionRemoveEvasionListener implements ABAction { private ABUnitCallback targetUnit; private ABEvasionListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); - target.removeEvasionListener(listener.callback(game, caster, localStore, castId)); + target.removeEvasionListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java index 39705af59..ac9b5256a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABUnitStateListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,10 +12,10 @@ public class ABActionRemoveUnitStateListener implements ABAction { private ABUnitCallback unit; private ABUnitStateListenerCallback listener; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - CUnit target = unit.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { + CUnit target = unit.callback(caster, localStore, castId); - target.removeStateListener(listener.callback(game, caster, localStore, castId)); + target.removeStateListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java index cdbd30fa3..1c5161653 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,10 +12,9 @@ public class ABActionDamageTakenModificationMultiplyDamageMultiplier implements private ABFloatCallback multiplier; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); - damage.addDamageMultiplier(multiplier.callback(game, caster, localStore, castId)); + damage.addDamageMultiplier(multiplier.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java index bb6577404..e1347cb99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,11 +12,10 @@ public class ABActionDamageTakenModificationSetDamageMultiplier implements ABAct private ABFloatCallback multiplier; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); - damage.setDamageMultiplier(multiplier.callback(game, caster, localStore, castId)); + damage.setDamageMultiplier(multiplier.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementFinishReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementFinishReincarnating.java index f43bb2caf..895373523 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementFinishReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementFinishReincarnating.java @@ -3,17 +3,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABActionDeathReplacementFinishReincarnating implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { caster.setFalseDeath(false); - game.getWorldCollision().addUnit(caster); + localStore.game.getWorldCollision().addUnit(caster); caster.getUnitAnimationListener().playAnimation(true, PrimaryTag.STAND, SequenceUtils.EMPTY, 1.0f, true); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReincarnating.java index 41f9a3724..06d7257a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReincarnating.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,8 +10,8 @@ public class ABActionDeathReplacementSetReincarnating implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnitDeathReplacementResult result = (CUnitDeathReplacementResult)localStore.get(ABLocalStoreKeys.DEATHRESULT+castId); CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking)localStore.get(ABLocalStoreKeys.DEATHSTACKING+castId); @@ -20,6 +19,6 @@ public void runAction(final CSimulation game, final CUnit caster, stacking.setAllowSamePriorityStacking(false); result.setReincarnating(true); caster.setFalseDeath(true); - game.getWorldCollision().removeUnit(caster); + localStore.game.getWorldCollision().removeUnit(caster); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java index e1ddca557..37c7f94f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,8 +10,8 @@ public class ABActionDeathReplacementSetReviving implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { CUnitDeathReplacementResult result = (CUnitDeathReplacementResult)localStore.get(ABLocalStoreKeys.DEATHRESULT+castId); CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking)localStore.get(ABLocalStoreKeys.DEATHSTACKING+castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java index 65827dd81..21202e03b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; @@ -31,21 +30,20 @@ public class ABActionPreDamageListenerAddBonusDamage implements ABAction { private ABBooleanCallback isNonlethal; private ABBooleanCallback isPassLimitedMagicImmune; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CDamageType theDamageType = null; if (damageType != null) { - theDamageType = damageType.callback(game, caster, localStore, castId); + theDamageType = damageType.callback(caster, localStore, castId); } CAttackType theAttackType = null; if (attackType != null) { - theAttackType = attackType.callback(game, caster, localStore, castId); + theAttackType = attackType.callback(caster, localStore, castId); } CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); CDamageFlags theFlags = null; - if (inheritFlags == null || inheritFlags.callback(game, caster, localStore, castId)) { + if (inheritFlags == null || inheritFlags.callback(caster, localStore, castId)) { theFlags = damage.getPrimaryDamageFlags().copy(); } else if (isRanged != null || isIgnoreInvulnerable != null || isExplode != null || isOnlyDamageSummons != null || isNonlethal != null || isPassLimitedMagicImmune != null) { @@ -53,27 +51,27 @@ public void runAction(final CSimulation game, final CUnit caster, final LocalDat if (isRanged == null) { ranged = damage.getPrimaryDamageFlags().isRanged(); } else { - ranged = isRanged.callback(game, caster, localStore, castId); + ranged = isRanged.callback(caster, localStore, castId); } theFlags = new CAttackDamageFlags(ranged); } if (isIgnoreInvulnerable != null) { - theFlags.setIgnoreInvulnerable(isIgnoreInvulnerable.callback(game, caster, localStore, castId)); + theFlags.setIgnoreInvulnerable(isIgnoreInvulnerable.callback(caster, localStore, castId)); } if (isExplode != null) { - theFlags.setExplode(isExplode.callback(game, caster, localStore, castId)); + theFlags.setExplode(isExplode.callback(caster, localStore, castId)); } if (isOnlyDamageSummons != null) { - theFlags.setOnlyDamageSummons(isOnlyDamageSummons.callback(game, caster, localStore, castId)); + theFlags.setOnlyDamageSummons(isOnlyDamageSummons.callback(caster, localStore, castId)); } if (isNonlethal != null) { - theFlags.setNonlethal(isNonlethal.callback(game, caster, localStore, castId)); + theFlags.setNonlethal(isNonlethal.callback(caster, localStore, castId)); } if (isPassLimitedMagicImmune != null) { - theFlags.setPassLimitedMagicImmune(isPassLimitedMagicImmune.callback(game, caster, localStore, castId)); + theFlags.setPassLimitedMagicImmune(isPassLimitedMagicImmune.callback(caster, localStore, castId)); } - damage.addBonusDamage(value.callback(game, caster, localStore, castId), theAttackType, theDamageType, theFlags); + damage.addBonusDamage(value.callback(caster, localStore, castId), theAttackType, theDamageType, theFlags); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java index 4e4f4fc70..c7d657498 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,10 +12,9 @@ public class ABActionPreDamageListenerAddDamageMultiplier implements ABAction { private ABFloatCallback value; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); - damage.addDamageMultiplier(value.callback(game, caster, localStore, castId)); + damage.addDamageMultiplier(value.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java index 0acccca9d..b1bedf373 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,8 +9,7 @@ public class ABActionPreDamageListenerLockDamageModifications implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); damage.lock(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java index 17d6dd5e0..d693fb5c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -13,12 +12,11 @@ public class ABActionPreDamageListenerSetMiss implements ABAction { private ABBooleanCallback miss; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); if (miss != null) { - damage.setMiss(miss.callback(game, caster, localStore, castId)); + damage.setMiss(miss.callback(caster, localStore, castId)); } else { damage.setMiss(true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionReactionPreventHit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionReactionPreventHit.java index 4de4945ac..d0c3732b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionReactionPreventHit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionReactionPreventHit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -9,8 +8,8 @@ public class ABActionReactionPreventHit implements ABAction { - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { localStore.put(ABLocalStoreKeys.REACTIONALLOWHIT+castId, false); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java index f6be5ee26..1d6a793f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -14,15 +13,14 @@ public class ABActionSetPreDamageStacking implements ABAction { private ABBooleanCallback allowStacking; private ABBooleanCallback allowSamePriorityStacking; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); - if (allowStacking != null && !allowStacking.callback(game, caster, localStore, castId)) { + if (allowStacking != null && !allowStacking.callback(caster, localStore, castId)) { damage.preventAllOtherModifications(); } if (allowSamePriorityStacking != null - && !allowSamePriorityStacking.callback(game, caster, localStore, castId)) { + && !allowSamePriorityStacking.callback(caster, localStore, castId)) { damage.preventOtherModificationsWithSamePriority(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java index c65f3b66c..daaa1b78b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -14,13 +13,13 @@ public class ABActionSubtractTotalDamageDealt implements ABAction { private ABFloatCallback amount; private ABFloatCallback minimum; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { float theMin = 0; if (minimum != null) { - theMin = minimum.callback(game, caster, localStore, castId); + theMin = minimum.callback(caster, localStore, castId); } CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); - damage.subtractTotalDamageDealt(amount.callback(game, caster, localStore, castId), theMin); + damage.subtractTotalDamageDealt(amount.callback(caster, localStore, castId), theMin); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java index 0320d70df..e46040242 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,7 +9,7 @@ public class ABCallbackGetAttackBaseDamage extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); return settings.getBaseDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java index d85e039db..47e4e0339 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,7 +9,7 @@ public class ABCallbackGetAttackMaximumSplashRadius extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); return Math.max(settings.getAreaOfEffectFullDamage(), Math.max(settings.getAreaOfEffectMediumDamage(), settings.getAreaOfEffectSmallDamage())); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java index 4d7337f0e..9fd81598f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetAttackType extends ABAttackTypeCallback { @Override - public CAttackType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CAttackType callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java index a9aab37ee..c63fe9f94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetDamageType extends ABDamageTypeCallback { @Override - public CDamageType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CDamageType callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().getDamageType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetFinalTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetFinalTotalDamageDealt.java index ccd15ca76..5063f48b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetFinalTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetFinalTotalDamageDealt.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,9 +9,9 @@ public class ABCallbackGetFinalTotalDamageDealt extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).computeFinalDamage(game, - caster); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)) + .computeFinalDamage(localStore.game, caster); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetNewBehaviorTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetNewBehaviorTarget.java index e69a77489..1ba123d58 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetNewBehaviorTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetNewBehaviorTarget.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks.ABTargetCallback; @@ -12,7 +11,7 @@ public class ABCallbackGetNewBehaviorTarget extends ABTargetCallback { @Override - public AbilityTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { CBehavior beh = (CBehavior) localStore.get(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + castId); AbilityTarget tar = beh.visit(BehaviorTargetVisitor.INSTANCE); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java index 41dda72c9..1e7d89392 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,7 +9,7 @@ public class ABCallbackGetRawTotalDamageDealt extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).computeRawTotalDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileAttackType.java index 52a576c56..f50e58343 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileAttackType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetReactionAttackProjectileAttackType extends ABAttackTypeCallback { @Override - public CAttackType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CAttackType callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ + castId)).getUnitAttack() .getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileDamage.java index 192590be8..41448d2fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileDamage.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,7 +9,7 @@ public class ABCallbackGetReactionAttackProjectileDamage extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ+castId)).getDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java index 9788bdd4c..9827f291c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetTriggeringAttackType extends ABAttackTypeCallback { @Override - public CAttackType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CAttackType callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java index ccd84d643..fffb4ec54 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetTriggeringDamageType extends ABDamageTypeCallback { @Override - public CDamageType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CDamageType callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).getPrimaryDamageType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java index 833747662..4e3225522 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetWeaponType extends ABWeaponTypeCallback { @Override - public CWeaponType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CWeaponType callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java index a27c9c4c7..a4259710e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -12,7 +11,7 @@ public class ABConditionIsAttackArtillery extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnitAttack attack = (CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId); if (attack instanceof CUnitAttackMissileSplash) { return ((CUnitAttackMissileSplash)attack).isArtillery(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java index 818dcdf69..ab83eddcd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,7 +9,7 @@ public class ABConditionIsAttackHoming extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); return settings.isProjectileHomingEnabled(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java index d6822d389..9fb6d2122 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -15,7 +14,7 @@ public class ABConditionIsNewBehaviorCategoryInList extends ABCondition { private List list; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, int castId) { CBehavior beh = (CBehavior) localStore.get(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + castId); CBehaviorCategory cat = CBehaviorCategory.IDLE; if (beh != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java index 3f7d040a2..3be2051ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,7 +9,7 @@ public class ABConditionIsTriggeringDamageAnAttack extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).getPrimaryDamageFlags() .isAttack(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java index 8818be7b4..79112716f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,7 +9,7 @@ public class ABConditionIsTriggeringDamageRanged extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getPrimaryDamageFlags().isRanged(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java index cfddafeca..184780ecc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java @@ -2,7 +2,6 @@ import java.util.EnumSet; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -22,7 +21,7 @@ public class ABConditionIsUnitValidSplashDamageTarget extends ABCondition { private ABBooleanCallback targetedEffect; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; @@ -37,16 +36,16 @@ public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore local if (targetsAllowed.isEmpty()) { return true; } - final CUnit theUnit = this.unit.callback(game, casterUnit, localStore, castId); + final CUnit theUnit = this.unit.callback(casterUnit, localStore, castId); boolean te = false; if (this.caster != null) { - theCaster = this.caster.callback(game, casterUnit, localStore, castId); + theCaster = this.caster.callback(casterUnit, localStore, castId); } if (this.targetedEffect != null) { - te = this.targetedEffect.callback(game, theCaster, localStore, castId); + te = this.targetedEffect.callback(theCaster, localStore, castId); } - return theUnit.canBeTargetedBy(game, theCaster, te, targetsAllowed, + return theUnit.canBeTargetedBy(localStore.game, theCaster, te, targetsAllowed, BooleanAbilityTargetCheckReceiver.getInstance().reset()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java index 8c11b82a4..3e897be48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java @@ -3,7 +3,6 @@ import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; @@ -17,11 +16,10 @@ public class ABActionAddUnitToQueue implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final Queue groupQueue = this.queue.callback(game, caster, localStore, castId); - final CUnit rUnit = this.unit.callback(game, caster, localStore, castId); + final Queue groupQueue = this.queue.callback(caster, localStore, castId); + final CUnit rUnit = this.unit.callback(caster, localStore, castId); groupQueue.add(rUnit); localStore.put(ABLocalStoreKeys.LASTADDEDUNIT, rUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java index 7973618aa..56322fd17 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java @@ -3,7 +3,6 @@ import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -14,10 +13,9 @@ public class ABActionClearUnitQueue implements ABSingleAction { private ABUnitQueueCallback queue; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final Queue groupQueue = this.queue.callback(game, caster, localStore, castId); + final Queue groupQueue = this.queue.callback(caster, localStore, castId); groupQueue.clear(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java index 890582838..c88f9256e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java @@ -4,7 +4,6 @@ import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; @@ -15,8 +14,7 @@ public class ABActionCreateUnitQueue implements ABSingleAction { private String name; @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { final Queue queue = new LinkedList<>(); if (this.name != null) { localStore.put("_unitqueue_" + this.name, queue); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java index 1a2631ba9..a079a8f88 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java @@ -3,7 +3,6 @@ import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; @@ -17,11 +16,10 @@ public class ABActionRemoveUnitFromQueue implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final Queue groupQueue = this.queue.callback(game, caster, localStore, castId); - final CUnit rUnit = this.unit.callback(game, caster, localStore, castId); + final Queue groupQueue = this.queue.callback(caster, localStore, castId); + final CUnit rUnit = this.unit.callback(caster, localStore, castId); groupQueue.remove(rUnit); localStore.put(ABLocalStoreKeys.LASTREMOVEDDUNIT, rUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java index cd153a50e..979127888 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,12 +13,11 @@ public class ABActionAddStateModBuff implements ABAction { private ABUnitCallback targetUnit; private ABStateModBuffCallback buff; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); - StateModBuff theBuff = buff.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + StateModBuff theBuff = buff.callback(caster, localStore, castId); target.addStateModBuff(theBuff); - target.computeUnitState(game, theBuff.getBuffType()); + target.computeUnitState(localStore.game, theBuff.getBuffType()); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java index 3c88c813c..aaf9413ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.ABLongCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -15,11 +14,11 @@ public class ABActionCreateStateModBuff implements ABAction { private StateModBuffType buffType; private ABLongCallback value; - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final LocalDataStore localStore, + final int castId) { StateModBuff buff = null; if (value != null) { - buff = new StateModBuff(buffType, value.callback(game, caster, localStore, castId)); + buff = new StateModBuff(buffType, value.callback(caster, localStore, castId)); } else { buff = new StateModBuff(buffType, 1); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java index da4f29ed1..902280bdf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,12 +13,11 @@ public class ABActionRemoveStateModBuff implements ABAction { private ABUnitCallback targetUnit; private ABStateModBuffCallback buff; - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(game, caster, localStore, castId); - StateModBuff theBuff = buff.callback(game, caster, localStore, castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + StateModBuff theBuff = buff.callback(caster, localStore, castId); target.removeStateModBuff(theBuff); - target.computeUnitState(game, theBuff.getBuffType()); + target.computeUnitState(localStore.game, theBuff.getBuffType()); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java index 57a3435f0..c4abb0564 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,11 +13,10 @@ public class ABActionSetUnitFadeTimer implements ABAction { private ABTimerCallback timer; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final CUnit target = this.targetUnit.callback(game, caster, localStore, castId); - final CTimer theTimer = this.timer.callback(game, caster, localStore, castId); + final CUnit target = this.targetUnit.callback(caster, localStore, castId); + final CTimer theTimer = this.timer.callback(caster, localStore, castId); target.setFadeTimer(theTimer); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java index a5223adaa..9e28ca0f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.ABLongCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; @@ -15,11 +14,10 @@ public class ABActionUpdateStateModBuff implements ABAction { private ABLongCallback value; @Override - public void runAction(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final StateModBuff buffObj = this.buff.callback(game, caster, localStore, castId); - buffObj.setValue(this.value.callback(game, caster, localStore, castId)); + final StateModBuff buffObj = this.buff.callback(caster, localStore, castId); + buffObj.setValue(this.value.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java index 4ba6417c2..1e1a43703 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -22,20 +21,20 @@ public class ABActionCreateLocationVisionModifier implements ABAction { private ABPlayerCallback player; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, int castId) { CFogModifier vision; - final AbilityPointTarget loc = this.location.callback(game, caster, localStore, castId); + final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); if (this.duration == null) { - vision = new CCircleFogModifier(CFogState.VISIBLE, this.radius.callback(game, caster, localStore, castId), + vision = new CCircleFogModifier(CFogState.VISIBLE, this.radius.callback(caster, localStore, castId), loc.getX(), loc.getY()); } else { vision = new CTimedCircleFogModifier(CFogState.VISIBLE, - this.radius.callback(game, caster, localStore, castId), loc.getX(), loc.getY(), - this.duration.callback(game, caster, localStore, castId)); + this.radius.callback(caster, localStore, castId), loc.getX(), loc.getY(), + this.duration.callback(caster, localStore, castId)); } if (this.player != null) { - this.player.callback(game, caster, localStore, castId).addFogModifer(game, vision, false); + this.player.callback(caster, localStore, castId).addFogModifer(localStore.game, vision, false); } localStore.put(ABLocalStoreKeys.LASTCREATEDVISIONMODIFIER, vision); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java index c704732e9..3888ec84d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; @@ -17,12 +16,12 @@ public class ABActionCreateProjectileVisionModifier implements ABAction { private ABFloatCallback radius; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, int castId) { final CProjectileVisionFogModifier vision = new CProjectileVisionFogModifier( - this.projectile.callback(game, caster, localStore, castId), - radius.callback(game, caster, localStore, castId)); + this.projectile.callback(caster, localStore, castId), + radius.callback(caster, localStore, castId)); if (this.player != null) { - this.player.callback(game, caster, localStore, castId).addFogModifer(game, vision, false); + this.player.callback(caster, localStore, castId).addFogModifer(localStore.game, vision, false); } localStore.put(ABLocalStoreKeys.LASTCREATEDVISIONMODIFIER, vision); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java index 9b8c49120..e7e6e9a97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; @@ -17,16 +16,16 @@ public class ABActionCreateUnitVisionModifier implements ABAction { private ABBooleanCallback alwaysNightVision; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, int castId) { boolean alwaysNight = false; if (this.alwaysNightVision != null) { - alwaysNight = this.alwaysNightVision.callback(game, caster, localStore, castId); + alwaysNight = this.alwaysNightVision.callback(caster, localStore, castId); } - final CUnitVisionFogModifier vision = new CUnitVisionFogModifier( - this.unit.callback(game, caster, localStore, castId), alwaysNight); + final CUnitVisionFogModifier vision = new CUnitVisionFogModifier(this.unit.callback(caster, localStore, castId), + alwaysNight); if (this.player != null) { - this.player.callback(game, caster, localStore, castId).addFogModifer(game, vision, false); + this.player.callback(caster, localStore, castId).addFogModifer(localStore.game, vision, false); } localStore.put(ABLocalStoreKeys.LASTCREATEDVISIONMODIFIER, vision); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java index 70ad3a0e0..b8972b82d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier.ABVisionModifierCallback; @@ -13,8 +12,9 @@ public class ABActionRemoveVisionModifier implements ABAction { private ABPlayerCallback player; @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - player.callback(game, caster, localStore, castId).removeFogModifer(game, modifier.callback(game, caster, localStore, castId)); + public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + player.callback(caster, localStore, castId).removeFogModifer(localStore.game, + modifier.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java index 1a2689a5b..ba0b2dbf4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,7 @@ public class ABActionSetBurrowPlaceholder implements ABAction { @Override - public void runAction(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, LocalDataStore localStore, int castId) { // TODO Auto-generated method stub } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java index 880ff32da..6e90f3ca3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackNull implements ABCallback { @Override - public Object callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Object callback(CUnit caster, LocalDataStore localStore, final int castId) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABAbilityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABAbilityCallback.java index 3e23be429..cd2659115 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABAbilityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABAbilityCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -8,7 +7,6 @@ public abstract class ABAbilityCallback implements ABCallback { - abstract public CAbility callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CAbility callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java index 06a9b4c1a..fe75c16b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,12 +13,11 @@ public class ABCallbackArgumentAbility extends ABAbilityCallback { private ABStringCallback name; @Override - public CAbility callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public CAbility callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABAbilityCallback) { - return ((ABAbilityCallback) cbck).callback(game, caster, localStore, castId); + return ((ABAbilityCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseAbilityCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java index 83c542c1e..e05fb30be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; @@ -14,13 +13,13 @@ public class ABCallbackGetAbilityById extends ABAbilityCallback { private ABUnitCallback unit; @Override - public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { - theUnit = this.unit.callback(game, caster, localStore, castId); + theUnit = this.unit.callback(caster, localStore, castId); } return theUnit.getAbility( - GetABAbilityByRawcodeVisitor.getInstance().reset(this.id.callback(game, caster, localStore, castId))); + GetABAbilityByRawcodeVisitor.getInstance().reset(this.id.callback(caster, localStore, castId))); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java index 672b6dca6..94cc051c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -11,8 +10,8 @@ public class ABCallbackGetBuffSourceAbility extends ABAbilityCallback { private ABBuffCallback buff; @Override - public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return buff.callback(game, caster, localStore, castId).getSourceAbility(); + public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { + return buff.callback(caster, localStore, castId).getSourceAbility(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetLastCreatedAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetLastCreatedAbility.java index 38ce371bc..00052befe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetLastCreatedAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetLastCreatedAbility.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetLastCreatedAbility extends ABAbilityCallback { @Override - public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.LASTCREATEDABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java index 116ccbca4..0c71b01f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetMatchingAbility extends ABAbilityCallback { @Override - public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.MATCHINGABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetPartnerAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetPartnerAbility.java index 68551979b..2dded676e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetPartnerAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetPartnerAbility.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetPartnerAbility extends ABAbilityCallback { @Override - public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.LASTPARTNERABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetReactionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetReactionAbility.java index ddbf376e8..9751e5680 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetReactionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetReactionAbility.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetReactionAbility extends ABAbilityCallback { @Override - public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.REACTIONABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetStoredAbilityByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetStoredAbilityByKey.java index 16bb24cb5..9620c1a0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetStoredAbilityByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetStoredAbilityByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -15,14 +14,14 @@ public class ABCallbackGetStoredAbilityByKey extends ABAbilityCallback { private ABBooleanCallback instanceValue; @Override - public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CAbility) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (CAbility) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java index 8c9e3b9dd..b01730bee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetThisAbility extends ABAbilityCallback { @Override - public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.ABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java index 4c724f78f..31f58a73b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionAbility extends ABAbilityCallback { private ABAbilityCallback fail; @Override - public CAbility callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public CAbility callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java index 4c27180bd..3314f43b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -16,15 +15,14 @@ public class ABCallbackReuseAbility extends ABAbilityCallback { private ABStringCallback name; @Override - public CAbility callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CAbility callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABAbilityCallback) { - return ((ABAbilityCallback) callback).callback(game, caster, localStore, castId); + return ((ABAbilityCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseAbilityCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbilityWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbilityWithArguments.java index f54853d31..85fb5ac55 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbilityWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbilityWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -19,12 +18,11 @@ public class ABCallbackReuseAbilityWithArguments extends ABAbilityCallback { private Map arguments; @Override - public CAbility callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CAbility callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABAbilityCallback) { @@ -34,7 +32,7 @@ public CAbility callback(final CSimulation game, final CUnit caster, } } - return ((ABAbilityCallback) callback).callback(game, caster, localStore, castId); + return ((ABAbilityCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseAbilityCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java index b0fa1b0f9..8a73a4a5f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABAttackModifierCallback implements ABCallback { - abstract public ABAttackModifier callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABAttackModifier callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java index 44adb0991..c24ace5e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedAttackModifier extends ABAttackModifierCallback { @Override - public ABAttackModifier callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public ABAttackModifier callback(CUnit caster, LocalDataStore localStore, final int castId) { return (ABAttackModifier) localStore.get(ABLocalStoreKeys.LASTCREATEDAMod); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java index 1be5c4dfa..54f5c6e27 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,13 +12,13 @@ public class ABCallbackGetStoredAttackModifierByKey extends ABAttackModifierCall private ABBooleanCallback instanceValue; @Override - public ABAttackModifier callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public ABAttackModifier callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABAttackModifier) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (ABAttackModifier) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java index d0b88c7db..fa7837264 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABAttackSettingsCallback implements ABCallback { - abstract public CUnitAttackSettings callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public CUnitAttackSettings callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java index 448d877a7..09ebca90d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetCurrentAttackSettings extends ABAttackSettingsCallback { @Override - public CUnitAttackSettings callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnitAttackSettings callback(CUnit caster, LocalDataStore localStore, final int castId) { System.err.println("Getting: " + localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId)); return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java index 1c4e37d97..d9001d6b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedAttackSettings extends ABAttackSettingsCallback { @Override - public CUnitAttackSettings callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnitAttackSettings callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.LASTCREATEDASettings); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java index 5eb729504..a02a4d1d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,11 +12,11 @@ public class ABCallbackGetStoredAttackSettingsByKey extends ABAttackSettingsCall private ABBooleanCallback instanceValue; @Override - public CUnitAttackSettings callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public CUnitAttackSettings callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABBooleanCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABBooleanCallback.java index 50120bca5..6dfdb80d7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABBooleanCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABBooleanCallback.java @@ -1,12 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABBooleanCallback implements ABCallback { - abstract public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java index ddbb24159..d2b05fe2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -17,7 +16,7 @@ public class ABCallbackGetAbilityDataAsBoolean extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java index 479f488ad..5442a8775 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; @@ -15,13 +14,12 @@ public class ABCallbackGetAbilityUniqueValueBoolean extends ABBooleanCallback { private ABBooleanCallback allowNull; @Override - public Boolean callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = key.callback(game, caster, localStore, castId); - final CAbility theAbility = ability.callback(game, caster, localStore, castId); + final String keyS = key.callback(caster, localStore, castId); + final CAbility theAbility = ability.callback(caster, localStore, castId); Boolean theVal = theAbility.getUniqueValue(keyS, Boolean.class); - if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + if (theVal != null || (allowNull != null && allowNull.callback(caster, localStore, castId))) { return theVal; } return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java index 05bf4fa06..fe51ccae3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -15,12 +14,11 @@ public class ABCallbackGetBuffUniqueValueBoolean extends ABBooleanCallback { private ABBooleanCallback allowNull; @Override - public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = key.callback(game, caster, localStore, castId); - final CBuff theBuff = buff.callback(game, caster, localStore, castId); + public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = key.callback(caster, localStore, castId); + final CBuff theBuff = buff.callback(caster, localStore, castId); Boolean theVal = theBuff.getUniqueValue(keyS, Boolean.class); - if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + if (theVal != null || (allowNull != null && allowNull.callback(caster, localStore, castId))) { return theVal; } return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java index fbf513eb8..afc598163 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -17,14 +16,14 @@ public class ABCallbackGetParentAbilityDataAsBoolean extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.PARENTLEVELDATA); final int parentLevel = (int) ((LocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) .get(ABLocalStoreKeys.CURRENTLEVEL); final String data = levelData.get(parentLevel - 1).getData() - .get(this.dataField.callback(game, caster, localStore, castId)); + .get(this.dataField.callback(caster, localStore, castId)); final int parsedData = Integer.parseInt(data); return parsedData == 1; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java index 2abd29853..db69c9733 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -14,14 +13,14 @@ public class ABCallbackGetStoredBooleanByKey extends ABCondition { private ABBooleanCallback instanceValue; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Boolean) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (Boolean) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java index 7039075fc..6803f951a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,11 +11,11 @@ public class ABCallbackInlineConditionBoolean extends ABBooleanCallback { private ABBooleanCallback fail; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castBoolean) { - if (condition != null && condition.callback(game, caster, localStore, castBoolean)) { - return pass.callback(game, caster, localStore, castBoolean); + public Boolean callback(CUnit caster, LocalDataStore localStore, int castBoolean) { + if (condition != null && condition.callback(caster, localStore, castBoolean)) { + return pass.callback(caster, localStore, castBoolean); } - return fail.callback(game, caster, localStore, castBoolean); + return fail.callback(caster, localStore, castBoolean); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java index fdde7ee18..74bc000f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,8 +11,8 @@ public class ABCallbackIntegerToBoolean extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return this.value.callback(game, caster, localStore, castId) != 0; + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + return this.value.callback(caster, localStore, castId) != 0; } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java index e01aceab4..a34e0a3be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,7 @@ public class ABCallbackRawBoolean extends ABCondition { private Boolean value; @Override - public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABBuffCallback.java index 5522f6e29..1194537d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABBuffCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -8,7 +7,6 @@ public abstract class ABBuffCallback implements ABCallback { - abstract public CBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java index bff8ebf55..28056c226 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,13 +13,12 @@ public class ABCallbackArgumentBuff extends ABBuffCallback { private ABStringCallback name; @Override - public CBuff callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABBuffCallback) { - return ((ABBuffCallback) cbck).callback(game, caster, localStore, castId); + return ((ABBuffCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseBuffCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java index 2ab69e815..51bd63229 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,8 +10,7 @@ public class ABCallbackEnumBuff extends ABBuffCallback { @Override - public CBuff callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.ENUMBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java index 93d97eb26..53c5d7315 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; @@ -15,9 +14,9 @@ public class ABCallbackGetBuffById extends ABBuffCallback { private ABIDCallback id; @Override - public CBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CUnit theUnit = unit.callback(game, caster, localStore, castId); - War3ID theId = id.callback(game, caster, localStore, castId); + public CBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + CUnit theUnit = unit.callback(caster, localStore, castId); + War3ID theId = id.callback(caster, localStore, castId); if (theUnit != null) { for (CAbility ability : theUnit.getAbilities()) { if (ability instanceof CBuff) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetLastCreatedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetLastCreatedBuff.java index a609a2c4f..dabdab1bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetLastCreatedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetLastCreatedBuff.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,8 +10,7 @@ public class ABCallbackGetLastCreatedBuff extends ABBuffCallback { @Override - public CBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java index 58967e5bc..cb4f19c2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,8 +10,7 @@ public class ABCallbackGetMatchingBuff extends ABBuffCallback { @Override - public CBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.MATCHINGBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetStoredBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetStoredBuffByKey.java index 2ac981e87..e6cfd8d58 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetStoredBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetStoredBuffByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -15,14 +14,14 @@ public class ABCallbackGetStoredBuffByKey extends ABBuffCallback { private ABBooleanCallback instanceValue; @Override - public CBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public CBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CBuff) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (CBuff) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java index 636d232dc..eb00a0086 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionBuff extends ABBuffCallback { private ABBuffCallback fail; @Override - public CBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public CBuff callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java index fd4f1ecfc..372d7febd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -16,16 +15,15 @@ public class ABCallbackReuseBuff extends ABBuffCallback { private ABStringCallback name; @Override - public CBuff callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABBuffCallback) { - return ((ABBuffCallback) callback).callback(game, caster, localStore, castId); + return ((ABBuffCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseBuffCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java index 202fdd439..7674eb6b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -19,11 +18,10 @@ public class ABCallbackReuseBuffWithArguments extends ABBuffCallback { private Map arguments; @Override - public CBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABBuffCallback) { @@ -33,7 +31,7 @@ public CBuff callback(final CSimulation game, final CUnit caster, final LocalDat } } - return ((ABBuffCallback) callback).callback(game, caster, localStore, castId); + return ((ABBuffCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseBuffCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackThisBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackThisBuff.java index 68f9f5523..edc839f62 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackThisBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackThisBuff.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,8 +10,7 @@ public class ABCallbackThisBuff extends ABBuffCallback { @Override - public CBuff callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.BUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java index bbff8a729..edec21910 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,13 +13,12 @@ public class ABCallbackArgumentDestructable extends ABDestructableCallback { private ABStringCallback name; @Override - public CDestructable callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CDestructable callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABDestructableCallback) { - return ((ABDestructableCallback) cbck).callback(game, caster, localStore, castId); + return ((ABDestructableCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseDestructableCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java index 03b6fa60b..10f99892c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetAbilityTargetedDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructable callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java index bfc8e0dc2..853a9ca6d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; @@ -11,7 +10,7 @@ public class ABCallbackGetAttackedDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructable callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.DESTRUCTABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java index 7d0ba5992..f2ca02f67 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetEnumDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructable callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.ENUMDESTRUCTABLE+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java index b4a4b7e00..b760286cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructable callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.LASTCREATEDDESTRUCTABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java index fd0d0c2ef..fdeb96519 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetProjectileHitDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructable callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.PROJECTILEHITDEST+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java index 364b20541..09a1b7f71 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -15,16 +14,15 @@ public class ABCallbackGetStoredDestructableByKey extends ABDestructableCallback private ABBooleanCallback instanceValue; @Override - public CDestructable callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CDestructable callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CDestructable) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (CDestructable) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java index 1ea9847e9..beb5130c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionDestructable extends ABDestructableCallbac private ABDestructableCallback fail; @Override - public CDestructable callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public CDestructable callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java index a48ffae99..a8609c128 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,16 +15,15 @@ public class ABCallbackReuseDestructable extends ABDestructableCallback { private ABStringCallback name; @Override - public CDestructable callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CDestructable callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABDestructableCallback) { - return ((ABDestructableCallback) callback).callback(game, caster, localStore, castId); + return ((ABDestructableCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseDestructableCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java index 840de23da..cc62a8aba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,12 +18,11 @@ public class ABCallbackReuseDestructableWithArguments extends ABDestructableCall private Map arguments; @Override - public CDestructable callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CDestructable callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABDestructableCallback) { @@ -34,7 +32,7 @@ public CDestructable callback(final CSimulation game, final CUnit caster, } } - return ((ABDestructableCallback) callback).callback(game, caster, localStore, castId); + return ((ABDestructableCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseDestructableCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java index 79f32b3c4..598833c98 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java @@ -1,14 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABDestructableCallback implements ABCallback { - abstract public CDestructable callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CDestructable callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java index 91534f065..28e4ff310 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,12 +13,11 @@ public class ABCallbackArgumentDestructableBuff extends ABDestructableBuffCallba private ABStringCallback name; @Override - public CDestructableBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public CDestructableBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABDestructableBuffCallback) { - return ((ABDestructableBuffCallback) cbck).callback(game, caster, localStore, castId); + return ((ABDestructableBuffCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java index a94240205..42ce959a6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -9,7 +8,7 @@ public class ABCallbackEnumDestructableBuff extends ABDestructableBuffCallback { @Override - public CDestructableBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructableBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructableBuff) localStore.get(ABLocalStoreKeys.ENUMDESTBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java index 8b6c891fb..bb60f3a42 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedDestructableBuff extends ABDestructableBuffCallback { @Override - public CDestructableBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructableBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructableBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDDESTBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java index 2c5439e30..9b98f9476 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -14,11 +13,11 @@ public class ABCallbackGetStoredDestructableBuffByKey extends ABDestructableBuff private ABBooleanCallback instanceValue; @Override - public CDestructableBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (CDestructableBuff) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public CDestructableBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (CDestructableBuff) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (CDestructableBuff) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (CDestructableBuff) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java index 9395a8b4b..8e60f9c61 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionDestructableBuff extends ABDestructableBuf private ABDestructableBuffCallback fail; @Override - public CDestructableBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public CDestructableBuff callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java index bafed857a..07475df1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -9,7 +8,7 @@ public class ABCallbackMatchingDestructableBuff extends ABDestructableBuffCallback { @Override - public CDestructableBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructableBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CDestructableBuff) localStore.get(ABLocalStoreKeys.MATCHINGDESTBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java index e285e5adc..c209f3355 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -16,16 +15,15 @@ public class ABCallbackReuseDestructableBuff extends ABDestructableBuffCallback private ABStringCallback name; @Override - public CDestructableBuff callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CDestructableBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABDestructableBuffCallback) { - return ((ABDestructableBuffCallback) callback).callback(game, caster, localStore, castId); + return ((ABDestructableBuffCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java index 91f844484..c31a7f15b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -19,11 +18,10 @@ public class ABCallbackReuseDestructableBuffWithArguments extends ABDestructable private Map arguments; @Override - public CDestructableBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CDestructableBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABDestructableBuffCallback) { @@ -33,7 +31,7 @@ public CDestructableBuff callback(final CSimulation game, final CUnit caster, fi } } - return ((ABDestructableBuffCallback) callback).callback(game, caster, localStore, castId); + return ((ABDestructableBuffCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java index c8fa8083d..2fbabdf07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -8,7 +7,7 @@ public abstract class ABDestructableBuffCallback implements ABCallback { - abstract public CDestructableBuff callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public CDestructableBuff callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackPreDamageListenerPriorityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackPreDamageListenerPriorityCallback.java index 482289461..e73078332 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackPreDamageListenerPriorityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackPreDamageListenerPriorityCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABAttackPreDamageListenerPriorityCallback implements ABCallback { - abstract public CUnitAttackPreDamageListenerPriority callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public CUnitAttackPreDamageListenerPriority callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackTypeCallback.java index 4e2acabc9..1aae734f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackTypeCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,5 @@ public abstract class ABAttackTypeCallback implements ABCallback { - abstract public CAttackType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CAttackType callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAutocastTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAutocastTypeCallback.java index cfa2fbcd1..e01508e99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAutocastTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAutocastTypeCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -8,7 +7,6 @@ public abstract class ABAutocastTypeCallback implements ABCallback { - abstract public AutocastType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public AutocastType callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java index 210573d0c..3a499dab8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,11 +12,11 @@ public class ABCallbackConditionalAutocastType extends ABAutocastTypeCallback { private ABAutocastTypeCallback value2; @Override - public AutocastType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (condition.callback(game, caster, localStore, castId)) { - return value1.callback(game, caster, localStore, castId); + public AutocastType callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (condition.callback(caster, localStore, castId)) { + return value1.callback(caster, localStore, castId); } - return value2.callback(game, caster, localStore, castId); + return value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAttackTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAttackTypeFromString.java index 1a79a7d53..8a7c87613 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAttackTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAttackTypeFromString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,8 @@ public class ABCallbackGetAttackTypeFromString extends ABAttackTypeCallback { private ABStringCallback id; @Override - public CAttackType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return CAttackType.valueOf(id.callback(game, caster, localStore, castId)); + public CAttackType callback(CUnit caster, LocalDataStore localStore, final int castId) { + return CAttackType.valueOf(id.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAutocastTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAutocastTypeFromString.java index f0baeffb5..3e0f408c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAutocastTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAutocastTypeFromString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -11,8 +10,8 @@ public class ABCallbackGetAutocastTypeFromString extends ABAutocastTypeCallback private ABStringCallback id; @Override - public AutocastType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return AutocastType.valueOf(id.callback(game, caster, localStore, castId)); + public AutocastType callback(CUnit caster, LocalDataStore localStore, final int castId) { + return AutocastType.valueOf(id.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDamageTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDamageTypeFromString.java index 1ca7440ff..588d28f02 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDamageTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDamageTypeFromString.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABCallbackRawString; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,10 +12,9 @@ public class ABCallbackGetDamageTypeFromString extends ABDamageTypeCallback { private ABStringCallback id; @Override - public CDamageType callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CDamageType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - return CDamageType.valueOf(this.id.callback(game, caster, localStore, castId)); + return CDamageType.valueOf(this.id.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java index 73101ed40..5344906a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,10 +10,9 @@ public class ABCallbackGetDefenseTypeFromString extends ABDefenseTypeCallback { private ABStringCallback id; @Override - public CDefenseType callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CDefenseType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - return CDefenseType.valueOf(this.id.callback(game, caster, localStore, castId)); + return CDefenseType.valueOf(this.id.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java index 0095a7a16..afa395111 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,9 +10,8 @@ public class ABCallbackGetMovementTypeFromString extends ABMovementTypeCallback private ABStringCallback id; @Override - public MovementType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - return MovementType.valueOf(this.id.callback(game, caster, localStore, castId)); + public MovementType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + return MovementType.valueOf(this.id.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetNonStackingStatBuffTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetNonStackingStatBuffTypeFromString.java index f05d70ff4..42738da06 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetNonStackingStatBuffTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetNonStackingStatBuffTypeFromString.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABCallbackRawString; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,9 +12,9 @@ public class ABCallbackGetNonStackingStatBuffTypeFromString extends ABNonStackin private ABStringCallback id; @Override - public NonStackingStatBuffType callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - return NonStackingStatBuffType.valueOf(this.id.callback(game, caster, localStore, castId)); + public NonStackingStatBuffType callback(final CUnit caster, final LocalDataStore localStore, + final int castId) { + return NonStackingStatBuffType.valueOf(this.id.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java index cde84d006..7dfffb40e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,14 +13,13 @@ public class ABCallbackGetStoredAttackTypeByKey extends ABAttackTypeCallback { private ABBooleanCallback instanceValue; @Override - public CAttackType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public CAttackType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CAttackType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (CAttackType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java index 45d0f7ad5..088c1eb60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,16 +13,15 @@ public class ABCallbackGetStoredDamageTypeByKey extends ABDamageTypeCallback { private ABBooleanCallback instanceValue; @Override - public CDamageType callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CDamageType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CDamageType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (CDamageType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java index 60ef5b57f..e8533a139 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,16 +13,15 @@ public class ABCallbackGetStoredDefenseTypeByKey extends ABDefenseTypeCallback { private ABBooleanCallback instanceValue; @Override - public CDefenseType callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CDefenseType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CDefenseType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (CDefenseType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java index 143a43c96..8b3c3a38e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,16 +13,15 @@ public class ABCallbackGetStoredMovementTypeByKey extends ABMovementTypeCallback private ABBooleanCallback instanceValue; @Override - public MovementType callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public MovementType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (MovementType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (MovementType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java index badbb2f19..9b4c2183f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,14 +13,13 @@ public class ABCallbackGetStoredTargetTypeByKey extends ABTargetTypeCallback { private ABBooleanCallback instanceValue; @Override - public CTargetType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public CTargetType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CTargetType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (CTargetType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java index ddbb74dc8..258fd2442 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,14 +13,13 @@ public class ABCallbackGetStoredWeaponTypeByKey extends ABWeaponTypeCallback { private ABBooleanCallback instanceValue; @Override - public CWeaponType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public CWeaponType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CWeaponType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (CWeaponType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java index a457f64b9..77c1be20e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,10 +10,9 @@ public class ABCallbackGetTargetTypeFromString extends ABTargetTypeCallback { private ABStringCallback id; @Override - public CTargetType callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CTargetType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - return CTargetType.valueOf(this.id.callback(game, caster, localStore, castId)); + return CTargetType.valueOf(this.id.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java index 8b903ba2d..773936441 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,9 +10,8 @@ public class ABCallbackGetUnitDefenseType extends ABDefenseTypeCallback { private ABUnitCallback unit; @Override - public CDefenseType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - return unit.callback(game, caster, localStore, castId).getDefenseType(); + public CDefenseType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + return unit.callback(caster, localStore, castId).getDefenseType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java index 359da7370..42ac0dcdd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,10 +10,9 @@ public class ABCallbackGetUnitMovementType extends ABMovementTypeCallback { private ABUnitCallback unit; @Override - public MovementType callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public MovementType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - return unit.callback(game, caster, localStore, castId).getMovementType(); + return unit.callback(caster, localStore, castId).getMovementType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java index d5a427c70..b6bca1c9b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,10 +11,9 @@ public class ABCallbackGetUnitTypeMovementType extends ABMovementTypeCallback { private ABIDCallback type; @Override - public MovementType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - War3ID theType = type.callback(game, caster, localStore, castId); - return game.getUnitData().getUnitType(theType).getMovementType(); + public MovementType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + War3ID theType = type.callback(caster, localStore, castId); + return localStore.game.getUnitData().getUnitType(theType).getMovementType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java index 89b3141f8..61f1f5b1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABCallbackRawString; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,10 +12,9 @@ public class ABCallbackGetWeaponTypeFromString extends ABWeaponTypeCallback { private ABStringCallback id; @Override - public CWeaponType callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CWeaponType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - return CWeaponType.valueOf(this.id.callback(game, caster, localStore, castId)); + return CWeaponType.valueOf(this.id.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawDeathEffectPriority.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawDeathEffectPriority.java index 46e0c78ed..8f29af937 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawDeathEffectPriority.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawDeathEffectPriority.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffectPriority; @@ -10,8 +9,8 @@ public class ABCallbackRawDeathEffectPriority extends ABDeathReplacementPriority private CUnitDeathReplacementEffectPriority priority; @Override - public CUnitDeathReplacementEffectPriority callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { + public CUnitDeathReplacementEffectPriority callback(CUnit caster, LocalDataStore localStore, + final int castId) { return priority; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawPreDamageListenerPriority.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawPreDamageListenerPriority.java index 2569fefe2..1de922372 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawPreDamageListenerPriority.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawPreDamageListenerPriority.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerPriority; @@ -10,8 +9,7 @@ public class ABCallbackRawPreDamageListenerPriority extends ABAttackPreDamageLis private CUnitAttackPreDamageListenerPriority priority; @Override - public CUnitAttackPreDamageListenerPriority callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { + public CUnitAttackPreDamageListenerPriority callback(CUnit caster, LocalDataStore localStore, final int castId) { return priority; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java index d38423c7d..f1821e1df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; @@ -10,7 +9,7 @@ public class ABCallbackRawTargetType extends ABTargetTypeCallback { private CTargetType value; @Override - public CTargetType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CTargetType callback(CUnit caster, LocalDataStore localStore, final int castId) { return value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java index 921bebd19..194d7b9ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; @@ -10,7 +9,7 @@ public class ABCallbackRawWeaponType extends ABWeaponTypeCallback { private CWeaponType value; @Override - public CWeaponType callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CWeaponType callback(CUnit caster, LocalDataStore localStore, final int castId) { return value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDamageTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDamageTypeCallback.java index 5ecbe7b93..1754e4600 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDamageTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDamageTypeCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,5 @@ public abstract class ABDamageTypeCallback implements ABCallback { - abstract public CDamageType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CDamageType callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDeathReplacementPriorityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDeathReplacementPriorityCallback.java index 30dcc293d..a57cde7c3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDeathReplacementPriorityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDeathReplacementPriorityCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABDeathReplacementPriorityCallback implements ABCallback { - abstract public CUnitDeathReplacementEffectPriority callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public CUnitDeathReplacementEffectPriority callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java index 77b09db98..bf18fbdad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,5 @@ public abstract class ABDefenseTypeCallback implements ABCallback { - abstract public CDefenseType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CDefenseType callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java index d4ed7a9ff..69af8474c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java @@ -1,13 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABMovementTypeCallback implements ABCallback { - abstract public MovementType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public MovementType callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABNonStackingStatBuffTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABNonStackingStatBuffTypeCallback.java index b682f499b..2355b9651 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABNonStackingStatBuffTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABNonStackingStatBuffTypeCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABNonStackingStatBuffTypeCallback implements ABCallback { - abstract public NonStackingStatBuffType callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public NonStackingStatBuffType callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java index 3e1409623..30cce0f97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,5 @@ public abstract class ABTargetTypeCallback implements ABCallback { - abstract public CTargetType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CTargetType callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java index c5cdf2479..684dc8521 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,5 @@ public abstract class ABWeaponTypeCallback implements ABCallback { - abstract public CWeaponType callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CWeaponType callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java index 1304ec32f..c5dfd0fe7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,12 +13,11 @@ public class ABCallbackArgumentTimeOfDayEvent extends ABTimeOfDayEventCallback { private ABStringCallback name; @Override - public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public ABTimeOfDayEvent callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABTimeOfDayEventCallback) { - return ((ABTimeOfDayEventCallback) cbck).callback(game, caster, localStore, castId); + return ((ABTimeOfDayEventCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseTimeOfDayEventCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetLastCreatedTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetLastCreatedTimeOfDayEvent.java index e71c0c089..d561bae2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetLastCreatedTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetLastCreatedTimeOfDayEvent.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedTimeOfDayEvent extends ABTimeOfDayEventCallback { @Override - public ABTimeOfDayEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public ABTimeOfDayEvent callback(CUnit caster, LocalDataStore localStore, final int castId) { return (ABTimeOfDayEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDTODEVENT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetStoredTimeOfDayEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetStoredTimeOfDayEventByKey.java index 95148ea2f..2a2c6c7a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetStoredTimeOfDayEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetStoredTimeOfDayEventByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,13 +13,13 @@ public class ABCallbackGetStoredTimeOfDayEventByKey extends ABTimeOfDayEventCall private ABBooleanCallback instanceValue; @Override - public ABTimeOfDayEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public ABTimeOfDayEvent callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABTimeOfDayEvent) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (ABTimeOfDayEvent) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java index 45f0bc137..5b7b76e2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionTimeOfDayEvent extends ABTimeOfDayEventCal private ABTimeOfDayEventCallback fail; @Override - public ABTimeOfDayEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public ABTimeOfDayEvent callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java index 89719ccb5..8ef8d61da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,16 +15,15 @@ public class ABCallbackReuseTimeOfDayEvent extends ABTimeOfDayEventCallback { private ABStringCallback name; @Override - public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public ABTimeOfDayEvent callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABTimeOfDayEventCallback) { - return ((ABTimeOfDayEventCallback) callback).callback(game, caster, localStore, castId); + return ((ABTimeOfDayEventCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseTimeOfDayEventCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java index 0626e1505..868299b2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,12 +18,11 @@ public class ABCallbackReuseTimeOfDayEventWithArguments extends ABTimeOfDayEvent private Map arguments; @Override - public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public ABTimeOfDayEvent callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABTimeOfDayEventCallback) { @@ -34,7 +32,7 @@ public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, } } - return ((ABTimeOfDayEventCallback) callback).callback(game, caster, localStore, castId); + return ((ABTimeOfDayEventCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseTimeOfDayEventCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABTimeOfDayEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABTimeOfDayEventCallback.java index 29d31a027..e1f5ab77a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABTimeOfDayEventCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABTimeOfDayEventCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,7 @@ public abstract class ABTimeOfDayEventCallback implements ABCallback { - abstract public ABTimeOfDayEvent callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABTimeOfDayEvent callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java index 727624abb..65b59d060 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,12 +13,11 @@ public class ABCallbackArgumentWidgetEvent extends ABWidgetEventCallback { private ABStringCallback name; @Override - public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public ABWidgetEvent callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABWidgetEventCallback) { - return ((ABWidgetEventCallback) cbck).callback(game, caster, localStore, castId); + return ((ABWidgetEventCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseWidgetEventCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java index 1f6c02e38..5ff22b3b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedWidgetEvent extends ABWidgetEventCallback { @Override - public ABWidgetEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public ABWidgetEvent callback(CUnit caster, LocalDataStore localStore, final int castId) { return (ABWidgetEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDWIDEVENT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java index 3ce8d9fdb..367ffeeec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,13 +13,13 @@ public class ABCallbackGetStoredWidgetEventByKey extends ABWidgetEventCallback { private ABBooleanCallback instanceValue; @Override - public ABWidgetEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public ABWidgetEvent callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABWidgetEvent) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (ABWidgetEvent) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java index d32a42b97..a05fc2b6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionWidgetEvent extends ABWidgetEventCallback private ABWidgetEventCallback fail; @Override - public ABWidgetEvent callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public ABWidgetEvent callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java index 623318409..a02a9d2a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,15 +15,14 @@ public class ABCallbackReuseWidgetEvent extends ABWidgetEventCallback { private ABStringCallback name; @Override - public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public ABWidgetEvent callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABWidgetEventCallback) { - return ((ABWidgetEventCallback) callback).callback(game, caster, localStore, castId); + return ((ABWidgetEventCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseWidgetEventCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java index 873e3f54c..18efbe8fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,12 +18,11 @@ public class ABCallbackReuseWidgetEventWithArguments extends ABWidgetEventCallba private Map arguments; @Override - public ABWidgetEvent callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public ABWidgetEvent callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABWidgetEventCallback) { @@ -34,7 +32,7 @@ public ABWidgetEvent callback(final CSimulation game, final CUnit caster, } } - return ((ABWidgetEventCallback) callback).callback(game, caster, localStore, castId); + return ((ABWidgetEventCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseWidgetEventCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java index 9c330024f..4b8d55bae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,6 @@ public abstract class ABWidgetEventCallback implements ABCallback { - abstract public ABWidgetEvent callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public ABWidgetEvent callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackAddFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackAddFloat.java index 1740b52e8..d1cf02fa0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackAddFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackAddFloat.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackAddFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) + value2.callback(game, caster, localStore, castId); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) + value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java index 649d6f3b4..0f881237e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -13,13 +12,12 @@ public class ABCallbackArgumentFloat extends ABFloatCallback { private ABStringCallback name; @Override - public Float callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABFloatCallback) { - return ((ABFloatCallback) cbck).callback(game, caster, localStore, castId); + return ((ABFloatCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseFloatCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCeilFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCeilFloat.java index ee4eb3fef..bdf965f81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCeilFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCeilFloat.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackCeilFloat extends ABFloatCallback { private ABFloatCallback value; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return (float) Math.ceil(value.callback(game, caster, localStore, castId)); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return (float) Math.ceil(value.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCos.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCos.java index 5a4317f72..00dfcc1b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCos.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCos.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackCos extends ABFloatCallback { private ABFloatCallback angle; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return (float) StrictMath.cos(angle.callback(game, caster, localStore, castId)); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return (float) StrictMath.cos(angle.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java index f6a67a68b..b3134d364 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackDegToRad extends ABFloatCallback { private ABFloatCallback angle; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return (float) StrictMath.toRadians(angle.callback(game, caster, localStore, castId)); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return (float) StrictMath.toRadians(angle.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDivideFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDivideFloat.java index c0aafccb4..f912ef26d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDivideFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDivideFloat.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,11 +10,10 @@ public class ABCallbackDivideFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - return this.value1.callback(game, caster, localStore, castId) - / this.value2.callback(game, caster, localStore, castId); + return this.value1.callback(caster, localStore, castId) + / this.value2.callback(caster, localStore, castId); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFMaxValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFMaxValue.java index a0388e229..3b72adc28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFMaxValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFMaxValue.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackFMaxValue extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { return Float.MAX_VALUE; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFloorFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFloorFloat.java index 6d8e3ba7a..592429d2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFloorFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFloorFloat.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackFloorFloat extends ABFloatCallback { private ABFloatCallback value; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return (float) Math.floor(value.callback(game, caster, localStore, castId)); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return (float) Math.floor(value.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityArea.java index e531b54ea..ae9441b8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityArea.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -13,12 +12,12 @@ public class ABCallbackGetAbilityArea extends ABFloatCallback { private ABAbilityCallback ability; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { if (ability == null) { AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getArea(); } else { - CAbility abil = ability.callback(game, caster, localStore, castId); + CAbility abil = ability.callback(caster, localStore, castId); if (abil instanceof AbilityBuilderAbility) { return ((AbilityBuilderAbility)abil).getArea(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastRange.java index 113213aa3..b07859601 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastRange.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -13,12 +12,12 @@ public class ABCallbackGetAbilityCastRange extends ABFloatCallback { private ABAbilityCallback ability; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { if (ability == null) { AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getCastRange(); } else { - CAbility abil = ability.callback(game, caster, localStore, castId); + CAbility abil = ability.callback(caster, localStore, castId); if (abil instanceof AbilityBuilderAbility) { return ((AbilityBuilderAbility) abil).getCastRange(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java index e0fd20607..9b100417b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -14,8 +13,7 @@ public class ABCallbackGetAbilityCastTime extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (ability != null) { return ability.getCastTime(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCooldown.java index 68671dc8d..67a7bde02 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCooldown.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -13,12 +12,12 @@ public class ABCallbackGetAbilityCooldown extends ABFloatCallback { private ABAbilityCallback ability; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { if (ability == null) { AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getCooldown(); } else { - CAbility abil = ability.callback(game, caster, localStore, castId); + CAbility abil = ability.callback(caster, localStore, castId); if (abil instanceof AbilityBuilderAbility) { return ((AbilityBuilderAbility) abil).getCooldown(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDataAsFloat.java index 015cdda7d..f54bfb048 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDataAsFloat.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -16,8 +15,7 @@ public class ABCallbackGetAbilityDataAsFloat extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDuration.java index 2462b92cf..fb81fde6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDuration.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -17,13 +16,12 @@ public class ABCallbackGetAbilityDuration extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); if (this.target != null) { - final CUnit tar = this.target.callback(game, caster, localStore, castId); + final CUnit tar = this.target.callback(caster, localStore, castId); if (tar.isHero() || tar.isUnitType(CUnitTypeJass.RESISTANT)) { return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getDurationHero(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityHeroDuration.java index 314af3be5..d1407f9ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityHeroDuration.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,7 +11,7 @@ public class ABCallbackGetAbilityHeroDuration extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getDurationHero(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java index a5bf1d31c..bad874231 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.units.GameObject; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,8 +9,7 @@ public class ABCallbackGetAbilityProjectileSpeed extends ABFloatCallback { @Override - public Float callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java index 0ae318e0d..701f22783 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; @@ -16,12 +15,11 @@ public class ABCallbackGetAbilityUniqueValueFloat extends ABFloatCallback { private ABBooleanCallback allowNull; @Override - public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = key.callback(game, caster, localStore, castId); - final CAbility theAbility = ability.callback(game, caster, localStore, castId); + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = key.callback(caster, localStore, castId); + final CAbility theAbility = ability.callback(caster, localStore, castId); Float theVal = theAbility.getUniqueValue(keyS, Float.class); - if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + if (theVal != null || (allowNull != null && allowNull.callback(caster, localStore, castId))) { return theVal; } return 0.0f; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAngleBetweenLocations.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAngleBetweenLocations.java index cbc8edf37..c98e12383 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAngleBetweenLocations.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAngleBetweenLocations.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; @@ -13,9 +12,9 @@ public class ABCallbackGetAngleBetweenLocations extends ABFloatCallback { private ABLocationCallback target; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final AbilityPointTarget o = this.origin.callback(game, caster, localStore, castId); - final AbilityPointTarget t = this.target.callback(game, caster, localStore, castId); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + final AbilityPointTarget o = this.origin.callback(caster, localStore, castId); + final AbilityPointTarget t = this.target.callback(caster, localStore, castId); final double dx = t.getX() - o.getX(); final double dy = t.getY() - o.getY(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java index 8f23430d9..3d0240509 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -11,10 +10,9 @@ public class ABCallbackGetBuffDurationElapsed extends ABFloatCallback { private ABBuffCallback buff; @Override - public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final CBuff theBuff = buff.callback(game, caster, localStore, castId); - return theBuff.getDurationMax() - theBuff.getDurationRemaining(game, caster); + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final CBuff theBuff = buff.callback(caster, localStore, castId); + return theBuff.getDurationMax() - theBuff.getDurationRemaining(localStore.game, caster); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java index 781b22e29..1f8230c58 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -16,13 +15,12 @@ public class ABCallbackGetBuffUniqueValueFloat extends ABFloatCallback { private ABBooleanCallback allowNull; @Override - public Float callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = key.callback(game, caster, localStore, castId); - final CBuff theBuff = buff.callback(game, caster, localStore, castId); + final String keyS = key.callback(caster, localStore, castId); + final CBuff theBuff = buff.callback(caster, localStore, castId); Float theVal = theBuff.getUniqueValue(keyS, Float.class); - if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + if (theVal != null || (allowNull != null && allowNull.callback(caster, localStore, castId))) { return theVal; } return 0.0f; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenLocations.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenLocations.java index 5af06ee4d..a01cb5367 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenLocations.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenLocations.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; @@ -12,9 +11,9 @@ public class ABCallbackGetDistanceBetweenLocations extends ABFloatCallback { private ABLocationCallback target; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - AbilityPointTarget o = origin.callback(game, caster, localStore, castId); - AbilityPointTarget t = target.callback(game, caster, localStore, castId); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + AbilityPointTarget o = origin.callback(caster, localStore, castId); + AbilityPointTarget t = target.callback(caster, localStore, castId); return o.dst(t); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java index 9bc579be1..3b18cac40 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,9 +10,9 @@ public class ABCallbackGetDistanceBetweenUnits extends ABFloatCallback { private ABUnitCallback target; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CUnit o = origin.callback(game, caster, localStore, castId); - CUnit t = target.callback(game, caster, localStore, castId); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + CUnit o = origin.callback(caster, localStore, castId); + CUnit t = target.callback(caster, localStore, castId); return (float) o.distance(t); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationX.java index 23dd6bea4..aa1e205ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationX.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetLocationX extends ABFloatCallback { private ABLocationCallback location; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return location.callback(game, caster, localStore, castId).getX(); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return location.callback(caster, localStore, castId).getX(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationY.java index 8416d2cc1..8adf10b36 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationY.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetLocationY extends ABFloatCallback { private ABLocationCallback location; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return location.callback(game, caster, localStore, castId).getY(); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return location.callback(caster, localStore, castId).getY(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetParentAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetParentAbilityDataAsFloat.java index b0e7d5ed1..4111d3d1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetParentAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetParentAbilityDataAsFloat.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -15,7 +14,7 @@ public class ABCallbackGetParentAbilityDataAsFloat extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { List levelData = (List) localStore .get(ABLocalStoreKeys.PARENTLEVELDATA); int parentLevel = (int) ((LocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetStoredFloatByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetStoredFloatByKey.java index 863ae5b19..4a7dbcad7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetStoredFloatByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetStoredFloatByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,16 +13,15 @@ public class ABCallbackGetStoredFloatByKey extends ABFloatCallback { private ABBooleanCallback instanceValue; @Override - public Float callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Float) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (Float) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitAcquisitionRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitAcquisitionRange.java index 547f5e2a5..799dc3342 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitAcquisitionRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitAcquisitionRange.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitAcquisitionRange extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CUnit theUnit = unit.callback(game, caster, localStore, castId); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + CUnit theUnit = unit.callback(caster, localStore, castId); if (theUnit.getAcquisitionRange() > 0) { return theUnit.getAcquisitionRange(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCastPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCastPoint.java index 5439a9ec2..7bd63e7b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCastPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCastPoint.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitCastPoint extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return unit.callback(game, caster, localStore, castId).getUnitType().getCastPoint(); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return unit.callback(caster, localStore, castId).getUnitType().getCastPoint(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java index de1c0fbb1..fb8d138f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,8 @@ public class ABCallbackGetUnitCurrentHp extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return unit == null ? caster.getLife() : this.unit.callback(game, caster, localStore, castId).getLife(); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return unit == null ? caster.getLife() : this.unit.callback(caster, localStore, castId).getLife(); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java index cc819f949..e14330771 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitCurrentMana extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return unit == null ? caster.getMana() : unit.callback(game, caster, localStore, castId).getMana(); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return unit == null ? caster.getMana() : unit.callback(caster, localStore, castId).getMana(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitFacing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitFacing.java index 11fac2add..fee193161 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitFacing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitFacing.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,8 @@ public class ABCallbackGetUnitFacing extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return this.unit.callback(game, caster, localStore, castId).getFacing(); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return this.unit.callback(caster, localStore, castId).getFacing(); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitInitialMana.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitInitialMana.java index d47bd9b79..20ba8f2e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitInitialMana.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitInitialMana.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitInitialMana extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return (float) unit.callback(game, caster, localStore, castId).getUnitType().getManaInitial(); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return (float) unit.callback(caster, localStore, castId).getUnitType().getManaInitial(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationX.java index 7042fb3c3..4b378b064 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationX.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitLocationX extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return unit.callback(game, caster, localStore, castId).getX(); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return unit.callback(caster, localStore, castId).getX(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationY.java index fb32723fd..5c6c27655 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationY.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitLocationY extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return unit.callback(game, caster, localStore, castId).getY(); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return unit.callback(caster, localStore, castId).getY(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java index 13dac4e14..905d960dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,11 +11,11 @@ public class ABCallbackInlineConditionFloat extends ABFloatCallback { private ABFloatCallback fail; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public Float callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackIntToFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackIntToFloat.java index 7384d89fc..4cff78ff6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackIntToFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackIntToFloat.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,8 @@ public class ABCallbackIntToFloat extends ABFloatCallback { private ABIntegerCallback value; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return this.value.callback(game, caster, localStore, castId).floatValue(); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return this.value.callback(caster, localStore, castId).floatValue(); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMaxFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMaxFloat.java index 8e11faa34..225e165ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMaxFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMaxFloat.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,10 +10,9 @@ public class ABCallbackMaxFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - return Math.max(this.value1.callback(game, caster, localStore, castId), - this.value2.callback(game, caster, localStore, castId)); + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + return Math.max(this.value1.callback(caster, localStore, castId), + this.value2.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMinFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMinFloat.java index 000601bb5..285b2b9a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMinFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMinFloat.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,10 +10,9 @@ public class ABCallbackMinFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - return Math.min(this.value1.callback(game, caster, localStore, castId), - this.value2.callback(game, caster, localStore, castId)); + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + return Math.min(this.value1.callback(caster, localStore, castId), + this.value2.callback(caster, localStore, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMultiplyFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMultiplyFloat.java index 0ba9e32fa..95630907a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMultiplyFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMultiplyFloat.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackMultiplyFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) * value2.callback(game, caster, localStore, castId); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) * value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackNegativeFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackNegativeFloat.java index db14a1089..9bef888f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackNegativeFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackNegativeFloat.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,10 +9,9 @@ public class ABCallbackNegativeFloat extends ABFloatCallback { private ABFloatCallback value; @Override - public Float callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - return -1 * this.value.callback(game, caster, localStore, castId); + return -1 * this.value.callback(caster, localStore, castId); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java index c1e6a47cb..5c10c0c4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.util.WarsmashConstants; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackOneGameTick extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { return WarsmashConstants.SIMULATION_STEP_TIME + 0.000001f; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackPi.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackPi.java index 945a5e271..5f40a1e74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackPi.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackPi.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackPi extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { return (float) StrictMath.PI; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomBoundedFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomBoundedFloat.java index 9dff4bf45..673a29d04 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomBoundedFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomBoundedFloat.java @@ -1,16 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRandomBoundedFloat extends ABFloatCallback { private ABFloatCallback bound; - + @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getSeededRandom().nextFloat(bound.callback(game, caster, localStore, castId)); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getSeededRandom().nextFloat(bound.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomFloat.java index 3b5a87c36..6a1a7463c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomFloat.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRandomFloat extends ABFloatCallback { @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getSeededRandom().nextFloat(); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getSeededRandom().nextFloat(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRawFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRawFloat.java index da2ccd5d3..5686b4b8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRawFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRawFloat.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,7 @@ public class ABCallbackRawFloat extends ABFloatCallback { private Float value; @Override - public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java index a362e7ff8..32eaf7e15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -15,16 +14,15 @@ public class ABCallbackReuseFloat extends ABFloatCallback { private ABStringCallback name; @Override - public Float callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABFloatCallback) { - return ((ABFloatCallback) callback).callback(game, caster, localStore, castId); + return ((ABFloatCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseFloatCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java index 75bfe3f13..854ec3d6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -18,11 +17,10 @@ public class ABCallbackReuseFloatWithArguments extends ABFloatCallback { private Map arguments; @Override - public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABFloatCallback) { @@ -32,7 +30,7 @@ public Float callback(final CSimulation game, final CUnit caster, final LocalDat } } - return ((ABFloatCallback) callback).callback(game, caster, localStore, castId); + return ((ABFloatCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseFloatCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSin.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSin.java index 113bbc0a7..49b718c69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSin.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSin.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackSin extends ABFloatCallback { private ABFloatCallback angle; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return (float) StrictMath.sin(angle.callback(game, caster, localStore, castId)); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return (float) StrictMath.sin(angle.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSubtractFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSubtractFloat.java index 416d6659c..023f7878d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSubtractFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSubtractFloat.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,11 +10,10 @@ public class ABCallbackSubtractFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - return this.value1.callback(game, caster, localStore, castId) - - this.value2.callback(game, caster, localStore, castId); + return this.value1.callback(caster, localStore, castId) + - this.value2.callback(caster, localStore, castId); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java index 1ed4b4a03..34b32b5d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackTan extends ABFloatCallback { private ABFloatCallback angle; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return (float) StrictMath.tan(angle.callback(game, caster, localStore, castId)); + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return (float) StrictMath.tan(angle.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTicksForDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTicksForDuration.java index debd78e3d..530b408c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTicksForDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTicksForDuration.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; import com.etheller.warsmash.util.WarsmashConstants; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackTicksForDuration extends ABFloatCallback { private ABFloatCallback duration; @Override - public Float callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return duration.callback(game, caster, localStore, castId) / WarsmashConstants.SIMULATION_STEP_TIME; + public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + return duration.callback(caster, localStore, castId) / WarsmashConstants.SIMULATION_STEP_TIME; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABFloatCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABFloatCallback.java index 15f8d3fec..3753ff950 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABFloatCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABFloatCallback.java @@ -1,12 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABFloatCallback implements ABCallback { - abstract public Float callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java index d9a7e5c09..9a5de862d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,13 +13,12 @@ public class ABCallbackArgumentFX extends ABFXCallback { private ABStringCallback name; @Override - public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public SimulationRenderComponent callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABFXCallback) { - return ((ABFXCallback) cbck).callback(game, caster, localStore, castId); + return ((ABFXCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseFXCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java index e29a743da..4a8515ba5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackGetLastCreatedFX extends ABFXCallback { @Override - public SimulationRenderComponent callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { + public SimulationRenderComponent callback(CUnit caster, LocalDataStore localStore, + final int castId) { return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.LASTCREATEDFX); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedLightningEffect.java index 3027c56a9..04dedca08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedLightningEffect.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,7 @@ public class ABCallbackGetLastCreatedLightningEffect extends ABLightningCallback { @Override - public SimulationRenderComponentLightning callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { + public SimulationRenderComponentLightning callback(CUnit caster, LocalDataStore localStore, final int castId) { return (SimulationRenderComponentLightning) localStore.get(ABLocalStoreKeys.LASTCREATEDLIGHTNING); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredFXByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredFXByKey.java index 235c14409..572c67ae7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredFXByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredFXByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,12 +13,12 @@ public class ABCallbackGetStoredFXByKey extends ABFXCallback { private ABBooleanCallback instanceValue; @Override - public SimulationRenderComponent callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public SimulationRenderComponent callback(CUnit caster, LocalDataStore localStore, + final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredLightningByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredLightningByKey.java index 0fffd0f5b..934544473 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredLightningByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredLightningByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,14 +13,13 @@ public class ABCallbackGetStoredLightningByKey extends ABLightningCallback { private ABBooleanCallback instanceValue; @Override - public SimulationRenderComponentLightning callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public SimulationRenderComponentLightning callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (SimulationRenderComponentLightning) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (SimulationRenderComponentLightning) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java index 73069302a..7c025ecaf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionFX extends ABFXCallback { private ABFXCallback fail; @Override - public SimulationRenderComponent callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public SimulationRenderComponent callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java index 458939ec3..05094e504 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,15 +15,15 @@ public class ABCallbackReuseFX extends ABFXCallback { private ABStringCallback name; @Override - public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { + public SimulationRenderComponent callback(final CUnit caster, final LocalDataStore localStore, + final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABFXCallback) { - return ((ABFXCallback) callback).callback(game, caster, localStore, castId); + return ((ABFXCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseFXCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java index 1f84df15b..fa281067e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,11 +18,11 @@ public class ABCallbackReuseFXWithArguments extends ABFXCallback { private Map arguments; @Override - public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { + public SimulationRenderComponent callback(final CUnit caster, final LocalDataStore localStore, + final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABFXCallback) { @@ -33,7 +32,7 @@ public SimulationRenderComponent callback(final CSimulation game, final CUnit ca } } - return ((ABFXCallback) callback).callback(game, caster, localStore, castId); + return ((ABFXCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseFXCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABFXCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABFXCallback.java index c104c5a5f..08f7e0b2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABFXCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABFXCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABFXCallback implements ABCallback { - abstract public SimulationRenderComponent callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public SimulationRenderComponent callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABLightningCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABLightningCallback.java index b1ec7b0e1..6525372d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABLightningCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABLightningCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABLightningCallback implements ABCallback { - abstract public SimulationRenderComponentLightning callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public SimulationRenderComponentLightning callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java index 97e74bb04..3ef7328b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,12 +13,11 @@ public class ABCallbackArgumentID extends ABIDCallback { private ABStringCallback name; @Override - public War3ID callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABIDCallback) { - return ((ABIDCallback) cbck).callback(game, caster, localStore, castId); + return ((ABIDCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseIDCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsID.java index ca16e5379..ac8faf1c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsID.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -17,7 +16,7 @@ public class ABCallbackGetAbilityDataAsID extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java index 6abfa9775..c69f9ce84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -19,7 +18,7 @@ public class ABCallbackGetAbilityDataAsIDFromList extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); @@ -31,7 +30,7 @@ public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore String[] ids = data.split(","); int i = 0; if (index != null) { - i = index.callback(game, caster, localStore, castId); + i = index.callback(caster, localStore, castId); } String tar = ids[Math.min(Math.max(i, 0), ids.length - 1)]; if ((tar == null) || "-".equals(tar) || tar.isBlank() || "_".equals(tar)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java index b429e8e69..dbc39040f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -17,7 +16,7 @@ public class ABCallbackGetAbilityDataAsRandomIDFromList extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); @@ -27,7 +26,7 @@ public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore return War3ID.NONE; } String[] ids = data.split(","); - int i = game.getSeededRandom().nextInt(ids.length); + int i = localStore.game.getSeededRandom().nextInt(ids.length); String tar = ids[i]; if ((tar == null) || "-".equals(tar) || tar.isBlank() || "_".equals(tar)) { return War3ID.NONE; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java index 169f1e15b..254609487 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; @@ -17,13 +16,12 @@ public class ABCallbackGetAbilityUniqueValueId extends ABIDCallback { private ABBooleanCallback allowNull; @Override - public War3ID callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = key.callback(game, caster, localStore, castId); - final CAbility theAbility = ability.callback(game, caster, localStore, castId); + public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = key.callback(caster, localStore, castId); + final CAbility theAbility = ability.callback(caster, localStore, castId); War3ID theVal = theAbility.getUniqueValue(keyS, War3ID.class); System.err.println("Get Unique ID Val: " + (theVal != null ? theVal.asStringValue() : null)); - if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + if (theVal != null || (allowNull != null && allowNull.callback(caster, localStore, castId))) { return theVal; } return War3ID.NONE; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUnitId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUnitId.java index 094cfd184..516c1e813 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUnitId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUnitId.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,7 +12,7 @@ public class ABCallbackGetAbilityUnitId extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAlias.java index cc4a881a1..cdb99e47c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAlias.java @@ -3,7 +3,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,7 @@ public class ABCallbackGetAlias extends ABIDCallback { @Override - public War3ID callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java index 16d813053..16e62e520 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,8 @@ public class ABCallbackGetBuffAlias extends ABIDCallback { private ABBuffCallback buff; @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return buff.callback(game, caster, localStore, castId).getAlias(); + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { + return buff.callback(caster, localStore, castId).getAlias(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java index e9e36a82c..d136d2054 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java @@ -3,7 +3,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,7 @@ public class ABCallbackGetBuffIdFromCode extends ABIDCallback { @Override - public War3ID callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return ((War3ID) localStore.get(ABLocalStoreKeys.CODE)).set(0, 'B'); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java index 8b8e456ec..e12e18c8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java @@ -3,7 +3,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -14,11 +13,10 @@ public class ABCallbackGetCode extends ABIDCallback { private ABAbilityCallback ability; @Override - public War3ID callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { if (ability != null) { - return ability.callback(game, caster, localStore, castId).getCode(); + return ability.callback(caster, localStore, castId).getCode(); } return (War3ID) localStore.get(ABLocalStoreKeys.CODE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java index 511028d00..316d21761 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -16,8 +15,7 @@ public class ABCallbackGetFirstBuffId extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final List buffs = ((List) localStore .get(ABLocalStoreKeys.LEVELDATA)).get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1) @@ -26,7 +24,7 @@ public War3ID callback(final CSimulation game, final CUnit caster, return buffs.get(0); } if (defaultId != null) { - return defaultId.callback(game, caster, localStore, castId); + return defaultId.callback(caster, localStore, castId); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstEffectId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstEffectId.java index 198a48af2..2b13d97c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstEffectId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstEffectId.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,7 +12,7 @@ public class ABCallbackGetFirstEffectId extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { List effects = ((List) localStore.get(ABLocalStoreKeys.LEVELDATA)) .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getEffects(); if (effects != null && !effects.isEmpty()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java index a3e3fc96b..0bd950f32 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,8 @@ public class ABCallbackGetItemType extends ABIDCallback { private ABItemCallback item; @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return item.callback(game, caster, localStore, castId).getTypeId(); + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { + return item.callback(caster, localStore, castId).getTypeId(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetNonCurrentTransformType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetNonCurrentTransformType.java index dcf4f81b8..487bc5bf7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetNonCurrentTransformType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetNonCurrentTransformType.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,13 +12,13 @@ public class ABCallbackGetNonCurrentTransformType extends ABIDCallback { private ABIDCallback alternateUnitId; @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { - u1 = unit.callback(game, caster, localStore, castId); + u1 = unit.callback(caster, localStore, castId); } - War3ID baseId = baseUnitId.callback(game, caster, localStore, castId); - War3ID altId = alternateUnitId.callback(game, caster, localStore, castId); + War3ID baseId = baseUnitId.callback(caster, localStore, castId); + War3ID altId = alternateUnitId.callback(caster, localStore, castId); if (altId == null || u1.getTypeId().equals(altId)) { return baseId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetParentAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetParentAlias.java index 70a7d5425..db2322dae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetParentAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetParentAlias.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,7 +9,7 @@ public class ABCallbackGetParentAlias extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { return (War3ID) ((LocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) .get(ABLocalStoreKeys.ALIAS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetSecondBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetSecondBuffId.java index 5b2368f53..58ca3a2c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetSecondBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetSecondBuffId.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,7 +12,7 @@ public class ABCallbackGetSecondBuffId extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { List buffs = ((List) localStore.get(ABLocalStoreKeys.LEVELDATA)) .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getBuffs(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetStoredIDByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetStoredIDByKey.java index 97b037fb8..a6c4e3736 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetStoredIDByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetStoredIDByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,13 +13,13 @@ public class ABCallbackGetStoredIDByKey extends ABIDCallback { private ABBooleanCallback instanceValue; @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (War3ID) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (War3ID) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetUnitType.java index c6c9ebe1c..f1b67ec07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetUnitType.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,11 +10,11 @@ public class ABCallbackGetUnitType extends ABIDCallback { private ABUnitCallback unit; @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { if (unit == null) { return caster.getTypeId(); } - return unit.callback(game, caster, localStore, castId).getTypeId(); + return unit.callback(caster, localStore, castId).getTypeId(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetWar3IDFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetWar3IDFromString.java index 3f17b0813..4a7c67381 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetWar3IDFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetWar3IDFromString.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,7 +10,7 @@ public class ABCallbackGetWar3IDFromString extends ABIDCallback { private String id; @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { return War3ID.fromString(this.id); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java index 94700fe6d..4138b8c14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionID extends ABIDCallback { private ABIDCallback fail; @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public War3ID callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java index cf70ddb5f..a98fb59be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,9 +11,9 @@ public class ABCallbackNullIfFalse extends ABIDCallback { private ABIDCallback value; @Override - public War3ID callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return value.callback(game, caster, localStore, castId); + public War3ID callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return value.callback(caster, localStore, castId); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java index fc87947bd..d6b9e7fc5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItemType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -17,10 +16,9 @@ public class ABCallbackRandomItemId extends ABIDCallback { private ABBooleanCallback ignoreRandomFlag; @Override - public War3ID callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { if (previousId == null && level == null && ignoreValidFlag == null && ignoreRandomFlag == null) { - return RandomTypeHandler.getRandomItemType(game).getTypeId(); + return RandomTypeHandler.getRandomItemType(localStore.game).getTypeId(); } War3ID id = null; @@ -28,18 +26,18 @@ public War3ID callback(final CSimulation game, final CUnit caster, final LocalDa boolean valid = true; boolean random = false; if (previousId != null) { - id = previousId.callback(game, caster, localStore, castId); + id = previousId.callback(caster, localStore, castId); } if (level != null) { - lv = level.callback(game, caster, localStore, castId); + lv = level.callback(caster, localStore, castId); } if (ignoreValidFlag != null) { - valid = ignoreValidFlag.callback(game, caster, localStore, castId); + valid = ignoreValidFlag.callback(caster, localStore, castId); } if (ignoreRandomFlag != null) { - random = ignoreRandomFlag.callback(game, caster, localStore, castId); + random = ignoreRandomFlag.callback(caster, localStore, castId); } - CItemType type = RandomTypeHandler.getRandomItemType(game, id, lv, valid, random); + CItemType type = RandomTypeHandler.getRandomItemType(localStore.game, id, lv, valid, random); if (type == null) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java index 558cd84a0..3f8f88c4e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,10 +9,9 @@ public class ABCallbackRandomMechanicalCritterId extends ABIDCallback { @Override - public War3ID callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - CUnitType id = RandomTypeHandler.getRandomMechanicalCritterType(game); + CUnitType id = RandomTypeHandler.getRandomMechanicalCritterType(localStore.game); if (id == null) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java index 1775c3563..2bdd84cd1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,15 +15,14 @@ public class ABCallbackReuseID extends ABIDCallback { private ABStringCallback name; @Override - public War3ID callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABIDCallback) { - return ((ABIDCallback) callback).callback(game, caster, localStore, castId); + return ((ABIDCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseIDCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseIDWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseIDWithArguments.java index 9f076fec4..ef27289d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseIDWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseIDWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,12 +18,11 @@ public class ABCallbackReuseIDWithArguments extends ABIDCallback { private Map arguments; @Override - public War3ID callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABIDCallback) { @@ -34,7 +32,7 @@ public War3ID callback(final CSimulation game, final CUnit caster, } } - return ((ABIDCallback) callback).callback(game, caster, localStore, castId); + return ((ABIDCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseIDCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABIDCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABIDCallback.java index 05fe624ec..aef8f6678 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABIDCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABIDCallback.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,6 +8,5 @@ public abstract class ABIDCallback implements ABCallback { @Override - abstract public War3ID callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAddInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAddInteger.java index 64e4ca3e0..7d41e502c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAddInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAddInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackAddInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) + value2.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) + value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAndInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAndInteger.java index 3e93542b7..3f6d90a79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAndInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAndInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackAndInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) & value2.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) & value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java index 46756c8e9..7b8977b84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -13,13 +12,12 @@ public class ABCallbackArgumentInteger extends ABIntegerCallback { private ABStringCallback name; @Override - public Integer callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABIntegerCallback) { - return ((ABIntegerCallback) cbck).callback(game, caster, localStore, castId); + return ((ABIntegerCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseIntegerCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java index aa7064c47..20c58353a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; @@ -16,17 +15,17 @@ public class ABCallbackCountBuffsOnUnitMatchingCondition extends ABIntegerCallba private ABCondition condition; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit u = caster; if (unit != null) { - u = unit.callback(game, caster, localStore, castId); + u = unit.callback(caster, localStore, castId); } int c = 0; for (CAbility ability : u.getAbilities()) { if (ability.getAbilityCategory() == CAbilityCategory.BUFF) { CBuff buff = (CBuff) ability; localStore.put(ABLocalStoreKeys.MATCHINGBUFF, buff); - if (condition != null && condition.callback(game, caster, localStore, castId)) { + if (condition != null && condition.callback(caster, localStore, castId)) { c++; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfLocation.java index 5421f5c09..cbf60cbd7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfLocation.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.badlogic.gdx.math.Rectangle; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; @@ -18,14 +17,14 @@ public class ABCallbackCountUnitsInRangeOfLocation extends ABIntegerCallback { private int count = 0; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - AbilityPointTarget origin = location.callback(game, caster, localStore, castId); - Float rangeVal = range.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + AbilityPointTarget origin = location.callback(caster, localStore, castId); + Float rangeVal = range.callback(caster, localStore, castId); recycleRect.set(origin.getX() - rangeVal, origin.getY() - rangeVal, rangeVal * 2, rangeVal * 2); count = 0; - game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (enumUnit.canReach(origin, rangeVal)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfUnit.java index a1ee47a47..e7f899ce9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.badlogic.gdx.math.Rectangle; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -17,15 +16,15 @@ public class ABCallbackCountUnitsInRangeOfUnit extends ABIntegerCallback { private int count = 0; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CUnit originUnitTarget = unit.callback(game, caster, localStore, castId); - Float rangeVal = range.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + CUnit originUnitTarget = unit.callback(caster, localStore, castId); + Float rangeVal = range.callback(caster, localStore, castId); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); count = 0; - game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDetectionDropdownConversion.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDetectionDropdownConversion.java index 83322a16a..3cfed3796 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDetectionDropdownConversion.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDetectionDropdownConversion.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackDetectionDropdownConversion extends ABIntegerCallback { private ABIntegerCallback value; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - int val = value.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + int val = value.callback(caster, localStore, castId); switch(val) { case 1: return 1; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDivideInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDivideInteger.java index 48b8d9ee0..6ad811c00 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDivideInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDivideInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackDivideInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) / value2.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) / value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java index 59dbdec3b..f93228b75 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -13,7 +12,7 @@ public class ABCallbackGetAbilityCastTimeAsInteger extends ABIntegerCallback { @SuppressWarnings("unchecked") @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (ability != null) { return (int) ability.getCastTime(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityDataAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityDataAsInteger.java index 6cc206cf7..727be3697 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityDataAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityDataAsInteger.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -16,7 +15,7 @@ public class ABCallbackGetAbilityDataAsInteger extends ABIntegerCallback { @SuppressWarnings("unchecked") @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java index 9767d3d93..8fc77b6bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetAbilityHandleAsInteger extends ABIntegerCallback { private ABAbilityCallback ability; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return ability.callback(game, caster, localStore, castId).getHandleId(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return ability.callback(caster, localStore, castId).getHandleId(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityManaCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityManaCost.java index b4d40dbc7..754fc8dc1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityManaCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityManaCost.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; @@ -13,12 +12,12 @@ public class ABCallbackGetAbilityManaCost extends ABIntegerCallback { private ABAbilityCallback ability; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { if (ability == null) { AbilityBuilderActiveAbility abil = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getChargedManaCost(); } else { - CAbility abil = ability.callback(game, caster, localStore, castId); + CAbility abil = ability.callback(caster, localStore, castId); if (abil instanceof AbilityBuilderActiveAbility) { return ((AbilityBuilderActiveAbility) abil).getChargedManaCost(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityTargetAttachmentPoints.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityTargetAttachmentPoints.java index 54b004d31..846759433 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityTargetAttachmentPoints.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityTargetAttachmentPoints.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -13,12 +12,12 @@ public class ABCallbackGetAbilityTargetAttachmentPoints extends ABIntegerCallbac private ABAbilityCallback ability; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { if (ability == null) { AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getAbilityIntField("Targetattachcount"); } else { - CAbility abil = ability.callback(game, caster, localStore, castId); + CAbility abil = ability.callback(caster, localStore, castId); if (abil instanceof AbilityBuilderAbility) { return ((AbilityBuilderAbility) abil).getAbilityIntField("Targetattachcount"); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java index 2746b89f1..6a7bee67f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; @@ -16,13 +15,12 @@ public class ABCallbackGetAbilityUniqueValueInteger extends ABIntegerCallback { private ABBooleanCallback allowNull; @Override - public Integer callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = key.callback(game, caster, localStore, castId); - final CAbility theAbility = ability.callback(game, caster, localStore, castId); + final String keyS = key.callback(caster, localStore, castId); + final CAbility theAbility = ability.callback(caster, localStore, castId); Integer theVal = theAbility.getUniqueValue(keyS, Integer.class); - if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + if (theVal != null || (allowNull != null && allowNull.callback(caster, localStore, castId))) { return theVal; } return 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java index 4f6e0e79e..a04f4fba6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetBuffHandleAsInteger extends ABIntegerCallback { private ABBuffCallback buff; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return buff.callback(game, caster, localStore, castId).getHandleId(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return buff.callback(caster, localStore, castId).getHandleId(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java index b02c0e777..f01bce058 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -16,12 +15,11 @@ public class ABCallbackGetBuffUniqueValueInteger extends ABIntegerCallback { private ABBooleanCallback allowNull; @Override - public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = key.callback(game, caster, localStore, castId); - final CBuff theBuff = buff.callback(game, caster, localStore, castId); + public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = key.callback(caster, localStore, castId); + final CBuff theBuff = buff.callback(caster, localStore, castId); Integer theVal = theBuff.getUniqueValue(keyS, Integer.class); - if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + if (theVal != null || (allowNull != null && allowNull.callback(caster, localStore, castId))) { return theVal; } return 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java index 093792c37..78b6568ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetCastId extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { return castId; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java index e766102ac..5956ded7e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,8 @@ public class ABCallbackGetIntegerFromList extends ABIntegerCallback { private ABIntegerCallback index; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return list.callback(game, caster, localStore, castId).get(index.callback(game, caster, localStore, castId)); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return list.callback(caster, localStore, castId).get(index.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java index 72a6f380c..3096e785c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -12,7 +11,7 @@ public class ABCallbackGetItemCharges extends ABIntegerCallback { private ABItemCallback item; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; @@ -20,7 +19,7 @@ public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStor CItem theItem; if (item != null) { - theItem = item.callback(game, caster, localStore, castId); + theItem = item.callback(caster, localStore, castId); } else { theItem = (CItem) localStore.get(ABLocalStoreKeys.ITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java index 6cfde5913..0c770f94d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -12,7 +11,7 @@ public class ABCallbackGetItemLevel extends ABIntegerCallback { private ABItemCallback item; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; @@ -20,7 +19,7 @@ public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStor CItem theItem; if (item != null) { - theItem = item.callback(game, caster, localStore, castId); + theItem = item.callback(caster, localStore, castId); } else { theItem = (CItem) localStore.get(ABLocalStoreKeys.ITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java index baa2c0a3b..5e0768e42 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -12,7 +11,7 @@ public class ABCallbackGetItemMaxCharges extends ABIntegerCallback { private ABItemCallback item; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; @@ -20,7 +19,7 @@ public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStor CItem theItem; if (item != null) { - theItem = item.callback(game, caster, localStore, castId); + theItem = item.callback(caster, localStore, castId); } else { theItem = (CItem) localStore.get(ABLocalStoreKeys.ITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java index 32709ccf8..2753b1688 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -12,7 +11,7 @@ public class ABCallbackGetItemSlot extends ABIntegerCallback { private ABItemCallback item; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; @@ -20,7 +19,7 @@ public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStor CItem theItem; if (item != null) { - theItem = item.callback(game, caster, localStore, castId); + theItem = item.callback(caster, localStore, castId); } else { theItem = (CItem)localStore.get(ABLocalStoreKeys.ITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java index aa474ba7f..f36ba4d3c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetListSize extends ABIntegerCallback { private ABListCallback list; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return list.callback(game, caster, localStore, castId).size(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return list.callback(caster, localStore, castId).size(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java index 09c03efa0..7625e2670 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.etheller.warsmash.util.WarsmashConstants; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetNeutralHostilePlayerId extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { return WarsmashConstants.MAX_PLAYERS - 4; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java index 986c06b8f..a9264d5ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.etheller.warsmash.util.WarsmashConstants; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetNeutralPassivePlayerId extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { return WarsmashConstants.MAX_PLAYERS - 1; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetPlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetPlayerId.java index 9308e3814..d86f35d74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetPlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetPlayerId.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetPlayerId extends ABIntegerCallback { private ABPlayerCallback player; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return player.callback(game, caster, localStore, castId).getId(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return player.callback(caster, localStore, castId).getId(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileDestructableTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileDestructableTargets.java index d2f4457ba..a645be081 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileDestructableTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileDestructableTargets.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,7 @@ public class ABCallbackGetProjectileDestructableTargets extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { return (Integer) localStore.get(ABLocalStoreKeys.PROJECTILEDESTTARGETS + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileUnitTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileUnitTargets.java index 5ed31801a..6b7da126a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileUnitTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileUnitTargets.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,7 +9,7 @@ public class ABCallbackGetProjectileUnitTargets extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { return (Integer) localStore.get(ABLocalStoreKeys.PROJECTILEUNITTARGETS + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java index cadf6319c..b764a4fb7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetSortableListSize extends ABIntegerCallback { private ABSortableListCallback list; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return list.callback(game, caster, localStore, castId).size(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return list.callback(caster, localStore, castId).size(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSpellLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSpellLevel.java index 2cfd5d9d0..204ab37b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSpellLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSpellLevel.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,7 @@ public class ABCallbackGetSpellLevel extends ABIntegerCallback { @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { return (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetStoredIntegerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetStoredIntegerByKey.java index 1678a454d..eca70e0e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetStoredIntegerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetStoredIntegerByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,14 +13,14 @@ public class ABCallbackGetStoredIntegerByKey extends ABIntegerCallback { private ABBooleanCallback instanceValue; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Integer) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (Integer) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitGroupSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitGroupSize.java index 15017c09f..05560b953 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitGroupSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitGroupSize.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitGroupSize extends ABIntegerCallback { private ABUnitGroupCallback group; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return group.callback(game, caster, localStore, castId).size(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return group.callback(caster, localStore, castId).size(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java index 078b9291e..a23e4f220 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitHandleAsInteger extends ABIntegerCallback { private ABUnitCallback unit; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return unit.callback(game, caster, localStore, castId).getHandleId(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return unit.callback(caster, localStore, castId).getHandleId(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java index ea99d7adf..da78e8ce6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,9 +9,9 @@ public class ABCallbackGetUnitMaximumHp extends ABIntegerCallback { private ABUnitCallback unit; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { return unit == null ? caster.getMaximumLife() - : this.unit.callback(game, caster, localStore, castId).getMaximumLife(); + : this.unit.callback(caster, localStore, castId).getMaximumLife(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java index c1a802aa7..cae825107 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,9 +9,9 @@ public class ABCallbackGetUnitMaximumMp extends ABIntegerCallback { private ABUnitCallback unit; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { return unit == null ? caster.getMaximumMana() - : unit.callback(game, caster, localStore, castId).getMaximumMana(); + : unit.callback(caster, localStore, castId).getMaximumMana(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitQueueSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitQueueSize.java index a3dca80e6..f1dc0ea54 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitQueueSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitQueueSize.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitQueueSize extends ABIntegerCallback { private ABUnitQueueCallback queue; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return queue.callback(game, caster, localStore, castId).size(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return queue.callback(caster, localStore, castId).size(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeFoodCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeFoodCost.java index 22de467a5..18d40f547 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeFoodCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeFoodCost.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitTypeFoodCost extends ABIntegerCallback { private ABIDCallback id; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getUnitData().getUnitType(id.callback(game, caster, localStore, castId)).getFoodUsed(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getUnitData().getUnitType(id.callback(caster, localStore, castId)).getFoodUsed(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeGoldCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeGoldCost.java index 8084ebe2c..e3ecd35ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeGoldCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeGoldCost.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitTypeGoldCost extends ABIntegerCallback { private ABIDCallback id; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getUnitData().getUnitType(id.callback(game, caster, localStore, castId)).getGoldCost(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getUnitData().getUnitType(id.callback(caster, localStore, castId)).getGoldCost(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeLumberCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeLumberCost.java index bf24843ea..2cdf270f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeLumberCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeLumberCost.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitTypeLumberCost extends ABIntegerCallback { private ABIDCallback id; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getUnitData().getUnitType(id.callback(game, caster, localStore, castId)).getLumberCost(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getUnitData().getUnitType(id.callback(caster, localStore, castId)).getLumberCost(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java index 93c44d7d1..5bdc5905a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,10 +7,10 @@ public class ABCallbackGetUnitTypeSpeed extends ABIntegerCallback { private ABIDCallback id; - + @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getUnitData().getUnitType(id.callback(game, caster, localStore, castId)).getSpeed(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getUnitData().getUnitType(id.callback(caster, localStore, castId)).getSpeed(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java index b8e30b9f8..4a5148663 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,11 +11,11 @@ public class ABCallbackInlineConditionInteger extends ABIntegerCallback { private ABIntegerCallback fail; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java index bac174c89..8afe632eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,11 +11,11 @@ public class ABCallbackIntegerIf extends ABIntegerCallback { private ABCondition condition; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (condition == null || !condition.callback(game, caster, localStore, castId)) { - return value2.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (condition == null || !condition.callback(caster, localStore, castId)) { + return value2.callback(caster, localStore, castId); } - return value1.callback(game, caster, localStore, castId); + return value1.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfFalse.java index 31f65fa40..8783507a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfFalse.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,11 +10,11 @@ public class ABCallbackIntegerZeroIfFalse extends ABIntegerCallback { private ABBooleanCallback bool; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (bool == null || !bool.callback(game, caster, localStore, castId)) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (bool == null || !bool.callback(caster, localStore, castId)) { return 0; } - return value.callback(game, caster, localStore, castId); + return value.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java index f63b7c73e..5422bae10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackIntegerZeroIfNull extends ABIntegerCallback { private ABIntegerCallback value; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v = value.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v = value.callback(caster, localStore, castId); return v == null ? 0 : v; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java index 1fa7b5189..011a90fdc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,9 +10,9 @@ public class ABCallbackIterator extends ABIntegerCallback { private ABCallback unique; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { if (this.unique != null) { - return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT+"$"+this.unique.callback(game, caster, localStore, castId), castId)); + return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT+"$"+this.unique.callback(caster, localStore, castId), castId)); } else { return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMaxInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMaxInteger.java index 3b052efc1..e9b93bdbc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMaxInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMaxInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,9 +9,9 @@ public class ABCallbackMaxInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return Math.max(value1.callback(game, caster, localStore, castId), - value2.callback(game, caster, localStore, castId)); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return Math.max(value1.callback(caster, localStore, castId), + value2.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMinInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMinInteger.java index 26ba485e7..9d422f2d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMinInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMinInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,9 +9,9 @@ public class ABCallbackMinInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return Math.min(value1.callback(game, caster, localStore, castId), - value2.callback(game, caster, localStore, castId)); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return Math.min(value1.callback(caster, localStore, castId), + value2.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMultiplyInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMultiplyInteger.java index 34aa312cd..1b677b86e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMultiplyInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMultiplyInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackMultiplyInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) * value2.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) * value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackOrInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackOrInteger.java index e67dfa334..2c840b890 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackOrInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackOrInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackOrInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) | value2.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) | value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackPlayerToStateModValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackPlayerToStateModValue.java index 84a7c06bf..80d959cfd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackPlayerToStateModValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackPlayerToStateModValue.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackPlayerToStateModValue extends ABIntegerCallback { private ABPlayerCallback player; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return 1 << player.callback(game, caster, localStore, castId).getId(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return 1 << player.callback(caster, localStore, castId).getId(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java index c33e047fd..397441c01 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,20 +11,20 @@ public class ABCallbackRandomInteger extends ABIntegerCallback { private ABIntegerCallback bound; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { if (bound != null) { - return game.getSeededRandom().nextInt(bound.callback(game, caster, localStore, castId)); + return localStore.game.getSeededRandom().nextInt(bound.callback(caster, localStore, castId)); } int low = Integer.MIN_VALUE; int high = Integer.MAX_VALUE; if (upperBound != null) { low = 0; - high = upperBound.callback(game, caster, localStore, castId); + high = upperBound.callback(caster, localStore, castId); } if (lowerBound != null) { - low = lowerBound.callback(game, caster, localStore, castId); + low = lowerBound.callback(caster, localStore, castId); } - return game.getSeededRandom().nextInt(low, high); + return localStore.game.getSeededRandom().nextInt(low, high); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRawInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRawInteger.java index d34c6f7c2..e5957873a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRawInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRawInteger.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,7 +9,7 @@ public class ABCallbackRawInteger extends ABIntegerCallback { private Integer value; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java index ec1ccfe99..980425716 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -15,16 +14,15 @@ public class ABCallbackReuseInteger extends ABIntegerCallback { private ABStringCallback name; @Override - public Integer callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABIntegerCallback) { - return ((ABIntegerCallback) callback).callback(game, caster, localStore, castId); + return ((ABIntegerCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseIntegerCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java index 5c523f204..e7e191979 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -18,12 +17,11 @@ public class ABCallbackReuseIntegerWithArguments extends ABIntegerCallback { private Map arguments; @Override - public Integer callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABIntegerCallback) { @@ -33,7 +31,7 @@ public Integer callback(final CSimulation game, final CUnit caster, } } - return ((ABIntegerCallback) callback).callback(game, caster, localStore, castId); + return ((ABIntegerCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseIntegerCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackSubtractInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackSubtractInteger.java index a5c76fc49..b7a0a11ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackSubtractInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackSubtractInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackSubtractInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) - value2.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) - value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java index 26984582a..dabc92426 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackTruncateFloatToInteger extends ABIntegerCallback { private ABFloatCallback value; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value.callback(game, caster, localStore, castId).intValue(); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value.callback(caster, localStore, castId).intValue(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABIntegerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABIntegerCallback.java index 3331354a4..4d833ea60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABIntegerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABIntegerCallback.java @@ -1,12 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABIntegerCallback implements ABCallback { - abstract public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java index 39c72b112..c5c94e8a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,12 +13,11 @@ public class ABCallbackArgumentItem extends ABItemCallback { private ABStringCallback name; @Override - public CItem callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public CItem callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABItemCallback) { - return ((ABItemCallback) cbck).callback(game, caster, localStore, castId); + return ((ABItemCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseItemCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java index 4a29aa7fd..3c726906f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetAbilityTargetedItem extends ABItemCallback { @Override - public CItem callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CItem callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CItem) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java index 9aa6ffeba..4b0e17aff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; @@ -11,7 +10,7 @@ public class ABCallbackGetAttackedItem extends ABItemCallback { @Override - public CItem callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CItem callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.ITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java index 42bfc8821..3a608fc18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedItem extends ABItemCallback { @Override - public CItem callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CItem callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CItem) localStore.get(ABLocalStoreKeys.LASTCREATEDITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java index 3bee0f1c2..5430dbf94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,11 +13,11 @@ public class ABCallbackGetStoredItemByKey extends ABItemCallback { private ABBooleanCallback instanceValue; @Override - public CItem callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (CItem) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public CItem callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (CItem) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (CItem) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (CItem) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java index 0d8c8a0f8..6bb85bc7d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionItem extends ABItemCallback { private ABItemCallback fail; @Override - public CItem callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public CItem callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java index 2df172851..cb3b1bfb2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,15 +15,14 @@ public class ABCallbackReuseItem extends ABItemCallback { private ABStringCallback name; @Override - public CItem callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CItem callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABItemCallback) { - return ((ABItemCallback) callback).callback(game, caster, localStore, castId); + return ((ABItemCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseItemCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java index 6a5ba10dd..07350edd3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,11 +18,10 @@ public class ABCallbackReuseItemWithArguments extends ABItemCallback { private Map arguments; @Override - public CItem callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CItem callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABItemCallback) { @@ -33,7 +31,7 @@ public CItem callback(final CSimulation game, final CUnit caster, final LocalDat } } - return ((ABItemCallback) callback).callback(game, caster, localStore, castId); + return ((ABItemCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseItemCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java index 8ce681199..0ca0a08e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java @@ -1,13 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABItemCallback implements ABCallback { - abstract public CItem callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CItem callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java index ccc334445..82619d7b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -16,12 +15,11 @@ public class ABCallbackArgumentList extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public List callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABListCallback) { - return ((ABListCallback) cbck).callback(game, caster, localStore, castId); + return ((ABListCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ArgumentLocationCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java index 598bdaa18..956319935 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -16,13 +15,12 @@ public class ABCallbackArgumentSortableList> ext @SuppressWarnings("unchecked") @Override - public List callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public List callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABListCallback) { - return ((ABListCallback) cbck).callback(game, caster, localStore, castId); + return ((ABListCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ArgumentLocationCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java index bf3fac158..3d6b4b05b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -15,11 +14,11 @@ public class ABCallbackGetStoredListByKey extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (List) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public List callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (List) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (List) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (List) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java index e1adb3af3..3895ca9c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -15,11 +14,11 @@ public class ABCallbackGetStoredSortableListByKey callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (List) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public List callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (List) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (List) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (List) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java index 6652b6210..e8d443fd2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -14,11 +13,11 @@ public class ABCallbackInlineConditionList extends ABListCallback { private ABListCallback fail; @Override - public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public List callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java index 743795c6e..5667661b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -14,11 +13,11 @@ public class ABCallbackInlineConditionSortableList fail; @Override - public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public List callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java index e075d8c00..8418502d7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java @@ -3,7 +3,6 @@ import java.util.Collections; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,15 +12,15 @@ public class ABCallbackListSorted> extends ABSor private ABListSortType sort; @Override - public List callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - List theList = list.callback(game, caster, localStore, castId); + public List callback(final CUnit caster, final LocalDataStore localStore, + final int castId) { + List theList = list.callback(caster, localStore, castId); switch(sort){ case DSC: theList.sort(Collections.reverseOrder()); break; case RAND: - Collections.shuffle(theList, game.getSeededRandom()); + Collections.shuffle(theList, localStore.game.getSeededRandom()); break; default: case ASC: diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java index a8888d4fd..ab6e5f660 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -18,16 +17,15 @@ public class ABCallbackReuseList extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public List callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABListCallback) { - return ((ABListCallback) callback).callback(game, caster, localStore, castId); + return ((ABListCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java index 46b8075c4..d40b122fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java @@ -4,7 +4,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -20,12 +19,11 @@ public class ABCallbackReuseListWithArguments extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public List callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABListCallback) { @@ -35,7 +33,7 @@ public List callback(final CSimulation game, final CUnit caster, } } - return ((ABListCallback) callback).callback(game, caster, localStore, castId); + return ((ABListCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java index 6d376baa2..2e67cb092 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -18,15 +17,14 @@ public class ABCallbackReuseSortableList> extend @SuppressWarnings("unchecked") @Override - public List callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public List callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABListCallback) { - return ((ABListCallback) callback).callback(game, caster, localStore, castId); + return ((ABListCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java index d03106562..8fde1bc96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java @@ -4,7 +4,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -20,12 +19,11 @@ public class ABCallbackReuseSortableListWithArguments callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public List callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABListCallback) { @@ -35,7 +33,7 @@ public List callback(final CSimulation game, final CUnit caster, } } - return ((ABListCallback) callback).callback(game, caster, localStore, castId); + return ((ABListCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java index 266e2bb46..01a37c740 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java @@ -2,13 +2,11 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABListCallback implements ABCallback { - abstract public List callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public List callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java index 3f2a6317c..0fd2b8c1c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java @@ -2,13 +2,11 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABSortableListCallback> implements ABCallback { - abstract public List callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public List callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java index fccea5a99..5325dbbcd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java @@ -3,14 +3,13 @@ import java.util.ArrayList; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackEmptyIntegerList extends ABIntegerListCallback { @Override - public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + public List callback(CUnit caster, LocalDataStore localStore, int castId) { return new ArrayList<>(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java index f211e3f84..18e251911 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java @@ -4,7 +4,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -18,16 +17,16 @@ public class ABCallbackIntegerListOfRange extends ABIntegerListCallback { private ABBooleanCallback inclusiveEnd; @Override - public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + public List callback(CUnit caster, LocalDataStore localStore, int castId) { int theStart = 0; if (start != null) { - theStart = start.callback(game, caster, localStore, castId); + theStart = start.callback(caster, localStore, castId); } - if (inclusiveEnd != null && inclusiveEnd.callback(game, caster, localStore, castId)) { - return IntStream.rangeClosed(theStart, end.callback(game, caster, localStore, castId)).boxed() + if (inclusiveEnd != null && inclusiveEnd.callback(caster, localStore, castId)) { + return IntStream.rangeClosed(theStart, end.callback(caster, localStore, castId)).boxed() .collect(Collectors.toList()); } - return IntStream.range(theStart, end.callback(game, caster, localStore, castId)).boxed() + return IntStream.range(theStart, end.callback(caster, localStore, castId)).boxed() .collect(Collectors.toList()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java index d4a2dda3a..0d7176a77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java @@ -2,13 +2,12 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABIntegerListCallback extends ABSortableListCallback { - abstract public List callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public List callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java index e5ee7db82..504f23189 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,7 +10,7 @@ public class ABCallbackEmptyLocationList extends ABLocationListCallback { @Override - public List callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + public List callback(CUnit caster, LocalDataStore localStore, int castId) { return new ArrayList<>(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java index 1bc3cc19f..bdb197d65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; @@ -10,6 +9,6 @@ public abstract class ABLocationListCallback extends ABListCallback { - abstract public List callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public List callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityEffectReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityEffectReactionListenerCallback.java index 809c9b7fa..2941ee11f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityEffectReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityEffectReactionListenerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABAbilityEffectReactionListenerCallback implements ABCallback { - abstract public ABAbilityEffectReactionListener callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABAbilityEffectReactionListener callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityProjReactionListenerCallback.java index a70233a81..db093e37b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityProjReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityProjReactionListenerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABAbilityProjReactionListenerCallback implements ABCallback { - abstract public ABAbilityProjReactionListener callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABAbilityProjReactionListener callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPostDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPostDamageListenerCallback.java index aaf0dc405..451ffacf5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPostDamageListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPostDamageListenerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABAttackPostDamageListenerCallback implements ABCallback { - abstract public ABAttackPostDamageListener callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABAttackPostDamageListener callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPreDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPreDamageListenerCallback.java index f223e22f1..5d21d0979 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPreDamageListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPreDamageListenerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABAttackPreDamageListenerCallback implements ABCallback { - abstract public ABAttackPreDamageListener callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABAttackPreDamageListener callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackProjReactionListenerCallback.java index 6bde5ad33..5de63c377 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackProjReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackProjReactionListenerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABAttackProjReactionListenerCallback implements ABCallback { - abstract public ABAttackProjReactionListener callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABAttackProjReactionListener callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABBehaviorChangeListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABBehaviorChangeListenerCallback.java index 7fd41e683..1fad2be56 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABBehaviorChangeListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABBehaviorChangeListenerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABBehaviorChangeListenerCallback implements ABCallback { - abstract public ABBehaviorChangeListener callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABBehaviorChangeListener callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityEffectReactionListener.java index 2be24ac07..72c787fcb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityEffectReactionListener.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackGetLastCreatedAbilityEffectReactionListener extends ABAbilityEffectReactionListenerCallback { @Override - public ABAbilityEffectReactionListener callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { + public ABAbilityEffectReactionListener callback(CUnit caster, LocalDataStore localStore, + final int castId) { return (ABAbilityEffectReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbERL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityProjReactionListener.java index 97721c8d1..852caa81c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityProjReactionListener.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,7 @@ public class ABCallbackGetLastCreatedAbilityProjReactionListener extends ABAbilityProjReactionListenerCallback { @Override - public ABAbilityProjReactionListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { + public ABAbilityProjReactionListener callback(CUnit caster, LocalDataStore localStore, final int castId) { return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbPRL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPostDamageListener.java index 6ad469c44..e0c531891 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPostDamageListener.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackGetLastCreatedAttackPostDamageListener extends ABAttackPostDamageListenerCallback { @Override - public ABAttackPostDamageListener callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { + public ABAttackPostDamageListener callback(CUnit caster, LocalDataStore localStore, + final int castId) { return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPoDL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPreDamageListener.java index 7e36ad5ce..2526cb4fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPreDamageListener.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackGetLastCreatedAttackPreDamageListener extends ABAttackPreDamageListenerCallback { @Override - public ABAttackPreDamageListener callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { + public ABAttackPreDamageListener callback(CUnit caster, LocalDataStore localStore, + final int castId) { return (ABAttackPreDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPrDL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackProjReactionListener.java index b472c5688..05597d359 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackProjReactionListener.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,7 @@ public class ABCallbackGetLastCreatedAttackProjReactionListener extends ABAttackProjReactionListenerCallback { @Override - public ABAttackProjReactionListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { + public ABAttackProjReactionListener callback(CUnit caster, LocalDataStore localStore, final int castId) { return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAtkPRL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedBehaviorChangeListener.java index 793764e3a..e790127fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedBehaviorChangeListener.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,7 @@ public class ABCallbackGetLastCreatedBehaviorChangeListener extends ABBehaviorChangeListenerCallback { @Override - public ABBehaviorChangeListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { + public ABBehaviorChangeListener callback(CUnit caster, LocalDataStore localStore, final int castId) { return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.LASTCREATEDBCL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenListener.java index 387e03613..76d66bbbd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenListener.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedDamageTakenListener extends ABDamageTakenListenerCallback { @Override - public ABDamageTakenListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public ABDamageTakenListener callback(CUnit caster, LocalDataStore localStore, final int castId) { return (ABDamageTakenListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenModificationListener.java index 5a85db1be..6c2c22af3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenModificationListener.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackGetLastCreatedDamageTakenModificationListener extends ABDamageTakenModificationListenerCallback { @Override - public ABDamageTakenModificationListener callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { + public ABDamageTakenModificationListener callback(CUnit caster, LocalDataStore localStore, + final int castId) { return (ABDamageTakenModificationListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTML); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDeathReplacement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDeathReplacement.java index 922f92cf1..058dc4c86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDeathReplacement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDeathReplacement.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,8 @@ public class ABCallbackGetLastCreatedDeathReplacement extends ABDeathReplacementCallback { @Override - public ABDeathReplacementEffect callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { + public ABDeathReplacementEffect callback(CUnit caster, LocalDataStore localStore, + final int castId) { return (ABDeathReplacementEffect) localStore.get(ABLocalStoreKeys.LASTCREATEDDRE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedEvasionListener.java index 16fdc10c8..86e23bad7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedEvasionListener.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,8 +8,7 @@ public class ABCallbackGetLastCreatedEvasionListener extends ABEvasionListenerCallback { @Override - public ABAttackEvasionListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { + public ABAttackEvasionListener callback(CUnit caster, LocalDataStore localStore, final int castId) { return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAEL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java index 399423e93..cb8a2c244 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedUnitStateListener extends ABUnitStateListenerCallback { @Override - public ABUnitStateListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public ABUnitStateListener callback(CUnit caster, LocalDataStore localStore, final int castId) { return (ABUnitStateListener) localStore.get(ABLocalStoreKeys.LASTCREATEDUSL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java index e8cc07ab9..554e76ef2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,14 +12,13 @@ public class ABCallbackGetStoredAbilityEffectReactionListenerByKey extends ABAbi private ABBooleanCallback instanceValue; @Override - public ABAbilityEffectReactionListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public ABAbilityEffectReactionListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABAbilityEffectReactionListener) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (ABAbilityEffectReactionListener) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityProjReactionListenerByKey.java index 7a5ca609a..1738f4140 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityProjReactionListenerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,12 +12,12 @@ public class ABCallbackGetStoredAbilityProjReactionListenerByKey extends ABAbili private ABBooleanCallback instanceValue; @Override - public ABAbilityProjReactionListener callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public ABAbilityProjReactionListener callback(CUnit caster, LocalDataStore localStore, + final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPostDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPostDamageListenerByKey.java index 44bc42617..a57b04ac2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPostDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPostDamageListenerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,12 +12,12 @@ public class ABCallbackGetStoredAttackPostDamageListenerByKey extends ABAttackPo private ABBooleanCallback instanceValue; @Override - public ABAttackPostDamageListener callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public ABAttackPostDamageListener callback(CUnit caster, LocalDataStore localStore, + final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPreDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPreDamageListenerByKey.java index 41c274044..363000bc2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPreDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPreDamageListenerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,14 +12,13 @@ public class ABCallbackGetStoredAttackPreDamageListenerByKey extends ABAttackPre private ABBooleanCallback instanceValue; @Override - public ABAttackPreDamageListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public ABAttackPreDamageListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABAttackPreDamageListener) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (ABAttackPreDamageListener) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackProjReactionListenerByKey.java index 3dfc510df..d9b960ae0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackProjReactionListenerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,12 +12,12 @@ public class ABCallbackGetStoredAttackProjReactionListenerByKey extends ABAttack private ABBooleanCallback instanceValue; @Override - public ABAttackProjReactionListener callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public ABAttackProjReactionListener callback(CUnit caster, LocalDataStore localStore, + final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredBehaviorChangeListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredBehaviorChangeListenerByKey.java index 39092b7a2..e301943e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredBehaviorChangeListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredBehaviorChangeListenerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,12 +12,12 @@ public class ABCallbackGetStoredBehaviorChangeListenerByKey extends ABBehaviorCh private ABBooleanCallback instanceValue; @Override - public ABBehaviorChangeListener callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public ABBehaviorChangeListener callback(CUnit caster, LocalDataStore localStore, + final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenListenerByKey.java index 3d6a8fc18..0fb774ba5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenListenerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,13 +12,13 @@ public class ABCallbackGetStoredDamageTakenListenerByKey extends ABDamageTakenLi private ABBooleanCallback instanceValue; @Override - public ABDamageTakenListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public ABDamageTakenListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABDamageTakenListener) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (ABDamageTakenListener) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenModificationListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenModificationListenerByKey.java index d6e9d8f84..65d7ec8ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenModificationListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenModificationListenerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,14 +12,13 @@ public class ABCallbackGetStoredDamageTakenModificationListenerByKey extends ABD private ABBooleanCallback instanceValue; @Override - public ABDamageTakenModificationListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public ABDamageTakenModificationListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABDamageTakenModificationListener) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (ABDamageTakenModificationListener) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDeathReplacementByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDeathReplacementByKey.java index 24a17b4db..9d025a792 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDeathReplacementByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDeathReplacementByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,14 +12,13 @@ public class ABCallbackGetStoredDeathReplacementByKey extends ABDeathReplacement private ABBooleanCallback instanceValue; @Override - public ABDeathReplacementEffect callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public ABDeathReplacementEffect callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABDeathReplacementEffect) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (ABDeathReplacementEffect) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredEvasionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredEvasionListenerByKey.java index b1c680666..447c357d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredEvasionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredEvasionListenerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,12 +12,12 @@ public class ABCallbackGetStoredEvasionListenerByKey extends ABEvasionListenerCa private ABBooleanCallback instanceValue; @Override - public ABAttackEvasionListener callback(CSimulation game, CUnit caster, - LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public ABAttackEvasionListener callback(CUnit caster, LocalDataStore localStore, + final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java index 133c2804e..efa177b1e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,13 +12,13 @@ public class ABCallbackGetStoredUnitStateListenerByKey extends ABUnitStateListen private ABBooleanCallback instanceValue; @Override - public ABUnitStateListener callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public ABUnitStateListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABUnitStateListener) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (ABUnitStateListener) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenListenerCallback.java index f09de9928..acb1f19a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenListenerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABDamageTakenListenerCallback implements ABCallback { - abstract public ABDamageTakenListener callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABDamageTakenListener callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenModificationListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenModificationListenerCallback.java index 49151eae5..fba1e9acf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenModificationListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenModificationListenerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABDamageTakenModificationListenerCallback implements ABCallback { - abstract public ABDamageTakenModificationListener callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABDamageTakenModificationListener callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDeathReplacementCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDeathReplacementCallback.java index 346d3bfb9..fa0a5c76d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDeathReplacementCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDeathReplacementCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABDeathReplacementCallback implements ABCallback { - abstract public ABDeathReplacementEffect callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABDeathReplacementEffect callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABEvasionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABEvasionListenerCallback.java index 217a3aa15..063d983e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABEvasionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABEvasionListenerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABEvasionListenerCallback implements ABCallback { - abstract public ABAttackEvasionListener callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABAttackEvasionListener callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java index ee1d755dc..ad814b8f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABUnitStateListenerCallback implements ABCallback { - abstract public ABUnitStateListener callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public ABUnitStateListener callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java index 73f983c3e..4c570e6ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,12 +13,11 @@ public class ABCallbackArgumentLocation extends ABLocationCallback { private ABStringCallback name; @Override - public AbilityPointTarget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public AbilityPointTarget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABLocationCallback) { - return ((ABLocationCallback) cbck).callback(game, caster, localStore, castId); + return ((ABLocationCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ArgumentLocationCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java index 7da8db37e..a929bb524 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -17,13 +16,12 @@ public class ABCallbackCreateLocationFromOffset extends ABLocationCallback { private ABBooleanCallback angleInDegrees; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { - final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); - final float d = this.dist.callback(game, caster, localStore, castId); - final float a = this.angle.callback(game, caster, localStore, castId); + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + final AbilityPointTarget orig = this.origin.callback(caster, localStore, castId); + final float d = this.dist.callback(caster, localStore, castId); + final float a = this.angle.callback(caster, localStore, castId); - if (angleInDegrees != null && angleInDegrees.callback(game, caster, localStore, castId)) { + if (angleInDegrees != null && angleInDegrees.callback(caster, localStore, castId)) { return new AbilityPointTarget((float) (orig.x + (d * Math.cos(Math.toRadians(a)))), (float) (orig.y + (d * Math.sin(Math.toRadians(a))))); } return new AbilityPointTarget((float) (orig.x + (d * Math.cos(a))), (float) (orig.y + (d * Math.sin(a)))); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromTarget.java index ac42441c0..63570a1a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromTarget.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; @@ -12,8 +11,8 @@ public class ABCallbackCreateLocationFromTarget extends ABLocationCallback { private ABTargetCallback target; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - AbilityTarget tar = target.callback(game, caster, localStore, castId); + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + AbilityTarget tar = target.callback(caster, localStore, castId); return new AbilityPointTarget(tar.getX(), tar.getY()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXY.java index 1a8b43206..296a4b991 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXY.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -12,8 +11,8 @@ public class ABCallbackCreateLocationFromXY extends ABLocationCallback { private ABFloatCallback y; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return new AbilityPointTarget(x.callback(game, caster, localStore, castId), y.callback(game, caster, localStore, castId)); + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + return new AbilityPointTarget(x.callback(caster, localStore, castId), y.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java index 59cc3c7b4..c5916b1ed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -13,10 +12,10 @@ public class ABCallbackCreateLocationFromXYOffset extends ABLocationCallback { private ABFloatCallback ydist; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); - return new AbilityPointTarget((float) (orig.x + xdist.callback(game, caster, localStore, castId)), - (float) (orig.y + ydist.callback(game, caster, localStore, castId))); + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + final AbilityPointTarget orig = this.origin.callback(caster, localStore, castId); + return new AbilityPointTarget((float) (orig.x + xdist.callback(caster, localStore, castId)), + (float) (orig.y + ydist.callback(caster, localStore, castId))); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java index 0c23c37bd..62a69fac7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -9,7 +8,7 @@ public class ABCallbackGetAttackImpactLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.ATTACKIMPACTLOCATION+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java index ebd5d1c76..c3d107fa4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; @@ -11,7 +10,7 @@ public class ABCallbackGetAttackTargetLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); if (tar.visit(AbilityTargetVisitor.POINT) != null) { return tar.visit(AbilityTargetVisitor.POINT); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java index 0cf89a6fa..d333350e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; @@ -11,7 +10,7 @@ public class ABCallbackGetGroundAttackedLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.POINT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java index 5edf319fc..ff4900e44 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -13,8 +12,8 @@ public class ABCallbackGetLocationFromList extends ABLocationCallback { private ABIntegerCallback index; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return list.callback(game, caster, localStore, castId).get(index.callback(game, caster, localStore, castId)); + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + return list.callback(caster, localStore, castId).get(index.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetProjectileCurrentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetProjectileCurrentLocation.java index 50d88ca64..6f3dec8f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetProjectileCurrentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetProjectileCurrentLocation.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -9,7 +8,7 @@ public class ABCallbackGetProjectileCurrentLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetStoredLocationByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetStoredLocationByKey.java index 72be9592a..cec14dc36 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetStoredLocationByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetStoredLocationByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -13,11 +12,11 @@ public class ABCallbackGetStoredLocationByKey extends ABLocationCallback { private ABBooleanCallback instanceValue; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetTargetedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetTargetedLocation.java index 86194b475..461e6d343 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetTargetedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetTargetedLocation.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABCallbackGetTargetedLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { final AbilityPointTarget target = (AbilityPointTarget) localStore .get(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetUnitLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetUnitLocation.java index 2fc38f796..82c614e10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetUnitLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetUnitLocation.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -12,8 +11,8 @@ public class ABCallbackGetUnitLocation extends ABLocationCallback { private ABUnitCallback unit; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CUnit theUnit = this.unit.callback(game, caster, localStore, castId); + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + final CUnit theUnit = this.unit.callback(caster, localStore, castId); return new AbilityPointTarget(theUnit.getX(), theUnit.getY()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java index d2c8a8cd4..d93ce8b67 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionLocation extends ABLocationCallback { private ABLocationCallback fail; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java index 22f983f3d..6097007ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -16,13 +15,12 @@ public class ABCallbackModifyLocationWithOffset extends ABLocationCallback { private ABBooleanCallback angleInDegrees; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { - final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); - final float d = this.dist.callback(game, caster, localStore, castId); - final float a = this.angle.callback(game, caster, localStore, castId); + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + final AbilityPointTarget orig = this.origin.callback(caster, localStore, castId); + final float d = this.dist.callback(caster, localStore, castId); + final float a = this.angle.callback(caster, localStore, castId); - if (angleInDegrees != null && angleInDegrees.callback(game, caster, localStore, castId)) { + if (angleInDegrees != null && angleInDegrees.callback(caster, localStore, castId)) { orig.add((float)(d * Math.cos(Math.toRadians(a))), (float)(d * Math.sin(Math.toRadians(a)))); return orig; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java index d19b3d2d8..4eb067039 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -13,10 +12,9 @@ public class ABCallbackModifyLocationWithXYOffset extends ABLocationCallback { private ABFloatCallback ydist; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, - final int castId) { - final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); - orig.add(xdist.callback(game, caster, localStore, castId), ydist.callback(game, caster, localStore, castId)); + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + final AbilityPointTarget orig = this.origin.callback(caster, localStore, castId); + orig.add(xdist.callback(caster, localStore, castId), ydist.callback(caster, localStore, castId)); return orig; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java index c0a079dbf..5555f6d6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -12,10 +11,10 @@ public class ABCallbackRandomLocationInRange extends ABLocationCallback { private ABFloatCallback range; @Override - public AbilityPointTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final AbilityPointTarget orig = this.origin.callback(game, caster, localStore, castId); - final float d = this.range.callback(game, caster, localStore, castId) * game.getSeededRandom().nextFloat(); - final float a = (float) (Math.PI * 2 * game.getSeededRandom().nextFloat()); + public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + final AbilityPointTarget orig = this.origin.callback(caster, localStore, castId); + final float d = this.range.callback(caster, localStore, castId) * localStore.game.getSeededRandom().nextFloat(); + final float a = (float) (Math.PI * 2 * localStore.game.getSeededRandom().nextFloat()); orig.add((float) (d * Math.cos(a)), (float) (d * Math.sin(a))); return orig; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java index c2ff34602..ce3c71fa3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -16,16 +15,15 @@ public class ABCallbackReuseLocation extends ABLocationCallback { private ABStringCallback name; @Override - public AbilityPointTarget callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public AbilityPointTarget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABLocationCallback) { - return ((ABLocationCallback) callback).callback(game, caster, localStore, castId); + return ((ABLocationCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java index 63c8b5d36..40ecd771d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -19,12 +18,11 @@ public class ABCallbackReuseLocationWithArguments extends ABLocationCallback { private Map arguments; @Override - public AbilityPointTarget callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public AbilityPointTarget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABLocationCallback) { @@ -34,7 +32,7 @@ public AbilityPointTarget callback(final CSimulation game, final CUnit caster, } } - return ((ABLocationCallback) callback).callback(game, caster, localStore, castId); + return ((ABLocationCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABLocationCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABLocationCallback.java index 3fba67ff4..dd7ae589d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABLocationCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABLocationCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -8,6 +7,6 @@ public abstract class ABLocationCallback implements ABCallback { - abstract public AbilityPointTarget callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public AbilityPointTarget callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAddLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAddLong.java index a49a5df5e..0899a71a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAddLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAddLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackAddLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) + value2.callback(game, caster, localStore, castId); + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) + value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAndLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAndLong.java index 73c0859d7..86d256449 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAndLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAndLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackAndLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) & value2.callback(game, caster, localStore, castId); + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) & value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java index 453bf34a1..4320d331b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -13,13 +12,12 @@ public class ABCallbackArgumentLong extends ABLongCallback { private ABStringCallback name; @Override - public Long callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Long callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABLongCallback) { - return ((ABLongCallback) cbck).callback(game, caster, localStore, castId); + return ((ABLongCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseLongCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java index ff62e01a3..25c68262f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,9 +10,9 @@ public class ABCallbackCreateDetectedData extends ABLongCallback { private ABIntegerCallback playerDetectedData; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - long ply = playerDetectedData.callback(game, caster, localStore, castId); - byte val = detectionLevel.callback(game, caster, localStore, castId).byteValue(); + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + long ply = playerDetectedData.callback(caster, localStore, castId); + byte val = detectionLevel.callback(caster, localStore, castId).byteValue(); return val + (ply<<8); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectorData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectorData.java index ea2500315..98560be0a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectorData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectorData.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; @@ -13,9 +12,9 @@ public class ABCallbackCreateDetectorData extends ABLongCallback { private ABFloatCallback range; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - long rng = Math.min(PathingGrid.getFogOfWarDistance(range.callback(game, caster, localStore, castId)), 8388607); - byte val = detectionLevel.callback(game, caster, localStore, castId).byteValue(); + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + long rng = Math.min(PathingGrid.getFogOfWarDistance(range.callback(caster, localStore, castId)), 8388607); + byte val = detectionLevel.callback(caster, localStore, castId).byteValue(); return val + (rng<<8); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java index 6b28050e7..f7d91f9a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,9 +10,9 @@ public class ABCallbackCreateOwnershipData extends ABLongCallback { private ABIntegerCallback playerId; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - long ply = playerId.callback(game, caster, localStore, castId); - int val = Math.min(priority.callback(game, caster, localStore, castId), 15) & 0b1111; + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + long ply = playerId.callback(caster, localStore, castId); + int val = Math.min(priority.callback(caster, localStore, castId), 15) & 0b1111; return val + (ply << 4); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackDivideLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackDivideLong.java index c20a0097d..5f9b815a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackDivideLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackDivideLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackDivideLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) / value2.callback(game, caster, localStore, castId); + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) / value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java index 907f20555..c10747602 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -16,7 +15,7 @@ public class ABCallbackGetAbilityDataAsLong extends ABLongCallback { @SuppressWarnings("unchecked") @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java index 870085672..86ab95110 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; @@ -16,13 +15,12 @@ public class ABCallbackGetAbilityUniqueValueLong extends ABLongCallback { private ABBooleanCallback allowNull; @Override - public Long callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Long callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = key.callback(game, caster, localStore, castId); - final CAbility theAbility = ability.callback(game, caster, localStore, castId); + final String keyS = key.callback(caster, localStore, castId); + final CAbility theAbility = ability.callback(caster, localStore, castId); Long theVal = theAbility.getUniqueValue(keyS, Long.class); - if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + if (theVal != null || (allowNull != null && allowNull.callback(caster, localStore, castId))) { return theVal; } return 0l; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java index 910f31e33..c76b1bb87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -16,13 +15,12 @@ public class ABCallbackGetBuffUniqueValueLong extends ABLongCallback { private ABBooleanCallback allowNull; @Override - public Long callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Long callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = key.callback(game, caster, localStore, castId); - final CBuff theBuff = buff.callback(game, caster, localStore, castId); + final String keyS = key.callback(caster, localStore, castId); + final CBuff theBuff = buff.callback(caster, localStore, castId); Long theVal = theBuff.getUniqueValue(keyS, Long.class); - if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + if (theVal != null || (allowNull != null && allowNull.callback(caster, localStore, castId))) { return theVal; } return 0l; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetStoredLongByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetStoredLongByKey.java index 1d9fe998c..8e91a511e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetStoredLongByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetStoredLongByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,13 +12,13 @@ public class ABCallbackGetStoredLongByKey extends ABLongCallback { private ABBooleanCallback instanceValue; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (Long) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (Long) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java index 27789f384..5bf259b56 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,11 +11,11 @@ public class ABCallbackInlineConditionLong extends ABLongCallback { private ABLongCallback fail; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public Long callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMaxLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMaxLong.java index e0c04f417..9b979f4ed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMaxLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMaxLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,9 +9,9 @@ public class ABCallbackMaxLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return Math.max(value1.callback(game, caster, localStore, castId), - value2.callback(game, caster, localStore, castId)); + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + return Math.max(value1.callback(caster, localStore, castId), + value2.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMinLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMinLong.java index 97b92b7f3..850a990e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMinLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMinLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,9 +9,9 @@ public class ABCallbackMinLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return Math.min(value1.callback(game, caster, localStore, castId), - value2.callback(game, caster, localStore, castId)); + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + return Math.min(value1.callback(caster, localStore, castId), + value2.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMultiplyLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMultiplyLong.java index fa704a3c5..b1d08c66d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMultiplyLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMultiplyLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackMultiplyLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) * value2.callback(game, caster, localStore, castId); + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) * value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackOrLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackOrLong.java index c3473f23f..f18171ffe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackOrLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackOrLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackOrLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) | value2.callback(game, caster, localStore, castId); + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) | value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java index 2dea5a171..8dc4f0e07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; import com.etheller.warsmash.util.WarsmashConstants; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackPlayerMaskAllPlayers extends ABLongCallback { @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { long dat = 0; for (int i = 0; i < WarsmashConstants.MAX_PLAYERS; i++) { dat |= 1 << i; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java index cbeb59bb0..0792fb8f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,10 +11,10 @@ public class ABCallbackPlayerMaskExcludePlayers extends ABLongCallback { List players; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { long dat = 0; for (ABPlayerCallback player : players) { - dat |= 1 << player.callback(game, caster, localStore, castId).getId(); + dat |= 1 << player.callback(caster, localStore, castId).getId(); } return ~dat; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java index 1e44f9e66..ac5466b43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,10 +11,10 @@ public class ABCallbackPlayerMaskIncludePlayers extends ABLongCallback { List players; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { long dat = 0; for (ABPlayerCallback player : players) { - dat |= 1 << player.callback(game, caster, localStore, castId).getId(); + dat |= 1 << player.callback(caster, localStore, castId).getId(); } return dat; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackRawLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackRawLong.java index 36b19fecb..412536874 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackRawLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackRawLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackRawLong extends ABLongCallback { private Long value; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { return value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java index 3a0100245..c424a0356 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -15,15 +14,14 @@ public class ABCallbackReuseLong extends ABLongCallback { private ABStringCallback name; @Override - public Long callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public Long callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABLongCallback) { - return ((ABLongCallback) callback).callback(game, caster, localStore, castId); + return ((ABLongCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseLongCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLongWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLongWithArguments.java index 7734eeeac..49e05b935 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLongWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLongWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -18,12 +17,11 @@ public class ABCallbackReuseLongWithArguments extends ABLongCallback { private Map arguments; @Override - public Long callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Long callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABLongCallback) { @@ -33,7 +31,7 @@ public Long callback(final CSimulation game, final CUnit caster, } } - return ((ABLongCallback) callback).callback(game, caster, localStore, castId); + return ((ABLongCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseLongCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackSubtractLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackSubtractLong.java index 0d267ae4c..61fd98d4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackSubtractLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackSubtractLong.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackSubtractLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value1.callback(game, caster, localStore, castId) - value2.callback(game, caster, localStore, castId); + public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value1.callback(caster, localStore, castId) - value2.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABLongCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABLongCallback.java index f637f4ebf..b853a6009 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABLongCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABLongCallback.java @@ -1,12 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABLongCallback implements ABCallback { - abstract public Long callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public Long callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java index 3bccdd49f..a6bd22467 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -13,12 +12,11 @@ public class ABCallbackArgumentOrderId extends ABOrderIdCallback { private ABStringCallback name; @Override - public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABOrderIdCallback) { - return ((ABOrderIdCallback) cbck).callback(game, caster, localStore, castId); + return ((ABOrderIdCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseOrderIdCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java index 59c8e85d2..74a45d017 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,14 +13,13 @@ public class ABCallbackGetStoredOrderIdByKey extends ABOrderIdCallback { private ABBooleanCallback instanceValue; @Override - public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Integer) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (Integer) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java index cc8c38845..10859008b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,8 @@ public class ABCallbackIdString extends ABOrderIdCallback { private ABStringCallback idString; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return OrderIdUtils.getOrderId(idString.callback(game, caster, localStore, castId)); + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return OrderIdUtils.getOrderId(idString.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java index 97bcbc64a..fb7f09526 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,11 +11,11 @@ public class ABCallbackInlineConditionOrderId extends ABOrderIdCallback { private ABOrderIdCallback fail; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public Integer callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java index ea22365db..60e3b83f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackRawID extends ABOrderIdCallback { private Integer id; @Override - public Integer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { return id; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java index 71339ea9c..ef53e1a7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -15,15 +14,14 @@ public class ABCallbackReuseOrderId extends ABOrderIdCallback { private ABStringCallback name; @Override - public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABOrderIdCallback) { - return ((ABOrderIdCallback) callback).callback(game, caster, localStore, castId); + return ((ABOrderIdCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseOrderIdCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java index babf19928..f4e565772 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -18,12 +17,11 @@ public class ABCallbackReuseOrderIdWithArguments extends ABOrderIdCallback { private Map arguments; @Override - public Integer callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABOrderIdCallback) { @@ -33,7 +31,7 @@ public Integer callback(final CSimulation game, final CUnit caster, } } - return ((ABOrderIdCallback) callback).callback(game, caster, localStore, castId); + return ((ABOrderIdCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseOrderIdCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java index db57554b1..a208ba295 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java @@ -1,12 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABOrderIdCallback implements ABCallback { - abstract public Integer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java index 4ebe7932f..fb04fd605 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,12 +13,11 @@ public class ABCallbackArgumentPlayer extends ABPlayerCallback { private ABStringCallback name; @Override - public CPlayer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public CPlayer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABPlayerCallback) { - return ((ABPlayerCallback) cbck).callback(game, caster, localStore, castId); + return ((ABPlayerCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReusePlayerCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java index 8e726ee44..e3fbe24a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; @@ -8,8 +7,8 @@ public class ABCallbackGetCastingPlayer extends ABPlayerCallback { @Override - public CPlayer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getPlayer(caster.getPlayerIndex()); + public CPlayer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getPlayer(caster.getPlayerIndex()); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java index 67fd018a2..775da81fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,8 @@ public class ABCallbackGetOwnerOfUnit extends ABPlayerCallback { private ABUnitCallback unit; @Override - public CPlayer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getPlayer(unit.callback(game, caster, localStore, castId).getPlayerIndex()); + public CPlayer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getPlayer(unit.callback(caster, localStore, castId).getPlayerIndex()); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java index 6058fc5b3..49d2d519d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,8 @@ public class ABCallbackGetPlayerById extends ABPlayerCallback { private ABIntegerCallback id; @Override - public CPlayer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getPlayer(id.callback(game, caster, localStore, castId)); + public CPlayer callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getPlayer(id.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java index 6a7160990..590150295 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,11 +12,11 @@ public class ABCallbackGetStoredPlayerByKey extends ABPlayerCallback { private ABBooleanCallback instanceValue; @Override - public CPlayer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (CPlayer) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public CPlayer callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (CPlayer) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (CPlayer) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (CPlayer) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java index 8a6e7a43f..4fa349b43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionPlayer extends ABPlayerCallback { private ABPlayerCallback fail; @Override - public CPlayer callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public CPlayer callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java index 73611444d..804d26203 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,15 +15,14 @@ public class ABCallbackReusePlayer extends ABPlayerCallback { private ABStringCallback name; @Override - public CPlayer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CPlayer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABPlayerCallback) { - return ((ABPlayerCallback) callback).callback(game, caster, localStore, castId); + return ((ABPlayerCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReusePlayerCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java index 030eb8d4e..206691cd7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,12 +18,11 @@ public class ABCallbackReusePlayerWithArguments extends ABPlayerCallback { private Map arguments; @Override - public CPlayer callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CPlayer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABPlayerCallback) { @@ -34,7 +32,7 @@ public CPlayer callback(final CSimulation game, final CUnit caster, } } - return ((ABPlayerCallback) callback).callback(game, caster, localStore, castId); + return ((ABPlayerCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReusePlayerCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java index 37d305112..68268408e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,5 @@ public abstract class ABPlayerCallback implements ABCallback { - abstract public CPlayer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CPlayer callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java index ce6cf6ce9..fd09d1e0a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,12 +13,11 @@ public class ABCallbackArgumentProjectile extends ABProjectileCallback { private ABStringCallback name; @Override - public CProjectile callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public CProjectile callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABProjectileCallback) { - return ((ABProjectileCallback) cbck).callback(game, caster, localStore, castId); + return ((ABProjectileCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java index 685cf05c0..570d33666 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedProjectile extends ABProjectileCallback { @Override - public CProjectile callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CProjectile callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.LASTCREATEDPROJECTILE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java index 269d4ad8f..16919c252 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,7 @@ public class ABCallbackGetReactionAbilityProjectile extends ABProjectileCallback { @Override - public CProjectile callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CProjectile callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.ABILITYPROJ); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java index 22f3d0475..02e34e5dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetReactionAttackProjectile extends ABProjectileCallback { @Override - public CProjectile callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CProjectile callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java index 5a9f53d9e..c716cb9f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,11 +12,11 @@ public class ABCallbackGetStoredProjectileByKey extends ABProjectileCallback { private ABBooleanCallback instanceValue; @Override - public CProjectile callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (CProjectile) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public CProjectile callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (CProjectile) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (CProjectile) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (CProjectile) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java index a252661b9..9f6341c86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetThisProjectile extends ABProjectileCallback { @Override - public CProjectile callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CProjectile callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.THISPROJECTILE+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java index 92c4129d1..f4f5d32c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionProjectile extends ABProjectileCallback { private ABProjectileCallback fail; @Override - public CProjectile callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public CProjectile callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java index 4dfd638e5..dd2a3be47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,15 +15,14 @@ public class ABCallbackReuseProjectile extends ABProjectileCallback { private ABStringCallback name; @Override - public CProjectile callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CProjectile callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABProjectileCallback) { - return ((ABProjectileCallback) callback).callback(game, caster, localStore, castId); + return ((ABProjectileCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java index 9821adba9..f243b78c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,12 +18,11 @@ public class ABCallbackReuseProjectileWithArguments extends ABProjectileCallback private Map arguments; @Override - public CProjectile callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CProjectile callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABProjectileCallback) { @@ -34,7 +32,7 @@ public CProjectile callback(final CSimulation game, final CUnit caster, } } - return ((ABProjectileCallback) callback).callback(game, caster, localStore, castId); + return ((ABProjectileCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java index 457994141..aa54afd1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,5 @@ public abstract class ABProjectileCallback implements ABCallback { - abstract public CProjectile callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CProjectile callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java index b66b54b6a..946df3d47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,13 +13,12 @@ public class ABCallbackArgumentNonStackingStatBuff extends ABNonStackingStatBuff private ABStringCallback name; @Override - public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABNonStackingStatBuffCallback) { - return ((ABNonStackingStatBuffCallback) cbck).callback(game, caster, localStore, castId); + return ((ABNonStackingStatBuffCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseNonStackingStatBuffCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetLastCreatedNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetLastCreatedNonStackingStatBuff.java index 49f038d18..53edf1173 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetLastCreatedNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetLastCreatedNonStackingStatBuff.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,7 @@ public class ABCallbackGetLastCreatedNonStackingStatBuff extends ABNonStackingStatBuffCallback { @Override - public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (NonStackingStatBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDNSSB); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetStoredNonStackingStatBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetStoredNonStackingStatBuffByKey.java index d0ecc270a..712e21c22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetStoredNonStackingStatBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetStoredNonStackingStatBuffByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,15 +13,15 @@ public class ABCallbackGetStoredNonStackingStatBuffByKey extends ABNonStackingSt private ABBooleanCallback instanceValue; @Override - public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, + final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (NonStackingStatBuff) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (NonStackingStatBuff) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java index 4677254a9..6ed082774 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionNonStackingStatBuff extends ABNonStackingS private ABNonStackingStatBuffCallback fail; @Override - public NonStackingStatBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public NonStackingStatBuff callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java index 6f12abdc1..a07708b10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,15 +15,14 @@ public class ABCallbackReuseNonStackingStatBuff extends ABNonStackingStatBuffCal private ABStringCallback name; @Override - public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABNonStackingStatBuffCallback) { - return ((ABNonStackingStatBuffCallback) callback).callback(game, caster, localStore, castId); + return ((ABNonStackingStatBuffCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseNonStackingStatBuffCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java index fc6a12bc6..8a21ce51d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,11 +18,10 @@ public class ABCallbackReuseNonStackingStatBuffWithArguments extends ABNonStacki private Map arguments; @Override - public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABNonStackingStatBuffCallback) { @@ -33,7 +31,7 @@ public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, } } - return ((ABNonStackingStatBuffCallback) callback).callback(game, caster, localStore, castId); + return ((ABNonStackingStatBuffCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseNonStackingStatBuffCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABNonStackingStatBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABNonStackingStatBuffCallback.java index fa43c7a28..b6377868b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABNonStackingStatBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABNonStackingStatBuffCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,6 @@ public abstract class ABNonStackingStatBuffCallback implements ABCallback { - abstract public NonStackingStatBuff callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, final int castId); + abstract public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, + final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java index 119e4df4c..4da6a464c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,12 +13,11 @@ public class ABCallbackArgumentStateModBuff extends ABStateModBuffCallback { private ABStringCallback name; @Override - public StateModBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public StateModBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABStateModBuffCallback) { - return ((ABStateModBuffCallback) cbck).callback(game, caster, localStore, castId); + return ((ABStateModBuffCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseStateModBuffCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetLastCreatedStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetLastCreatedStateModBuff.java index 90e730720..537122f11 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetLastCreatedStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetLastCreatedStateModBuff.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedStateModBuff extends ABStateModBuffCallback { @Override - public StateModBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public StateModBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { return (StateModBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDSMB); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetStoredStateModBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetStoredStateModBuffByKey.java index 8771aa258..25b15615d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetStoredStateModBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetStoredStateModBuffByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,11 +12,11 @@ public class ABCallbackGetStoredStateModBuffByKey extends ABStateModBuffCallback private ABBooleanCallback instanceValue; @Override - public StateModBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (StateModBuff) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public StateModBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (StateModBuff) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (StateModBuff) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (StateModBuff) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java index 3a93ab5d3..57e42290e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionStateModBuff extends ABStateModBuffCallbac private ABStateModBuffCallback fail; @Override - public StateModBuff callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public StateModBuff callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java index c09a81b92..98946b406 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,16 +15,15 @@ public class ABCallbackReuseStateModBuff extends ABStateModBuffCallback { private ABStringCallback name; @Override - public StateModBuff callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public StateModBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABStateModBuffCallback) { - return ((ABStateModBuffCallback) callback).callback(game, caster, localStore, castId); + return ((ABStateModBuffCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseStateModBuffCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java index 3b2b0ee71..831854104 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,12 +18,11 @@ public class ABCallbackReuseStateModBuffWithArguments extends ABStateModBuffCall private Map arguments; @Override - public StateModBuff callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public StateModBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABStateModBuffCallback) { @@ -34,7 +32,7 @@ public StateModBuff callback(final CSimulation game, final CUnit caster, } } - return ((ABStateModBuffCallback) callback).callback(game, caster, localStore, castId); + return ((ABStateModBuffCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseStateModBuffCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABStateModBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABStateModBuffCallback.java index 4775aa566..84e0c4e66 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABStateModBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABStateModBuffCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,5 @@ public abstract class ABStateModBuffCallback implements ABCallback { - abstract public StateModBuff callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public StateModBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java index 2860207d0..6dfb6f0be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -12,13 +11,12 @@ public class ABCallbackArgumentString extends ABStringCallback { private ABStringCallback name; @Override - public String callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public String callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABStringCallback) { - return ((ABStringCallback) cbck).callback(game, caster, localStore, castId); + return ((ABStringCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseStringCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackBooleanToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackBooleanToString.java index f2452e44d..ad12b4e2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackBooleanToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackBooleanToString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackBooleanToString extends ABStringCallback { private ABBooleanCallback value; @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return "" + value.callback(game, caster, localStore, castId); + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + return "" + value.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackCatStrings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackCatStrings.java index fe2c10643..3d53f88a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackCatStrings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackCatStrings.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,10 +10,10 @@ public class ABCallbackCatStrings extends ABStringCallback { private List stringList; @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { String output = ""; for (ABStringCallback callB : stringList) { - output += callB.callback(game, caster, localStore, castId); + output += callB.callback(caster, localStore, castId); } return output; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackFloatToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackFloatToString.java index 96240705f..0dc034814 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackFloatToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackFloatToString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackFloatToString extends ABStringCallback { private ABFloatCallback value; @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return "" + value.callback(game, caster, localStore, castId); + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + return "" + value.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityDataAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityDataAsString.java index 5511388bb..e16bb7fd4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityDataAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityDataAsString.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -15,7 +14,7 @@ public class ABCallbackGetAbilityDataAsString extends ABStringCallback { @SuppressWarnings("unchecked") @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java index 1ca730d67..9a933b65c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetAbilityHandleAsString extends ABStringCallback { private ABAbilityCallback ability; @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return "" + ability.callback(game, caster, localStore, castId).getHandleId(); + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + return "" + ability.callback(caster, localStore, castId).getHandleId(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java index ab391e430..8c75edee8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; @@ -15,13 +14,12 @@ public class ABCallbackGetAbilityUniqueValueString extends ABStringCallback { private ABBooleanCallback allowNull; @Override - public String callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public String callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = key.callback(game, caster, localStore, castId); - final CAbility theAbility = ability.callback(game, caster, localStore, castId); + final String keyS = key.callback(caster, localStore, castId); + final CAbility theAbility = ability.callback(caster, localStore, castId); String theVal = theAbility.getUniqueValue(keyS, String.class); - if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + if (theVal != null || (allowNull != null && allowNull.callback(caster, localStore, castId))) { return theVal; } return ""; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAliasAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAliasAsString.java index 7f0dff87c..a4e7d1d16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAliasAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAliasAsString.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetAliasAsString extends ABStringCallback { @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((War3ID) localStore.get(ABLocalStoreKeys.ALIAS)).asStringValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAllowStackingKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAllowStackingKey.java index 26bcc2ad2..634324974 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAllowStackingKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAllowStackingKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; @@ -9,7 +8,7 @@ public class ABCallbackGetAllowStackingKey extends ABStringCallback { @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { return NonStackingStatBuff.ALLOW_STACKING_KEY; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java index 88dae46ff..5629cb57c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetBuffHandleAsString extends ABStringCallback { private ABBuffCallback buff; @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return "" + buff.callback(game, caster, localStore, castId).getHandleId(); + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + return "" + buff.callback(caster, localStore, castId).getHandleId(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java index 269c97f06..55175ed28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -15,12 +14,11 @@ public class ABCallbackGetBuffUniqueValueString extends ABStringCallback { private ABBooleanCallback allowNull; @Override - public String callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = key.callback(game, caster, localStore, castId); - final CBuff theBuff = buff.callback(game, caster, localStore, castId); + public String callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = key.callback(caster, localStore, castId); + final CBuff theBuff = buff.callback(caster, localStore, castId); String theVal = theBuff.getUniqueValue(keyS, String.class); - if (theVal != null || (allowNull != null && allowNull.callback(game, caster, localStore, castId))) { + if (theVal != null || (allowNull != null && allowNull.callback(caster, localStore, castId))) { return theVal; } return ""; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetCodeAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetCodeAsString.java index 381a0ff5b..887348ceb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetCodeAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetCodeAsString.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetCodeAsString extends ABStringCallback { @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((War3ID) localStore.get(ABLocalStoreKeys.CODE)).asStringValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java index ad6bd732f..444b0ccce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -13,16 +12,15 @@ public class ABCallbackGetStoredStringByKey extends ABStringCallback { private ABBooleanCallback instanceValue; @Override - public String callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public String callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (String) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (String) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetUnitHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetUnitHandleAsString.java index b43c50295..7ec4b03b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetUnitHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetUnitHandleAsString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackGetUnitHandleAsString extends ABStringCallback { private ABUnitCallback unit; @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return "" + unit.callback(game, caster, localStore, castId).getHandleId(); + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + return "" + unit.callback(caster, localStore, castId).getHandleId(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java index 8b87c38a1..a85d43718 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackIdToString extends ABStringCallback { private ABIDCallback value; @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value.callback(game, caster, localStore, castId).asStringValue(); + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value.callback(caster, localStore, castId).asStringValue(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java index 8bff0ada5..05abd01eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,11 +11,11 @@ public class ABCallbackInlineConditionString extends ABStringCallback { private ABStringCallback fail; @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public String callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIntegerToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIntegerToString.java index d70563300..62647051b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIntegerToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIntegerToString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackIntegerToString extends ABStringCallback { private ABIntegerCallback value; @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return "" + value.callback(game, caster, localStore, castId); + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + return "" + value.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackLongToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackLongToString.java index 057df917f..54edae3f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackLongToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackLongToString.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.ABLongCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackLongToString extends ABStringCallback { private ABLongCallback value; @Override - public String callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return "" + value.callback(game, caster, localStore, castId); + public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + return "" + value.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackRawString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackRawString.java index 144c8d122..592a0a331 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackRawString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackRawString.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,7 @@ public class ABCallbackRawString extends ABStringCallback { private String value; @Override - public String callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public String callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java index bb287b952..8432a2dd7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,15 +13,14 @@ public class ABCallbackReuseString extends ABStringCallback { private ABStringCallback name; @Override - public String callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public String callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABStringCallback) { - return ((ABStringCallback) callback).callback(game, caster, localStore, castId); + return ((ABStringCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseStringCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseStringWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseStringWithArguments.java index cd6d3de2b..49878b1db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseStringWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseStringWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -17,12 +16,11 @@ public class ABCallbackReuseStringWithArguments extends ABStringCallback { private Map arguments; @Override - public String callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public String callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABStringCallback) { @@ -32,7 +30,7 @@ public String callback(final CSimulation game, final CUnit caster, } } - return ((ABStringCallback) callback).callback(game, caster, localStore, castId); + return ((ABStringCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseStringCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABStringCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABStringCallback.java index 8280230f5..bea38ea7e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABStringCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABStringCallback.java @@ -1,12 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABStringCallback implements ABCallback { - abstract public String callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public String callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java index e6f99cc97..9a100015e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,13 +13,12 @@ public class ABCallbackArgumentTarget extends ABTargetCallback { private ABStringCallback name; @Override - public AbilityTarget callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public AbilityTarget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABTargetCallback) { - return ((ABTargetCallback) cbck).callback(game, caster, localStore, castId); + return ((ABTargetCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseTargetCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetAbilityTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetAbilityTarget.java index af3f7065f..ebaff7b19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetAbilityTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetAbilityTarget.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; @@ -10,7 +9,7 @@ public class ABCallbackGetAbilityTarget extends ABTargetCallback { @Override - public AbilityTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityPointTarget target = (AbilityPointTarget) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+castId); if (target != null) { return target; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetStoredTargetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetStoredTargetByKey.java index 5d4590005..28e631573 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetStoredTargetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetStoredTargetByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -13,11 +12,11 @@ public class ABCallbackGetStoredTargetByKey extends ABTargetCallback { private ABBooleanCallback instanceValue; @Override - public AbilityTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (AbilityTarget) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public AbilityTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (AbilityTarget) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (AbilityTarget) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (AbilityTarget) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java index f9f035044..ef8747ced 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionTarget extends ABTargetCallback { private ABTargetCallback fail; @Override - public AbilityTarget callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public AbilityTarget callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java index de806e2f5..c6863e5e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -16,15 +15,14 @@ public class ABCallbackReuseTarget extends ABTargetCallback { private ABStringCallback name; @Override - public AbilityTarget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public AbilityTarget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABTargetCallback) { - return ((ABTargetCallback) callback).callback(game, caster, localStore, castId); + return ((ABTargetCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseTargetCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java index 1a42eb02e..45d5c0cba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -19,11 +18,10 @@ public class ABCallbackReuseTargetWithArguments extends ABTargetCallback { private Map arguments; @Override - public AbilityTarget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public AbilityTarget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABTargetCallback) { @@ -33,7 +31,7 @@ public AbilityTarget callback(final CSimulation game, final CUnit caster, final } } - return ((ABTargetCallback) callback).callback(game, caster, localStore, castId); + return ((ABTargetCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseTargetCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABTargetCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABTargetCallback.java index 9d962d51a..8779fc6f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABTargetCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABTargetCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -8,6 +7,5 @@ public abstract class ABTargetCallback implements ABCallback { - abstract public AbilityTarget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public AbilityTarget callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java index f7811416f..4b70fc3d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,13 +13,12 @@ public class ABCallbackArgumentTimer extends ABTimerCallback { private ABStringCallback name; @Override - public CTimer callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CTimer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABTimerCallback) { - return ((ABTimerCallback) cbck).callback(game, caster, localStore, castId); + return ((ABTimerCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseTimerCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetFiringTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetFiringTimer.java index c246129b6..ccc037b51 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetFiringTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetFiringTimer.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetFiringTimer extends ABTimerCallback { @Override - public CTimer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CTimer callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CTimer) localStore.get(ABLocalStoreKeys.FIRINGTIMER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastCreatedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastCreatedTimer.java index 0048eae9e..875179932 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastCreatedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastCreatedTimer.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedTimer extends ABTimerCallback { @Override - public CTimer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CTimer callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CTimer) localStore.get(ABLocalStoreKeys.LASTCREATEDTIMER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastStartedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastStartedTimer.java index f9f287bc9..d14d94c6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastStartedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastStartedTimer.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastStartedTimer extends ABTimerCallback { @Override - public CTimer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CTimer callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CTimer) localStore.get(ABLocalStoreKeys.LASTSTARTEDTIMER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetStoredTimerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetStoredTimerByKey.java index 0c0f4cd6e..eb7802629 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetStoredTimerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetStoredTimerByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,13 +12,13 @@ public class ABCallbackGetStoredTimerByKey extends ABTimerCallback { private ABBooleanCallback instanceValue; @Override - public CTimer callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { + public CTimer callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (CTimer) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { return (CTimer) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java index fc3d4c072..674d86ad3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionTimer extends ABTimerCallback { private ABTimerCallback fail; @Override - public CTimer callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public CTimer callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java index 751d7c680..f0909a5d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,16 +15,15 @@ public class ABCallbackReuseTimer extends ABTimerCallback { private ABStringCallback name; @Override - public CTimer callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CTimer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABTimerCallback) { - return ((ABTimerCallback) callback).callback(game, caster, localStore, castId); + return ((ABTimerCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseTimerCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java index c8efb1caa..937c4787d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,12 +18,11 @@ public class ABCallbackReuseTimerWithArguments extends ABTimerCallback { private Map arguments; @Override - public CTimer callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CTimer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABTimerCallback) { @@ -34,7 +32,7 @@ public CTimer callback(final CSimulation game, final CUnit caster, } } - return ((ABTimerCallback) callback).callback(game, caster, localStore, castId); + return ((ABTimerCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseTimerCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABTimerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABTimerCallback.java index d78c6588a..eed668032 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABTimerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABTimerCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,5 @@ public abstract class ABTimerCallback implements ABCallback { - abstract public CTimer callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CTimer callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java index 89b135ef9..69ac73f42 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -13,13 +12,12 @@ public class ABCallbackArgumentUnit extends ABUnitCallback { private ABStringCallback name; @Override - public CUnit callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABUnitCallback) { - return ((ABUnitCallback) cbck).callback(game, caster, localStore, castId); + return ((ABUnitCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseUnitCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityPairedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityPairedUnit.java index 2e424e7dc..6972ed701 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityPairedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityPairedUnit.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,7 +9,7 @@ public class ABCallbackGetAbilityPairedUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ABILITYPAIREDUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityTargetedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityTargetedUnit.java index facfaa9ea..036e31e86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityTargetedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityTargetedUnit.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,7 @@ public class ABCallbackGetAbilityTargetedUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java index baa1fe52f..55f1b7f22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; @@ -10,7 +9,7 @@ public class ABCallbackGetAttackedUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.UNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackingUnit.java index df075e84c..68c296d2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackingUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,7 @@ public class ABCallbackGetAttackingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ATTACKINGUNIT+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffCastingUnit.java index 583a2382e..f6b23df8a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffCastingUnit.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,7 @@ public class ABCallbackGetBuffCastingUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.BUFFCASTINGUNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffedUnit.java index 2e399d576..498fadd3a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffedUnit.java @@ -1,15 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffedUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return caster; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCastingUnit.java index 7b6a8ad73..746007352 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCastingUnit.java @@ -1,15 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetCastingUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return caster; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java index 3ca588889..837532dd3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,7 @@ public class ABCallbackGetChainUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.CHAINUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java index 5cd326dc1..f93d61cde 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,7 @@ public class ABCallbackGetCompUnit1 extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.COMPUNIT1); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java index 81bc87fee..7f70c32f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,7 @@ public class ABCallbackGetCompUnit2 extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.COMPUNIT2); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java index d892557bb..3e7b838e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,7 @@ public class ABCallbackGetDamagedUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGEDUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java index d36cd0a89..cf8936f44 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,7 @@ public class ABCallbackGetDamagingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGINGUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDyingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDyingUnit.java index 6cb20279e..abca60fe5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDyingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDyingUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,7 @@ public class ABCallbackGetDyingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.DYINGUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetEnumUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetEnumUnit.java index e42bced15..31138a4da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetEnumUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetEnumUnit.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,7 +9,7 @@ public class ABCallbackGetEnumUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ENUMUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetKillingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetKillingUnit.java index a9b2dd75f..9a280dcae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetKillingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetKillingUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,7 @@ public class ABCallbackGetKillingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.KILLINGUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetLastCreatedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetLastCreatedUnit.java index 3a1765c26..53fc080dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetLastCreatedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetLastCreatedUnit.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,7 +9,7 @@ public class ABCallbackGetLastCreatedUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.LASTCREATEDUNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetListenerUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetListenerUnit.java index c2f2f2248..fedbff8ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetListenerUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetListenerUnit.java @@ -1,13 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetListenerUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return caster; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetMatchingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetMatchingUnit.java index 70ccc6734..2c413df46 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetMatchingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetMatchingUnit.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,7 +9,7 @@ public class ABCallbackGetMatchingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.MATCHINGUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java index 9ccf4c54c..693cbdc2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java @@ -3,7 +3,6 @@ import java.util.List; import com.badlogic.gdx.math.Rectangle; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -18,17 +17,17 @@ public class ABCallbackGetNearestCorpseInRangeOfUnit extends ABUnitCallback { private ABUnitCallback originUnit; private ABFloatCallback range; private List conditions; - + @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CUnit originUnitTarget = originUnit.callback(game, caster, localStore, castId); - Float rangeVal = range.callback(game, caster, localStore, castId); - + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + CUnit originUnitTarget = originUnit.callback(caster, localStore, castId); + Float rangeVal = range.callback(caster, localStore, castId); + final UnitAndRange ur = new UnitAndRange(); - + recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - game.getWorldCollision().enumCorpsesInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumCorpsesInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { @@ -36,11 +35,11 @@ public boolean call(final CUnit enumUnit) { if (ur.getUnit() == null || ur.getRange() > dist) { if (conditions != null) { boolean result = true; - localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); + localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); for (ABCondition condition : conditions) { - result = result && condition.callback(game, caster, localStore, castId); + result = result && condition.callback(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); + localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); if (result) { ur.setRange(dist); ur.setUnit(enumUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java index 4ecbb2d16..547f0c89d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java @@ -3,7 +3,6 @@ import java.util.List; import com.badlogic.gdx.math.Rectangle; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -20,15 +19,15 @@ public class ABCallbackGetNearestUnitInRangeOfUnit extends ABUnitCallback { private List conditions; @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CUnit originUnitTarget = originUnit.callback(game, caster, localStore, castId); - Float rangeVal = range.callback(game, caster, localStore, castId); + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + CUnit originUnitTarget = originUnit.callback(caster, localStore, castId); + Float rangeVal = range.callback(caster, localStore, castId); final UnitAndRange ur = new UnitAndRange(); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { @@ -38,7 +37,7 @@ public boolean call(final CUnit enumUnit) { boolean result = true; localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); for (ABCondition condition : conditions) { - result = result && condition.callback(game, caster, localStore, castId); + result = result && condition.callback(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); if (result) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetParentCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetParentCastingUnit.java index 9c923e07a..b1be6d932 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetParentCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetParentCastingUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,7 @@ public class ABCallbackGetParentCastingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.PARENTCASTER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileHitUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileHitUnit.java index aa38bf81e..61f4d901b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileHitUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileHitUnit.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,7 @@ public class ABCallbackGetProjectileHitUnit extends ABUnitCallback { @Override - public CUnit callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java index 339a56764..8b3215db2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,9 +10,8 @@ public class ABCallbackGetProjectileSourceUnit extends ABUnitCallback { private ABProjectileCallback proj; @Override - public CUnit callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - CProjectile p = proj.callback(game, caster, localStore, castId); + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + CProjectile p = proj.callback(caster, localStore, castId); return p.getSource(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityCastingUnit.java index 8cdaa8ba1..f298cd6eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityCastingUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,7 +7,7 @@ public class ABCallbackGetReactionAbilityCastingUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.REACTIONABILITYCASTER + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityTargetUnit.java index 6a8931468..2967a6468 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityTargetUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; @@ -10,7 +9,7 @@ public class ABCallbackGetReactionAbilityTargetUnit extends ABUnitCallback { @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.REACTIONABILITYCASTER+castId); return tar.visit(AbilityTargetVisitor.UNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetStoredUnitByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetStoredUnitByKey.java index 60f2df15f..4fbbeacee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetStoredUnitByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetStoredUnitByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,11 +12,11 @@ public class ABCallbackGetStoredUnitByKey extends ABUnitCallback { private ABBooleanCallback instanceValue; @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (CUnit) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (CUnit) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (CUnit) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java index e9124d2a4..5714264eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,11 +11,11 @@ public class ABCallbackInlineConditionUnit extends ABUnitCallback { private ABUnitCallback fail; @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public CUnit callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackPollUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackPollUnitQueue.java index 837a67b50..efbe8c337 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackPollUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackPollUnitQueue.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -10,8 +9,8 @@ public class ABCallbackPollUnitQueue extends ABUnitCallback { private ABUnitQueueCallback queue; @Override - public CUnit callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return queue.callback(game, caster, localStore, castId).poll(); + public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + return queue.callback(caster, localStore, castId).poll(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java index 54250cb15..95f921462 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -15,16 +14,15 @@ public class ABCallbackReuseUnit extends ABUnitCallback { private ABStringCallback name; @Override - public CUnit callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABUnitCallback) { - return ((ABUnitCallback) callback).callback(game, caster, localStore, castId); + return ((ABUnitCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseUnitCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java index 772bd23da..652fd7337 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -18,12 +17,11 @@ public class ABCallbackReuseUnitWithArguments extends ABUnitCallback { private Map arguments; @Override - public CUnit callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABUnitCallback) { @@ -33,7 +31,7 @@ public CUnit callback(final CSimulation game, final CUnit caster, } } - return ((ABUnitCallback) callback).callback(game, caster, localStore, castId); + return ((ABUnitCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseUnitCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABUnitCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABUnitCallback.java index 01c3133de..ac524ae49 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABUnitCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABUnitCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,5 @@ public abstract class ABUnitCallback implements ABCallback { @Override - abstract public CUnit callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java index 9704b71d7..9524cf7be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java @@ -3,7 +3,6 @@ import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -15,13 +14,12 @@ public class ABCallbackArgumentUnitGroup extends ABUnitGroupCallback { private ABStringCallback name; @Override - public Set callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Set callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABUnitGroupCallback) { - return ((ABUnitGroupCallback) cbck).callback(game, caster, localStore, castId); + return ((ABUnitGroupCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseUnitGroupCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetLastCreatedUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetLastCreatedUnitGroup.java index bf03ee673..a88252795 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetLastCreatedUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetLastCreatedUnitGroup.java @@ -2,7 +2,6 @@ import java.util.Set; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,7 +10,7 @@ public class ABCallbackGetLastCreatedUnitGroup extends ABUnitGroupCallback { @SuppressWarnings("unchecked") @Override - public Set callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Set callback(CUnit caster, LocalDataStore localStore, final int castId) { return (Set) localStore.get(ABLocalStoreKeys.LASTCREATEDUNITGROUP); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java index f05116ad1..60cb65866 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java @@ -3,7 +3,6 @@ import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -17,14 +16,13 @@ public class ABCallbackGetStoredUnitGroupByKey extends ABUnitGroupCallback { @SuppressWarnings("unchecked") @Override - public Set callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public Set callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Set) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (Set) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetUnitGroupByName.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetUnitGroupByName.java index 227485b8f..410dfcdca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetUnitGroupByName.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetUnitGroupByName.java @@ -2,7 +2,6 @@ import java.util.Set; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,7 +11,7 @@ public class ABCallbackGetUnitGroupByName extends ABUnitGroupCallback { @SuppressWarnings("unchecked") @Override - public Set callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Set callback(CUnit caster, LocalDataStore localStore, final int castId) { return (Set) localStore.get("_unitgroup_" + name); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java index 5eef62e50..856205096 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java @@ -2,7 +2,6 @@ import java.util.Set; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -14,11 +13,11 @@ public class ABCallbackInlineConditionUnitGroup extends ABUnitGroupCallback { private ABUnitGroupCallback fail; @Override - public Set callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public Set callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java index 10031186a..0b921637e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java @@ -3,7 +3,6 @@ import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -17,16 +16,15 @@ public class ABCallbackReuseUnitGroup extends ABUnitGroupCallback { private ABStringCallback name; @Override - public Set callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Set callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABUnitGroupCallback) { - return ((ABUnitGroupCallback) callback).callback(game, caster, localStore, castId); + return ((ABUnitGroupCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseUnitGroupCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java index ebeb24276..64e55e05f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java @@ -4,7 +4,6 @@ import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,12 +18,11 @@ public class ABCallbackReuseUnitGroupWithArguments extends ABUnitGroupCallback { private Map arguments; @Override - public Set callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Set callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABUnitGroupCallback) { @@ -34,7 +32,7 @@ public Set callback(final CSimulation game, final CUnit caster, } } - return ((ABUnitGroupCallback) callback).callback(game, caster, localStore, castId); + return ((ABUnitGroupCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseUnitGroupCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABUnitGroupCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABUnitGroupCallback.java index b54986217..eb21bdc23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABUnitGroupCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABUnitGroupCallback.java @@ -2,13 +2,11 @@ import java.util.Set; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABUnitGroupCallback implements ABCallback { - abstract public Set callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public Set callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java index 8b068f1c4..bc8d72913 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java @@ -3,7 +3,6 @@ import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -15,13 +14,12 @@ public class ABCallbackArgumentUnitQueue extends ABUnitQueueCallback { private ABStringCallback name; @Override - public Queue callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Queue callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABUnitQueueCallback) { - return ((ABUnitQueueCallback) cbck).callback(game, caster, localStore, castId); + return ((ABUnitQueueCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseUnitQueueCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java index 87ff751f6..f14d27106 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java @@ -2,7 +2,6 @@ import java.util.Queue; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,7 +10,7 @@ public class ABCallbackGetLastCreatedUnitQueue extends ABUnitQueueCallback { @SuppressWarnings("unchecked") @Override - public Queue callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Queue callback(CUnit caster, LocalDataStore localStore, final int castId) { return (Queue) localStore.get(ABLocalStoreKeys.LASTCREATEDUNITQUEUE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java index 8cca2491d..1496d6856 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java @@ -3,7 +3,6 @@ import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -17,14 +16,13 @@ public class ABCallbackGetStoredUnitQueueByKey extends ABUnitQueueCallback { @SuppressWarnings("unchecked") @Override - public Queue callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public Queue callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Queue) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (Queue) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java index d5d981c19..63fced9f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java @@ -2,7 +2,6 @@ import java.util.Queue; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,7 +11,7 @@ public class ABCallbackGetUnitQueueByName extends ABUnitQueueCallback { @SuppressWarnings("unchecked") @Override - public Queue callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Queue callback(CUnit caster, LocalDataStore localStore, final int castId) { return (Queue) localStore.get("_unitqueue_" + name); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java index 6614a293b..a2ce99210 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java @@ -2,7 +2,6 @@ import java.util.Queue; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -14,11 +13,11 @@ public class ABCallbackInlineConditionUnitQueue extends ABUnitQueueCallback { private ABUnitQueueCallback fail; @Override - public Queue callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public Queue callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java index ce6189050..2a978657a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java @@ -3,7 +3,6 @@ import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -17,16 +16,15 @@ public class ABCallbackReuseUnitQueue extends ABUnitQueueCallback { private ABStringCallback name; @Override - public Queue callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public Queue callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABUnitQueueCallback) { - return ((ABUnitQueueCallback) callback).callback(game, caster, localStore, castId); + return ((ABUnitQueueCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseUnitQueueCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java index 356e8ca1e..f8a5f8b70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java @@ -4,7 +4,6 @@ import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,11 +18,10 @@ public class ABCallbackReuseUnitQueueWithArguments extends ABUnitQueueCallback { private Map arguments; @Override - public Queue callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public Queue callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABUnitQueueCallback) { @@ -33,7 +31,7 @@ public Queue callback(final CSimulation game, final CUnit caster, final L } } - return ((ABUnitQueueCallback) callback).callback(game, caster, localStore, castId); + return ((ABUnitQueueCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseUnitQueueCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java index bcc9e92c3..04bbc8dea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java @@ -2,13 +2,11 @@ import java.util.Queue; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABUnitQueueCallback implements ABCallback { - abstract public Queue callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public Queue callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java index 83c1683fa..cb9a43c40 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -14,13 +13,12 @@ public class ABCallbackArgumentVisionModifier extends ABVisionModifierCallback { private ABStringCallback name; @Override - public CFogModifier callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CFogModifier callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABVisionModifierCallback) { - return ((ABVisionModifierCallback) cbck).callback(game, caster, localStore, castId); + return ((ABVisionModifierCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseVisionModifierCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java index 2d4dacc87..658563491 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -9,7 +8,7 @@ public class ABCallbackGetLastCreatedVisionModifier extends ABVisionModifierCallback { @Override - public CFogModifier callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CFogModifier callback(CUnit caster, LocalDataStore localStore, final int castId) { return (CFogModifier) localStore.get(ABLocalStoreKeys.LASTCREATEDVISIONMODIFIER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java index c42d2b030..5adc855a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -13,11 +12,11 @@ public class ABCallbackGetStoredVisionModifierByKey extends ABVisionModifierCall private ABBooleanCallback instanceValue; @Override - public CFogModifier callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - if (instanceValue == null || instanceValue.callback(game, caster, localStore, castId)) { - return (CFogModifier) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(game, caster, localStore, castId), castId)); + public CFogModifier callback(CUnit caster, LocalDataStore localStore, final int castId) { + if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { + return (CFogModifier) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { - return (CFogModifier) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(game, caster, localStore, castId), castId)); + return (CFogModifier) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java index 8e01d3abd..a9a95b814 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionVisionModifier extends ABVisionModifierCal private ABVisionModifierCallback fail; @Override - public CFogModifier callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public CFogModifier callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java index 70ed102cd..26e3370fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -16,15 +15,14 @@ public class ABCallbackReuseVisionModifier extends ABVisionModifierCallback { private ABStringCallback name; @Override - public CFogModifier callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CFogModifier callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABVisionModifierCallback) { - return ((ABVisionModifierCallback) callback).callback(game, caster, localStore, castId); + return ((ABVisionModifierCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseVisionModifierCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java index 2c0669e95..0984f49a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -19,11 +18,10 @@ public class ABCallbackReuseVisionModifierWithArguments extends ABVisionModifier private Map arguments; @Override - public CFogModifier callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CFogModifier callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABVisionModifierCallback) { @@ -33,7 +31,7 @@ public CFogModifier callback(final CSimulation game, final CUnit caster, final L } } - return ((ABVisionModifierCallback) callback).callback(game, caster, localStore, castId); + return ((ABVisionModifierCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseVisionModifierCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java index 7d6ec0c08..951bbe4d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,6 +7,5 @@ public abstract class ABVisionModifierCallback implements ABCallback { - abstract public CFogModifier callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CFogModifier callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java index bd41ec935..c1fdb9229 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -14,13 +13,12 @@ public class ABCallbackArgumentWidget extends ABWidgetCallback { private ABStringCallback name; @Override - public CWidget callback(final CSimulation game, final CUnit caster, - final LocalDataStore localStore, + public CWidget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABWidgetCallback) { - return ((ABWidgetCallback) cbck).callback(game, caster, localStore, castId); + return ((ABWidgetCallback) cbck).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseWidgetCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java index 043595a26..d807bf277 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; @@ -11,8 +10,8 @@ public class ABCallbackDestructableToWidget extends ABWidgetCallback { private ABDestructableCallback destructable; @Override - public CWidget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return destructable.callback(game, caster, localStore, castId); + public CWidget callback(CUnit caster, LocalDataStore localStore, final int castId) { + return destructable.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java index 763964a61..02c889533 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,7 +9,7 @@ public class ABCallbackGetProjectileHitWidget extends ABWidgetCallback { @Override - public CWidget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public CWidget callback(CUnit caster, LocalDataStore localStore, final int castId) { final CWidget unit = (CWidget) localStore.get(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); final CWidget dest = (CWidget) localStore.get(ABLocalStoreKeys.PROJECTILEHITDEST + castId); if (unit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java index 27a363e06..8e3604742 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -15,14 +14,13 @@ public class ABCallbackGetStoredWidgetByKey extends ABWidgetCallback { private ABBooleanCallback instanceValue; @Override - public CWidget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - if ((this.instanceValue == null) || this.instanceValue.callback(game, caster, localStore, castId)) { + public CWidget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CWidget) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(game, caster, localStore, castId), castId)); + .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); } else { return (CWidget) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(game, caster, localStore, castId), castId)); + .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java index 70fbbc0f7..59b04d30d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,11 +12,11 @@ public class ABCallbackInlineConditionWidget extends ABWidgetCallback { private ABWidgetCallback fail; @Override - public CWidget callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - if (condition != null && condition.callback(game, caster, localStore, castId)) { - return pass.callback(game, caster, localStore, castId); + public CWidget callback(CUnit caster, LocalDataStore localStore, int castId) { + if (condition != null && condition.callback(caster, localStore, castId)) { + return pass.callback(caster, localStore, castId); } - return fail.callback(game, caster, localStore, castId); + return fail.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java index 918089769..7a75c6a2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; @@ -11,8 +10,8 @@ public class ABCallbackItemToWidget extends ABWidgetCallback { private ABItemCallback item; @Override - public CWidget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return item.callback(game, caster, localStore, castId); + public CWidget callback(CUnit caster, LocalDataStore localStore, final int castId) { + return item.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java index b5c5f2ff5..fc17b9c01 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -16,15 +15,14 @@ public class ABCallbackReuseWidget extends ABWidgetCallback { private ABStringCallback name; @Override - public CWidget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CWidget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABWidgetCallback) { - return ((ABWidgetCallback) callback).callback(game, caster, localStore, castId); + return ((ABWidgetCallback) callback).callback(caster, localStore, castId); } else { System.err.println("Trying to run ReuseWidgetCallback, but key is missing or callback was the wrong type: " + keyS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java index ff6949e48..a6152a1e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -19,11 +18,10 @@ public class ABCallbackReuseWidgetWithArguments extends ABWidgetCallback { private Map arguments; @Override - public CWidget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public CWidget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABWidgetCallback) { @@ -33,7 +31,7 @@ public CWidget callback(final CSimulation game, final CUnit caster, final LocalD } } - return ((ABWidgetCallback) callback).callback(game, caster, localStore, castId); + return ((ABWidgetCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseWidgetCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java index e6cb5281f..06dc79fd5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -11,8 +10,8 @@ public class ABCallbackUnitToWidget extends ABWidgetCallback { private ABUnitCallback unit; @Override - public CWidget callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return unit.callback(game, caster, localStore, castId); + public CWidget callback(CUnit caster, LocalDataStore localStore, final int castId) { + return unit.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java index b5ea1eaac..c429e0743 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; @@ -8,6 +7,5 @@ public abstract class ABWidgetCallback implements ABCallback { - abstract public CWidget callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public CWidget callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java index 880856c13..e60e75502 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; @@ -15,12 +14,11 @@ public class ABCallbackArgumentBoolean extends ABCondition { private ABStringCallback name; @Override - public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final String keyS = name.callback(game, caster, localStore, castId); + public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABBooleanCallback) { - return ((ABBooleanCallback) cbck).callback(game, caster, localStore, castId); + return ((ABBooleanCallback) cbck).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseBooleanCallback, but key is missing or callback was the wrong type: " + keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java index 3d986e874..0d959a210 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -17,15 +16,14 @@ public class ABCallbackReuseBoolean extends ABCondition { private ABStringCallback name; @Override - public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABBooleanCallback) { - return ((ABBooleanCallback) callback).callback(game, caster, localStore, castId); + return ((ABBooleanCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseBooleanCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java index 6cfe8bd3c..3b8f4023f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java @@ -3,7 +3,6 @@ import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -20,11 +19,10 @@ public class ABCallbackReuseBooleanWithArguments extends ABCondition { private Map arguments; @Override - public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { + public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); - final String keyS = name.callback(game, caster, localStore, castId); + final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABBooleanCallback) { @@ -34,7 +32,7 @@ public Boolean callback(final CSimulation game, final CUnit caster, final LocalD } } - return ((ABBooleanCallback) callback).callback(game, caster, localStore, castId); + return ((ABBooleanCallback) callback).callback(caster, localStore, castId); } else { System.err.println( "Trying to run ReuseBooleanCallback, but key is missing or callback was the wrong type: " diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java index 8ea932a99..c7a3e2e0e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java @@ -3,7 +3,6 @@ import java.util.EnumSet; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; @@ -22,7 +21,7 @@ public class ABConditionIsDestructableValidTarget extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; @@ -40,10 +39,11 @@ public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore local return true; } if (caster != null) { - theCaster = caster.callback(game, casterUnit, localStore, castId); + theCaster = caster.callback(casterUnit, localStore, castId); } - return target.callback(game, casterUnit, localStore, castId).canBeTargetedBy(game, theCaster, targetsAllowed); + return target.callback(casterUnit, localStore, castId).canBeTargetedBy(localStore.game, theCaster, + targetsAllowed); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java index 13f97e2ac..9600ec117 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; @@ -17,20 +16,20 @@ public class ABConditionIsPassAllAbilityTargetChecks extends ABCondition { private ABWidgetCallback target; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; if (caster != null) { - theCaster = caster.callback(game, casterUnit, localStore, castId); + theCaster = caster.callback(casterUnit, localStore, castId); } AbilityBuilderActiveAbility abil = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - abil.checkCanTarget(game, theCaster, abil.getBaseOrderId(), + abil.checkCanTarget(localStore.game, theCaster, abil.getBaseOrderId(), ((Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId))), - target.callback(game, casterUnit, localStore, castId), booleanTargetReceiver); + target.callback(casterUnit, localStore, castId), booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java index db0faf46f..3e4a585b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java @@ -2,7 +2,6 @@ import java.util.Set; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; @@ -15,9 +14,9 @@ public class ABConditionIsUnitInGroup extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Set groupSet = group.callback(game, caster, localStore, castId); - CUnit rUnit = unit.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Set groupSet = group.callback(caster, localStore, castId); + CUnit rUnit = unit.callback(caster, localStore, castId); return groupSet.contains(rUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java index fdffc2d73..60f3d5c79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -14,10 +13,10 @@ public class ABConditionIsUnitInRangeOfUnit extends ABCondition { private ABFloatCallback range; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { - return caster.callback(game, casterUnit, localStore, castId).canReach( - target.callback(game, casterUnit, localStore, castId), - range.callback(game, casterUnit, localStore, castId)); + public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + return caster.callback(casterUnit, localStore, castId).canReach( + target.callback(casterUnit, localStore, castId), + range.callback(casterUnit, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java index 31085ef36..ce624e235 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; @@ -16,21 +15,21 @@ public class ABConditionIsUnitPassAllAbilityTargetChecks extends ABCondition { private ABUnitCallback target; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; - CUnit theTarget = target.callback(game, casterUnit, localStore, castId); + CUnit theTarget = target.callback(casterUnit, localStore, castId); if (theTarget == null) { return false; } if (caster != null) { - theCaster = caster.callback(game, casterUnit, localStore, castId); + theCaster = caster.callback(casterUnit, localStore, castId); } AbilityBuilderActiveAbility abil = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - abil.checkCanTarget(game, theCaster, abil.getBaseOrderId(), + abil.checkCanTarget(localStore.game, theCaster, abil.getBaseOrderId(), ((Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId))), theTarget, booleanTargetReceiver); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java index 178291093..6fc5e0c96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java @@ -4,7 +4,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -26,36 +25,36 @@ public class ABConditionIsUnitValidTarget extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (ability != null && ability instanceof AbilityBuilderActiveAbility) { - targetsAllowed = ((AbilityBuilderActiveAbility)ability).getTargetsAllowed(); + targetsAllowed = ((AbilityBuilderActiveAbility) ability).getTargetsAllowed(); } else { List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL))-1) + targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1) .getTargetsAllowed(); } - + if (targetsAllowed.isEmpty()) { return true; } - final CUnit theUnit = this.target.callback(game, casterUnit, localStore, castId); + final CUnit theUnit = this.target.callback(casterUnit, localStore, castId); if (theUnit == null) { return false; } boolean te = false; if (this.caster != null) { - theCaster = this.caster.callback(game, casterUnit, localStore, castId); + theCaster = this.caster.callback(casterUnit, localStore, castId); } if (this.targetedEffect != null) { - te = this.targetedEffect.callback(game, theCaster, localStore, castId); + te = this.targetedEffect.callback(theCaster, localStore, castId); } - return theUnit.canBeTargetedBy(game, theCaster, te, targetsAllowed, + return theUnit.canBeTargetedBy(localStore.game, theCaster, te, targetsAllowed, BooleanAbilityTargetCheckReceiver.getInstance().reset()); } @@ -64,8 +63,7 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String casterExpr; if (this.caster == null) { casterExpr = jassTextGenerator.getCaster(); - } - else { + } else { casterExpr = this.caster.generateJassEquivalent(jassTextGenerator); } String targetedEffectExpr = "false"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java index 08d5bbcbc..c43f4ed54 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java @@ -4,7 +4,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; @@ -24,7 +23,7 @@ public class ABConditionIsValidTarget extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; @@ -42,15 +41,15 @@ public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore local return true; } if (this.caster != null) { - theCaster = this.caster.callback(game, casterUnit, localStore, castId); + theCaster = this.caster.callback(casterUnit, localStore, castId); } - CWidget widget = this.target.callback(game, casterUnit, localStore, castId); + CWidget widget = this.target.callback(casterUnit, localStore, castId); if (widget == null) { return false; } - return widget.canBeTargetedBy(game, theCaster, targetsAllowed); + return widget.canBeTargetedBy(localStore.game, theCaster, targetsAllowed); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java index 1456c5b24..6eb556290 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java @@ -3,7 +3,6 @@ import java.util.List; import com.badlogic.gdx.math.Rectangle; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -21,15 +20,15 @@ public class ABConditionMatchingCorpseExistsInRangeOfUnit extends ABCondition { private List conditions; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CUnit originUnitTarget = originUnit.callback(game, caster, localStore, castId); - Float rangeVal = range.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CUnit originUnitTarget = originUnit.callback(caster, localStore, castId); + Float rangeVal = range.callback(caster, localStore, castId); final UnitAndRange ur = new UnitAndRange(); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - game.getWorldCollision().enumCorpsesInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumCorpsesInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { @@ -38,7 +37,7 @@ public boolean call(final CUnit enumUnit) { boolean result = true; localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); for (ABCondition condition : conditions) { - result = result && condition.callback(game, caster, localStore, castId); + result = result && condition.callback(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); if (result) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java index b4e231438..935c81471 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; import com.badlogic.gdx.math.Rectangle; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; @@ -19,22 +18,22 @@ public class ABConditionMatchingUnitExistsInRangeOfUnit extends ABCondition { private ABCondition condition; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CUnit originUnitTarget = originUnit.callback(game, caster, localStore, castId); - Float rangeVal = range.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CUnit originUnitTarget = originUnit.callback(caster, localStore, castId); + Float rangeVal = range.callback(caster, localStore, castId); final UnitAndRange ur = new UnitAndRange(); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); - game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { if (ur.getUnit() == null) { if (condition != null) { localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); - boolean result = condition.callback(game, caster, localStore, castId); + boolean result = condition.callback(caster, localStore, castId); localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); if (result) { ur.setUnit(enumUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java index d44f96e42..dff57c026 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -13,8 +12,8 @@ public class ABConditionSetCantUseReasonOnFailure extends ABCondition { private CommandStringErrorKeysEnum reason; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - boolean result = condition.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + boolean result = condition.callback(caster, localStore, castId); if (!result) { localStore.put(ABLocalStoreKeys.CANTUSEREASON, reason.getKey()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java index 8eb0bca93..044312875 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; @@ -14,9 +13,9 @@ public class ABConditionDoesAbilityHaveUniqueFlag extends ABCondition { ABStringCallback flag; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CAbility theAbility = ability.callback(game, caster, localStore, castId); - return theAbility.hasUniqueFlag(flag.callback(game, caster, localStore, castId)); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CAbility theAbility = ability.callback(caster, localStore, castId); + return theAbility.hasUniqueFlag(flag.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java index e2be0182b..d7cc21dff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABConditionIsAutoCastCurrentlyActive extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.ISAUTOCASTON); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java index 0aae35fc7..3b880e356 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -10,7 +9,7 @@ public class ABConditionIsDisabled extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.isDisabled(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java index 47f439cba..1747c3b04 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -10,7 +9,7 @@ public class ABConditionIsFlexAbilityNonPointTarget extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return !ability.isPointTarget(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java index 11ed1e2da..76968c84d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -10,7 +9,7 @@ public class ABConditionIsFlexAbilityNonTargeted extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return !ability.isTargetedSpell(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java index 466cdb13b..18de5f2fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -10,7 +9,7 @@ public class ABConditionIsFlexAbilityPointTarget extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return ability.isPointTarget(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java index b99bbd1c2..165841e8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -10,7 +9,7 @@ public class ABConditionIsFlexAbilityTargeted extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore .get(ABLocalStoreKeys.ISFLEXABILITY); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java index 8119e3d87..7029b3f8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -10,10 +9,10 @@ public class ABConditionIsOnCooldown extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - return ability.getCooldownRemainingTicks(game, caster) > 0; + return ability.getCooldownRemainingTicks(localStore.game, caster) > 0; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java index 70f369647..1c1f6f780 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,7 +11,7 @@ public class ABConditionIsToggleAbilityActive extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.isActive(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java index 29b220bb1..e9a19393e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -9,7 +8,7 @@ public class ABConditionIsTransformingToAlternate extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.TRANSFORMINGTOALT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java index 0cd8a5520..1be4f09f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABConditionWasAutoCast extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java index fe90a4644..194d28ee4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABConditionWasAutoCastPreviouslyActive extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.WASAUTOCASTON); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java index d8fa47f16..0bda0791d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java @@ -2,7 +2,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -11,7 +10,7 @@ public class ABConditionWasCastingInterrupted extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.INTERRUPTED); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java index 9ef3451ef..b62dbf0ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,7 +9,7 @@ public class ABConditionIsAttackProjectile extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isProjectile(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java index 285b59a2a..1ee2d01fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; @@ -10,7 +9,7 @@ public class ABConditionIsAttackRanged extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isRanged(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java index a1361d596..cf3cee33f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -14,9 +13,9 @@ public class ABConditionDoesBuffHaveUniqueFlag extends ABCondition { ABStringCallback flag; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CBuff theBuff = buff.callback(game, caster, localStore, castId); - return theBuff.hasUniqueFlag(flag.callback(game, caster, localStore, castId)); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CBuff theBuff = buff.callback(caster, localStore, castId); + return theBuff.hasUniqueFlag(flag.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java index c14f9a397..41b938930 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -13,9 +12,9 @@ public class ABConditionIsBuffAlly extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CBuff theBuff = buff.callback(game, caster, localStore, castId); - return game.getPlayer(caster.getPlayerIndex()).hasAlliance(theBuff.getSourceUnit().getPlayerIndex(), + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CBuff theBuff = buff.callback(caster, localStore, castId); + return localStore.game.getPlayer(caster.getPlayerIndex()).hasAlliance(theBuff.getSourceUnit().getPlayerIndex(), CAllianceType.SHARED_SPELLS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java index 342935896..7d0b5bb9c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -13,9 +12,9 @@ public class ABConditionIsBuffEnemy extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CBuff theBuff = buff.callback(game, caster, localStore, castId); - return !game.getPlayer(caster.getPlayerIndex()).hasAlliance(theBuff.getSourceUnit().getPlayerIndex(), + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CBuff theBuff = buff.callback(caster, localStore, castId); + return !localStore.game.getPlayer(caster.getPlayerIndex()).hasAlliance(theBuff.getSourceUnit().getPlayerIndex(), CAllianceType.PASSIVE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java index 53ab755a7..ee0248b7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -12,8 +11,8 @@ public class ABConditionIsBuffMagic extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CBuff theBuff = buff.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CBuff theBuff = buff.callback(caster, localStore, castId); return theBuff.isMagic(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java index dec0767e9..de9e33118 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -12,8 +11,8 @@ public class ABConditionIsBuffNegative extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CBuff theBuff = buff.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CBuff theBuff = buff.callback(caster, localStore, castId); return !theBuff.isPositive(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java index 4d0c88ca3..7007884d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; @@ -12,8 +11,8 @@ public class ABConditionIsBuffPositive extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CBuff theBuff = buff.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CBuff theBuff = buff.callback(caster, localStore, castId); return theBuff.isPositive(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java index 05b2cca09..ad2a85b4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,9 +12,9 @@ public class ABConditionIsAttackTypeEqual extends ABCondition { private ABAttackTypeCallback attackType2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CAttackType lA = attackType1.callback(game, caster, localStore, castId); - CAttackType rA = attackType2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CAttackType lA = attackType1.callback(caster, localStore, castId); + CAttackType rA = attackType2.callback(caster, localStore, castId); if (lA == null) { if (rA == null) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java index d75427f2b..82d233a80 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,9 +12,9 @@ public class ABConditionIsDamageTypeEqual extends ABCondition { private ABDamageTypeCallback damageType2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CDamageType lD = damageType1.callback(game, caster, localStore, castId); - CDamageType rD = damageType2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CDamageType lD = damageType1.callback(caster, localStore, castId); + CDamageType rD = damageType2.callback(caster, localStore, castId); if (lD == null) { if (rD == null) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java index 701815126..e30465925 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDefenseTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,9 +12,9 @@ public class ABConditionIsDefenseTypeEqual extends ABCondition { private ABDefenseTypeCallback defenseType2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CDefenseType lD = defenseType1.callback(game, caster, localStore, castId); - CDefenseType rD = defenseType2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CDefenseType lD = defenseType1.callback(caster, localStore, castId); + CDefenseType rD = defenseType2.callback(caster, localStore, castId); if (lD == null) { if (rD == null) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java index bc0ce559b..de1cfdeab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDefenseTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -15,10 +14,10 @@ public class ABConditionIsDefenseTypeInList extends ABCondition { private List list; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - CDefenseType theType = defenseType.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, int castId) { + CDefenseType theType = defenseType.callback(caster, localStore, castId); for (ABDefenseTypeCallback lType : list) { - if (theType == lType.callback(game, caster, localStore, castId)) { + if (theType == lType.callback(caster, localStore, castId)) { return true; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java index 53dd3b6f3..7d3728e49 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,9 +12,9 @@ public class ABConditionIsIdEqual extends ABCondition { private ABIDCallback id2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - War3ID lA = id1.callback(game, caster, localStore, castId); - War3ID rA = id2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + War3ID lA = id1.callback(caster, localStore, castId); + War3ID rA = id2.callback(caster, localStore, castId); if (lA == null) { if (rA == null) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java index f1979e822..247c51809 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABMovementTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,9 +12,9 @@ public class ABConditionIsMovementTypeEqual extends ABCondition { private ABMovementTypeCallback movementType2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - MovementType lD = movementType1.callback(game, caster, localStore, castId); - MovementType rD = movementType2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + MovementType lD = movementType1.callback(caster, localStore, castId); + MovementType rD = movementType2.callback(caster, localStore, castId); if (lD == null) { if (rD == null) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java index d82d59042..c828a8a60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,9 +11,9 @@ public class ABConditionIsUnitEqual extends ABCondition { private ABUnitCallback unit2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CUnit lUnit = unit1.callback(game, caster, localStore, castId); - CUnit rUnit = unit2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CUnit lUnit = unit1.callback(caster, localStore, castId); + CUnit rUnit = unit2.callback(caster, localStore, castId); if (lUnit == null) { if (rUnit == null) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java index f35493714..078ea0a62 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,9 +12,9 @@ public class ABConditionIsWeaponTypeEqual extends ABCondition { private ABWeaponTypeCallback weaponType2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CWeaponType lD = weaponType1.callback(game, caster, localStore, castId); - CWeaponType rD = weaponType2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CWeaponType lD = weaponType1.callback(caster, localStore, castId); + CWeaponType rD = weaponType2.callback(caster, localStore, castId); if (lD == null) { if (rD == null) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java index 7c242343b..7222a8625 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; @@ -15,11 +14,11 @@ public class ABConditionDoesDestructableHaveBuff extends ABCondition { private ABIDCallback id; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CDestructable theDestructable = dest.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CDestructable theDestructable = dest.callback(caster, localStore, castId); if (theDestructable != null) { for (CDestructableBuff ability : theDestructable.getBuffs()) { - if ((ability).getAlias() == id.callback(game, caster, localStore, castId)) { + if ((ability).getAlias() == id.callback(caster, localStore, castId)) { return true; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java index f8f9d8012..763565ea4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; @@ -16,12 +15,12 @@ public class ABConditionDoesDestructableHaveBuffMatchingCondition extends ABCond private ABBooleanCallback condition; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CDestructable theDestructable = dest.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CDestructable theDestructable = dest.callback(caster, localStore, castId); if (theDestructable != null) { for (CDestructableBuff ability : theDestructable.getBuffs()) { localStore.put(ABLocalStoreKeys.MATCHINGDESTBUFF, ability); - if (condition.callback(game, caster, localStore, castId)) { + if (condition.callback(caster, localStore, castId)) { localStore.remove(ABLocalStoreKeys.MATCHINGDESTBUFF); return true; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java index d5b726af8..2248d8bf6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java @@ -3,7 +3,6 @@ import java.util.EnumSet; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -15,10 +14,10 @@ public class ABConditionIsTree extends ABCondition { private ABDestructableCallback dest; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CDestructable theDestructable = dest.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CDestructable theDestructable = dest.callback(caster, localStore, castId); if (theDestructable != null) { - return theDestructable.canBeTargetedBy(game, caster, EnumSet.of(CTargetType.TREE)); + return theDestructable.canBeTargetedBy(localStore.game, caster, EnumSet.of(CTargetType.TREE)); } return false; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java index f467f0986..81ea9612d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructablebuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; @@ -12,8 +11,8 @@ public class ABConditionIsDestructableBuffMagic extends ABCondition { ABDestructableBuffCallback buff; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CDestructableBuff theBuff = buff.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CDestructableBuff theBuff = buff.callback(caster, localStore, castId); return theBuff.isMagic(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java index a6432e777..9d76cddca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,8 +7,8 @@ public class ABConditionGameplayConstantCanDisableDivineShield extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getGameplayConstants().isCanDisableDivineShield(); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getGameplayConstants().isCanDisableDivineShield(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java index 89bf5aeb6..4bf76e374 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,8 +7,8 @@ public class ABConditionGameplayConstantIsDefendCanDeflect extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getGameplayConstants().isDefendDeflection(); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getGameplayConstants().isDefendDeflection(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java index a868f6249..e817f9145 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,8 +7,8 @@ public class ABConditionGameplayConstantIsRelativeUpgradeCosts extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getGameplayConstants().isRelativeUpgradeCosts(); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getGameplayConstants().isRelativeUpgradeCosts(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java index 000e10afc..e6e78674b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -8,8 +7,8 @@ public class ABConditionGameplayConstantSmartAbolishMagic extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return game.getGameplayConstants().isAbolishMagicSmartDispel(); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + return localStore.game.getGameplayConstants().isAbolishMagicSmartDispel(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java index 5af15bcb1..2b9f299cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -10,19 +9,19 @@ public class ABConditionIsTimeOfDayInRange extends ABCondition { private ABFloatCallback startTime; private ABFloatCallback endTime; - + @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { float st = 0; float et = Float.MAX_VALUE; if (startTime != null) { - st = startTime.callback(game, caster, localStore, castId); + st = startTime.callback(caster, localStore, castId); } if (endTime != null) { - et = endTime.callback(game, caster, localStore, castId); + et = endTime.callback(caster, localStore, castId); } - return st <= et ? game.getGameTimeOfDay() >= st && game.getGameTimeOfDay() < et - : game.getGameTimeOfDay() >= st || game.getGameTimeOfDay() < et; + return st <= et ? localStore.game.getGameTimeOfDay() >= st && localStore.game.getGameTimeOfDay() < et + : localStore.game.getGameTimeOfDay() >= st || localStore.game.getGameTimeOfDay() < et; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java index 608d81df4..70fc52927 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -10,7 +9,7 @@ public class ABConditionIsItemAbility extends ABCondition { @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.getItem() != null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java index 452f70259..08ac0aafa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; @@ -13,13 +12,13 @@ public class ABConditionItemHasCharges extends ABCondition { private ABItemCallback item; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { if (item == null) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.getItem().getCharges() > 0; } else { - return item.callback(game, caster, localStore, castId).getCharges() > 0; + return item.callback(caster, localStore, castId).getCharges() > 0; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java index ac5e5554c..25683e485 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; @@ -13,13 +12,13 @@ public class ABConditionItemIsCharged extends ABCondition { private ABItemCallback item; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { if (item == null) { AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.getItem().getItemType().getNumberOfCharges() > 0; } else { - return item.callback(game, caster, localStore, castId).getItemType().getNumberOfCharges() > 0; + return item.callback(caster, localStore, castId).getItemType().getNumberOfCharges() > 0; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java index 0ba58f90e..117d35c01 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; @@ -13,9 +12,10 @@ public class ABConditionIsLocationDeepWater extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - AbilityPointTarget loc = location.callback(game, caster, localStore, castId); - return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + AbilityPointTarget loc = location.callback(caster, localStore, castId); + return localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) + && !localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java index d7591a378..8dbd3fc0e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; @@ -13,11 +12,11 @@ public class ABConditionIsLocationFlyingOnly extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - AbilityPointTarget loc = location.callback(game, caster, localStore, castId); - return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.FLYABLE) - && !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) - && !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + AbilityPointTarget loc = location.callback(caster, localStore, castId); + return localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.FLYABLE) + && !localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) + && !localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java index 948b90265..de0c1485d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; @@ -13,10 +12,10 @@ public class ABConditionIsLocationShallowWater extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - AbilityPointTarget loc = location.callback(game, caster, localStore, castId); - return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) - && game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + AbilityPointTarget loc = location.callback(caster, localStore, castId); + return localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) + && localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java index ab50f93e7..134c1ffdf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; @@ -13,9 +12,9 @@ public class ABConditionIsLocationWalkable extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - AbilityPointTarget loc = location.callback(game, caster, localStore, castId); - return game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + AbilityPointTarget loc = location.callback(caster, localStore, castId); + return localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java index fced58891..94d14d4e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; @@ -13,9 +12,10 @@ public class ABConditionIsLocationWalkableNonWater extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - AbilityPointTarget loc = location.callback(game, caster, localStore, castId); - return !game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + AbilityPointTarget loc = location.callback(caster, localStore, castId); + return !localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) + && localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java index 317cf5231..69d32d5b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java @@ -3,7 +3,6 @@ import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -13,12 +12,12 @@ public class ABConditionAnd extends ABCondition { private List conditions; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { boolean result = true; if (conditions != null) { for (ABCondition cond : conditions) { if (result) { - result = result && cond.callback(game, caster, localStore, castId); + result = result && cond.callback(caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java index f529cd814..aab2bc8e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionBool extends ABCondition { private ABBooleanCallback bool; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return bool.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + return bool.callback(caster, localStore, castId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java index 0ab6c5ed3..ea9f08f16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionIsNull extends ABCondition { private ABCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value.callback(game, caster, localStore, castId) == null; + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value.callback(caster, localStore, castId) == null; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java index 359ecefbc..b20978398 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -11,8 +10,8 @@ public class ABConditionNot extends ABCondition { private ABCondition condition; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return !condition.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + return !condition.callback(caster, localStore, castId); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java index dcfcca383..20d8a5155 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionNotNull extends ABCondition { private ABCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return value.callback(game, caster, localStore, castId) != null; + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + return value.callback(caster, localStore, castId) != null; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java index 9d6616604..9f049e397 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -12,12 +11,12 @@ public class ABConditionOr extends ABCondition { private List conditions; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { boolean result = false; if (conditions != null) { for (ABCondition cond : conditions) { if (!result) { - result = result || cond.callback(game, caster, localStore, castId); + result = result || cond.callback(caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java index 190060c37..ff733364f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionFloatEq0 extends ABCondition { private ABFloatCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Float v = value.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Float v = value.callback(caster, localStore, castId); return v==0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java index 65668159d..e7f94e028 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,9 +12,9 @@ public class ABConditionFloatEqual extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Float v1 = value1.callback(game, caster, localStore, castId); - Float v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Float v1 = value1.callback(caster, localStore, castId); + Float v2 = value2.callback(caster, localStore, castId); return v1.equals(v2); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java index 171b051a9..f5ad9f40c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,9 +12,9 @@ public class ABConditionFloatGt extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Float v1 = value1.callback(game, caster, localStore, castId); - Float v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Float v1 = value1.callback(caster, localStore, castId); + Float v2 = value2.callback(caster, localStore, castId); return v1 > v2; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java index 5d548577e..5adf5c0ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionFloatGt0 extends ABCondition { private ABFloatCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Float v = value.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Float v = value.callback(caster, localStore, castId); return v > 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java index 79ea49033..c703b442d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,9 +11,9 @@ public class ABConditionFloatGte extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Float v1 = value1.callback(game, caster, localStore, castId); - Float v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Float v1 = value1.callback(caster, localStore, castId); + Float v2 = value2.callback(caster, localStore, castId); return v1 >= v2; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java index 5ff84ec9d..862a07238 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,9 +11,9 @@ public class ABConditionFloatLt extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Float v1 = value1.callback(game, caster, localStore, castId); - Float v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Float v1 = value1.callback(caster, localStore, castId); + Float v2 = value2.callback(caster, localStore, castId); return v1 < v2; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java index ed5b68b10..7ca5ac0d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,9 +11,9 @@ public class ABConditionFloatLte extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Float v1 = value1.callback(game, caster, localStore, castId); - Float v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Float v1 = value1.callback(caster, localStore, castId); + Float v2 = value2.callback(caster, localStore, castId); return v1 <= v2; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java index 943dc3811..7642ddb4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,9 +11,9 @@ public class ABConditionFloatNe extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Float v1 = value1.callback(game, caster, localStore, castId); - Float v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Float v1 = value1.callback(caster, localStore, castId); + Float v2 = value2.callback(caster, localStore, castId); return !v1.equals(v2); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java index 4b3d73885..9ea124d70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionFloatNe0 extends ABCondition { private ABFloatCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Float v = value.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Float v = value.callback(caster, localStore, castId); return v!=0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java index 97c57ce2e..c90c3c7ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,9 +11,9 @@ public class ABConditionIntegerEq extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v1 = value1.callback(game, caster, localStore, castId); - Integer v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v1 = value1.callback(caster, localStore, castId); + Integer v2 = value2.callback(caster, localStore, castId); return v1.equals(v2); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java index 232c51d1a..a9a6b947e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionIntegerEq0 extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v1 = value.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v1 = value.callback(caster, localStore, castId); return v1 == 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java index 5bdf88992..43b6d41bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,9 +11,9 @@ public class ABConditionIntegerGt extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v1 = value1.callback(game, caster, localStore, castId); - Integer v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v1 = value1.callback(caster, localStore, castId); + Integer v2 = value2.callback(caster, localStore, castId); return v1 > v2; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java index 863f20b3e..e2c689da7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionIntegerGt0 extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v1 = value.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v1 = value.callback(caster, localStore, castId); return v1 > 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java index 2dd05c9c6..a3207c087 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,9 +11,9 @@ public class ABConditionIntegerGte extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v1 = value1.callback(game, caster, localStore, castId); - Integer v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v1 = value1.callback(caster, localStore, castId); + Integer v2 = value2.callback(caster, localStore, castId); return v1 >= v2; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java index 4e1410648..93a14f75a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionIntegerIsEven extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v1 = value.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v1 = value.callback(caster, localStore, castId); return (v1 % 2) == 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java index 8c174e293..7a134c5fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionIntegerIsOdd extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v1 = value.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v1 = value.callback(caster, localStore, castId); return (v1 % 2) == 1; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java index 0e61fde49..8d6a719c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,9 +12,9 @@ public class ABConditionIntegerLt extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v1 = value1.callback(game, caster, localStore, castId); - Integer v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v1 = value1.callback(caster, localStore, castId); + Integer v2 = value2.callback(caster, localStore, castId); return v1 < v2; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java index 3ff961760..117b490ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,9 +11,9 @@ public class ABConditionIntegerLte extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v1 = value1.callback(game, caster, localStore, castId); - Integer v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v1 = value1.callback(caster, localStore, castId); + Integer v2 = value2.callback(caster, localStore, castId); return v1 <= v2; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java index 42dcaca49..b743c3f0d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,9 +11,9 @@ public class ABConditionIntegerNe extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v1 = value1.callback(game, caster, localStore, castId); - Integer v2 = value2.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v1 = value1.callback(caster, localStore, castId); + Integer v2 = value2.callback(caster, localStore, castId); return !v1.equals(v2); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java index 851a75da4..581d31437 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionIntegerNe0 extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - Integer v1 = value.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + Integer v1 = value.callback(caster, localStore, castId); return v1 != 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java index 9ca05b8ce..75ebb1462 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,8 +12,8 @@ public class ABConditionIsProjectileReflected extends ABCondition { private ABProjectileCallback projectile; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - final CProjectile proj = this.projectile.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + final CProjectile proj = this.projectile.callback(caster, localStore, castId); return proj.isReflected(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java index 835d19d2c..462234cd5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.timer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,8 +10,8 @@ public class ABConditionIsTimerActive extends ABCondition { private ABTimerCallback timer; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - return timer.callback(game, caster, localStore, castId).isRunning(); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + return timer.callback(caster, localStore, castId).isRunning(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java index a63d1d3b4..08dc6d640 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; @@ -16,16 +15,16 @@ public class ABConditionDoesUnitHaveAbilityMatchingCondition extends ABCondition private ABBooleanCallback condition; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { for (CAbility ability : theUnit.getAbilities()) { if (CAbilityCategory.BUFF != ability.getAbilityCategory()) { localStore.put(ABLocalStoreKeys.MATCHINGABILITY, ability); - if (condition.callback(game, caster, localStore, castId)) { + if (condition.callback(caster, localStore, castId)) { localStore.remove(ABLocalStoreKeys.MATCHINGABILITY); return true; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java index 443d8cbf1..be742435f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; @@ -15,15 +14,15 @@ public class ABConditionDoesUnitHaveBuff extends ABCondition { private ABIDCallback id; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { for (CAbility ability : theUnit.getAbilities()) { if (ability instanceof CBuff) { - if (((CBuff) ability).getAlias() == id.callback(game, caster, localStore, castId)) { + if (((CBuff) ability).getAlias() == id.callback(caster, localStore, castId)) { return true; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java index 1492eb380..14ac45667 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; @@ -16,16 +15,16 @@ public class ABConditionDoesUnitHaveBuffMatchingCondition extends ABCondition { private ABBooleanCallback condition; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { for (CAbility ability : theUnit.getAbilities()) { if (ability instanceof CBuff) { localStore.put(ABLocalStoreKeys.MATCHINGBUFF, ability); - if (condition.callback(game, caster, localStore, castId)) { + if (condition.callback(caster, localStore, castId)) { localStore.remove(ABLocalStoreKeys.MATCHINGBUFF); return true; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java index 03d1671d3..1e130776f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,10 +10,10 @@ public class ABConditionIsUnitAlive extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return !theUnit.isDead(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java index 517e299b2..706d11aaa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,10 +10,10 @@ public class ABConditionIsUnitBuilding extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isBuilding(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java index 1cef3b883..7023c5e76 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,10 +10,10 @@ public class ABConditionIsUnitConstructing extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isConstructing(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java index 3f46913ee..a4a70604a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,10 +10,10 @@ public class ABConditionIsUnitConstructingOrUpgrading extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isConstructingOrUpgrading(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java index 5b3f15e1a..0d96eb30d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,10 +10,10 @@ public class ABConditionIsUnitDead extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isDead(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java index e755bf434..5aad4a1d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -14,15 +13,15 @@ public class ABConditionIsUnitEnemy extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { - CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); + public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + CUnit theUnit = unit.callback(casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (this.self != null) { - theCaster = this.self.callback(game, casterUnit, localStore, castId); + theCaster = this.self.callback(casterUnit, localStore, castId); } if (theUnit != null) { - return !game.getPlayer(theUnit.getPlayerIndex()).hasAlliance(theCaster.getPlayerIndex(), + return !localStore.game.getPlayer(theUnit.getPlayerIndex()).hasAlliance(theCaster.getPlayerIndex(), CAllianceType.PASSIVE); } return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java index 06cf41033..68404ecdd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -14,15 +13,15 @@ public class ABConditionIsUnitFriend extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { - CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); + public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + CUnit theUnit = unit.callback(casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (this.self != null) { - theCaster = this.self.callback(game, casterUnit, localStore, castId); + theCaster = this.self.callback(casterUnit, localStore, castId); } if (theUnit != null) { - return game.getPlayer(theUnit.getPlayerIndex()).hasAlliance(theCaster.getPlayerIndex(), + return localStore.game.getPlayer(theUnit.getPlayerIndex()).hasAlliance(theCaster.getPlayerIndex(), CAllianceType.SHARED_SPELLS); } return false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java index 405e3065b..e4902f8eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,10 +10,10 @@ public class ABConditionIsUnitHero extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isHero(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java index 8e3e7991e..c40533180 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,8 +11,8 @@ public class ABConditionIsUnitHeroDuration extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { - CUnit theUnit = unit.callback(game, caster, localStore, castId); + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + CUnit theUnit = unit.callback(caster, localStore, castId); if (theUnit != null && (theUnit.isHero() || theUnit.isUnitType(CUnitTypeJass.RESISTANT))) { return true; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java index e4d4e6d5c..dd10252d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,10 +10,10 @@ public class ABConditionIsUnitHidden extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isHidden(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java index b8621333a..047d28807 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,10 +10,10 @@ public class ABConditionIsUnitMagicImmune extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isMagicImmune(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java index 5aa100623..5b21eae65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,10 +11,10 @@ public class ABConditionIsUnitMaxHp extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.getLife() >= theUnit.getMaximumLife(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java index 6df8851b3..6582dac95 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,10 +11,10 @@ public class ABConditionIsUnitMaxMp extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.getMana() >= theUnit.getMaximumMana(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java index c2fec28a2..00ba1dbf2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,10 +10,10 @@ public class ABConditionIsUnitMorphImmune extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isMorphImmune(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java index 0b3847fc1..9b2cb3e46 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,10 +11,10 @@ public class ABConditionIsUnitPolymorphed extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isUnitType(CUnitTypeJass.POLYMORPHED); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java index d2a0eb24c..1e5595623 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,15 +12,15 @@ public class ABConditionIsUnitShareSpells extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { - CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); + public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + CUnit theUnit = unit.callback(casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (caster != null) { - theCaster = caster.callback(game, casterUnit, localStore, castId); + theCaster = caster.callback(casterUnit, localStore, castId); } if (theUnit != null) { - return game.getPlayer(theUnit.getPlayerIndex()).hasAlliance(theCaster.getPlayerIndex(), CAllianceType.SHARED_SPELLS); + return localStore.game.getPlayer(theUnit.getPlayerIndex()).hasAlliance(theCaster.getPlayerIndex(), CAllianceType.SHARED_SPELLS); } return false; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java index 363a52ce4..79603651d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,10 +11,10 @@ public class ABConditionIsUnitSleeping extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isUnitType(CUnitTypeJass.SLEEPING); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java index a886fb8ce..9f26fd602 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -12,10 +11,10 @@ public class ABConditionIsUnitSummoned extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isUnitType(CUnitTypeJass.SUMMONED); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java index fbe16d5b0..6320b537a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,10 +10,10 @@ public class ABConditionIsUnitTraining extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isBuildQueueActive(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java index df4141687..1ac4c011a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,13 +12,13 @@ public class ABConditionIsUnitType extends ABCondition { private ABIDCallback unitType; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { - return theUnit.getTypeId().equals(unitType.callback(game, caster, localStore, castId)); + return theUnit.getTypeId().equals(unitType.callback(caster, localStore, castId)); } return false; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java index 0e8172d13..a278a80f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -11,10 +10,10 @@ public class ABConditionIsUnitUpgrading extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { return theUnit.isUpgrading(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java index 578454441..edacc873d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -13,15 +12,15 @@ public class ABConditionIsUnitVisible extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CSimulation game, CUnit casterUnit, LocalDataStore localStore, final int castId) { - CUnit theUnit = unit.callback(game, casterUnit, localStore, castId); + public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + CUnit theUnit = unit.callback(casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (this.caster != null) { - theCaster = this.caster.callback(game, casterUnit, localStore, castId); + theCaster = this.caster.callback(casterUnit, localStore, castId); } if (theUnit != null) { - return theUnit.isVisible(game, theCaster.getPlayerIndex()); + return theUnit.isVisible(localStore.game, theCaster.getPlayerIndex()); } return false; } @@ -31,8 +30,7 @@ public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { String casterExpr; if (this.caster == null) { casterExpr = jassTextGenerator.getCaster(); - } - else { + } else { casterExpr = this.caster.generateJassEquivalent(jassTextGenerator); } return "IsUnitEnemy(" + this.unit.generateJassEquivalent(jassTextGenerator) + ", GetOwningPlayer(" + casterExpr diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java index 4dda35617..ac13f91a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; @@ -20,14 +19,14 @@ public class ABConditionSuccessfullyChargeResources extends ABCondition { private ABIntegerCallback food; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } - CPlayer thePlayer = game.getPlayer(theUnit.getPlayerIndex()); + CPlayer thePlayer = localStore.game.getPlayer(theUnit.getPlayerIndex()); if (player != null) { - thePlayer = player.callback(game, caster, localStore, castId); + thePlayer = player.callback(caster, localStore, castId); } int manaCost = 0; @@ -35,16 +34,16 @@ public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStor int lumberCost = 0; int foodCost = 0; if (mana != null) { - manaCost = mana.callback(game, caster, localStore, castId); + manaCost = mana.callback(caster, localStore, castId); } if (gold != null) { - goldCost = gold.callback(game, caster, localStore, castId); + goldCost = gold.callback(caster, localStore, castId); } if (lumber != null) { - lumberCost = lumber.callback(game, caster, localStore, castId); + lumberCost = lumber.callback(caster, localStore, castId); } if (food != null) { - foodCost = food.callback(game, caster, localStore, castId); + foodCost = food.callback(caster, localStore, castId); } if ((manaCost > 0 && manaCost > theUnit.getMana()) || (goldCost > 0 && goldCost > thePlayer.getGold()) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java index b0dc6b09b..d54b04734 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java @@ -1,6 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; @@ -13,13 +12,13 @@ public class ABConditionUnitHasResearch extends ABCondition { private ABIDCallback researchId; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } if (theUnit != null) { - return theUnit.getLevelOfAppliedUpgrade(researchId.callback(game, caster, localStore, castId)) > 0; + return theUnit.getLevelOfAppliedUpgrade(researchId.callback(caster, localStore, castId)) > 0; } return false; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java index b50b24dc0..40588f83a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java @@ -2,7 +2,6 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -16,10 +15,10 @@ public class ABConditionIsCurrentBehaviorCategoryInList extends ABCondition { private List list; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { + public Boolean callback(CUnit caster, LocalDataStore localStore, int castId) { CUnit theUnit = caster; if (unit != null) { - theUnit = unit.callback(game, caster, localStore, castId); + theUnit = unit.callback(caster, localStore, castId); } CBehavior beh = theUnit.getCurrentBehavior(); CBehaviorCategory cat = CBehaviorCategory.IDLE; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java index 3245de34b..25006c250 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unittype; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; @@ -15,10 +14,11 @@ public class ABConditionIsLocationPathableForUnitType extends ABCondition { ABIDCallback unitType; @Override - public Boolean callback(CSimulation game, CUnit caster, LocalDataStore localStore, int castId) { - War3ID uType = unitType.callback(game, caster, localStore, castId); - AbilityPointTarget loc = location.callback(game, caster, localStore, castId); - return game.getPathingGrid().isPathable(loc.x, loc.y, game.getUnitData().getUnitType(uType).getMovementType()); + public Boolean callback(CUnit caster, LocalDataStore localStore, int castId) { + War3ID uType = unitType.callback(caster, localStore, castId); + AbilityPointTarget loc = location.callback(caster, localStore, castId); + return localStore.game.getPathingGrid().isPathable(loc.x, loc.y, + localStore.game.getUnitData().getUnitType(uType).getMovementType()); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java index a5f92557c..f1eaad5e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java @@ -65,7 +65,7 @@ public void onAdd(CSimulation game, CDestructable dest) { localStore.put(ABLocalStoreKeys.BUFFEDDEST + castId, this); if (onAddActions != null) { for (ABAction action : onAddActions) { - action.runAction(game, this.caster, localStore, castId); + action.runAction(this.caster, localStore, castId); } } localStore.remove(ABLocalStoreKeys.BUFFEDDEST + castId); @@ -76,7 +76,7 @@ public void onRemove(CSimulation game, CDestructable dest) { localStore.put(ABLocalStoreKeys.BUFFEDDEST + castId, this); if (onRemoveActions != null) { for (ABAction action : onRemoveActions) { - action.runAction(game, this.caster, localStore, castId); + action.runAction(this.caster, localStore, castId); } } localStore.remove(ABLocalStoreKeys.BUFFEDDEST + castId); @@ -87,7 +87,7 @@ public void onDeath(CSimulation game, CDestructable dest) { localStore.put(ABLocalStoreKeys.BUFFEDDEST + castId, this); if (onDeathActions != null) { for (ABAction action : onDeathActions) { - action.runAction(game, this.caster, localStore, castId); + action.runAction(this.caster, localStore, castId); } } localStore.remove(ABLocalStoreKeys.BUFFEDDEST + castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java index 91c283de7..e813171a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java @@ -72,7 +72,7 @@ protected void onBuffAdd(CSimulation game, CUnit unit) { } if (onAddActions != null) { for (ABAction action : onAddActions) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } } } @@ -90,7 +90,7 @@ protected void onBuffRemove(CSimulation game, CUnit unit) { } if (onRemoveActions != null) { for (ABAction action : onRemoveActions) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java index 2877f9b7b..ccd0c3185 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java @@ -83,7 +83,7 @@ protected void onBuffAdd(CSimulation game, CUnit unit) { if (onAddActions != null) { localStore.put(ABLocalStoreKeys.BUFF, this); for (ABAction action : onAddActions) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } localStore.remove(ABLocalStoreKeys.BUFF); } @@ -103,7 +103,7 @@ protected void onBuffRemove(CSimulation game, CUnit unit) { if (onRemoveActions != null) { localStore.put(ABLocalStoreKeys.BUFF, this); for (ABAction action : onRemoveActions) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } localStore.remove(ABLocalStoreKeys.BUFF); } @@ -125,7 +125,7 @@ protected void onBuffExpire(CSimulation game, CUnit unit) { if (onExpireActions != null) { localStore.put(ABLocalStoreKeys.BUFF, this); for (ABAction action : onExpireActions) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } localStore.remove(ABLocalStoreKeys.BUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java index bf3be7368..4c8088ddc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java @@ -49,7 +49,7 @@ protected void onBuffRemove(CSimulation game, CUnit unit) { @Override public void onDeath(CSimulation game, CUnit unit) { if (unit.isHero()) { - TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, + TransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); unit.remove(game, this); } @@ -59,10 +59,10 @@ public void onDeath(CSimulation game, CUnit unit) { protected void onBuffExpire(CSimulation game, CUnit unit) { if (dur > 0) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); - new DelayInstantTransformationTimer(game, sourceUnit, localStore, unit, actions, addAlternateTagAfter, + new DelayInstantTransformationTimer(sourceUnit, localStore, unit, actions, addAlternateTagAfter, transTime, null, targetType, keepRatios, abil, null, transTime, 0).start(game); } else { - TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, + TransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); } unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.abil, null); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java index 3a8528dc4..e0f55d2b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java @@ -38,7 +38,7 @@ public void onTick(CSimulation game, CUnit unit) { if (onTickActions != null) { localStore.put(ABLocalStoreKeys.BUFF, this); for (ABAction action : onTickActions) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } localStore.remove(ABLocalStoreKeys.BUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java index 1d5ad9a87..30c9aee3d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java @@ -38,7 +38,7 @@ public void onTick(CSimulation game, CUnit unit) { if (onTickActions != null) { localStore.put(ABLocalStoreKeys.BUFF, this); for (ABAction action : onTickActions) { - action.runAction(game, unit, localStore, castId); + action.runAction(unit, localStore, castId); } localStore.remove(ABLocalStoreKeys.BUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java index b6bf5a902..4928e3559 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java @@ -81,7 +81,7 @@ protected void onBuffRemove(CSimulation game, CUnit unit) { @Override public void onDeath(CSimulation game, CUnit unit) { if (unit.isHero()) { - TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, + TransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); unit.remove(game, this); } @@ -105,11 +105,11 @@ protected void onBuffExpire(CSimulation game, CUnit unit) { if (instantTransformation) { if (dur > 0) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); - new DelayInstantTransformationTimer(game, sourceUnit, localStore, unit, actions, addAlternateTagAfter, + new DelayInstantTransformationTimer(sourceUnit, localStore, unit, actions, addAlternateTagAfter, transTime, null, targetType, keepRatios, abil, null, transTime, 0).start(game); } else { - TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, - abil, addAlternateTagAfter, perm, true); + TransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, + addAlternateTagAfter, perm, true); } unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.abil, null); unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.abil, null); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java index 6732ea729..6bd44dd69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java @@ -1,12 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public interface ABAction extends JassTextGeneratorStmt { - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java index 4b778e920..88305a44d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java @@ -1,12 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; import com.etheller.warsmash.parsers.jass.JassTextGeneratorExpr; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public interface ABCallback extends JassTextGeneratorExpr { - public Object callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + public Object callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java index 7b19b8eed..9fa505b21 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java @@ -1,13 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; import com.etheller.warsmash.parsers.jass.JassTextGeneratorExpr; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABCondition extends ABBooleanCallback implements JassTextGeneratorExpr { - abstract public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId); + abstract public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java index 343462f96..3322b3df7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java @@ -9,7 +9,6 @@ public class ABLocalStoreKeys { public static final String PARENTLOCALSTORE = "_parentLocalStore"; public static final String ALIAS = "_alias"; public static final String CODE = "_code"; - public static final String GAME = "_game"; public static final String THISUNIT = "_thisUnit"; public static final String ABILITY = "_ability"; public static final String CURRENTLEVEL = "_currentLevel"; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/LocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/LocalDataStore.java index 62444287d..2d8b5d430 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/LocalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/LocalDataStore.java @@ -1,5 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; + public abstract class LocalDataStore implements DataStore { + public CSimulation game = null; +// public CUnit originUnit = null; +// public CAbility originAbility = null; +// public CPlayer originPlayer = null; +// public CUpgradeEffect originUpgrade = null; + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/MapLocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/MapLocalDataStore.java index eff2b85cb..25aa77e88 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/MapLocalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/MapLocalDataStore.java @@ -5,6 +5,8 @@ import java.util.Map; import java.util.Set; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; + public class MapLocalDataStore extends LocalDataStore { private Map store; @@ -12,6 +14,11 @@ public MapLocalDataStore() { this.store = new HashMap<>(); } + public MapLocalDataStore(CSimulation game) { + this.store = new HashMap<>(); + this.game = game; + } + @Override public boolean containsKey(String key) { return store.containsKey(key); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java index a12b9fa59..5720375d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java @@ -5,7 +5,6 @@ import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CGlobalWidgetEvent; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -16,7 +15,6 @@ public class ABGlobalWidgetEvent extends CGlobalWidgetEvent { - private CSimulation game; private CUnit caster; private LocalDataStore localStore; private int castId; @@ -24,10 +22,9 @@ public class ABGlobalWidgetEvent extends CGlobalWidgetEvent { private ABCondition condition; private List actions; - public ABGlobalWidgetEvent(CSimulation game, CUnit caster, LocalDataStore localStore, int castId, - CWidget widget, JassGameEventsWar3 eventType, ABCondition condition, List actions) { - super(game, game.getGlobalScope(), null, eventType, null); - this.game = game; + public ABGlobalWidgetEvent(CUnit caster, LocalDataStore localStore, int castId, CWidget widget, + JassGameEventsWar3 eventType, ABCondition condition, List actions) { + super(localStore.game, localStore.game.getGlobalScope(), null, eventType, null); this.caster = caster; this.localStore = localStore; this.castId = castId; @@ -38,7 +35,7 @@ public ABGlobalWidgetEvent(CSimulation game, CUnit caster, LocalDataStore localS @Override public void fire(final CWidget triggerWidget, final TriggerExecutionScope scope) { - if (condition == null || condition.callback(game, caster, localStore, castId)) { + if (condition == null || condition.callback(caster, localStore, castId)) { if (scope instanceof CommonTriggerExecutionScope) { this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId, ((CommonTriggerExecutionScope) scope).getSpellTargetUnit()); @@ -57,7 +54,7 @@ public void fire(final CWidget triggerWidget, final TriggerExecutionScope scope) } if (actions != null) { for (ABAction action : actions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java index 943b0223a..c7b06d51d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java @@ -4,7 +4,6 @@ import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; @@ -17,7 +16,6 @@ public class ABPlayerEvent extends CPlayerEvent { - private CSimulation game; private CUnit caster; private LocalDataStore localStore; private int castId; @@ -25,10 +23,9 @@ public class ABPlayerEvent extends CPlayerEvent { private ABCondition condition; private List actions; - public ABPlayerEvent(CSimulation game, CUnit caster, LocalDataStore localStore, int castId, CPlayerJass player, + public ABPlayerEvent(CUnit caster, LocalDataStore localStore, int castId, CPlayerJass player, JassGameEventsWar3 eventType, ABCondition condition, List actions) { - super(game.getGlobalScope(), player, null, eventType, null); - this.game = game; + super(localStore.game.getGlobalScope(), player, null, eventType, null); this.caster = caster; this.localStore = localStore; this.castId = castId; @@ -38,7 +35,7 @@ public ABPlayerEvent(CSimulation game, CUnit caster, LocalDataStore localStore, } public void fire(final CUnit hero, final TriggerExecutionScope scope) { - if (condition == null || condition.callback(game, caster, localStore, castId)) { + if (condition == null || condition.callback(caster, localStore, castId)) { if (scope instanceof CommonTriggerExecutionScope) { this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId, ((CommonTriggerExecutionScope) scope).getSpellTargetUnit()); @@ -57,7 +54,7 @@ public void fire(final CUnit hero, final TriggerExecutionScope scope) { } if (actions != null) { for (ABAction action : actions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId); @@ -71,10 +68,10 @@ public void fire(final CUnit hero, final TriggerExecutionScope scope) { } public void fire(final CPlayer player, final TriggerExecutionScope scope) { - if (condition == null || condition.callback(game, caster, localStore, castId)) { + if (condition == null || condition.callback(caster, localStore, castId)) { if (actions != null) { for (ABAction action : actions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java index f68124293..320bac5c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java @@ -22,10 +22,10 @@ public class ABTimeOfDayEvent implements TimeOfDayEvent { private String equalityId; - public ABTimeOfDayEvent(CSimulation game, CUnit caster, LocalDataStore localStore, int castId, - List actions, float startTime, float endTime, String equalityId) { + public ABTimeOfDayEvent(CUnit caster, LocalDataStore localStore, int castId, List actions, + float startTime, float endTime, String equalityId) { super(); - this.game = game; + this.game = localStore.game; this.caster = caster; this.localStore = localStore; this.castId = castId; @@ -39,7 +39,7 @@ public ABTimeOfDayEvent(CSimulation game, CUnit caster, LocalDataStore localStor public void fire() { if (actions != null) { for (ABAction eventAction : actions) { - eventAction.runAction(game, caster, localStore, castId); + eventAction.runAction(caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java index 99688cd35..a1a85c8c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java @@ -4,7 +4,6 @@ import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -16,7 +15,6 @@ public class ABWidgetEvent extends CWidgetEvent { - private CSimulation game; private CUnit caster; private LocalDataStore localStore; private int castId; @@ -24,10 +22,9 @@ public class ABWidgetEvent extends CWidgetEvent { private ABCondition condition; private List actions; - public ABWidgetEvent(CSimulation game, CUnit caster, LocalDataStore localStore, int castId, CWidget widget, + public ABWidgetEvent(CUnit caster, LocalDataStore localStore, int castId, CWidget widget, JassGameEventsWar3 eventType, ABCondition condition, List actions) { - super(game.getGlobalScope(), widget, null, eventType, null); - this.game = game; + super(localStore.game.getGlobalScope(), widget, null, eventType, null); this.caster = caster; this.localStore = localStore; this.castId = castId; @@ -38,7 +35,7 @@ public ABWidgetEvent(CSimulation game, CUnit caster, LocalDataStore localStore, @Override public void fire(final CWidget triggerWidget, final TriggerExecutionScope scope) { - if (condition == null || condition.callback(game, caster, localStore, castId)) { + if (condition == null || condition.callback(caster, localStore, castId)) { if (scope instanceof CommonTriggerExecutionScope) { this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId, ((CommonTriggerExecutionScope) scope).getSpellTargetUnit()); @@ -57,7 +54,7 @@ public void fire(final CWidget triggerWidget, final TriggerExecutionScope scope) } if (actions != null) { for (ABAction action : actions) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java index 4c08ea571..da2fd060f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java @@ -7,7 +7,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; @@ -26,16 +25,16 @@ public class TransformationHandler { - public static void setUnitID(final CSimulation game, final LocalDataStore localStore, final CUnit unit, - final CUnitType newType, final boolean keepRatios, final boolean addAlternateTagAfter, - final OnTransformationActions actions, final CAbility ability) { - setUnitID(game, localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability, false); + public static void setUnitID(final LocalDataStore localStore, final CUnit unit, final CUnitType newType, + final boolean keepRatios, final boolean addAlternateTagAfter, final OnTransformationActions actions, + final CAbility ability) { + setUnitID(localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability, false); } - public static void setUnitID(final CSimulation game, final LocalDataStore localStore, final CUnit unit, - final CUnitType newType, final boolean keepRatios, final boolean addAlternateTagAfter, - final OnTransformationActions actions, final CAbility ability, final boolean updateArt) { - final CPlayer pl = game.getPlayer(unit.getPlayerIndex()); + public static void setUnitID(final LocalDataStore localStore, final CUnit unit, final CUnitType newType, + final boolean keepRatios, final boolean addAlternateTagAfter, final OnTransformationActions actions, + final CAbility ability, final boolean updateArt) { + final CPlayer pl = localStore.game.getPlayer(unit.getPlayerIndex()); if (actions != null) { pl.setGold(Math.max(pl.getGold() - actions.goldCost, 0)); pl.setLumber(Math.max(pl.getLumber() - actions.lumberCost, 0)); @@ -43,13 +42,13 @@ public static void setUnitID(final CSimulation game, final LocalDataStore localS if (!addAlternateTagAfter) { if (actions.onUntransformActions != null) { for (final ABAction action : actions.onUntransformActions) { - action.runAction(game, unit, localStore, actions.castId); + action.runAction(unit, localStore, actions.castId); } } } } - unit.setTypeId(game, newType.getTypeId(), keepRatios, updateArt); + unit.setTypeId(localStore.game, newType.getTypeId(), keepRatios, updateArt); pl.setUnitFoodUsed(unit, newType.getFoodUsed()); pl.setUnitFoodMade(unit, newType.getFoodMade()); if (addAlternateTagAfter) { @@ -61,12 +60,12 @@ public static void setUnitID(final CSimulation game, final LocalDataStore localS unit.getUnitAnimationListener().forceResetCurrentAnimation(); } } - game.unitSoundEffectEvent(unit, ability.getAlias()); + localStore.game.unitSoundEffectEvent(unit, ability.getAlias()); if (addAlternateTagAfter && (actions != null)) { if (actions.onTransformActions != null) { for (final ABAction action : actions.onTransformActions) { - action.runAction(game, unit, localStore, actions.castId); + action.runAction(unit, localStore, actions.castId); } } } @@ -99,132 +98,131 @@ public static void setTags(final CUnit unit, final boolean addAlternateTagAfter) addAlternateTagAfter ? EnumSet.of(SecondaryTag.ALTERNATE) : SequenceUtils.EMPTY, 1.0f, true); } - public static void beginTakingOff(final CSimulation game, final LocalDataStore localStore, final CUnit unit, - final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, - final CAbility ability, final boolean addAlternateTagAfter, final boolean immediateTakeoff, - final float altitudeAdjustmentDelay, final float altitudeAdjustmentDuration) { + public static void beginTakingOff(final LocalDataStore localStore, final CUnit unit, final CUnitType newType, + final boolean keepRatios, final OnTransformationActions actions, final CAbility ability, + final boolean addAlternateTagAfter, final boolean immediateTakeoff, final float altitudeAdjustmentDelay, + final float altitudeAdjustmentDuration) { CTimer timer = (CTimer) localStore.get(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT); if (timer != null) { - game.unregisterTimer(timer); + localStore.game.unregisterTimer(timer); } timer = (new DelayTimerTimer( - new AltitudeAdjustmentTimer(game, unit, newType.getDefaultFlyingHeight(), altitudeAdjustmentDuration), + new AltitudeAdjustmentTimer(unit, newType.getDefaultFlyingHeight(), altitudeAdjustmentDuration), localStore, altitudeAdjustmentDelay)); - timer.start(game); + timer.start(localStore.game); localStore.put(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT, timer); - TransformationHandler.setUnitID(game, localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, - ability); + TransformationHandler.setUnitID(localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability); if (immediateTakeoff) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); } else { - final CTimer t2 = new TransformationMorphAnimationTimer(game, unit, addAlternateTagAfter, + final CTimer t2 = new TransformationMorphAnimationTimer(unit, addAlternateTagAfter, altitudeAdjustmentDelay); - t2.start(game); + t2.start(localStore.game); localStore.put(ABLocalStoreKeys.WAITING_ANIMATION, t2); } } - public static void beginLanding(final CSimulation game, final LocalDataStore localStore, final CUnit unit, - final CUnitType newType, final boolean addAlternateTagAfter, final boolean immediateLanding, - final float landingDelay, final float altitudeAdjustmentDuration) { + public static void beginLanding(final LocalDataStore localStore, final CUnit unit, final CUnitType newType, + final boolean addAlternateTagAfter, final boolean immediateLanding, final float landingDelay, + final float altitudeAdjustmentDuration) { unit.setFacing(225); if (immediateLanding) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); } else { - final CTimer timer = new TransformationMorphAnimationTimer(game, unit, addAlternateTagAfter, landingDelay); - timer.start(game); + final CTimer timer = new TransformationMorphAnimationTimer(unit, addAlternateTagAfter, landingDelay); + timer.start(localStore.game); localStore.put(ABLocalStoreKeys.WAITING_ANIMATION, timer); } CTimer timer = (CTimer) localStore.get(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT); if (timer != null) { - game.unregisterTimer(timer); + localStore.game.unregisterTimer(timer); } - timer = new AltitudeAdjustmentTimer(game, unit, newType.getDefaultFlyingHeight(), altitudeAdjustmentDuration); - timer.start(game); + timer = new AltitudeAdjustmentTimer(unit, newType.getDefaultFlyingHeight(), altitudeAdjustmentDuration); + timer.start(localStore.game); localStore.put(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT, timer); } - public static void startSlowTransformation(final CSimulation game, final LocalDataStore localStore, - final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, + public static void startSlowTransformation(final LocalDataStore localStore, final CUnit unit, + final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final CAbility ability, final boolean addAlternateTagAfter, final boolean takingOff, final boolean landing, final boolean immediateTakeoff, final boolean immediateLanding, final float altitudeAdjustmentDelay, final float landingDelay, final float altitudeAdjustmentDuration) { final CTimer timer = (CTimer) localStore.get(ABLocalStoreKeys.WAITING_ANIMATION); if (timer != null) { - game.unregisterTimer(timer); + localStore.game.unregisterTimer(timer); } unit.getUnitAnimationListener().queueAnimation(PrimaryTag.STAND, addAlternateTagAfter ? SequenceUtils.EMPTY : EnumSet.of(SecondaryTag.ALTERNATE), true); if (takingOff || landing) { if (takingOff) { - TransformationHandler.beginTakingOff(game, localStore, unit, newType, keepRatios, actions, ability, + TransformationHandler.beginTakingOff(localStore, unit, newType, keepRatios, actions, ability, addAlternateTagAfter, immediateTakeoff, altitudeAdjustmentDelay, altitudeAdjustmentDuration); } if (landing) { - TransformationHandler.beginLanding(game, localStore, unit, newType, addAlternateTagAfter, - immediateLanding, landingDelay, altitudeAdjustmentDuration); + TransformationHandler.beginLanding(localStore, unit, newType, addAlternateTagAfter, immediateLanding, + landingDelay, altitudeAdjustmentDuration); } } else { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); } } - public static void finishSlowTransformation(final CSimulation game, final LocalDataStore localStore, - final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, + public static void finishSlowTransformation(final LocalDataStore localStore, final CUnit unit, + final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final boolean addAlternateTagAfter, final boolean permanent, final boolean takingOff) { if (!takingOff) { - TransformationHandler.setUnitID(game, localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, + TransformationHandler.setUnitID(localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability); } if (permanent) { - unit.remove(game, ability); + unit.remove(localStore.game, ability); } } - public static void instantTransformation(final CSimulation game, final LocalDataStore localStore, - final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, - final AbilityBuilderAbility ability, final boolean addAlternateTagAfter, final boolean permanent, - final boolean playMorph) { + public static void instantTransformation(final LocalDataStore localStore, final CUnit unit, final CUnitType newType, + final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, + final boolean addAlternateTagAfter, final boolean permanent, final boolean playMorph) { if (newType.getTypeId().equals(unit.getTypeId())) { return; } - setUnitID(game, localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability, false); + setUnitID(localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability, false); if (playMorph) { TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); } if (permanent) { - unit.remove(game, ability); + unit.remove(localStore.game, ability); } } - public static void createSlowTransformBackBuff(final CSimulation game, CUnit sourceUnit, final LocalDataStore localStore, - final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, + public static void createSlowTransformBackBuff(CUnit sourceUnit, final LocalDataStore localStore, final CUnit unit, + final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, final float transformationTime, final float duration, final boolean permanent, final boolean takingOff, final boolean landing, final boolean immediateTakeoff, final boolean immediateLanding, final float altitudeAdjustmentDelay, final float landingDelay, final float altitudeAdjustmentDuration) { if (addAlternateTagAfter && (duration > 0)) { - unit.add(game, - new ABTimedTransformationBuff(game.getHandleIdAllocator().createId(), localStore, ability, sourceUnit, actions, - buffId == null ? ability.getAlias() : buffId, duration, ability, newType, keepRatios, - !addAlternateTagAfter, permanent, duration, transformationTime, landingDelay, - altitudeAdjustmentDelay, altitudeAdjustmentDuration, immediateLanding, immediateTakeoff)); + unit.add(localStore.game, + new ABTimedTransformationBuff(localStore.game.getHandleIdAllocator().createId(), localStore, + ability, sourceUnit, actions, buffId == null ? ability.getAlias() : buffId, duration, + ability, newType, keepRatios, !addAlternateTagAfter, permanent, duration, + transformationTime, landingDelay, altitudeAdjustmentDelay, altitudeAdjustmentDuration, + immediateLanding, immediateTakeoff)); } } - public static void createInstantTransformBackBuff(final CSimulation game, CUnit sourceUnit, final LocalDataStore localStore, + public static void createInstantTransformBackBuff(CUnit sourceUnit, final LocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, final float transformationTime, final float duration, final boolean permanent) { if (addAlternateTagAfter && (duration > 0)) { - final ABBuff thebuff = ability.visit( - GetInstantTransformationBuffVisitor.getInstance().reset(game, sourceUnit, localStore, newType, keepRatios, - actions, buffId, addAlternateTagAfter, transformationTime, duration, permanent)); + final ABBuff thebuff = ability.visit(GetInstantTransformationBuffVisitor.getInstance().reset( + localStore.game, sourceUnit, localStore, newType, keepRatios, actions, buffId, addAlternateTagAfter, + transformationTime, duration, permanent)); if (thebuff != null) { - unit.add(game, thebuff); + unit.add(localStore.game, thebuff); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java index b0a559b39..3dd927ead 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java @@ -2,23 +2,20 @@ import java.util.Comparator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABUnitComparator implements Comparator { - - private CSimulation game; + private CUnit caster; private LocalDataStore localStore; private int castId; private ABIntegerCallback comparison; - public ABUnitComparator(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId, ABIntegerCallback comparison) { - this.game = game; + public ABUnitComparator(final CUnit caster, final LocalDataStore localStore, final int castId, + ABIntegerCallback comparison) { this.caster = caster; this.localStore = localStore; this.castId = castId; @@ -29,7 +26,7 @@ public ABUnitComparator(final CSimulation game, final CUnit caster, final LocalD public int compare(CUnit o1, CUnit o2) { this.localStore.put(ABLocalStoreKeys.COMPUNIT1, o1); this.localStore.put(ABLocalStoreKeys.COMPUNIT2, o2); - int v = comparison.callback(game, caster, localStore, castId); + int v = comparison.callback(caster, localStore, castId); this.localStore.remove(ABLocalStoreKeys.COMPUNIT1); this.localStore.remove(ABLocalStoreKeys.COMPUNIT2); return v; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java index 1ca497884..1dfa6b724 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java @@ -9,7 +9,6 @@ import com.etheller.interpreter.ast.value.CodeJassValue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -22,9 +21,8 @@ public ABActionJass(final CodeJassValue jassFunction) { } @Override - public void runAction(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - final GlobalScope globalScope = game.getGlobalScope(); + public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + final GlobalScope globalScope = localStore.game.getGlobalScope(); final JassThread thread = globalScope.createThread(this.jassFunction, CommonTriggerExecutionScope.abilityBuilder(caster, localStore, castId)); globalScope.runThreadUntilCompletion(thread); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java index 2668334e3..bd6c09202 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java @@ -6,7 +6,6 @@ import com.etheller.interpreter.ast.scope.trigger.TriggerBooleanExpression; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; @@ -19,9 +18,8 @@ public ABConditionJass(final TriggerBooleanExpression boolExpr) { } @Override - public Boolean callback(final CSimulation game, final CUnit caster, final LocalDataStore localStore, - final int castId) { - return this.boolExpr.evaluate(game.getGlobalScope(), + public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + return this.boolExpr.evaluate(localStore.game.getGlobalScope(), CommonTriggerExecutionScope.abilityBuilder(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java index b31058b5f..879d97f0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java @@ -38,7 +38,7 @@ public boolean onHit(final CSimulation simulation, CUnit source, CUnit target, C localStore.put(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId, target); localStore.put(ABLocalStoreKeys.REACTIONABILITY+triggerId, ability); for (ABAction action : actions) { - action.runAction(simulation, target, localStore, triggerId); + action.runAction(target, localStore, triggerId); } localStore.remove(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId); localStore.remove(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java index 8bad56d43..b3d419f7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java @@ -38,7 +38,7 @@ public boolean onHit(final CSimulation simulation, CUnit source, CUnit target, C localStore.put(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId, target); localStore.put(ABLocalStoreKeys.ABILITYPROJ+triggerId, projectile); for (ABAction action : actions) { - action.runAction(simulation, target, localStore, triggerId); + action.runAction(target, localStore, triggerId); } localStore.remove(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId); localStore.remove(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java index ed7adaabb..eb988c9e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java @@ -35,7 +35,7 @@ public boolean onAttack(CSimulation simulation, CUnit target, CDamageCalculation localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); localStore.put(ABLocalStoreKeys.DAMAGECALC+triggerId, damage); for (ABCondition condition : conditions) { - evade = evade || condition.callback(simulation, target, localStore, triggerId); + evade = evade || condition.callback(target, localStore, triggerId); } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java index 95af86483..cdd0b9489 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java @@ -52,7 +52,7 @@ public int getPriority(CSimulation simulation, CUnit source, AbilityTarget targe localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.castId, source); localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.castId, target); localStore.put(ABLocalStoreKeys.THEATTACK + this.castId, attack); - int prio = this.priority.callback(simulation, source, this.localStore, this.castId); + int prio = this.priority.callback(source, this.localStore, this.castId); localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.castId); localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.castId); localStore.remove(ABLocalStoreKeys.THEATTACK + this.castId); @@ -70,7 +70,7 @@ public boolean checkPreLaunchApplication(CSimulation simulation, CUnit source, A localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.castId, source); localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.castId, target); localStore.put(ABLocalStoreKeys.THEATTACK + this.castId, attack); - ret = this.preLaunchCondition.callback(simulation, source, this.localStore, this.castId); + ret = this.preLaunchCondition.callback(source, this.localStore, this.castId); localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.castId); localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.castId); localStore.remove(ABLocalStoreKeys.THEATTACK + this.castId); @@ -89,7 +89,7 @@ public void applyPreLaunchModification(CSimulation simulation, CUnit source, Abi localStore.put(ABLocalStoreKeys.ATTACKSETTINGS + this.castId, settings); localStore.put(ABLocalStoreKeys.ATTACKMODLOOP + this.castId, loop); for (ABAction action : this.preLaunchModification) { - action.runAction(simulation, source, this.localStore, this.castId); + action.runAction(source, this.localStore, this.castId); } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.castId); localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.castId); @@ -109,7 +109,7 @@ public boolean checkApplication(CSimulation simulation, CUnit source, AbilityTar localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.castId, source); localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.castId, target); localStore.put(ABLocalStoreKeys.THEATTACK + this.castId, attack); - ret = this.condition.callback(simulation, source, this.localStore, this.castId); + ret = this.condition.callback(source, this.localStore, this.castId); localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.castId); localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.castId); localStore.remove(ABLocalStoreKeys.THEATTACK + this.castId); @@ -128,7 +128,7 @@ public void applyModification(CSimulation simulation, CUnit source, AbilityTarge localStore.put(ABLocalStoreKeys.ATTACKSETTINGS + this.castId, settings); localStore.put(ABLocalStoreKeys.ATTACKMODLOOP + this.castId, loop); for (ABAction action : this.modification) { - action.runAction(simulation, source, this.localStore, this.castId); + action.runAction(source, this.localStore, this.castId); } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.castId); localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java index 0252559c5..ba2807983 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java @@ -41,7 +41,7 @@ public void onHit(CSimulation simulation, AbilityTarget target, CUnitAttack atta localStore.put(ABLocalStoreKeys.THEATTACK + this.triggerId, attack); if (actions != null) { for (ABAction action : actions) { - action.runAction(simulation, damage.getSource(), localStore, triggerId); + action.runAction(damage.getSource(), localStore, triggerId); } } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); @@ -61,7 +61,7 @@ public int getPriority(CSimulation simulation, CUnit attacker, AbilityTarget tar localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.triggerId, attacker); localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.triggerId, target); localStore.put(ABLocalStoreKeys.THEATTACK + this.triggerId, attack); - int prio = this.priority.callback(simulation, attacker, this.localStore, this.triggerId); + int prio = this.priority.callback(attacker, this.localStore, this.triggerId); localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.triggerId); localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.triggerId); localStore.remove(ABLocalStoreKeys.THEATTACK + this.triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java index aeea044f5..bed044193 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java @@ -42,7 +42,7 @@ public void onAttack(CSimulation simulation, AbilityTarget target, AbilityPointT localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, calc); if (actions != null) { for (ABAction action : actions) { - action.runAction(simulation, calc.getSource(), localStore, triggerId); + action.runAction(calc.getSource(), localStore, triggerId); } } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java index 1a8893602..2fb0f7a45 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java @@ -39,7 +39,7 @@ public boolean onHit(final CSimulation simulation, CUnit source, CUnit target, C localStore.put(ABLocalStoreKeys.ATTACKPROJ + triggerId, projectile); if (actions != null) { for (ABAction action : actions) { - action.runAction(simulation, target, localStore, triggerId); + action.runAction(target, localStore, triggerId); } } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java index a54eb3071..6c093f7d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java @@ -35,7 +35,7 @@ public void onChange(CSimulation game, CUnit unit, CBehavior previousBehavior, C localStore.put(ABLocalStoreKeys.BEHAVIORONGOING + triggerId, ongoing); if (actions != null) { for (ABAction action : actions) { - action.runAction(game, unit, localStore, triggerId); + action.runAction(unit, localStore, triggerId); } } localStore.remove(ABLocalStoreKeys.PRECHANGEBEHAVIOR + triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java index 3819f527a..d4e4148b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java @@ -39,7 +39,7 @@ public int getPriority(CSimulation simulation, CUnit target, CDamageCalculation localStore.put(ABLocalStoreKeys.DAMAGINGUNIT + triggerId, damage.getSource()); localStore.put(ABLocalStoreKeys.DAMAGEDUNIT + triggerId, target); localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); - int prio = this.priority.callback(simulation, target, this.localStore, this.triggerId); + int prio = this.priority.callback(target, this.localStore, this.triggerId); localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT + triggerId); localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); @@ -53,7 +53,7 @@ public void onDamage(CSimulation simulation, CUnit target, CDamageCalculation da localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); if (actions != null) { for (ABAction action : actions) { - action.runAction(simulation, target, localStore, triggerId); + action.runAction(target, localStore, triggerId); } } localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java index 56b3e5366..e43f7eec9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java @@ -39,7 +39,7 @@ public int getPriority(CSimulation simulation, CUnit target, CDamageCalculation localStore.put(ABLocalStoreKeys.DAMAGINGUNIT + triggerId, damage.getSource()); localStore.put(ABLocalStoreKeys.DAMAGEDUNIT + triggerId, target); localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); - int prio = this.priority.callback(simulation, target, this.localStore, this.triggerId); + int prio = this.priority.callback(target, this.localStore, this.triggerId); localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT + triggerId); localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); @@ -53,7 +53,7 @@ public void onDamage(CSimulation simulation, CUnit target, CDamageCalculation da localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); if (actions != null) { for (ABAction action : actions) { - action.runAction(simulation, target, localStore, triggerId); + action.runAction(target, localStore, triggerId); } } localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java index 75c3a8daf..cd0593758 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java @@ -38,7 +38,7 @@ public CUnitDeathReplacementStacking onDeath(CSimulation simulation, CUnit unit, localStore.put(ABLocalStoreKeys.DEATHSTACKING + triggerId, stacking); if (actions != null) { for (ABAction action : actions) { - action.runAction(simulation, unit, localStore, triggerId); + action.runAction(unit, localStore, triggerId); } } localStore.remove(ABLocalStoreKeys.KILLINGUNIT + triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java index fc6d680c8..5471424af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java @@ -103,7 +103,7 @@ public void setOnHideStateChanged(List onHideStateChanged) { public void lifeChanged() { if (onLifeChanged != null) { for (ABAction action : onLifeChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -112,7 +112,7 @@ public void lifeChanged() { public void manaChanged() { if (onManaChanged != null) { for (ABAction action : onManaChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -121,7 +121,7 @@ public void manaChanged() { public void ordersChanged() { if (onOrdersChanged != null) { for (ABAction action : onOrdersChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -130,7 +130,7 @@ public void ordersChanged() { public void queueChanged() { if (onQueueChanged != null) { for (ABAction action : onQueueChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -139,7 +139,7 @@ public void queueChanged() { public void rallyPointChanged() { if (onRallyPointChanged != null) { for (ABAction action : onRallyPointChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -148,7 +148,7 @@ public void rallyPointChanged() { public void waypointsChanged() { if (onWaypointsChanged != null) { for (ABAction action : onWaypointsChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -157,7 +157,7 @@ public void waypointsChanged() { public void heroStatsChanged() { if (onHeroStatsChanged != null) { for (ABAction action : onHeroStatsChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -166,7 +166,7 @@ public void heroStatsChanged() { public void inventoryChanged() { if (onInventoryChanged != null) { for (ABAction action : onInventoryChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -175,7 +175,7 @@ public void inventoryChanged() { public void attacksChanged() { if (onAttacksChanged != null) { for (ABAction action : onAttacksChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -184,7 +184,7 @@ public void attacksChanged() { public void abilitiesChanged() { if (onAbilitiesChanged != null) { for (ABAction action : onAbilitiesChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -193,7 +193,7 @@ public void abilitiesChanged() { public void upgradesChanged() { if (onUpgradesChanged != null) { for (ABAction action : onUpgradesChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } @@ -202,7 +202,7 @@ public void upgradesChanged() { public void hideStateChanged() { if (onHideStateChanged != null) { for (ABAction action : onHideStateChanged) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/DataFieldLetter.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/DataFieldLetter.java index 67bc84309..571426d00 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/DataFieldLetter.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/DataFieldLetter.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template; import com.etheller.interpreter.ast.util.CHandle; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; public enum DataFieldLetter implements CHandle { A(0), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java index 1aecb8c6d..293abcc7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java @@ -1,7 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile; import java.util.List; -import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -18,18 +17,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCollisionProjectileListener implements CAbilityCollisionProjectileListener { - + private List onLaunch; private List onPreHits; private List canHitTarget; private List onHit; - + private CUnit caster; private LocalDataStore localStore; private int castId; - public ABCollisionProjectileListener(List onLaunch, List onPreHits, List canHitTarget, List onHit, CUnit caster, - LocalDataStore localStore, int castId) { + public ABCollisionProjectileListener(List onLaunch, List onPreHits, + List canHitTarget, List onHit, CUnit caster, LocalDataStore localStore, int castId) { super(); this.onLaunch = onLaunch; this.onPreHits = onPreHits; @@ -43,22 +42,22 @@ public ABCollisionProjectileListener(List onLaunch, List onP @Override public void onLaunch(CSimulation game, CProjectile projectile, AbilityTarget target) { if (onLaunch != null) { - localStore.put(ABLocalStoreKeys.THISPROJECTILE+castId, projectile); + localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); for (ABAction action : onLaunch) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.THISPROJECTILE+castId); + localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); } } @Override public void onPreHits(CSimulation game, CProjectile projectile, AbilityPointTarget loc) { if (onPreHits != null) { - localStore.put(ABLocalStoreKeys.THISPROJECTILE+castId, projectile); + localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); for (ABAction action : onPreHits) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.THISPROJECTILE+castId); + localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); } } @@ -68,13 +67,13 @@ public boolean canHitTarget(CSimulation game, CWidget target) { if (canHitTarget != null) { CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); - localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT+castId, targetUnit); - localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST+castId, targetDest); + localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT + castId, targetUnit); + localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST + castId, targetDest); for (ABCondition condition : canHitTarget) { - result = result && condition.callback(game, caster, localStore, castId); + result = result && condition.callback(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT+castId); - localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST+castId); + localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); + localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); } return result; } @@ -84,31 +83,31 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target if (onHit != null) { CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); - localStore.put(ABLocalStoreKeys.THISPROJECTILE+castId, projectile); - localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT+castId, targetUnit); - localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST+castId, targetDest); + localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); + localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT + castId, targetUnit); + localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST + castId, targetDest); for (ABAction action : onHit) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT+castId); - localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST+castId); - localStore.remove(ABLocalStoreKeys.THISPROJECTILE+castId); + localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); + localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); + localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); } } @Override public void setUnitTargets(int units) { - localStore.put(ABLocalStoreKeys.PROJECTILEUNITTARGETS+castId, units); + localStore.put(ABLocalStoreKeys.PROJECTILEUNITTARGETS + castId, units); } @Override public void setDestructableTargets(int dests) { - localStore.put(ABLocalStoreKeys.PROJECTILEDESTTARGETS+castId, dests); + localStore.put(ABLocalStoreKeys.PROJECTILEDESTTARGETS + castId, dests); } @Override public void setCurrentLocation(AbilityPointTarget loc) { - localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC+castId, loc); + localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId, loc); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java index c6ad63884..5ca83724d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java @@ -15,16 +15,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABProjectileListener implements CAbilityProjectileListener { - + private List onLaunch; private List onHit; - + private CUnit caster; private LocalDataStore localStore; private int castId; - public ABProjectileListener(List onLaunch, List onHit, CUnit caster, - LocalDataStore localStore, int castId) { + public ABProjectileListener(List onLaunch, List onHit, CUnit caster, LocalDataStore localStore, + int castId) { super(); this.onLaunch = onLaunch; this.onHit = onHit; @@ -36,11 +36,11 @@ public ABProjectileListener(List onLaunch, List onHit, CUnit @Override public void onLaunch(CSimulation game, CProjectile projectile, AbilityTarget target) { if (onLaunch != null) { - localStore.put(ABLocalStoreKeys.THISPROJECTILE+castId, projectile); + localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); for (ABAction action : onLaunch) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.THISPROJECTILE+castId); + localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); } } @@ -49,19 +49,19 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target if (onHit != null) { CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); - localStore.put(ABLocalStoreKeys.THISPROJECTILE+castId, projectile); - localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT+castId, targetUnit); - localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST+castId, targetDest); - localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC+castId, new AbilityPointTarget(projectile.getX(), projectile.getY())); + localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); + localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT + castId, targetUnit); + localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST + castId, targetDest); + localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId, + new AbilityPointTarget(projectile.getX(), projectile.getY())); for (ABAction action : onHit) { - action.runAction(game, caster, localStore, castId); + action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT+castId); - localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST+castId); - localStore.remove(ABLocalStoreKeys.THISPROJECTILE+castId); - localStore.remove(ABLocalStoreKeys.PROJECTILECURRENTLOC+castId); + localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); + localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); + localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); + localStore.remove(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); } } - } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java index d82c4c559..7b69bb375 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java @@ -38,7 +38,7 @@ public void onFire(CSimulation simulation) { localStore.put(ABLocalStoreKeys.FIRINGTIMER, this); if (actions != null) { for (ABAction action : actions) { - action.runAction(simulation, caster, localStore, castId); + action.runAction(caster, localStore, castId); } } if (localStore != null) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/AltitudeAdjustmentTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/AltitudeAdjustmentTimer.java index 2a84e5ef1..36a773d18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/AltitudeAdjustmentTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/AltitudeAdjustmentTimer.java @@ -11,7 +11,7 @@ public class AltitudeAdjustmentTimer extends CTimer { private int durTicks; private int endTick = 0; - public AltitudeAdjustmentTimer(CSimulation game, CUnit unit, float targetHeight, float duration) { + public AltitudeAdjustmentTimer(CUnit unit, float targetHeight, float duration) { super(); this.unit = unit; durTicks = Math.round(duration / WarsmashConstants.SIMULATION_STEP_TIME); @@ -24,7 +24,7 @@ public AltitudeAdjustmentTimer(CSimulation game, CUnit unit, float targetHeight, } this.setTimeoutTime(0f); } - + @Override public void start(CSimulation game) { if (endTick == 0) { @@ -39,9 +39,9 @@ public void onFire(CSimulation game) { return; } this.unit.setFlyHeight(this.unit.getFlyHeight() + this.heightInc); - if(game.getGameTurnTick() >= endTick) { + if (game.getGameTurnTick() >= endTick) { this.setRepeats(false); } } - + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java index 23ac9eb6a..5a8ee778f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java @@ -25,7 +25,7 @@ public class DelayInstantTransformationTimer extends CTimer { private float transTime; private float dur; - public DelayInstantTransformationTimer(CSimulation game, CUnit sourceUnit, LocalDataStore localStore, CUnit unit, + public DelayInstantTransformationTimer(CUnit sourceUnit, LocalDataStore localStore, CUnit unit, OnTransformationActions actions, boolean addAlternateTagAfter, float delay, CUnitType baseType, CUnitType targetType, final boolean keepRatios, AbilityBuilderAbility ability, War3ID buffId, float transformationTime, float duration) { @@ -47,12 +47,11 @@ public DelayInstantTransformationTimer(CSimulation game, CUnit sourceUnit, Local } public void onFire(CSimulation game) { - TransformationHandler.instantTransformation(game, localStore, unit, targetType, keepRatios, actions, abil, + TransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, false); if (dur > 0) { - TransformationHandler.createInstantTransformBackBuff(game, sourceUnit, localStore, unit, baseType, - keepRatios, actions.createUntransformActions(), abil, theBuffId, addAlternateTagAfter, transTime, - dur, perm); + TransformationHandler.createInstantTransformBackBuff(sourceUnit, localStore, unit, baseType, keepRatios, + actions.createUntransformActions(), abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/TransformationMorphAnimationTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/TransformationMorphAnimationTimer.java index 8647769db..10535652f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/TransformationMorphAnimationTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/TransformationMorphAnimationTimer.java @@ -13,8 +13,7 @@ public class TransformationMorphAnimationTimer extends CTimer { private final CUnit unit; private final boolean addAlternateTagAfter; - public TransformationMorphAnimationTimer(final CSimulation game, final CUnit unit, - final boolean addAlternateTagAfter, final float delay) { + public TransformationMorphAnimationTimer(final CUnit unit, final boolean addAlternateTagAfter, final float delay) { super(); this.unit = unit; this.addAlternateTagAfter = addAlternateTagAfter; @@ -28,8 +27,7 @@ public void onFire(final CSimulation game) { this.unit.getUnitAnimationListener().removeSecondaryTag(SecondaryTag.ALTERNATE); this.unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.MORPH, SequenceUtils.EMPTY, 1.0f, true); - } - else { + } else { this.unit.getUnitAnimationListener().playAnimation(false, PrimaryTag.MORPH, EnumSet.of(SecondaryTag.ALTERNATE), 1.0f, true); } @@ -37,8 +35,7 @@ public void onFire(final CSimulation game) { this.addAlternateTagAfter ? EnumSet.of(SecondaryTag.ALTERNATE) : SequenceUtils.EMPTY, true); if (this.addAlternateTagAfter) { this.unit.getUnitAnimationListener().addSecondaryTag(SecondaryTag.ALTERNATE); - } - else { + } else { this.unit.getUnitAnimationListener().removeSecondaryTag(SecondaryTag.ALTERNATE); } } From 6547f5e0fae8882b4eb65be803a4d441b5d2040b Mon Sep 17 00:00:00 2001 From: Glasir Date: Sat, 13 Dec 2025 00:23:38 -0500 Subject: [PATCH 34/44] Major AB Refactor: Part 3 - Behavior Naming * A number of folders in the AB behaviors were oddly or unclearly named. * This refactor attempts to move classes to more reasonably named folders --- ...ReplacementPassivesNonItemLowPriority.json | 8 +- .../CAbilityAbilityBuilderGenericActive.java | 4 +- .../ability/CAbilityAbilityBuilderNoIcon.java | 2 +- .../CAbilityAbilityBuilderPassive.java | 2 +- .../ABActionAbilityAttemptToApplyEffect.java | 6 +- .../ABActionAbilityRunEndCastingActions.java | 8 +- .../{ => ability}/ABActionAddAbility.java | 6 +- .../ABActionAddNewAbility.java | 6 +- .../ABActionAddRallyAbility.java | 4 +- .../ABActionCleanUpCastInstance.java | 2 +- .../ability/ABActionClickDisableAbility.java | 2 +- .../ability/ABActionClickEnableAbility.java | 2 +- .../ABActionCreateAbilityFromId.java | 4 +- .../ABActionPrepUnownedAbilityForUse.java | 6 +- .../{ => ability}/ABActionRemoveAbility.java | 6 +- .../action/ability/ABActionResetCooldown.java | 4 +- .../ABActionSendStartCastingEvents.java | 2 +- .../action/ability/ABActionStartCooldown.java | 6 +- .../ABActionAbilitySetShowIcon.java | 6 +- .../ABActionAddTargetAllowed.java | 2 +- .../ABActionDisableAbility.java | 4 +- .../ABActionDisableAbilityById.java | 6 +- .../ABActionEnableAbility.java | 4 +- .../ABActionEnableAbilityById.java | 6 +- .../ABActionRemoveTargetAllowed.java | 2 +- .../ABActionSetAbilityCastRange.java | 4 +- .../ABActionSetAutoTargetDestructable.java | 2 +- .../ABActionSetAutoTargetUnit.java | 4 +- .../ABActionSetPreventEndEvents.java | 2 +- .../ABActionAddAttackModifier.java | 4 +- .../ABActionCreateAttackModifier.java | 6 +- .../ABActionFireModifiedAttack.java | 6 +- .../ABActionRemoveAttackModifier.java | 4 +- .../ABActionStartModifiedAttack.java | 6 +- ...ABActionAttackModifierAddAnimationTag.java | 4 +- ...onAttackModifierAddPostDamageListener.java | 4 +- ...ionAttackModifierAddPreDamageListener.java | 4 +- ...ActionAttackModifierApplyAllArtFields.java | 4 +- .../ABActionAttackModifierApplyArt.java | 4 +- ...BActionAttackModifierApplyArtAndSpeed.java | 4 +- ...ActionAttackModifierApplyDefaultSpeed.java | 2 +- ...tackModifierPreventOtherModifications.java | 2 +- ...PreventOtherSamePriorityModifications.java | 2 +- ...ctionAttackModifierRemoveAnimationTag.java | 4 +- ...ttackModifierRemovePostDamageListener.java | 4 +- ...AttackModifierRemovePreDamageListener.java | 4 +- .../ABActionAttackModifierSetAttackArc.java | 4 +- ...ctionAttackModifierSetAttackDeathTime.java | 4 +- ...ABActionAttackModifierSetAttackHoming.java | 4 +- ...BActionAttackModifierSetAttackImpactZ.java | 4 +- ...ABActionAttackModifierSetAttackStartZ.java | 4 +- ...ABActionAttackModifierSetSplashFields.java | 6 +- ...ABCallbackGetModifiedAttackAttackType.java | 4 +- ...ABCallbackGetModifiedAttackDamageType.java | 4 +- ...ABCallbackGetModifiedAttackWeaponType.java | 4 +- ...ctionAttemptToReOrderPreviousBehavior.java | 2 +- ...ActionAttemptToResumePreviousBehavior.java | 2 +- .../ABActionChangeAttackActionToMovement.java | 4 +- .../ABActionForceBeginCreatedBehavior.java | 4 +- .../behavior/action/buff/ABActionAddBuff.java | 4 +- .../ABActionAddNonStackingDisplayBuff.java | 6 +- .../{ => buff}/ABActionAddSlowBuff.java | 12 +- .../{ => buff}/ABActionAddStunBuff.java | 12 +- .../buff/ABActionCreatePassiveBuff.java | 6 +- .../buff/ABActionCreateTargetingBuff.java | 4 +- .../buff/ABActionCreateTimedArtBuff.java | 8 +- .../action/buff/ABActionCreateTimedBuff.java | 12 +- .../buff/ABActionCreateTimedLifeBuff.java | 6 +- ...ActionCreateTimedPausedExpirationBuff.java | 12 +- .../ABActionCreateTimedTargetingBuff.java | 8 +- .../buff/ABActionCreateTimedTickingBuff.java | 12 +- .../ABActionCreateTimedTickingPausedBuff.java | 12 +- ...ActionCreateTimedTickingPostDeathBuff.java | 12 +- .../{unit => buff}/ABActionDispelBuffs.java | 4 +- .../action/buff/ABActionRemoveBuff.java | 4 +- .../ABActionRemoveNonStackingDisplayBuff.java | 6 +- .../{unit => damage}/ABActionDamageArea.java | 14 +-- .../ABActionDamageAttackSplash.java | 14 +-- .../{unit => damage}/ABActionDamageBurst.java | 14 +-- .../ABActionDamageSplash.java | 14 +-- .../ABActionDamageTarget.java | 12 +- .../action/{unit => damage}/ABActionHeal.java | 8 +- .../ABActionDeleteStoredKey.java | 4 +- .../ABActionStoreValueLocally.java | 12 +- .../ABActionCreateDestructable.java | 10 +- .../ABActionDamageDestructable.java | 10 +- .../ABActionAddDestructableBuff.java | 2 +- .../ABActionCreateDestructableBuff.java | 6 +- .../ABActionDispelDestructableBuffs.java | 4 +- .../ABActionRemoveDestructableBuff.java | 2 +- .../ABActionCreateTimeOfDayEvent.java | 4 +- .../ABActionRegisterTimeOfDayEvent.java | 2 +- .../ABActionRegisterUniqueTimeOfDayEvent.java | 2 +- .../ABActionUnregisterTimeOfDayEvent.java | 2 +- .../widget/ABActionRegisterWidgetEvent.java | 2 +- .../widget/ABActionUnregisterWidgetEvent.java | 2 +- .../ABActionCreateFloatingTextOnUnit.java | 4 +- ...ActionCreateNumericFloatingTextOnUnit.java | 4 +- .../ABActionCreateSpellEffectAtLocation.java | 6 +- .../fx/ABActionCreateSpellEffectAtPoint.java | 4 +- .../fx/ABActionCreateSpellEffectOnUnit.java | 6 +- ...nCreateTemporarySpellEffectAtLocation.java | 6 +- ...tionCreateTemporarySpellEffectAtPoint.java | 4 +- ...ctionCreateTemporarySpellEffectOnUnit.java | 4 +- .../action/fx/ABActionRemoveEffect.java | 2 +- .../ABActionCreateGroupEffectAtLocation.java | 8 +- .../ABActionCreateLightningEffect.java | 10 +- .../ABActionRemoveLightningEffect.java | 4 +- ...ionCreateLoopingSoundEffectAtLocation.java | 6 +- ...BActionCreateLoopingSoundEffectOnUnit.java | 6 +- .../ABActionCreateSoundEffectAtLocation.java | 6 +- .../ABActionCreateSoundEffectOnUnit.java | 6 +- .../{ => splat}/ABActionCreateUberSplat.java | 6 +- .../ABActionCreateTerrainBowlAtLocation.java | 6 +- ...ABActionCreateTerrainRippleAtLocation.java | 10 +- .../ABActionCreateTerrainWaveAtLocation.java | 8 +- .../ABActionModifyTerrainVertex.java | 6 +- .../gamestate/ABActionSetFalseTimeOfDay.java | 4 +- .../action/item/ABActionChargeItem.java | 2 +- .../action/item/ABActionTransformItem.java | 2 +- ...IterateDestructablesInRangeOfLocation.java | 6 +- .../unit}/ABActionIterateUnitsInGroup.java | 4 +- .../unit}/ABActionIterateUnitsInQueue.java | 2 +- ...itsInRangeOfLocationMatchingCondition.java | 6 +- ...geOfLocationMatchingConditionWithSort.java | 8 +- ...teUnitsInRangeOfUnitMatchingCondition.java | 6 +- ...nRangeOfUnitMatchingConditionWithSort.java | 8 +- .../unit}/ABActionIterateUnitsInRect.java | 2 +- .../action/list/ABActionListRemove.java | 2 +- .../action/list/ABActionLocationListAdd.java | 4 +- .../list/ABActionSortableListRemove.java | 2 +- .../ABActionIssueStopOrder.java | 4 +- .../player/ABActionGiveResourcesToPlayer.java | 2 +- .../ABActionSetAbilityEnabledForPlayer.java | 4 +- ...teLocationTargetedCollisionProjectile.java | 12 +- ...ctionCreateLocationTargetedProjectile.java | 10 +- ...reateLocationTargetedPseudoProjectile.java | 12 +- ...nCreateUnitTargetedBouncingProjectile.java | 12 +- ...CreateUnitTargetedCollisionProjectile.java | 12 +- .../ABActionCreateUnitTargetedProjectile.java | 10 +- ...ionCreateUnitTargetedPseudoProjectile.java | 12 +- .../ABActionSetAttackProjectileDamage.java | 2 +- .../projectile/ABActionSetProjectileDone.java | 2 +- .../ABActionSetProjectileReflected.java | 2 +- .../ABActionSetProjectileTarget.java | 2 +- .../ABActionCheckAbilityEffectReaction.java | 4 +- .../ABActionCheckAbilityProjReaction.java | 4 +- .../action/stats/ABActionAddDefenseBonus.java | 6 +- .../stats/ABActionAddNonStackingStatBuff.java | 4 +- .../ABActionCreateNonStackingStatBuff.java | 6 +- .../ABActionRecomputeStatBuffsOnUnit.java | 4 +- .../stats/ABActionRemoveDefenseBonus.java | 6 +- .../ABActionRemoveNonStackingStatBuff.java | 4 +- .../ABActionUpdateNonStackingStatBuff.java | 4 +- .../structural/ABActionChainEffect.java | 10 +- .../structural/ABActionCreateSubroutine.java | 4 +- .../action/structural/ABActionFor.java | 2 +- .../structural/ABActionPeriodicExecute.java | 4 +- .../structural/ABActionRunReuseAction.java | 2 +- .../ABActionRunReuseActionWithArguments.java | 2 +- .../structural/ABActionRunSubroutine.java | 4 +- .../action/timer/ABActionCreateTimer.java | 4 +- .../action/timer/ABActionKillTimer.java | 2 +- .../action/timer/ABActionRemoveTimer.java | 2 +- .../action/timer/ABActionStartTimer.java | 2 +- .../timer/ABActionUpdateTimerTimeout.java | 4 +- .../ABActionAbilityAddUniqueFlag.java | 6 +- .../ABActionAbilityRemoveUniqueFlag.java | 6 +- .../ABActionBuffAddUniqueFlag.java | 6 +- .../ABActionBuffRemoveUniqueFlag.java | 6 +- .../ABActionAbilityRemoveUniqueValue.java | 6 +- .../ABActionAbilityStoreUniqueValue.java | 6 +- .../ABActionBuffRemoveUniqueValue.java | 6 +- .../ABActionBuffStoreUniqueValue.java | 6 +- .../action/unit/ABActionCreateUnit.java | 8 +- .../action/unit/ABActionHideUnit.java | 2 +- .../action/unit/ABActionKillUnit.java | 2 +- .../action/unit/ABActionRemoveUnit.java | 2 +- .../action/unit/ABActionResurrect.java | 2 +- .../unit/ABActionSetExplodesOnDeath.java | 6 +- .../unit/ABActionStartSacrificingUnit.java | 4 +- .../unit/ABActionStartTrainingUnit.java | 4 +- .../action/unit/ABActionUnhideUnit.java | 2 +- .../ABActionAddSecondaryAnimationTag.java | 4 +- .../unit/animation/ABActionPlayAnimation.java | 8 +- .../animation/ABActionQueueAnimation.java | 6 +- .../ABActionRemoveSecondaryAnimationTag.java | 4 +- .../unit/art/ABActionDivideUnitAlpha.java | 4 +- .../unit/art/ABActionMultiplyUnitAlpha.java | 4 +- .../{ => art}/ABActionMultiplyUnitScale.java | 6 +- .../action/unit/art/ABActionSetUnitAlpha.java | 4 +- .../movement/ABActionSetUnitFlyHeight.java | 4 +- ...BActionSetUnitMovementTypeNoCollision.java | 4 +- .../unit/{ => stats}/ABActionAddMp.java | 8 +- .../unit/{ => stats}/ABActionSetHp.java | 8 +- .../unit/{ => stats}/ABActionSetMp.java | 8 +- .../unit/{ => stats}/ABActionSetSpeed.java | 6 +- .../unit/{ => stats}/ABActionSubtractMp.java | 8 +- .../ABActionMergeUnits.java | 14 +-- .../ABActionTransformUnit.java | 10 +- .../ABActionTransformUnitAppearance.java | 6 +- .../ABActionTransformUnitInstant.java | 10 +- .../ABActionTransformedUnitAbilityAdd.java | 10 +- .../ABActionTransformedUnitAbilityRemove.java | 8 +- .../ABActionDisableWorkerAbilities.java | 4 +- .../ABActionEnableWorkerAbilities.java | 4 +- .../ABActionInstantReturnResources.java | 4 +- .../ABActionSendUnitBackToWork.java | 4 +- .../unitgroup/ABActionAddUnitToGroup.java | 4 +- .../ABActionRemoveUnitFromGroup.java | 4 +- .../ABActionAddAttackPostDamageListener.java | 6 +- .../ABActionAddAttackPreDamageListener.java | 8 +- ...BActionCreateAttackPostDamageListener.java | 6 +- ...ABActionCreateAttackPreDamageListener.java | 4 +- ...BActionRemoveAttackPostDamageListener.java | 6 +- ...ABActionRemoveAttackPreDamageListener.java | 8 +- ...ActionPreDamageListenerAddBonusDamage.java | 10 +- ...nPreDamageListenerAddDamageMultiplier.java | 4 +- ...DamageListenerLockDamageModifications.java | 2 +- .../ABActionPreDamageListenerSetMiss.java | 4 +- .../ABActionSetPreDamageStacking.java | 4 +- .../ABCallbackGetAttackBaseDamage.java | 4 +- .../ABCallbackGetAttackDamageType.java} | 6 +- ...BCallbackGetAttackMaximumSplashRadius.java | 4 +- .../ABCallbackGetAttackType.java | 4 +- .../ABCallbackGetAttackWeaponType.java} | 6 +- .../ABConditionIsAttackArtillery.java | 2 +- .../ABConditionIsAttackHoming.java | 2 +- ...onditionIsUnitValidSplashDamageTarget.java | 6 +- .../ABActionAddBehaviorChangeListener.java | 6 +- .../ABActionCreateBehaviorChangeListener.java | 4 +- .../ABActionRemoveBehaviorChangeListener.java | 6 +- .../ABCallbackGetNewBehaviorTarget.java | 4 +- ...BConditionIsNewBehaviorCategoryInList.java | 2 +- .../ABActionAddDamageTakenListener.java | 6 +- ...ionAddDamageTakenModificationListener.java | 6 +- .../ABActionCreateDamageTakenListener.java | 6 +- ...CreateDamageTakenModificationListener.java | 6 +- .../ABActionRemoveDamageTakenListener.java | 6 +- ...RemoveDamageTakenModificationListener.java | 6 +- ...nModificationMultiplyDamageMultiplier.java | 4 +- ...eTakenModificationSetDamageMultiplier.java | 4 +- ...ABConditionIsTriggeringDamageAnAttack.java | 2 +- .../ABConditionIsTriggeringDamageRanged.java | 2 +- .../ABActionAddDeathReplacementEffect.java | 8 +- .../ABActionCreateDeathReplacementEffect.java | 4 +- .../ABActionRemoveDeathReplacementEffect.java | 8 +- ...onDeathReplacementFinishReincarnating.java | 2 +- ...ctionDeathReplacementSetReincarnating.java | 2 +- .../ABActionDeathReplacementSetReviving.java | 2 +- .../ABActionAddEvasionListener.java | 6 +- .../ABActionCreateEvasionListener.java | 4 +- .../ABActionRemoveEvasionListener.java | 6 +- ...ctionAddAbilityEffectReactionListener.java | 6 +- ...BActionAddAbilityProjReactionListener.java | 6 +- ...ABActionAddAttackProjReactionListener.java | 6 +- ...onCreateAbilityEffectReactionListener.java | 4 +- ...tionCreateAbilityProjReactionListener.java | 4 +- ...ctionCreateAttackProjReactionListener.java | 4 +- ...onRemoveAbilityEffectReactionListener.java | 6 +- ...tionRemoveAbilityProjReactionListener.java | 6 +- ...ctionRemoveAttackProjReactionListener.java | 6 +- .../ABActionReactionPreventHit.java | 2 +- ...GetReactionAttackProjectileAttackType.java | 4 +- ...backGetReactionAttackProjectileDamage.java | 4 +- .../ABActionSubtractTotalDamageDealt.java | 11 +- .../ABCallbackGetFinalTotalDamageDealt.java | 10 +- .../ABCallbackGetRawTotalDamageDealt.java | 10 +- .../ABCallbackGetTriggeringAttackType.java | 9 +- .../ABCallbackGetTriggeringDamageType.java | 9 +- .../ABActionAddUnitStateListener.java | 6 +- .../ABActionCreateUnitStateListener.java | 2 +- .../ABActionRemoveUnitStateListener.java | 6 +- .../unitqueue/ABActionAddUnitToQueue.java | 2 +- .../ABActionRemoveUnitFromQueue.java | 2 +- .../unitstate/ABActionAddStateModBuff.java | 4 +- .../unitstate/ABActionCreateStateModBuff.java | 2 +- .../unitstate/ABActionRemoveStateModBuff.java | 4 +- .../unitstate/ABActionSetUnitFadeTimer.java | 4 +- .../unitstate/ABActionUpdateStateModBuff.java | 4 +- .../ABActionCreateLocationVisionModifier.java | 4 +- ...BActionCreateProjectileVisionModifier.java | 2 +- .../ABActionCreateUnitVisionModifier.java | 4 +- .../ABAbilityCallback.java | 2 +- .../ABCallbackArgumentAbility.java | 4 +- .../ABCallbackGetAbilityById.java | 6 +- .../ABCallbackGetBuffSourceAbility.java | 4 +- .../ABCallbackGetLastCreatedAbility.java | 2 +- .../ABCallbackGetMatchingAbility.java | 2 +- .../ABCallbackGetPartnerAbility.java | 2 +- .../ABCallbackGetReactionAbility.java | 2 +- .../ABCallbackGetStoredAbilityByKey.java | 6 +- .../ABCallbackGetThisAbility.java | 2 +- .../ABCallbackInlineConditionAbility.java | 2 +- .../ABCallbackReuseAbility.java | 4 +- .../ABCallbackReuseAbilityWithArguments.java | 4 +- ...BCallbackGetStoredAttackModifierByKey.java | 4 +- ...BCallbackGetStoredAttackSettingsByKey.java | 4 +- .../ABBooleanCallback.java | 2 +- .../ABCallbackGetAbilityDataAsBoolean.java | 2 +- ...BCallbackGetAbilityUniqueValueBoolean.java | 6 +- .../ABCallbackGetBuffUniqueValueBoolean.java | 6 +- ...CallbackGetParentAbilityDataAsBoolean.java | 4 +- .../ABCallbackGetStoredBooleanByKey.java | 4 +- .../ABCallbackInlineConditionBoolean.java | 2 +- .../ABCallbackIntegerToBoolean.java | 4 +- .../ABCallbackRawBoolean.java | 2 +- .../ABBuffCallback.java | 2 +- .../ABCallbackArgumentBuff.java | 4 +- .../ABCallbackEnumBuff.java | 2 +- .../ABCallbackGetBuffById.java | 6 +- .../ABCallbackGetLastCreatedBuff.java | 2 +- .../ABCallbackGetMatchingBuff.java | 2 +- .../ABCallbackGetStoredBuffByKey.java | 6 +- .../ABCallbackInlineConditionBuff.java | 2 +- .../ABCallbackReuseBuff.java | 4 +- .../ABCallbackReuseBuffWithArguments.java | 4 +- .../ABCallbackThisBuff.java | 2 +- .../ABCallbackArgumentDestructable.java | 2 +- .../ABCallbackGetStoredDestructableByKey.java | 4 +- .../ABCallbackReuseDestructable.java | 2 +- ...allbackReuseDestructableWithArguments.java | 2 +- .../ABCallbackArgumentDestructableBuff.java | 2 +- ...allbackGetStoredDestructableBuffByKey.java | 4 +- .../ABCallbackReuseDestructableBuff.java | 2 +- ...ackReuseDestructableBuffWithArguments.java | 2 +- ...tackPreDamageListenerPriorityCallback.java | 2 +- .../ABAttackTypeCallback.java | 2 +- .../ABAutocastTypeCallback.java | 2 +- .../ABCallbackConditionalAutocastType.java | 2 +- .../ABCallbackGetAttackTypeFromString.java | 4 +- .../ABCallbackGetAutocastTypeFromString.java | 4 +- .../ABCallbackGetDamageTypeFromString.java | 6 +- .../ABCallbackGetDefenseTypeFromString.java | 4 +- .../ABCallbackGetMovementTypeFromString.java | 4 +- ...kGetNonStackingStatBuffTypeFromString.java | 6 +- .../ABCallbackGetStoredAttackTypeByKey.java | 6 +- .../ABCallbackGetStoredDamageTypeByKey.java | 6 +- .../ABCallbackGetStoredDefenseTypeByKey.java | 6 +- .../ABCallbackGetStoredMovementTypeByKey.java | 6 +- .../ABCallbackGetStoredTargetTypeByKey.java | 6 +- .../ABCallbackGetStoredWeaponTypeByKey.java | 6 +- .../ABCallbackGetTargetTypeFromString.java | 4 +- .../ABCallbackGetUnitDefenseType.java | 4 +- .../ABCallbackGetUnitMovementType.java | 4 +- .../ABCallbackGetUnitTypeMovementType.java | 4 +- .../ABCallbackGetWeaponTypeFromString.java | 6 +- .../ABCallbackRawDeathEffectPriority.java | 2 +- ...BCallbackRawPreDamageListenerPriority.java | 2 +- .../ABCallbackRawTargetType.java | 2 +- .../ABCallbackRawWeaponType.java | 2 +- .../ABDamageTypeCallback.java | 2 +- .../ABDeathReplacementPriorityCallback.java | 2 +- .../ABDefenseTypeCallback.java | 2 +- .../ABMovementTypeCallback.java | 2 +- .../ABNonStackingStatBuffTypeCallback.java | 2 +- .../ABTargetTypeCallback.java | 2 +- .../ABWeaponTypeCallback.java | 2 +- .../ABCallbackArgumentTimeOfDayEvent.java | 4 +- ...BCallbackGetLastCreatedTimeOfDayEvent.java | 2 +- ...BCallbackGetStoredTimeOfDayEventByKey.java | 6 +- ...CallbackInlineConditionTimeOfDayEvent.java | 2 +- .../ABCallbackReuseTimeOfDayEvent.java | 4 +- ...lbackReuseTimeOfDayEventWithArguments.java | 4 +- .../timeevent}/ABTimeOfDayEventCallback.java | 2 +- .../ABCallbackArgumentWidgetEvent.java | 4 +- .../ABCallbackGetLastCreatedWidgetEvent.java | 2 +- .../ABCallbackGetStoredWidgetEventByKey.java | 6 +- .../ABCallbackInlineConditionWidgetEvent.java | 2 +- .../ABCallbackReuseWidgetEvent.java | 4 +- ...CallbackReuseWidgetEventWithArguments.java | 4 +- .../widgetevent}/ABWidgetEventCallback.java | 2 +- .../ABCallbackAddFloat.java | 2 +- .../ABCallbackArgumentFloat.java | 4 +- .../ABCallbackCeilFloat.java | 2 +- .../ABCallbackCos.java | 2 +- .../ABCallbackDegToRad.java | 2 +- .../ABCallbackDivideFloat.java | 2 +- .../ABCallbackFMaxValue.java | 2 +- .../ABCallbackFloorFloat.java | 2 +- .../ABCallbackGetAbilityArea.java | 4 +- .../ABCallbackGetAbilityCastRange.java | 4 +- .../ABCallbackGetAbilityCastTime.java | 2 +- .../ABCallbackGetAbilityCooldown.java | 4 +- .../ABCallbackGetAbilityDataAsFloat.java | 2 +- .../ABCallbackGetAbilityDuration.java | 4 +- .../ABCallbackGetAbilityHeroDuration.java | 2 +- .../ABCallbackGetAbilityProjectileSpeed.java | 2 +- .../ABCallbackGetAbilityUniqueValueFloat.java | 8 +- .../ABCallbackGetAngleBetweenLocations.java | 4 +- .../ABCallbackGetBuffDurationElapsed.java | 4 +- .../ABCallbackGetBuffUniqueValueFloat.java | 8 +- ...ABCallbackGetDistanceBetweenLocations.java | 4 +- .../ABCallbackGetDistanceBetweenUnits.java | 4 +- .../ABCallbackGetLocationX.java | 4 +- .../ABCallbackGetLocationY.java | 4 +- ...ABCallbackGetParentAbilityDataAsFloat.java | 2 +- .../ABCallbackGetStoredFloatByKey.java | 6 +- .../ABCallbackGetUnitAcquisitionRange.java | 4 +- .../ABCallbackGetUnitCastPoint.java | 4 +- .../ABCallbackGetUnitCurrentHp.java | 4 +- .../ABCallbackGetUnitCurrentMana.java | 4 +- .../ABCallbackGetUnitFacing.java | 4 +- .../ABCallbackGetUnitInitialMana.java | 4 +- .../ABCallbackGetUnitLocationX.java | 4 +- .../ABCallbackGetUnitLocationY.java | 4 +- .../ABCallbackInlineConditionFloat.java | 2 +- .../ABCallbackIntToFloat.java | 4 +- .../ABCallbackMaxFloat.java | 2 +- .../ABCallbackMinFloat.java | 2 +- .../ABCallbackMultiplyFloat.java | 2 +- .../ABCallbackNegativeFloat.java | 2 +- .../ABCallbackOneGameTick.java | 2 +- .../ABCallbackPi.java | 2 +- .../ABCallbackRandomBoundedFloat.java | 2 +- .../ABCallbackRandomFloat.java | 2 +- .../ABCallbackRawFloat.java | 2 +- .../ABCallbackReuseFloat.java | 4 +- .../ABCallbackReuseFloatWithArguments.java | 4 +- .../ABCallbackSin.java | 2 +- .../ABCallbackSubtractFloat.java | 2 +- .../ABCallbackTan.java | 2 +- .../ABCallbackTicksForDuration.java | 2 +- .../ABFloatCallback.java | 2 +- .../ABCallbackArgumentFX.java | 4 +- .../ABCallbackGetLastCreatedFX.java | 2 +- ...CallbackGetLastCreatedLightningEffect.java | 2 +- .../ABCallbackGetStoredFXByKey.java | 6 +- .../ABCallbackGetStoredLightningByKey.java | 6 +- .../ABCallbackInlineConditionFX.java | 2 +- .../ABCallbackReuseFX.java | 4 +- .../ABCallbackReuseFXWithArguments.java | 4 +- .../{fxcallbacks => fx}/ABFXCallback.java | 2 +- .../ABLightningCallback.java | 2 +- .../ABCallbackArgumentID.java | 4 +- .../ABCallbackGetAbilityDataAsID.java | 2 +- .../ABCallbackGetAbilityDataAsIDFromList.java | 4 +- ...lbackGetAbilityDataAsRandomIDFromList.java | 2 +- .../ABCallbackGetAbilityUniqueValueId.java | 8 +- .../ABCallbackGetAbilityUnitId.java | 2 +- .../ABCallbackGetAlias.java | 2 +- .../ABCallbackGetBuffAlias.java | 4 +- .../ABCallbackGetBuffIdFromCode.java | 2 +- .../ABCallbackGetCode.java | 4 +- .../ABCallbackGetFirstBuffId.java | 2 +- .../ABCallbackGetFirstEffectId.java | 2 +- .../ABCallbackGetItemType.java | 2 +- .../ABCallbackGetNonCurrentTransformType.java | 4 +- .../ABCallbackGetParentAlias.java | 2 +- .../ABCallbackGetSecondBuffId.java | 2 +- .../ABCallbackGetStoredIDByKey.java | 6 +- .../ABCallbackGetUnitType.java | 4 +- .../ABCallbackGetWar3IDFromString.java | 2 +- .../ABCallbackInlineConditionID.java | 2 +- .../ABCallbackNullIfFalse.java | 2 +- .../ABCallbackRandomItemId.java | 6 +- .../ABCallbackRandomMechanicalCritterId.java | 2 +- .../ABCallbackReuseID.java | 4 +- .../ABCallbackReuseIDWithArguments.java | 4 +- .../{idcallbacks => id}/ABIDCallback.java | 2 +- .../ABCallbackAddInteger.java | 2 +- .../ABCallbackAndInteger.java | 2 +- .../ABCallbackArgumentInteger.java | 4 +- ...backCountBuffsOnUnitMatchingCondition.java | 4 +- ...ABCallbackCountUnitsInRangeOfLocation.java | 6 +- .../ABCallbackCountUnitsInRangeOfUnit.java | 6 +- ...ABCallbackDetectionDropdownConversion.java | 2 +- .../ABCallbackDivideInteger.java | 2 +- ...ABCallbackGetAbilityCastTimeAsInteger.java | 2 +- .../ABCallbackGetAbilityDataAsInteger.java | 2 +- .../ABCallbackGetAbilityHandleAsInteger.java | 4 +- .../ABCallbackGetAbilityManaCost.java | 4 +- ...lbackGetAbilityTargetAttachmentPoints.java | 4 +- ...BCallbackGetAbilityUniqueValueInteger.java | 8 +- .../ABCallbackGetBuffHandleAsInteger.java | 4 +- .../ABCallbackGetBuffUniqueValueInteger.java | 8 +- .../ABCallbackGetCastId.java | 2 +- .../ABCallbackGetIntegerFromList.java | 2 +- .../ABCallbackGetItemCharges.java | 2 +- .../ABCallbackGetItemLevel.java | 2 +- .../ABCallbackGetItemMaxCharges.java | 2 +- .../ABCallbackGetItemSlot.java | 2 +- .../ABCallbackGetListSize.java | 2 +- .../ABCallbackGetNeutralHostilePlayerId.java | 2 +- .../ABCallbackGetNeutralPassivePlayerId.java | 2 +- .../ABCallbackGetPlayerId.java | 2 +- ...lbackGetProjectileDestructableTargets.java | 2 +- .../ABCallbackGetProjectileUnitTargets.java | 2 +- .../ABCallbackGetSortableListSize.java | 2 +- .../ABCallbackGetSpellLevel.java | 2 +- .../ABCallbackGetStoredIntegerByKey.java | 6 +- .../ABCallbackGetUnitGroupSize.java | 4 +- .../ABCallbackGetUnitHandleAsInteger.java | 4 +- .../ABCallbackGetUnitMaximumHp.java | 4 +- .../ABCallbackGetUnitMaximumMp.java | 4 +- .../ABCallbackGetUnitQueueSize.java | 2 +- .../ABCallbackGetUnitTypeFoodCost.java | 4 +- .../ABCallbackGetUnitTypeGoldCost.java | 4 +- .../ABCallbackGetUnitTypeLumberCost.java | 4 +- .../ABCallbackGetUnitTypeSpeed.java | 4 +- .../ABCallbackInlineConditionInteger.java | 2 +- .../ABCallbackIntegerIf.java | 2 +- .../ABCallbackIntegerZeroIfFalse.java | 4 +- .../ABCallbackIntegerZeroIfNull.java | 2 +- .../ABCallbackIterator.java | 2 +- .../ABCallbackMaxInteger.java | 2 +- .../ABCallbackMinInteger.java | 2 +- .../ABCallbackMultiplyInteger.java | 2 +- .../ABCallbackOrInteger.java | 2 +- .../ABCallbackPlayerToStateModValue.java | 2 +- .../ABCallbackRandomInteger.java | 2 +- .../ABCallbackRawInteger.java | 2 +- .../ABCallbackReuseInteger.java | 4 +- .../ABCallbackReuseIntegerWithArguments.java | 4 +- .../ABCallbackSubtractInteger.java | 2 +- .../ABCallbackTruncateFloatToInteger.java | 4 +- .../ABIntegerCallback.java | 2 +- .../callback/item/ABCallbackArgumentItem.java | 2 +- .../item/ABCallbackGetStoredItemByKey.java | 4 +- .../callback/item/ABCallbackReuseItem.java | 2 +- .../ABCallbackReuseItemWithArguments.java | 2 +- .../callback/list/ABCallbackArgumentList.java | 2 +- .../list/ABCallbackArgumentSortableList.java | 2 +- .../list/ABCallbackGetStoredListByKey.java | 4 +- .../ABCallbackGetStoredSortableListByKey.java | 4 +- .../callback/list/ABCallbackReuseList.java | 2 +- .../ABCallbackReuseListWithArguments.java | 2 +- .../list/ABCallbackReuseSortableList.java | 2 +- ...allbackReuseSortableListWithArguments.java | 2 +- .../integer/ABCallbackIntegerListOfRange.java | 4 +- ...AbilityEffectReactionListenerCallback.java | 2 +- ...ABAbilityProjReactionListenerCallback.java | 2 +- .../ABAttackPostDamageListenerCallback.java | 2 +- .../ABAttackPreDamageListenerCallback.java | 2 +- .../ABAttackProjReactionListenerCallback.java | 2 +- .../ABBehaviorChangeListenerCallback.java | 2 +- ...tCreatedAbilityEffectReactionListener.java | 2 +- ...astCreatedAbilityProjReactionListener.java | 2 +- ...etLastCreatedAttackPostDamageListener.java | 2 +- ...GetLastCreatedAttackPreDamageListener.java | 2 +- ...LastCreatedAttackProjReactionListener.java | 2 +- ...kGetLastCreatedBehaviorChangeListener.java | 2 +- ...backGetLastCreatedDamageTakenListener.java | 2 +- ...reatedDamageTakenModificationListener.java | 2 +- ...allbackGetLastCreatedDeathReplacement.java | 2 +- ...CallbackGetLastCreatedEvasionListener.java | 2 +- ...llbackGetLastCreatedUnitStateListener.java | 2 +- ...redAbilityEffectReactionListenerByKey.java | 6 +- ...toredAbilityProjReactionListenerByKey.java | 6 +- ...etStoredAttackPostDamageListenerByKey.java | 6 +- ...GetStoredAttackPreDamageListenerByKey.java | 6 +- ...StoredAttackProjReactionListenerByKey.java | 6 +- ...kGetStoredBehaviorChangeListenerByKey.java | 6 +- ...backGetStoredDamageTakenListenerByKey.java | 6 +- ...dDamageTakenModificationListenerByKey.java | 6 +- ...allbackGetStoredDeathReplacementByKey.java | 6 +- ...CallbackGetStoredEvasionListenerByKey.java | 6 +- ...llbackGetStoredUnitStateListenerByKey.java | 6 +- .../ABDamageTakenListenerCallback.java | 2 +- ...mageTakenModificationListenerCallback.java | 2 +- .../ABDeathReplacementCallback.java | 2 +- .../ABEvasionListenerCallback.java | 2 +- .../ABUnitStateListenerCallback.java | 2 +- .../ABCallbackArgumentLocation.java | 4 +- .../ABCallbackCreateLocationFromOffset.java | 6 +- .../ABCallbackCreateLocationFromTarget.java | 4 +- .../ABCallbackCreateLocationFromXY.java | 4 +- .../ABCallbackCreateLocationFromXYOffset.java | 4 +- .../ABCallbackGetAttackImpactLocation.java | 2 +- .../ABCallbackGetAttackTargetLocation.java | 2 +- .../ABCallbackGetGroundAttackedLocation.java | 2 +- .../ABCallbackGetLocationFromList.java | 4 +- ...BCallbackGetProjectileCurrentLocation.java | 2 +- .../ABCallbackGetStoredLocationByKey.java | 6 +- .../ABCallbackGetTargetedLocation.java | 2 +- .../ABCallbackGetUnitLocation.java | 4 +- .../ABCallbackInlineConditionLocation.java | 2 +- .../ABCallbackModifyLocationWithOffset.java | 6 +- .../ABCallbackModifyLocationWithXYOffset.java | 4 +- .../ABCallbackRandomLocationInRange.java | 4 +- .../ABCallbackReuseLocation.java | 4 +- .../ABCallbackReuseLocationWithArguments.java | 4 +- .../ABLocationCallback.java | 2 +- .../ABCallbackAddLong.java | 2 +- .../ABCallbackAndLong.java | 2 +- .../ABCallbackArgumentLong.java | 4 +- .../ABCallbackCreateDetectedData.java | 4 +- .../ABCallbackCreateDetectorData.java | 6 +- .../ABCallbackCreateOwnershipData.java | 4 +- .../ABCallbackDivideLong.java | 2 +- .../ABCallbackGetAbilityDataAsLong.java | 2 +- .../ABCallbackGetAbilityUniqueValueLong.java | 8 +- .../ABCallbackGetBuffUniqueValueLong.java | 8 +- .../ABCallbackGetStoredLongByKey.java | 6 +- .../ABCallbackInlineConditionLong.java | 2 +- .../ABCallbackMaxLong.java | 2 +- .../ABCallbackMinLong.java | 2 +- .../ABCallbackMultiplyLong.java | 2 +- .../ABCallbackOrLong.java | 2 +- .../ABCallbackPlayerMaskAllPlayers.java | 2 +- .../ABCallbackPlayerMaskExcludePlayers.java | 2 +- .../ABCallbackPlayerMaskIncludePlayers.java | 2 +- .../ABCallbackRawLong.java | 2 +- .../ABCallbackReuseLong.java | 4 +- .../ABCallbackReuseLongWithArguments.java | 4 +- .../ABCallbackSubtractLong.java | 2 +- .../ABLongCallback.java | 2 +- .../orderid/ABCallbackArgumentOrderId.java | 2 +- .../ABCallbackGetStoredOrderIdByKey.java | 4 +- .../callback/orderid/ABCallbackIdString.java | 2 +- .../orderid/ABCallbackReuseOrderId.java | 2 +- .../ABCallbackReuseOrderIdWithArguments.java | 2 +- .../player/ABCallbackArgumentPlayer.java | 2 +- .../player/ABCallbackGetOwnerOfUnit.java | 2 +- .../player/ABCallbackGetPlayerById.java | 2 +- .../ABCallbackGetStoredPlayerByKey.java | 4 +- .../player/ABCallbackReusePlayer.java | 2 +- .../ABCallbackReusePlayerWithArguments.java | 2 +- .../ABCallbackArgumentProjectile.java | 2 +- .../ABCallbackGetStoredProjectileByKey.java | 4 +- .../projectile/ABCallbackReuseProjectile.java | 2 +- ...BCallbackReuseProjectileWithArguments.java | 2 +- ...ABCallbackArgumentNonStackingStatBuff.java | 4 +- ...backGetLastCreatedNonStackingStatBuff.java | 2 +- ...backGetStoredNonStackingStatBuffByKey.java | 6 +- ...ackInlineConditionNonStackingStatBuff.java | 2 +- .../ABCallbackReuseNonStackingStatBuff.java | 4 +- ...ReuseNonStackingStatBuffWithArguments.java | 4 +- .../ABNonStackingStatBuffCallback.java | 2 +- .../ABCallbackArgumentStateModBuff.java | 4 +- .../ABCallbackGetLastCreatedStateModBuff.java | 2 +- .../ABCallbackGetStoredStateModBuffByKey.java | 6 +- ...ABCallbackInlineConditionStateModBuff.java | 2 +- .../ABCallbackReuseStateModBuff.java | 4 +- ...allbackReuseStateModBuffWithArguments.java | 4 +- .../ABStateModBuffCallback.java | 2 +- .../ABCallbackArgumentString.java | 2 +- .../ABCallbackBooleanToString.java | 4 +- .../ABCallbackCatStrings.java | 2 +- .../ABCallbackFloatToString.java | 4 +- .../ABCallbackGetAbilityDataAsString.java | 2 +- .../ABCallbackGetAbilityHandleAsString.java | 4 +- ...ABCallbackGetAbilityUniqueValueString.java | 6 +- .../ABCallbackGetAliasAsString.java | 2 +- .../ABCallbackGetAllowStackingKey.java | 2 +- .../ABCallbackGetBuffHandleAsString.java | 4 +- .../ABCallbackGetBuffUniqueValueString.java | 6 +- .../ABCallbackGetCodeAsString.java | 2 +- .../ABCallbackGetStoredStringByKey.java | 4 +- .../ABCallbackGetUnitHandleAsString.java | 4 +- .../ABCallbackIdToString.java | 4 +- .../ABCallbackInlineConditionString.java | 2 +- .../ABCallbackIntegerToString.java | 4 +- .../ABCallbackLongToString.java | 4 +- .../ABCallbackRawString.java | 2 +- .../ABCallbackReuseString.java | 2 +- .../ABCallbackReuseStringWithArguments.java | 2 +- .../ABStringCallback.java | 2 +- .../ABCallbackArgumentTarget.java | 4 +- .../ABCallbackGetAbilityTarget.java | 2 +- .../ABCallbackGetStoredTargetByKey.java | 6 +- .../ABCallbackInlineConditionTarget.java | 2 +- .../ABCallbackReuseTarget.java | 4 +- .../ABCallbackReuseTargetWithArguments.java | 4 +- .../ABTargetCallback.java | 2 +- .../ABCallbackArgumentTimer.java | 4 +- .../ABCallbackGetFiringTimer.java | 2 +- .../ABCallbackGetLastCreatedTimer.java | 2 +- .../ABCallbackGetLastStartedTimer.java | 2 +- .../ABCallbackGetStoredTimerByKey.java | 6 +- .../ABCallbackInlineConditionTimer.java | 2 +- .../ABCallbackReuseTimer.java | 4 +- .../ABCallbackReuseTimerWithArguments.java | 4 +- .../ABTimerCallback.java | 2 +- .../ABCallbackArgumentUnit.java | 4 +- .../ABCallbackGetAbilityPairedUnit.java | 2 +- .../ABCallbackGetAbilityTargetedUnit.java | 2 +- .../ABCallbackGetAttackedUnit.java | 2 +- .../ABCallbackGetAttackingUnit.java | 2 +- .../ABCallbackGetBuffCastingUnit.java | 2 +- .../ABCallbackGetBuffedUnit.java | 2 +- .../ABCallbackGetCastingUnit.java | 2 +- .../ABCallbackGetChainUnit.java | 2 +- .../ABCallbackGetCompUnit1.java | 2 +- .../ABCallbackGetCompUnit2.java | 2 +- .../ABCallbackGetDamagedUnit.java | 2 +- .../ABCallbackGetDamagingUnit.java | 2 +- .../ABCallbackGetDyingUnit.java | 2 +- .../ABCallbackGetEnumUnit.java | 2 +- .../ABCallbackGetKillingUnit.java | 2 +- .../ABCallbackGetLastCreatedUnit.java | 2 +- .../ABCallbackGetListenerUnit.java | 2 +- .../ABCallbackGetMatchingUnit.java | 2 +- ...CallbackGetNearestCorpseInRangeOfUnit.java | 4 +- ...ABCallbackGetNearestUnitInRangeOfUnit.java | 4 +- .../ABCallbackGetParentCastingUnit.java | 2 +- .../ABCallbackGetProjectileHitUnit.java | 2 +- .../ABCallbackGetProjectileSourceUnit.java | 2 +- ...CallbackGetReactionAbilityCastingUnit.java | 2 +- ...BCallbackGetReactionAbilityTargetUnit.java | 2 +- .../ABCallbackGetStoredUnitByKey.java | 6 +- .../ABCallbackInlineConditionUnit.java | 2 +- .../ABCallbackPollUnitQueue.java | 2 +- .../ABCallbackReuseUnit.java | 4 +- .../ABCallbackReuseUnitWithArguments.java | 4 +- .../ABUnitCallback.java | 2 +- .../ABCallbackArgumentUnitGroup.java | 4 +- .../ABCallbackGetLastCreatedUnitGroup.java | 2 +- .../ABCallbackGetStoredUnitGroupByKey.java | 6 +- .../ABCallbackGetUnitGroupByName.java | 2 +- .../ABCallbackInlineConditionUnitGroup.java | 2 +- .../ABCallbackReuseUnitGroup.java | 4 +- ...ABCallbackReuseUnitGroupWithArguments.java | 4 +- .../ABUnitGroupCallback.java | 2 +- .../ABCallbackArgumentUnitQueue.java | 2 +- .../ABCallbackGetStoredUnitQueueByKey.java | 4 +- .../unitqueue/ABCallbackReuseUnitQueue.java | 2 +- ...ABCallbackReuseUnitQueueWithArguments.java | 2 +- .../ABCallbackArgumentVisionModifier.java | 2 +- ...BCallbackGetStoredVisionModifierByKey.java | 4 +- .../ABCallbackReuseVisionModifier.java | 2 +- ...lbackReuseVisionModifierWithArguments.java | 2 +- .../widget/ABCallbackArgumentWidget.java | 2 +- .../ABCallbackGetStoredWidgetByKey.java | 4 +- .../widget/ABCallbackReuseWidget.java | 2 +- .../ABCallbackReuseWidgetWithArguments.java | 2 +- .../widget/ABCallbackUnitToWidget.java | 2 +- .../condition/ABCallbackArgumentBoolean.java | 4 +- .../condition/ABCallbackReuseBoolean.java | 4 +- .../ABCallbackReuseBooleanWithArguments.java | 4 +- .../condition/buff/ABConditionIsBuffAlly.java | 2 +- .../buff/ABConditionIsBuffEnemy.java | 2 +- .../buff/ABConditionIsBuffMagic.java | 2 +- .../buff/ABConditionIsBuffNegative.java | 2 +- .../buff/ABConditionIsBuffPositive.java | 2 +- .../ABConditionIsAttackTypeEqual.java | 2 +- .../ABConditionIsDamageTypeEqual.java | 2 +- .../ABConditionIsDefenseTypeEqual.java | 2 +- .../ABConditionIsDefenseTypeInList.java | 2 +- .../comparison/ABConditionIsIdEqual.java | 2 +- .../ABConditionIsMovementTypeEqual.java | 2 +- .../comparison/ABConditionIsUnitEqual.java | 2 +- .../ABConditionIsWeaponTypeEqual.java | 2 +- ...BConditionSuccessfullyChargeResources.java | 6 +- .../ABConditionDoesDestructableHaveBuff.java | 2 +- ...DestructableHaveBuffMatchingCondition.java | 2 +- .../game/ABConditionIsTimeOfDayInRange.java | 2 +- .../ABConditionIsLocationDeepWater.java | 2 +- .../ABConditionIsLocationFlyingOnly.java | 2 +- ...onditionIsLocationPathableForUnitType.java | 6 +- .../ABConditionIsLocationShallowWater.java | 2 +- .../ABConditionIsLocationWalkable.java | 2 +- ...ABConditionIsLocationWalkableNonWater.java | 2 +- .../condition/logical/ABConditionBool.java | 2 +- .../ABConditionIsUnitInGroup.java | 6 +- .../ABConditionIsUnitInRangeOfUnit.java | 6 +- ...tionMatchingCorpseExistsInRangeOfUnit.java | 6 +- ...ditionMatchingUnitExistsInRangeOfUnit.java | 6 +- .../numeric/ABConditionFloatEq0.java | 2 +- .../numeric/ABConditionFloatEqual.java | 2 +- .../condition/numeric/ABConditionFloatGt.java | 2 +- .../numeric/ABConditionFloatGt0.java | 2 +- .../numeric/ABConditionFloatGte.java | 2 +- .../condition/numeric/ABConditionFloatLt.java | 2 +- .../numeric/ABConditionFloatLte.java | 2 +- .../condition/numeric/ABConditionFloatNe.java | 2 +- .../numeric/ABConditionFloatNe0.java | 2 +- .../numeric/ABConditionIntegerEq.java | 2 +- .../numeric/ABConditionIntegerEq0.java | 2 +- .../numeric/ABConditionIntegerGt.java | 2 +- .../numeric/ABConditionIntegerGt0.java | 2 +- .../numeric/ABConditionIntegerGte.java | 2 +- .../numeric/ABConditionIntegerIsEven.java | 2 +- .../numeric/ABConditionIntegerIsOdd.java | 2 +- .../numeric/ABConditionIntegerLt.java | 2 +- .../numeric/ABConditionIntegerLte.java | 2 +- .../numeric/ABConditionIntegerNe.java | 2 +- .../numeric/ABConditionIntegerNe0.java | 2 +- .../ABConditionIsDestructableValidTarget.java | 4 +- ...ConditionIsPassAllAbilityTargetChecks.java | 4 +- ...itionIsUnitPassAllAbilityTargetChecks.java | 4 +- .../ABConditionIsUnitValidTarget.java | 6 +- .../ABConditionIsValidTarget.java | 4 +- .../timer/ABConditionIsTimerActive.java | 2 +- .../ABConditionDoesAbilityHaveUniqueFlag.java | 6 +- .../ABConditionDoesBuffHaveUniqueFlag.java | 6 +- .../condition/unit/ABConditionIsUnitType.java | 4 +- ...nDoesUnitHaveAbilityMatchingCondition.java | 6 +- .../ABConditionIsUnitEnemy.java | 4 +- .../ABConditionIsUnitFriend.java | 4 +- .../ABConditionIsUnitShareSpells.java | 4 +- ...ditionIsCurrentBehaviorCategoryInList.java | 2 +- .../ABConditionDoesUnitHaveBuff.java | 6 +- ...tionDoesUnitHaveBuffMatchingCondition.java | 6 +- .../ABConditionIsUnitBuilding.java | 4 +- .../ABConditionIsUnitHero.java | 4 +- .../ABConditionIsUnitHeroDuration.java | 4 +- .../ABConditionIsUnitHidden.java | 4 +- .../ABConditionIsUnitMagicImmune.java | 4 +- .../ABConditionIsUnitMorphImmune.java | 4 +- .../ABConditionIsUnitSummoned.java | 4 +- .../{ => state}/ABConditionIsUnitAlive.java | 4 +- .../{ => state}/ABConditionIsUnitDead.java | 4 +- .../{ => state}/ABConditionIsUnitMaxHp.java | 4 +- .../{ => state}/ABConditionIsUnitMaxMp.java | 4 +- .../ABConditionIsUnitPolymorphed.java | 4 +- .../ABConditionIsUnitSleeping.java | 4 +- .../ABConditionIsUnitUpgrading.java | 4 +- .../{ => state}/ABConditionIsUnitVisible.java | 4 +- .../ABConditionIsUnitConstructing.java | 4 +- ...onditionIsUnitConstructingOrUpgrading.java | 4 +- .../{ => tech}/ABConditionIsUnitTraining.java | 4 +- .../ABConditionUnitHasResearch.java | 6 +- .../buff/{ => defaultbuffs}/ABBuffSlow.java | 3 +- .../buff/{ => defaultbuffs}/ABBuffStun.java | 3 +- .../abilitybuilder/core/ABCondition.java | 2 +- .../core/AbilityBuilderGsonBuilder.java | 106 ++++++++++++------ .../iterstructs/ABUnitComparator.java | 2 +- .../listener/ABAttackModifier.java | 2 +- .../listener/ABAttackPostDamageListener.java | 2 +- .../listener/ABDamageTakenListener.java | 2 +- .../ABDamageTakenModificationListener.java | 2 +- .../parser/AbilityBuilderConfiguration.java | 5 +- .../parser/AbilityBuilderParser.java | 6 +- .../AbilityBuilderOverrideFields.java | 14 +-- .../AbilityBuilderParserTemplateFields.java | 3 +- .../AbilityBuilderSpecialConfigFields.java | 10 +- .../AbilityBuilderSpecialDisplayFields.java | 10 +- 828 files changed, 1708 insertions(+), 1629 deletions(-) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{abilities => ability}/ABActionAbilityAttemptToApplyEffect.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{abilities => ability}/ABActionAbilityRunEndCastingActions.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => ability}/ABActionAddAbility.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => ability}/ABActionAddNewAbility.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => ability}/ABActionAddRallyAbility.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => ability}/ABActionCleanUpCastInstance.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => ability}/ABActionCreateAbilityFromId.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => ability}/ABActionPrepUnownedAbilityForUse.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => ability}/ABActionRemoveAbility.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{abilities => abilitydata}/ABActionAbilitySetShowIcon.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ability => abilitydata}/ABActionAddTargetAllowed.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ability => abilitydata}/ABActionDisableAbility.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ability => abilitydata}/ABActionDisableAbilityById.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ability => abilitydata}/ABActionEnableAbility.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ability => abilitydata}/ABActionEnableAbilityById.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ability => abilitydata}/ABActionRemoveTargetAllowed.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ability => abilitydata}/ABActionSetAbilityCastRange.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ability => abilitydata}/ABActionSetAutoTargetDestructable.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ability => abilitydata}/ABActionSetAutoTargetUnit.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ability => abilitydata}/ABActionSetPreventEndEvents.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/ABActionAddAttackModifier.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/ABActionCreateAttackModifier.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/ABActionFireModifiedAttack.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/ABActionRemoveAttackModifier.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/ABActionStartModifiedAttack.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierAddAnimationTag.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierAddPostDamageListener.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierAddPreDamageListener.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierApplyAllArtFields.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierApplyArt.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierApplyArtAndSpeed.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierApplyDefaultSpeed.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierPreventOtherModifications.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierRemoveAnimationTag.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierRemovePostDamageListener.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierRemovePreDamageListener.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierSetAttackArc.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierSetAttackDeathTime.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierSetAttackHoming.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierSetAttackImpactZ.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierSetAttackStartZ.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABActionAttackModifierSetSplashFields.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABCallbackGetModifiedAttackAttackType.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABCallbackGetModifiedAttackDamageType.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{attack => attackmodifier}/internal/ABCallbackGetModifiedAttackWeaponType.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => behavior}/ABActionChangeAttackActionToMovement.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => behavior}/ABActionForceBeginCreatedBehavior.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => buff}/ABActionAddSlowBuff.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => buff}/ABActionAddStunBuff.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => buff}/ABActionDispelBuffs.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => damage}/ABActionDamageArea.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => damage}/ABActionDamageAttackSplash.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => damage}/ABActionDamageBurst.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => damage}/ABActionDamageSplash.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => damage}/ABActionDamageTarget.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => damage}/ABActionHeal.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => datastore}/ABActionDeleteStoredKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{structural => datastore}/ABActionStoreValueLocally.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{destructable => destructablebuff}/ABActionAddDestructableBuff.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{destructable => destructablebuff}/ABActionCreateDestructableBuff.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{destructable => destructablebuff}/ABActionDispelDestructableBuffs.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{destructable => destructablebuff}/ABActionRemoveDestructableBuff.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => group}/ABActionCreateGroupEffectAtLocation.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => lightning}/ABActionCreateLightningEffect.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => lightning}/ABActionRemoveLightningEffect.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => sound}/ABActionCreateLoopingSoundEffectAtLocation.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => sound}/ABActionCreateLoopingSoundEffectOnUnit.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => sound}/ABActionCreateSoundEffectAtLocation.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => sound}/ABActionCreateSoundEffectOnUnit.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => splat}/ABActionCreateUberSplat.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => terrain}/ABActionCreateTerrainBowlAtLocation.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => terrain}/ABActionCreateTerrainRippleAtLocation.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => terrain}/ABActionCreateTerrainWaveAtLocation.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/{ => terrain}/ABActionModifyTerrainVertex.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{ => iterator}/destructable/ABActionIterateDestructablesInRangeOfLocation.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{structural => iterator/unit}/ABActionIterateUnitsInGroup.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{structural => iterator/unit}/ABActionIterateUnitsInQueue.java (99%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{structural => iterator/unit}/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{structural => iterator/unit}/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{structural => iterator/unit}/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{structural => iterator/unit}/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{structural => iterator/unit}/ABActionIterateUnitsInRect.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => order}/ABActionIssueStopOrder.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => reaction}/ABActionCheckAbilityEffectReaction.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{unit => reaction}/ABActionCheckAbilityProjReaction.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{abilities => uniqueflag}/ABActionAbilityAddUniqueFlag.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{abilities => uniqueflag}/ABActionAbilityRemoveUniqueFlag.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{buff => uniqueflag}/ABActionBuffAddUniqueFlag.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{buff => uniqueflag}/ABActionBuffRemoveUniqueFlag.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{abilities => uniquevalue}/ABActionAbilityRemoveUniqueValue.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{abilities => uniquevalue}/ABActionAbilityStoreUniqueValue.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{buff => uniquevalue}/ABActionBuffRemoveUniqueValue.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/{buff => uniquevalue}/ABActionBuffStoreUniqueValue.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => art}/ABActionMultiplyUnitScale.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => stats}/ABActionAddMp.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => stats}/ABActionSetHp.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => stats}/ABActionSetMp.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => stats}/ABActionSetSpeed.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => stats}/ABActionSubtractMp.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => transformation}/ABActionMergeUnits.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => transformation}/ABActionTransformUnit.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => transformation}/ABActionTransformUnitAppearance.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => transformation}/ABActionTransformUnitInstant.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => transformation}/ABActionTransformedUnitAbilityAdd.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => transformation}/ABActionTransformedUnitAbilityRemove.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => worker}/ABActionDisableWorkerAbilities.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => worker}/ABActionEnableWorkerAbilities.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => worker}/ABActionInstantReturnResources.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/{ => worker}/ABActionSendUnitBackToWork.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => attack}/ABActionAddAttackPostDamageListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => attack}/ABActionAddAttackPreDamageListener.java (79%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => attack}/ABActionCreateAttackPostDamageListener.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => attack}/ABActionCreateAttackPreDamageListener.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => attack}/ABActionRemoveAttackPostDamageListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => attack}/ABActionRemoveAttackPreDamageListener.java (79%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => attack/internalaction}/ABActionPreDamageListenerAddBonusDamage.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => attack/internalaction}/ABActionPreDamageListenerAddDamageMultiplier.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => attack/internalaction}/ABActionPreDamageListenerLockDamageModifications.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => attack/internalaction}/ABActionPreDamageListenerSetMiss.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => attack/internalaction}/ABActionSetPreDamageStacking.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks => attack/internalcallback}/ABCallbackGetAttackBaseDamage.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks/ABCallbackGetDamageType.java => attack/internalcallback/ABCallbackGetAttackDamageType.java} (79%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks => attack/internalcallback}/ABCallbackGetAttackMaximumSplashRadius.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks => attack/internalcallback}/ABCallbackGetAttackType.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks/ABCallbackGetWeaponType.java => attack/internalcallback/ABCallbackGetAttackWeaponType.java} (79%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalConditions => attack/internalcondition}/ABConditionIsAttackArtillery.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalConditions => attack/internalcondition}/ABConditionIsAttackHoming.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalConditions => attack/internalcondition}/ABConditionIsUnitValidSplashDamageTarget.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => behavior}/ABActionAddBehaviorChangeListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => behavior}/ABActionCreateBehaviorChangeListener.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => behavior}/ABActionRemoveBehaviorChangeListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks => behavior/internalcallback}/ABCallbackGetNewBehaviorTarget.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalConditions => behavior/internalcondition}/ABConditionIsNewBehaviorCategoryInList.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => damagetaken}/ABActionAddDamageTakenListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => damagetaken}/ABActionAddDamageTakenModificationListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => damagetaken}/ABActionCreateDamageTakenListener.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => damagetaken}/ABActionCreateDamageTakenModificationListener.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => damagetaken}/ABActionRemoveDamageTakenListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => damagetaken}/ABActionRemoveDamageTakenModificationListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => damagetaken/internalaction}/ABActionDamageTakenModificationMultiplyDamageMultiplier.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => damagetaken/internalaction}/ABActionDamageTakenModificationSetDamageMultiplier.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalConditions => damagetaken/internalcondition}/ABConditionIsTriggeringDamageAnAttack.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalConditions => damagetaken/internalcondition}/ABConditionIsTriggeringDamageRanged.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => death}/ABActionAddDeathReplacementEffect.java (79%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => death}/ABActionCreateDeathReplacementEffect.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => death}/ABActionRemoveDeathReplacementEffect.java (79%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => death/internalaction}/ABActionDeathReplacementFinishReincarnating.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => death/internalaction}/ABActionDeathReplacementSetReincarnating.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => death/internalaction}/ABActionDeathReplacementSetReviving.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => evasion}/ABActionAddEvasionListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => evasion}/ABActionCreateEvasionListener.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => evasion}/ABActionRemoveEvasionListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => reaction}/ABActionAddAbilityEffectReactionListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => reaction}/ABActionAddAbilityProjReactionListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => reaction}/ABActionAddAttackProjReactionListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => reaction}/ABActionCreateAbilityEffectReactionListener.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => reaction}/ABActionCreateAbilityProjReactionListener.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => reaction}/ABActionCreateAttackProjReactionListener.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => reaction}/ABActionRemoveAbilityEffectReactionListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => reaction}/ABActionRemoveAbilityProjReactionListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => reaction}/ABActionRemoveAttackProjReactionListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => reaction/internalaction}/ABActionReactionPreventHit.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks => reaction/internalcallback}/ABCallbackGetReactionAttackProjectileAttackType.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks => reaction/internalcallback}/ABCallbackGetReactionAttackProjectileDamage.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalActions => sharedinternalactions}/ABActionSubtractTotalDamageDealt.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks => sharedinternalcallbacks}/ABCallbackGetFinalTotalDamageDealt.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks => sharedinternalcallbacks}/ABCallbackGetRawTotalDamageDealt.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks => sharedinternalcallbacks}/ABCallbackGetTriggeringAttackType.java (74%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{internalCallbacks => sharedinternalcallbacks}/ABCallbackGetTriggeringDamageType.java (74%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => state}/ABActionAddUnitStateListener.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => state}/ABActionCreateUnitStateListener.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/{ => state}/ABActionRemoveUnitStateListener.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABAbilityCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackArgumentAbility.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackGetAbilityById.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackGetBuffSourceAbility.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackGetLastCreatedAbility.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackGetMatchingAbility.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackGetPartnerAbility.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackGetReactionAbility.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackGetStoredAbilityByKey.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackGetThisAbility.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackInlineConditionAbility.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackReuseAbility.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{abilitycallbacks => ability}/ABCallbackReuseAbilityWithArguments.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{booleancallbacks => booleans}/ABBooleanCallback.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{booleancallbacks => booleans}/ABCallbackGetAbilityDataAsBoolean.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{booleancallbacks => booleans}/ABCallbackGetAbilityUniqueValueBoolean.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{booleancallbacks => booleans}/ABCallbackGetBuffUniqueValueBoolean.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{booleancallbacks => booleans}/ABCallbackGetParentAbilityDataAsBoolean.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{booleancallbacks => booleans}/ABCallbackGetStoredBooleanByKey.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{booleancallbacks => booleans}/ABCallbackInlineConditionBoolean.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{booleancallbacks => booleans}/ABCallbackIntegerToBoolean.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{booleancallbacks => booleans}/ABCallbackRawBoolean.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{buffcallbacks => buff}/ABBuffCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{buffcallbacks => buff}/ABCallbackArgumentBuff.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{buffcallbacks => buff}/ABCallbackEnumBuff.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{buffcallbacks => buff}/ABCallbackGetBuffById.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{buffcallbacks => buff}/ABCallbackGetLastCreatedBuff.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{buffcallbacks => buff}/ABCallbackGetMatchingBuff.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{buffcallbacks => buff}/ABCallbackGetStoredBuffByKey.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{buffcallbacks => buff}/ABCallbackInlineConditionBuff.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{buffcallbacks => buff}/ABCallbackReuseBuff.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{buffcallbacks => buff}/ABCallbackReuseBuffWithArguments.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{buffcallbacks => buff}/ABCallbackThisBuff.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABAttackPreDamageListenerPriorityCallback.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABAttackTypeCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABAutocastTypeCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackConditionalAutocastType.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetAttackTypeFromString.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetAutocastTypeFromString.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetDamageTypeFromString.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetDefenseTypeFromString.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetMovementTypeFromString.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetNonStackingStatBuffTypeFromString.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetStoredAttackTypeByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetStoredDamageTypeByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetStoredDefenseTypeByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetStoredMovementTypeByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetStoredTargetTypeByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetStoredWeaponTypeByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetTargetTypeFromString.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetUnitDefenseType.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetUnitMovementType.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetUnitTypeMovementType.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackGetWeaponTypeFromString.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackRawDeathEffectPriority.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackRawPreDamageListenerPriority.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackRawTargetType.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABCallbackRawWeaponType.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABDamageTypeCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABDeathReplacementPriorityCallback.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABDefenseTypeCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABMovementTypeCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABNonStackingStatBuffTypeCallback.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABTargetTypeCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{enumcallbacks => enums}/ABWeaponTypeCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/timeeventcallbacks => event/timeevent}/ABCallbackArgumentTimeOfDayEvent.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/timeeventcallbacks => event/timeevent}/ABCallbackGetLastCreatedTimeOfDayEvent.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/timeeventcallbacks => event/timeevent}/ABCallbackGetStoredTimeOfDayEventByKey.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/timeeventcallbacks => event/timeevent}/ABCallbackInlineConditionTimeOfDayEvent.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/timeeventcallbacks => event/timeevent}/ABCallbackReuseTimeOfDayEvent.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/timeeventcallbacks => event/timeevent}/ABCallbackReuseTimeOfDayEventWithArguments.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/timeeventcallbacks => event/timeevent}/ABTimeOfDayEventCallback.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/widgetcallbacks => event/widgetevent}/ABCallbackArgumentWidgetEvent.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/widgetcallbacks => event/widgetevent}/ABCallbackGetLastCreatedWidgetEvent.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/widgetcallbacks => event/widgetevent}/ABCallbackGetStoredWidgetEventByKey.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/widgetcallbacks => event/widgetevent}/ABCallbackInlineConditionWidgetEvent.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/widgetcallbacks => event/widgetevent}/ABCallbackReuseWidgetEvent.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/widgetcallbacks => event/widgetevent}/ABCallbackReuseWidgetEventWithArguments.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{eventcallbacks/widgetcallbacks => event/widgetevent}/ABWidgetEventCallback.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackAddFloat.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackArgumentFloat.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackCeilFloat.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackCos.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackDegToRad.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackDivideFloat.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackFMaxValue.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackFloorFloat.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetAbilityArea.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetAbilityCastRange.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetAbilityCastTime.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetAbilityCooldown.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetAbilityDataAsFloat.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetAbilityDuration.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetAbilityHeroDuration.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetAbilityProjectileSpeed.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetAbilityUniqueValueFloat.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetAngleBetweenLocations.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetBuffDurationElapsed.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetBuffUniqueValueFloat.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetDistanceBetweenLocations.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetDistanceBetweenUnits.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetLocationX.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetLocationY.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetParentAbilityDataAsFloat.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetStoredFloatByKey.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetUnitAcquisitionRange.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetUnitCastPoint.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetUnitCurrentHp.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetUnitCurrentMana.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetUnitFacing.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetUnitInitialMana.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetUnitLocationX.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackGetUnitLocationY.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackInlineConditionFloat.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackIntToFloat.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackMaxFloat.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackMinFloat.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackMultiplyFloat.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackNegativeFloat.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackOneGameTick.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackPi.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackRandomBoundedFloat.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackRandomFloat.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackRawFloat.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackReuseFloat.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackReuseFloatWithArguments.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackSin.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackSubtractFloat.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackTan.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABCallbackTicksForDuration.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{floatcallbacks => floats}/ABFloatCallback.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{fxcallbacks => fx}/ABCallbackArgumentFX.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{fxcallbacks => fx}/ABCallbackGetLastCreatedFX.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{fxcallbacks => fx}/ABCallbackGetLastCreatedLightningEffect.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{fxcallbacks => fx}/ABCallbackGetStoredFXByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{fxcallbacks => fx}/ABCallbackGetStoredLightningByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{fxcallbacks => fx}/ABCallbackInlineConditionFX.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{fxcallbacks => fx}/ABCallbackReuseFX.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{fxcallbacks => fx}/ABCallbackReuseFXWithArguments.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{fxcallbacks => fx}/ABFXCallback.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{fxcallbacks => fx}/ABLightningCallback.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackArgumentID.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetAbilityDataAsID.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetAbilityDataAsIDFromList.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetAbilityDataAsRandomIDFromList.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetAbilityUniqueValueId.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetAbilityUnitId.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetAlias.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetBuffAlias.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetBuffIdFromCode.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetCode.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetFirstBuffId.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetFirstEffectId.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetItemType.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetNonCurrentTransformType.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetParentAlias.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetSecondBuffId.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetStoredIDByKey.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetUnitType.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackGetWar3IDFromString.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackInlineConditionID.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackNullIfFalse.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackRandomItemId.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackRandomMechanicalCritterId.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackReuseID.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABCallbackReuseIDWithArguments.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{idcallbacks => id}/ABIDCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackAddInteger.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackAndInteger.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackArgumentInteger.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackCountBuffsOnUnitMatchingCondition.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackCountUnitsInRangeOfLocation.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackCountUnitsInRangeOfUnit.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackDetectionDropdownConversion.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackDivideInteger.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetAbilityCastTimeAsInteger.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetAbilityDataAsInteger.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetAbilityHandleAsInteger.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetAbilityManaCost.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetAbilityTargetAttachmentPoints.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetAbilityUniqueValueInteger.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetBuffHandleAsInteger.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetBuffUniqueValueInteger.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetCastId.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetIntegerFromList.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetItemCharges.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetItemLevel.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetItemMaxCharges.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetItemSlot.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetListSize.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetNeutralHostilePlayerId.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetNeutralPassivePlayerId.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetPlayerId.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetProjectileDestructableTargets.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetProjectileUnitTargets.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetSortableListSize.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetSpellLevel.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetStoredIntegerByKey.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetUnitGroupSize.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetUnitHandleAsInteger.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetUnitMaximumHp.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetUnitMaximumMp.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetUnitQueueSize.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetUnitTypeFoodCost.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetUnitTypeGoldCost.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetUnitTypeLumberCost.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackGetUnitTypeSpeed.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackInlineConditionInteger.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackIntegerIf.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackIntegerZeroIfFalse.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackIntegerZeroIfNull.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackIterator.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackMaxInteger.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackMinInteger.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackMultiplyInteger.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackOrInteger.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackPlayerToStateModValue.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackRandomInteger.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackRawInteger.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackReuseInteger.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackReuseIntegerWithArguments.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackSubtractInteger.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABCallbackTruncateFloatToInteger.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{integercallbacks => integers}/ABIntegerCallback.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABAbilityEffectReactionListenerCallback.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABAbilityProjReactionListenerCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABAttackPostDamageListenerCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABAttackPreDamageListenerCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABAttackProjReactionListenerCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABBehaviorChangeListenerCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetLastCreatedAbilityEffectReactionListener.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetLastCreatedAbilityProjReactionListener.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetLastCreatedAttackPostDamageListener.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetLastCreatedAttackPreDamageListener.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetLastCreatedAttackProjReactionListener.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetLastCreatedBehaviorChangeListener.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetLastCreatedDamageTakenListener.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetLastCreatedDamageTakenModificationListener.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetLastCreatedDeathReplacement.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetLastCreatedEvasionListener.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetLastCreatedUnitStateListener.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetStoredAbilityProjReactionListenerByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetStoredAttackPostDamageListenerByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetStoredAttackPreDamageListenerByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetStoredAttackProjReactionListenerByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetStoredBehaviorChangeListenerByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetStoredDamageTakenListenerByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetStoredDamageTakenModificationListenerByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetStoredDeathReplacementByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetStoredEvasionListenerByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABCallbackGetStoredUnitStateListenerByKey.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABDamageTakenListenerCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABDamageTakenModificationListenerCallback.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABDeathReplacementCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABEvasionListenerCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{listenercallbacks => listener}/ABUnitStateListenerCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackArgumentLocation.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackCreateLocationFromOffset.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackCreateLocationFromTarget.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackCreateLocationFromXY.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackCreateLocationFromXYOffset.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackGetAttackImpactLocation.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackGetAttackTargetLocation.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackGetGroundAttackedLocation.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackGetLocationFromList.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackGetProjectileCurrentLocation.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackGetStoredLocationByKey.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackGetTargetedLocation.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackGetUnitLocation.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackInlineConditionLocation.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackModifyLocationWithOffset.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackModifyLocationWithXYOffset.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackRandomLocationInRange.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackReuseLocation.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABCallbackReuseLocationWithArguments.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{locationcallbacks => location}/ABLocationCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackAddLong.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackAndLong.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackArgumentLong.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackCreateDetectedData.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackCreateDetectorData.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackCreateOwnershipData.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackDivideLong.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackGetAbilityDataAsLong.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackGetAbilityUniqueValueLong.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackGetBuffUniqueValueLong.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackGetStoredLongByKey.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackInlineConditionLong.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackMaxLong.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackMinLong.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackMultiplyLong.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackOrLong.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackPlayerMaskAllPlayers.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackPlayerMaskExcludePlayers.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackPlayerMaskIncludePlayers.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackRawLong.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackReuseLong.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackReuseLongWithArguments.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABCallbackSubtractLong.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{longcallbacks => longs}/ABLongCallback.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statbuffcallbacks => statbuff}/ABCallbackArgumentNonStackingStatBuff.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statbuffcallbacks => statbuff}/ABCallbackGetLastCreatedNonStackingStatBuff.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statbuffcallbacks => statbuff}/ABCallbackGetStoredNonStackingStatBuffByKey.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statbuffcallbacks => statbuff}/ABCallbackInlineConditionNonStackingStatBuff.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statbuffcallbacks => statbuff}/ABCallbackReuseNonStackingStatBuff.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statbuffcallbacks => statbuff}/ABCallbackReuseNonStackingStatBuffWithArguments.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statbuffcallbacks => statbuff}/ABNonStackingStatBuffCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statemodcallbacks => statemod}/ABCallbackArgumentStateModBuff.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statemodcallbacks => statemod}/ABCallbackGetLastCreatedStateModBuff.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statemodcallbacks => statemod}/ABCallbackGetStoredStateModBuffByKey.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statemodcallbacks => statemod}/ABCallbackInlineConditionStateModBuff.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statemodcallbacks => statemod}/ABCallbackReuseStateModBuff.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statemodcallbacks => statemod}/ABCallbackReuseStateModBuffWithArguments.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{statemodcallbacks => statemod}/ABStateModBuffCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackArgumentString.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackBooleanToString.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackCatStrings.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackFloatToString.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackGetAbilityDataAsString.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackGetAbilityHandleAsString.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackGetAbilityUniqueValueString.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackGetAliasAsString.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackGetAllowStackingKey.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackGetBuffHandleAsString.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackGetBuffUniqueValueString.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackGetCodeAsString.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackGetStoredStringByKey.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackGetUnitHandleAsString.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackIdToString.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackInlineConditionString.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackIntegerToString.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackLongToString.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackRawString.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackReuseString.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABCallbackReuseStringWithArguments.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{stringcallbacks => strings}/ABStringCallback.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{targetcallbacks => target}/ABCallbackArgumentTarget.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{targetcallbacks => target}/ABCallbackGetAbilityTarget.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{targetcallbacks => target}/ABCallbackGetStoredTargetByKey.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{targetcallbacks => target}/ABCallbackInlineConditionTarget.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{targetcallbacks => target}/ABCallbackReuseTarget.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{targetcallbacks => target}/ABCallbackReuseTargetWithArguments.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{targetcallbacks => target}/ABTargetCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{timercallbacks => timer}/ABCallbackArgumentTimer.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{timercallbacks => timer}/ABCallbackGetFiringTimer.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{timercallbacks => timer}/ABCallbackGetLastCreatedTimer.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{timercallbacks => timer}/ABCallbackGetLastStartedTimer.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{timercallbacks => timer}/ABCallbackGetStoredTimerByKey.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{timercallbacks => timer}/ABCallbackInlineConditionTimer.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{timercallbacks => timer}/ABCallbackReuseTimer.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{timercallbacks => timer}/ABCallbackReuseTimerWithArguments.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{timercallbacks => timer}/ABTimerCallback.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackArgumentUnit.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetAbilityPairedUnit.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetAbilityTargetedUnit.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetAttackedUnit.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetAttackingUnit.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetBuffCastingUnit.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetBuffedUnit.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetCastingUnit.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetChainUnit.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetCompUnit1.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetCompUnit2.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetDamagedUnit.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetDamagingUnit.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetDyingUnit.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetEnumUnit.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetKillingUnit.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetLastCreatedUnit.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetListenerUnit.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetMatchingUnit.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetNearestCorpseInRangeOfUnit.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetNearestUnitInRangeOfUnit.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetParentCastingUnit.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetProjectileHitUnit.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetProjectileSourceUnit.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetReactionAbilityCastingUnit.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetReactionAbilityTargetUnit.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackGetStoredUnitByKey.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackInlineConditionUnit.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackPollUnitQueue.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackReuseUnit.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABCallbackReuseUnitWithArguments.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitcallbacks => unit}/ABUnitCallback.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitgroupcallbacks => unitgroup}/ABCallbackArgumentUnitGroup.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitgroupcallbacks => unitgroup}/ABCallbackGetLastCreatedUnitGroup.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitgroupcallbacks => unitgroup}/ABCallbackGetStoredUnitGroupByKey.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitgroupcallbacks => unitgroup}/ABCallbackGetUnitGroupByName.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitgroupcallbacks => unitgroup}/ABCallbackInlineConditionUnitGroup.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitgroupcallbacks => unitgroup}/ABCallbackReuseUnitGroup.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitgroupcallbacks => unitgroup}/ABCallbackReuseUnitGroupWithArguments.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/{unitgroupcallbacks => unitgroup}/ABUnitGroupCallback.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{unit => cost}/ABConditionSuccessfullyChargeResources.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{unittype => location}/ABConditionIsLocationPathableForUnitType.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{ => membership}/ABConditionIsUnitInGroup.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{ => membership}/ABConditionIsUnitInRangeOfUnit.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{ => membership}/ABConditionMatchingCorpseExistsInRangeOfUnit.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{ => membership}/ABConditionMatchingUnitExistsInRangeOfUnit.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{ => targeting}/ABConditionIsDestructableValidTarget.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{ => targeting}/ABConditionIsPassAllAbilityTargetChecks.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{ => targeting}/ABConditionIsUnitPassAllAbilityTargetChecks.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{ => targeting}/ABConditionIsUnitValidTarget.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{ => targeting}/ABConditionIsValidTarget.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{ability => uniqueflag}/ABConditionDoesAbilityHaveUniqueFlag.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/{buff => uniqueflag}/ABConditionDoesBuffHaveUniqueFlag.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => ability}/ABConditionDoesUnitHaveAbilityMatchingCondition.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => alliance}/ABConditionIsUnitEnemy.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => alliance}/ABConditionIsUnitFriend.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => alliance}/ABConditionIsUnitShareSpells.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => buff}/ABConditionDoesUnitHaveBuff.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => buff}/ABConditionDoesUnitHaveBuffMatchingCondition.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => classification}/ABConditionIsUnitBuilding.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => classification}/ABConditionIsUnitHero.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => classification}/ABConditionIsUnitHeroDuration.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => classification}/ABConditionIsUnitHidden.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => classification}/ABConditionIsUnitMagicImmune.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => classification}/ABConditionIsUnitMorphImmune.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => classification}/ABConditionIsUnitSummoned.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => state}/ABConditionIsUnitAlive.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => state}/ABConditionIsUnitDead.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => state}/ABConditionIsUnitMaxHp.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => state}/ABConditionIsUnitMaxMp.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => state}/ABConditionIsUnitPolymorphed.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => state}/ABConditionIsUnitSleeping.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => state}/ABConditionIsUnitUpgrading.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => state}/ABConditionIsUnitVisible.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => tech}/ABConditionIsUnitConstructing.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => tech}/ABConditionIsUnitConstructingOrUpgrading.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => tech}/ABConditionIsUnitTraining.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/{ => tech}/ABConditionUnitHasResearch.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/{ => defaultbuffs}/ABBuffSlow.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/{ => defaultbuffs}/ABBuffStun.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/{ => subfields}/AbilityBuilderOverrideFields.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/{ => subfields}/AbilityBuilderParserTemplateFields.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/{ => subfields}/AbilityBuilderSpecialConfigFields.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/{ => subfields}/AbilityBuilderSpecialDisplayFields.java (94%) diff --git a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json index e795ab446..dee809d16 100644 --- a/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json +++ b/core/assets/abilityBehaviors/AttackReplacementPassivesNonItemLowPriority.json @@ -1272,7 +1272,7 @@ "type": "getAttackType" }, "damageType": { - "type": "getDamageType" + "type": "getAttackDamageType" }, "fullDamage": { "type": "getAbilityDataAsFloat", @@ -1416,7 +1416,7 @@ "type": "getAttackType" }, "damageType": { - "type": "getDamageType" + "type": "getAttackDamageType" }, "fullDamage": { "type": "getAbilityDataAsFloat", @@ -1530,7 +1530,7 @@ "condition": { "type": "isWeaponTypeEqual", "weaponType1": { - "type": "getWeaponType" + "type": "getAttackWeaponType" }, "weaponType2": { "type": "getWeaponTypeFromString", @@ -1575,7 +1575,7 @@ "value": "damT" }, "valueToStore": { - "type": "getDamageType" + "type": "getAttackDamageType" } },{ "type": "storeValueLocally", diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java index 6ba27a6e1..345612011 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java @@ -30,8 +30,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABTargetTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABTargetTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java index 32503a989..b2e215bce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java @@ -15,7 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractGenericNoIconAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java index c6bec5361..8fdc1e244 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java index 4fbf9a4eb..beca2653d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAttemptToApplyEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityRunEndCastingActions.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityRunEndCastingActions.java index 6d830665e..95bfc67df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRunEndCastingActions.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityRunEndCastingActions.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java index 1d5590711..89831f9f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddNewAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddNewAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java index 30345ef6c..3543de8e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddNewAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddRallyAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddRallyAbility.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddRallyAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddRallyAbility.java index 2f01e9432..f9f50a20d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddRallyAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddRallyAbility.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCleanUpCastInstance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCleanUpCastInstance.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCleanUpCastInstance.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCleanUpCastInstance.java index f2f5c3a0c..f609212f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCleanUpCastInstance.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCleanUpCastInstance.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import java.util.HashSet; import java.util.Set; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java index 753e9ae45..076625cee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java index bdb2f82b8..165249189 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java index 4a5b048fe..6ecafeeeb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionCreateAbilityFromId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java index dbb1d9250..c0d08b789 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionPrepUnownedAbilityForUse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveAbility.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveAbility.java index c2aa9add5..f7cd47953 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionRemoveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveAbility.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java index bdf4d40bd..f59b06143 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java index 1a81ad1c4..9996626e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java index 2cc12510a..c7258ef3c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java index 8e593e8fc..a6575e273 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilitySetShowIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java index dcabfb6eb..2cc35f5f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; import java.util.EnumSet; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java index b8ef58438..41d723f87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbilityById.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java index 5c4a04843..b1ff8e8b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDisableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java index 57bd94970..09582d61e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbilityById.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java index 362f2b9cd..8247671b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionEnableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java index 672d9c088..5fa53b9b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; import java.util.EnumSet; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java index 932cd6e3c..7ba2d5507 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java index 41ad80365..da17e8f69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java index 30eab19f0..657f49f94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetAutoTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java index 20245e6f9..5cb9bfb86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSetPreventEndEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionAddAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionAddAttackModifier.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionAddAttackModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionAddAttackModifier.java index 90d63d683..df9011bfa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionAddAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionAddAttackModifier.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java index 3e1b3500c..6a01b7f51 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionCreateAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java index 9442a6433..8d5a82eae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionFireModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java index 4c272692b..3906cb95d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionRemoveAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java index 2022b0790..688740903 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/ABActionStartModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorAttackListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java index bda950ef3..62e4bdce4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java index 5017f5369..0fdae038c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java index df7d29085..9f3227b28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierAddPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java index 9bbef1ca4..a395f97d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyAllArtFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java index b0f45d099..3742c93b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java index f77c0a665..13dceb002 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyArtAndSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java index 8fb776ed9..e6b56cfc3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierApplyDefaultSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java @@ -1,5 +1,5 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java index ce1e73df4..698876ce8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java @@ -1,5 +1,5 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java index ecb853d9e..964b45e9c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java @@ -1,5 +1,5 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java index 5147d234c..7500b001a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemoveAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java index 929c0b610..344e6ec05 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java index 92e64c7c9..3525fd86c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierRemovePreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java index 04c6d2f91..0a3defadf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackArc.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java index fcb5ff43f..87fb52aec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackDeathTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java index 0aa3e3598..dcdca45f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java index 88a5a4a3f..a79cadcfc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackImpactZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java index de6224bbd..19b2431d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetAttackStartZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java index dd285eb0b..87611a2f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABActionAttackModifierSetSplashFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java index 7331fc9db..092b3e691 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java index db0890fd9..bcbe64575 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java index 9f4dd4469..028c48d73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attack/internal/ABCallbackGetModifiedAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java index 487970ce6..a577d8964 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java index 4806377d0..94735dbdf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionChangeAttackActionToMovement.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionChangeAttackActionToMovement.java index 5b80600af..74ed8061e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionChangeAttackActionToMovement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionChangeAttackActionToMovement.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorNextBehaviorVisitor; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java index 8739a030f..aba575ebb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionForceBeginCreatedBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java index d96e47d4f..eaaac593d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java index e91ce7907..0b4cd15c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java index e8c4380e2..045fabde6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuffSlow; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs.ABBuffSlow; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java index 1439579f9..bf6f2d0eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionAddStunBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuffStun; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs.ABBuffStun; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java index 65ccf2347..364f63355 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java index 5cd6797b8..b80f76ec4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTargetingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java index 84d72af39..eb3830b9b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -6,10 +6,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedArtBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java index 12d5294f5..9718b7ca2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java index 665f6926a..5e22631c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.util.CBuffTimedLife; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java index 167630789..5056d0be7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedPausedExpirationBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java index f9b3b5537..d565254a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java @@ -6,10 +6,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTargetingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java index 4877991c8..efb964cc4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java index 415cba55c..554021682 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPausedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java index 7daf66e07..114091da9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPostDeathBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java index 8ba7fa66f..3c6bc24bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDispelBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java index c7f18e1da..ddb143e31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java index 5fae71a26..295e09c69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java index 145644da1..92dc42ae4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java index c1c9039b5..474d81e91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageAttackSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java index f02fd775d..eb4dd67f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageBurst.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java index a5cef0822..b4393f4ed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java index 5cf208550..27205f394 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHeal.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHeal.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java index a744c35e2..89fa29406 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHeal.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionDeleteStoredKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionDeleteStoredKey.java index eebacf4dc..b3721a726 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ABActionDeleteStoredKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionDeleteStoredKey.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.datastore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionStoreValueLocally.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionStoreValueLocally.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java index 8e582c655..2e4eccd60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionStoreValueLocally.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.datastore; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java index 4c3955f8e..73d0b9d1e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java @@ -5,11 +5,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java index cee2156b8..a4040d27c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionAddDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionAddDestructableBuff.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionAddDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionAddDestructableBuff.java index 78167f085..8c99ab5a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionAddDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionAddDestructableBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructablebuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java index e9d511c5a..1aee785e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructablebuff; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java index 13c794dad..06c04654a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDispelDestructableBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructablebuff; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java index 11809ccbe..3523f2e4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructablebuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java index 67c9fbdfb..956b18197 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java index 8ddc033ea..c72701309 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks.ABTimeOfDayEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java index 6581dc076..94631a565 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks.ABTimeOfDayEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java index cf983d0ae..6d6a99511 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks.ABTimeOfDayEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java index 9d23e40cf..269cdf7f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks.ABWidgetEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent.ABWidgetEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java index 392156481..ec74c36f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks.ABWidgetEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent.ABWidgetEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java index 68f843ca7..8cabb1195 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java index 895c5781d..69ff293a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java index a64fbc868..15dbb9cfe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java index 2adcb2cf6..82f1eed7f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java index bbe8dd547..57874c717 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java index 0218655be..d420357e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java @@ -4,9 +4,9 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java index 2bb665d94..a9df24668 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java index fdd9aaf4a..ded17d489 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java index e1f67b58e..d96a577bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks.ABFXCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx.ABFXCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java index aebd9c639..315ddf5af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateGroupEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.group; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java index ca923b021..be9993d14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.lightning; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java index d1a3dd290..6c76761b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.lightning; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks.ABLightningCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx.ABLightningCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java index f5b84288f..b05fc27fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.sound; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java index d81c11441..fb8b52fd6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateLoopingSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.sound; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java index 322dbc8bf..8d2d256b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.sound; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java index 77a2a5589..21edad3a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.sound; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java index ad859f92d..777ed6a5a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateUberSplat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.splat; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainBowlAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainBowlAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java index baca1de96..e826f6be8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainBowlAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.terrain; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java index de5417585..5c3b18514 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainRippleAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.terrain; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java index 42810c78e..2a9f66c66 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTerrainWaveAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.terrain; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java index a39239204..57f812d96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionModifyTerrainVertex.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.terrain; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java index 5bed1c73e..6c2ff4508 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java index b4098b946..78073be4f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java index 584ddcd66..d32f585d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionIterateDestructablesInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionIterateDestructablesInRangeOfLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java index 47bfda491..44ce0f878 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionIterateDestructablesInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.destructable; import java.util.ArrayList; import java.util.List; @@ -11,8 +11,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructableEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java index 53dce1ee5..fefcd92a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -9,7 +9,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java similarity index 99% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInQueue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java index e78d21652..ebeab836f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java index 118e27160..df35d0e61 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -10,8 +10,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java index 6a7b15fee..eecf57131 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -10,9 +10,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java index fdf7a2e2a..4b408fe8a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -9,8 +9,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java index 931031a70..afc0d51e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -9,9 +9,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java index a16e1fb9c..8f04382bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIterateUnitsInRect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java index d99cd58d2..b4a7cfa31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java @@ -3,7 +3,7 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java index 2241dbc87..71c1990b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java @@ -4,9 +4,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java index 69e0771d8..882d75b1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java @@ -3,7 +3,7 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionIssueStopOrder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/order/ABActionIssueStopOrder.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionIssueStopOrder.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/order/ABActionIssueStopOrder.java index 4b5b3bbd3..f7a6e9f2f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionIssueStopOrder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/order/ABActionIssueStopOrder.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.order; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java index c27b329f7..c97d809a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java index 327e3494f..4b56157e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java index 080fc2d39..567ff6cae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java index e6ba33be1..666e9be36 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java @@ -6,11 +6,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java index 53a85be3b..e4aa25cba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java @@ -8,12 +8,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java index 9fb0c6f6f..e7a8d240e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java @@ -14,12 +14,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.ABAttackSettingsCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java index 3be33adf3..f3ccce3c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java index 77438e007..56b0fed52 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java @@ -6,11 +6,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.ABAttackSettingsCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java index 78efc6aff..d324fff43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java index f3547c590..b490774d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java index 6ee290a3e..378b7f593 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java index 1f69e512f..eb5a80499 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java index c04180090..9de562f4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityEffectReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityEffectReaction.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java index d817cbe8f..85928fb35 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityEffectReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.reaction; import java.util.List; @@ -6,7 +6,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityProjReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityProjReaction.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityProjReaction.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityProjReaction.java index 9d4c407d5..777eabe51 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCheckAbilityProjReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityProjReaction.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.reaction; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java index 9179719e8..284f0af87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java index 134978641..65e625238 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java index 1b7fb5833..5f4db8287 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABNonStackingStatBuffTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABNonStackingStatBuffTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java index 484c00d6f..be87faf94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABNonStackingStatBuffTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABNonStackingStatBuffTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java index 70db204e7..ee531cbb7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java index 7dc625dc1..c26dae6ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java index 04267470a..504d35a56 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java index faf6b931b..b94c74e87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java @@ -9,11 +9,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java index b598f36c5..53b71d667 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java index bea52dec4..f2c0fef31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java index bfcb38cc5..e77ff588d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java index f6c3e0d1b..8a9b161a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java index a4e4dbf5d..1912a01d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java index 0ae212259..969de311c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java index 7d8e70cac..1896efff0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java index 1d86732a4..68cb30a67 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java index efa1a5b8f..6fe9c1348 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java index 8ae16520d..abe632d12 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java index efe56d8fe..ab286d93d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java index 757408e44..af2bf2168 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityAddUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniqueflag; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java index 30666f6fa..c89d1c088 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniqueflag; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java index d52d86b7a..3edfdec34 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffAddUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniqueflag; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java index a0279cf2a..07ad57626 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniqueflag; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java index 29bab45e3..16f004f3f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityRemoveUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniquevalue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java index 0b6063790..38a4eff8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilities/ABActionAbilityStoreUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniquevalue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java index 04eb11c7e..78975669d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffRemoveUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniquevalue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java index 3975b9c1f..65a76182e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionBuffStoreUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniquevalue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java index 2a7222ff4..8d7485ad8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java @@ -5,10 +5,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitClassification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java index 055f5f0e8..98b96a80d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java index 6856f13d0..1eacc4847 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java index 33067dcc7..8317abb28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java index 3f870a3f8..d85291740 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java index e0f0a06e7..1968b48bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java index a5860a9f8..737e02e7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java index ef732bed8..29ba4c866 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java index 701a4b12d..39a3e5b79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java index 602afa014..38f9848dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java index 757861dfd..339db9f95 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java index c95b1463e..3ea4ee83c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java index 0f0141165..41e31926b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java index 822758341..1f1bdb8ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java index 904cfccc6..37d531eb3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitScale.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitScale.java index 320ee763a..96a6aab9b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMultiplyUnitScale.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitScale.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java index 5d9cec697..b563418e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java index f177fd95d..ddf13421a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java index c0a911d6f..ed7dd015d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddMp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java index 6f15f8d70..b02755d01 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionAddMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetHp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java index 4f15b3672..f5e17cd76 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetMp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java index 2d5dbdc41..6156f0ea0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetSpeed.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetSpeed.java index 07ae480ec..3ddbe943b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetSpeed.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java index d63f5f735..66676a06a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSubtractMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMergeUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMergeUnits.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java index 151d059d5..3a12109f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionMergeUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java index 8cbebcea7..d35f3a2d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; import java.util.List; @@ -8,10 +8,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorFinishTransformation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java index 1858e1a20..3453fd1df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitAppearance.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java index 043f0e75d..9e36df12e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformUnitInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; import java.util.List; @@ -6,10 +6,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java index b28216b1a..2349f8029 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; import java.util.List; @@ -7,10 +7,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java index b47a0925e..77bd03964 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionTransformedUnitAbilityRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; import java.util.List; @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDisableWorkerAbilities.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDisableWorkerAbilities.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java index e56d10905..a12617e9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionDisableWorkerAbilities.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.worker; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -15,7 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityAcolyteHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityWispHarvest; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionEnableWorkerAbilities.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionEnableWorkerAbilities.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java index 9aea0b4a2..1bdf58089 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionEnableWorkerAbilities.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.worker; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -15,7 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityAcolyteHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityWispHarvest; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionInstantReturnResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionInstantReturnResources.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionInstantReturnResources.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionInstantReturnResources.java index 3880bbd1a..09c56bfc4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionInstantReturnResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionInstantReturnResources.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.worker; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityHarvest; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSendUnitBackToWork.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionSendUnitBackToWork.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSendUnitBackToWork.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionSendUnitBackToWork.java index 927d48393..65def3e38 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSendUnitBackToWork.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionSendUnitBackToWork.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.worker; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java index 4bc14c026..4af3dd0b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java index ce2c8c867..e88480b82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java index 37d8925d3..b52698f47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java similarity index 79% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPreDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java index bba1cdc18..428ec5f52 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackPreDamageListenerPriorityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackPreDamageListenerPriorityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java index 9d2f10632..253863eee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPreDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java index 6f50a88c8..8ac83b30e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java index cbf0d3f63..855394b79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPostDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java similarity index 79% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java index a2d555925..bcc5574aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackPreDamageListenerPriorityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackPreDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackPreDamageListenerPriorityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java index 21202e03b..4700c1cf9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java index c7d657498..7589b5984 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerAddDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java index b1bedf373..c307fde38 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerLockDamageModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java @@ -1,5 +1,5 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java index d693fb5c4..cf77f9f07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionPreDamageListenerSetMiss.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java index 1d6a793f6..256187a9c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSetPreDamageStacking.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java index e46040242..faca6dd39 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackBaseDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java similarity index 79% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java index c63fe9f94..91d9b9460 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; -public class ABCallbackGetDamageType extends ABDamageTypeCallback { +public class ABCallbackGetAttackDamageType extends ABDamageTypeCallback { @Override public CDamageType callback(CUnit caster, LocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java index 47e4e0339..c0265b8f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackMaximumSplashRadius.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java index 9fd81598f..543adcf5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java similarity index 79% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java index 4e3225522..923b01610 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; -public class ABCallbackGetWeaponType extends ABWeaponTypeCallback { +public class ABCallbackGetAttackWeaponType extends ABWeaponTypeCallback { @Override public CWeaponType callback(CUnit caster, LocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java index a4259710e..7eb90dbf2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackArtillery.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java index ab83eddcd..a4e8a053d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java index 184780ecc..e06de7ea9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsUnitValidSplashDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcondition; import java.util.EnumSet; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddBehaviorChangeListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java index 4b047efe7..d2cf315e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABBehaviorChangeListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABBehaviorChangeListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateBehaviorChangeListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java index 831db1546..001b5557c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveBehaviorChangeListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java index 567f68d3d..9892690c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABBehaviorChangeListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABBehaviorChangeListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetNewBehaviorTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetNewBehaviorTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java index 1ba123d58..e696a982d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetNewBehaviorTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks.ABTargetCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target.ABTargetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java index 9fb6d2122..556a05f7c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsNewBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior.internalcondition; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java index a8e767638..003962ae7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenModificationListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java index 99e3a9818..40cf02a97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenModificationListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenModificationListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java index a367958b2..77e80f79e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenModificationListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java index 052fce4ba..9e1d235fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java index 8104e93a8..729ca7d1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java index a7b87b5a4..5ad2a0a91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDamageTakenModificationListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenModificationListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java index 1c5161653..471ad4660 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationMultiplyDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java index e1347cb99..59a62bda3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDamageTakenModificationSetDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java index 3be2051ba..99d2e63c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageAnAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalcondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java index 79112716f..4b2af2a17 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalConditions/ABConditionIsTriggeringDamageRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalcondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java similarity index 79% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDeathReplacementEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java index bbe0063f2..38f9b1317 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDeathReplacementPriorityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDeathReplacementCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDeathReplacementPriorityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDeathReplacementCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDeathReplacementEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java index 629cad50b..8f5adf57d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java similarity index 79% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDeathReplacementEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java index 32e58fa48..73582bcdc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDeathReplacementPriorityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABDeathReplacementCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDeathReplacementPriorityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDeathReplacementCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementFinishReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementFinishReincarnating.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java index 895373523..70555465a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementFinishReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java @@ -1,5 +1,5 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReincarnating.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java index 06d7257a3..d3ae32cb2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java @@ -1,5 +1,5 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java index 37c7f94f1..3dcf8b550 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionDeathReplacementSetReviving.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java @@ -1,5 +1,5 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddEvasionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java index 8c0f0fdb9..b8718edfe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.evasion; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABEvasionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABEvasionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateEvasionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java index 01244132d..f3342808b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.evasion; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java index c7b784630..287d5971a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.evasion; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABEvasionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABEvasionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityEffectReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java index 6fa5adb4f..0aaeed5bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityEffectReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityEffectReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityProjReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java index aebf1b7cb..94ecdf355 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityProjReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityProjReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackProjReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java index bd4b476c0..2f807161d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackProjReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackProjReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityEffectReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java index dd134ad05..6eeb0951e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityProjReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java index 75bae8c56..c45a3ad1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackProjReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java index 3243092c5..c4079b058 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityEffectReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java index 3bcfaf104..155bb5120 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityEffectReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityEffectReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityProjReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java index 3857e8073..520acc0fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAbilityProjReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityProjReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackProjReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java index 088f358ff..f4f070098 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABAttackProjReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackProjReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionReactionPreventHit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionReactionPreventHit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java index d0c3732b7..9f45b5ba5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionReactionPreventHit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java @@ -1,5 +1,5 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileAttackType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java index f50e58343..fa267555c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileDamage.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java index 41448d2fc..8aeb7196e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetReactionAttackProjectileDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java index daaa1b78b..974f26fb0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalActions/ABActionSubtractTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java @@ -1,13 +1,20 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalactions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; +/* + * This can technically be called in any of: + * EvasionListener, PostDamageListener, PreDamageListener, DamageTakenListener, DamageTakenModificationListener + * Though note that the PostDamageListener and DamageTakenListener happen after the damage is dealt to the unit. + * + * It's really meant for PreDamageListener and DamageTakenModificationListener + */ public class ABActionSubtractTotalDamageDealt implements ABAction { private ABFloatCallback amount; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetFinalTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetFinalTotalDamageDealt.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java index 5063f48b9..ecffa99a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetFinalTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java @@ -1,11 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; +/* + * This can technically be called in any of: + * EvasionListener, PostDamageListener, PreDamageListener, DamageTakenListener, DamageTakenModificationListener + * + * It's really meant for DamageTaken or PostDamage, as in other cases may expect other changes to be made after + */ public class ABCallbackGetFinalTotalDamageDealt extends ABFloatCallback { @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java index 1e7d89392..5a8773683 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetRawTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java @@ -1,11 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; +/* + * This can technically be called in any of: + * EvasionListener, PostDamageListener, PreDamageListener, DamageTakenListener, DamageTakenModificationListener + * + * It's really meant for PreDamage or DamageTakenModification, when modifying the base damage (think mana shield) + */ public class ABCallbackGetRawTotalDamageDealt extends ABFloatCallback { @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java similarity index 74% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java index 9827f291c..f780b5edc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java @@ -1,12 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; +/* + * This can technically be called in any of: + * EvasionListener, PostDamageListener, PreDamageListener, DamageTakenListener, DamageTakenModificationListener + * + */ public class ABCallbackGetTriggeringAttackType extends ABAttackTypeCallback { @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java similarity index 74% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java index fffb4ec54..17c27d61e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/internalCallbacks/ABCallbackGetTriggeringDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java @@ -1,12 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; +/* + * This can technically be called in any of: + * EvasionListener, PostDamageListener, PreDamageListener, DamageTakenListener, DamageTakenModificationListener + * + */ public class ABCallbackGetTriggeringDamageType extends ABDamageTypeCallback { @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java index 375595bed..c9ff3a6ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionAddUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.state; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABUnitStateListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABUnitStateListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java index b44eea6cc..cdd37f635 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionCreateUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java @@ -1,5 +1,5 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.state; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java index ac9b5256a..b9d829bc0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/ABActionRemoveUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.state; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.ABUnitStateListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABUnitStateListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java index 3e897be48..5f542c228 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java index a079a8f88..ad9ed817a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java index 979127888..7b60db40e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java @@ -2,8 +2,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java index aaf9413ae..bc5980719 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java @@ -2,7 +2,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.ABLongCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.ABLongCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java index 902280bdf..0b67b5e98 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java @@ -2,8 +2,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java index c4abb0564..2e67dcc4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java index 9e28ca0f8..443ad92f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java @@ -2,8 +2,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.ABLongCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.ABLongCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java index 1e1a43703..74d546d3e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java index 3888ec84d..a674a3eee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java index e7e6e9a97..461f4c2a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java @@ -1,9 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABAbilityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABAbilityCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABAbilityCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABAbilityCallback.java index cd2659115..a28ff5e3e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABAbilityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABAbilityCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java index fe75c16b1..d15c1700e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackArgumentAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java index e05fb30be..df47ae3c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityById extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java index 94cc051c1..5797f2ee4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetBuffSourceAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffSourceAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetLastCreatedAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetLastCreatedAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java index 00052befe..5c8449beb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetLastCreatedAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java index 0c71b01f3..e36afdd87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetMatchingAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetPartnerAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetPartnerAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java index 2dded676e..738ef0fd5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetPartnerAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetReactionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetReactionAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java index 9751e5680..6d1672867 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetReactionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetStoredAbilityByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetStoredAbilityByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java index 9620c1a0f..d0669f104 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetStoredAbilityByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java index b01730bee..6c4acb934 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackGetThisAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java index 31f58a73b..6d78f8f8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackInlineConditionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java index 3314f43b5..1c6196f82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbilityWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbilityWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java index 85fb5ac55..ac368df08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/abilitycallbacks/ABCallbackReuseAbilityWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; import java.util.Map; @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java index 54f5c6e27..afa1f31ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java index a02a4d1d3..4d082f44b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABBooleanCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABBooleanCallback.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABBooleanCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABBooleanCallback.java index 6dfdb80d7..005706436 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABBooleanCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABBooleanCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityDataAsBoolean.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityDataAsBoolean.java index d2b05fe2d..49f348436 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityDataAsBoolean.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityUniqueValueBoolean.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityUniqueValueBoolean.java index 5442a8775..90e6d37ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetAbilityUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityUniqueValueBoolean.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetBuffUniqueValueBoolean.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetBuffUniqueValueBoolean.java index fe51ccae3..1941adb50 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetBuffUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetBuffUniqueValueBoolean.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffUniqueValueBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetParentAbilityDataAsBoolean.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetParentAbilityDataAsBoolean.java index afc598163..7e8f32459 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetParentAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetParentAbilityDataAsBoolean.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetStoredBooleanByKey.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetStoredBooleanByKey.java index db69c9733..23dc92a59 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackGetStoredBooleanByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetStoredBooleanByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackInlineConditionBoolean.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackInlineConditionBoolean.java index 6803f951a..6fe28024c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackInlineConditionBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackInlineConditionBoolean.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackIntegerToBoolean.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackIntegerToBoolean.java index 74bc000f8..3fc83e3dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackIntegerToBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackIntegerToBoolean.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackRawBoolean.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackRawBoolean.java index a34e0a3be..50c979d5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleancallbacks/ABCallbackRawBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackRawBoolean.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABBuffCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABBuffCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABBuffCallback.java index 1194537d8..a62f65ccc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABBuffCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java index 28056c226..a82241058 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackArgumentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java index 51bd63229..fa994e214 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackEnumBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetBuffById.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetBuffById.java index 53c5d7315..484c1c899 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetBuffById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetBuffById.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffById extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetLastCreatedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetLastCreatedBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java index dabdab1bf..47ebe1d8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetLastCreatedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java index cb4f19c2d..90d980c23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetMatchingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetStoredBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetStoredBuffByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java index e6cfd8d58..a60ac379b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackGetStoredBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java index eb00a0086..5dfb73f13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackInlineConditionBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java index 372d7febd..d19bcc47c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java index 7674eb6b5..6c2146d92 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackReuseBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; import java.util.Map; @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackThisBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackThisBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java index edc839f62..e05908780 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buffcallbacks/ABCallbackThisBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java index edec21910..8a8102021 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java index 09a1b7f71..72713a893 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java index a8609c128..8a4571db7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java index cc62a8aba..79a1e97c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java index 28e4ff310..59f560912 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java index 9b98f9476..c6b6ef7b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java index c209f3355..32944704b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java index c31a7f15b..c5b2f28c3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackPreDamageListenerPriorityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackPreDamageListenerPriorityCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java index e73078332..d6bc7ae14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackPreDamageListenerPriorityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackTypeCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackTypeCallback.java index 1aae734f4..4fb9a21ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAttackTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackTypeCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAutocastTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAutocastTypeCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAutocastTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAutocastTypeCallback.java index e01508e99..b41d4e7f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABAutocastTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAutocastTypeCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java index 3a499dab8..38f7421db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackConditionalAutocastType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAttackTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAttackTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java index 8a7c87613..4188f49ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAttackTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAutocastTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAutocastTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java index 3e0f408c6..96305d571 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetAutocastTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAutocastTypeFromString extends ABAutocastTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDamageTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDamageTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java index 588d28f02..6f928a8d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDamageTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABCallbackRawString; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABCallbackRawString; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java index 5344906a7..ca7ab37b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetDefenseTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java index afa395111..b1cca5ed2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetMovementTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetMovementTypeFromString extends ABMovementTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetNonStackingStatBuffTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetNonStackingStatBuffTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java index 42738da06..3d8239752 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetNonStackingStatBuffTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABCallbackRawString; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABCallbackRawString; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java index 7dfffb40e..0224644d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredAttackTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java index 088c1eb60..dd20f9e0d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDamageTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java index e8533a139..74ebf5c5e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredDefenseTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java index 8b3c3a38e..7340a62f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredMovementTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java index 9b4c2183f..b18005389 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredTargetTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java index 258fd2442..3f99a8ada 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetStoredWeaponTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java index 77c1be20e..8cf57ef4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetTargetTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitDefenseType.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitDefenseType.java index 773936441..a9b56b95f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitDefenseType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitDefenseType.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitMovementType.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitMovementType.java index 42ac0dcdd..abc395435 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitMovementType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitMovementType.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitMovementType extends ABMovementTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java index b6bca1c9b..6e50e0122 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetUnitTypeMovementType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitTypeMovementType extends ABMovementTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java index 61f1f5b1d..bb84fc243 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackGetWeaponTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABCallbackRawString; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABCallbackRawString; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawDeathEffectPriority.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawDeathEffectPriority.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java index 8f29af937..f74ffc5d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawDeathEffectPriority.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawPreDamageListenerPriority.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawPreDamageListenerPriority.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java index 1de922372..d8249bb6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawPreDamageListenerPriority.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawTargetType.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawTargetType.java index f1821e1df..eb081641e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawTargetType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawTargetType.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawWeaponType.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawWeaponType.java index 194d7b9ae..fa83f6643 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABCallbackRawWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawWeaponType.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDamageTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDamageTypeCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDamageTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDamageTypeCallback.java index 1754e4600..69d5123a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDamageTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDamageTypeCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDeathReplacementPriorityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDeathReplacementPriorityCallback.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDeathReplacementPriorityCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDeathReplacementPriorityCallback.java index a57cde7c3..c5298d79f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDeathReplacementPriorityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDeathReplacementPriorityCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDefenseTypeCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDefenseTypeCallback.java index bf18fbdad..0845217ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABDefenseTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDefenseTypeCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABMovementTypeCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABMovementTypeCallback.java index 69af8474c..e614ae5b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABMovementTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABMovementTypeCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABNonStackingStatBuffTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABNonStackingStatBuffTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java index 2355b9651..e63106c23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABNonStackingStatBuffTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABTargetTypeCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABTargetTypeCallback.java index 30cce0f97..6f5b59872 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABTargetTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABTargetTypeCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABWeaponTypeCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABWeaponTypeCallback.java index 684dc8521..49b65e3ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enumcallbacks/ABWeaponTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABWeaponTypeCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java index c5dfd0fe7..989c2e30b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackArgumentTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetLastCreatedTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetLastCreatedTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java index d561bae2e..934ff8956 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetLastCreatedTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetStoredTimeOfDayEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetStoredTimeOfDayEventByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java index 2a2c6c7a3..1fca2dd22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackGetStoredTimeOfDayEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java index 5b7b76e2c..c639de023 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackInlineConditionTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java index 8ef8d61da..8f26dcc15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java index 868299b2a..55c2e584f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABCallbackReuseTimeOfDayEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABTimeOfDayEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABTimeOfDayEventCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java index e1f5ab77a..a878b7ff7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/timeeventcallbacks/ABTimeOfDayEventCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java index 65b59d060..25f1d6df2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackArgumentWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java index 5ff22b3b2..1a22e2f86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetLastCreatedWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java index 367ffeeec..f6ab8e5ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackGetStoredWidgetEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java index a05fc2b6f..36ff56c15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackInlineConditionWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java index a02a9d2a0..c360cf643 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java index 18efbe8fb..b590b22a6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABCallbackReuseWidgetEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABWidgetEventCallback.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABWidgetEventCallback.java index 4b8d55bae..3f1937687 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/eventcallbacks/widgetcallbacks/ABWidgetEventCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABWidgetEventCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackAddFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackAddFloat.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackAddFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackAddFloat.java index d1cf02fa0..bb4240a51 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackAddFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackAddFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java index 0f881237e..dcfa90b34 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackArgumentFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCeilFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCeilFloat.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCeilFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCeilFloat.java index bdf965f81..ea16a932e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCeilFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCeilFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCos.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCos.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCos.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCos.java index 00dfcc1b6..eaaba4c35 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackCos.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCos.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDegToRad.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDegToRad.java index b3134d364..f15812418 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDegToRad.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDegToRad.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDivideFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDivideFloat.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDivideFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDivideFloat.java index f912ef26d..1025ce0f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackDivideFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDivideFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFMaxValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFMaxValue.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFMaxValue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFMaxValue.java index 3b72adc28..3c05e1baa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFMaxValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFMaxValue.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFloorFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFloorFloat.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFloorFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFloorFloat.java index 592429d2a..456ca1b7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackFloorFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFloorFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityArea.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java index ae9441b8c..cff6e36e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastRange.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java index b07859601..35ddadbdd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java index 9b100417b..ab04ab1c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCastTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCooldown.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java index 67a7bde02..8a790f094 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDataAsFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java index f54bfb048..71c1a1c8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDuration.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java index fb81fde6a..fd191759c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityHeroDuration.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java index d1407f9ff..9296b7e9c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java index bad874231..8d34da22e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityProjectileSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java index 701f22783..ce74684b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAbilityUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAngleBetweenLocations.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAngleBetweenLocations.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java index c98e12383..9a2bd8269 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetAngleBetweenLocations.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAngleBetweenLocations extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java index 3d0240509..167b48c8a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffDurationElapsed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffDurationElapsed extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java index 1f8230c58..9c94e1e04 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetBuffUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffUniqueValueFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenLocations.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenLocations.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java index a01cb5367..03c6ea169 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenLocations.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetDistanceBetweenLocations extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java index 3b18cac40..edae8fd8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetDistanceBetweenUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetDistanceBetweenUnits extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationX.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationX.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationX.java index aa1e205ee..ab5c3ee84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationX.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLocationX extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationY.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationY.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationY.java index 8adf10b36..56c44a807 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetLocationY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationY.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetLocationY extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetParentAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetParentAbilityDataAsFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java index 4111d3d1d..0704cd34c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetParentAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetStoredFloatByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetStoredFloatByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java index 4a7dbcad7..593cf6500 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetStoredFloatByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitAcquisitionRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitAcquisitionRange.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java index 799dc3342..a794eea57 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitAcquisitionRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitAcquisitionRange extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCastPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCastPoint.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCastPoint.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCastPoint.java index 7bd63e7b3..87a7bade3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCastPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCastPoint.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitCastPoint extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java index fb8d138f9..8a35ec60d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitCurrentHp extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java index e14330771..36cb32467 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitCurrentMana.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitCurrentMana extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitFacing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitFacing.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitFacing.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitFacing.java index fee193161..d15000cff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitFacing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitFacing.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitFacing extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitInitialMana.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitInitialMana.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitInitialMana.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitInitialMana.java index 20ba8f2e0..a4e02eb79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitInitialMana.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitInitialMana.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitInitialMana extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationX.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationX.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationX.java index 4b378b064..8b5b81586 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationX.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitLocationX extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationY.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationY.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationY.java index 5c6c27655..de3c41dd1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackGetUnitLocationY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationY.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitLocationY extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java index 905d960dc..da2757ab0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackInlineConditionFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackIntToFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackIntToFloat.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackIntToFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackIntToFloat.java index 4cff78ff6..934ce4f97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackIntToFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackIntToFloat.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIntToFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMaxFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMaxFloat.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMaxFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMaxFloat.java index 225e165ac..ca0a3f581 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMaxFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMaxFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMinFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMinFloat.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMinFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMinFloat.java index 285b2b9a7..c3d8e057c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMinFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMinFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMultiplyFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMultiplyFloat.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMultiplyFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMultiplyFloat.java index 95630907a..7ab841571 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackMultiplyFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMultiplyFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackNegativeFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackNegativeFloat.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackNegativeFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackNegativeFloat.java index 9bef888f4..c28626e44 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackNegativeFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackNegativeFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackOneGameTick.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackOneGameTick.java index 5c10c0c4c..dac26f31c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackOneGameTick.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackOneGameTick.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackPi.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackPi.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackPi.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackPi.java index 5f40a1e74..e73e0e34c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackPi.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackPi.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomBoundedFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomBoundedFloat.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomBoundedFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomBoundedFloat.java index 673a29d04..84f77dc9b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomBoundedFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomBoundedFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomFloat.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomFloat.java index 6a1a7463c..7f8286f0d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRandomFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRawFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRawFloat.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRawFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRawFloat.java index 5686b4b8c..98595cea1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackRawFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRawFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java index 32eaf7e15..05fae0dae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java index 854ec3d6e..cafdb7f08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackReuseFloatWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSin.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSin.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSin.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSin.java index 49b718c69..034fd543b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSin.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSin.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSubtractFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSubtractFloat.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSubtractFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSubtractFloat.java index 023f7878d..f5e50527b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackSubtractFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSubtractFloat.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTan.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTan.java index 34b32b5d4..65181f421 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTan.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTan.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTicksForDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTicksForDuration.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTicksForDuration.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTicksForDuration.java index 530b408c7..d353e7c06 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABCallbackTicksForDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTicksForDuration.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABFloatCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABFloatCallback.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABFloatCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABFloatCallback.java index 3753ff950..f8a34bbda 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floatcallbacks/ABFloatCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABFloatCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java index 9a5de862d..98591218f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackArgumentFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java index 4a8515ba5..e661f972a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedLightningEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java index 04dedca08..ef43424d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetLastCreatedLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredFXByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredFXByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java index 572c67ae7..0f3fff9b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredFXByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredLightningByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredLightningByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java index 934544473..ead92d66d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackGetStoredLightningByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java index 7c025ecaf..7a2a6e3bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackInlineConditionFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java index 05094e504..243e41274 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java index fa281067e..713948d99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABCallbackReuseFXWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABFXCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABFXCallback.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABFXCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABFXCallback.java index 08f7e0b2e..7a05dfffd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABFXCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABFXCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABLightningCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABLightningCallback.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABLightningCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABLightningCallback.java index 6525372d1..6bf312826 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fxcallbacks/ABLightningCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABLightningCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java index 3ef7328b8..7787cc001 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackArgumentID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsID.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java index ac8faf1c0..bfe7eaec6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java index c69f9ce84..f245032ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java index dbc39040f..071cb38ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityDataAsRandomIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java index 254609487..88f98c9e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUniqueValueId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUnitId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUnitId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java index 516c1e813..51c064b60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAbilityUnitId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAlias.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java index cdb99e47c..7b6733248 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffAlias.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffAlias.java index 16e62e520..c242827cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffAlias.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffAlias extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java index d136d2054..e9398d32f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetBuffIdFromCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java index e12e18c8c..06963ea77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java index 316d21761..b09888dcc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstEffectId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstEffectId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java index 2b13d97c4..62be62f4a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetFirstEffectId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetItemType.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetItemType.java index 0bd950f32..bfea14a75 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetItemType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetItemType.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetNonCurrentTransformType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetNonCurrentTransformType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java index 487bc5bf7..1831fd4d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetNonCurrentTransformType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetNonCurrentTransformType extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetParentAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetParentAlias.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java index db2322dae..bd0735bff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetParentAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetSecondBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetSecondBuffId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java index 58ca3a2c0..c0b1b935f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetSecondBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetStoredIDByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetStoredIDByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java index a6c4e3736..344c1aabe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetStoredIDByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetUnitType.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetUnitType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetUnitType.java index f1b67ec07..cd7d0d104 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetUnitType.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitType extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetWar3IDFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetWar3IDFromString.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetWar3IDFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetWar3IDFromString.java index 4a7c67381..a8c71bf5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackGetWar3IDFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetWar3IDFromString.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java index 4138b8c14..af3dc4b66 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackInlineConditionID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java index a98fb59be..e6e303cf5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackNullIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java index d6b9e7fc5..b2e311651 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomItemId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItemType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.RandomTypeHandler; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java index 3f8f88c4e..b93a5df74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackRandomMechanicalCritterId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java index 2bdd84cd1..ad8021f1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseIDWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseIDWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java index ef27289d5..4f08d6675 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABCallbackReuseIDWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import java.util.Map; @@ -6,7 +6,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABIDCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABIDCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABIDCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABIDCallback.java index aef8f6678..e903f9308 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/idcallbacks/ABIDCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABIDCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAddInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAddInteger.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAddInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAddInteger.java index 7d41e502c..7e07570e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAddInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAddInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAndInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAndInteger.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAndInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAndInteger.java index 3f6d90a79..e4b9a2212 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackAndInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAndInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java index 7b8977b84..54059b6cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackArgumentInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java index 20c58353a..d83a19162 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountBuffsOnUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java index cbf60cbd7..ff1f900e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCountUnitsInRangeOfLocation extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java index e7f899ce9..2bfdfc84d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackCountUnitsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCountUnitsInRangeOfUnit extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDetectionDropdownConversion.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDetectionDropdownConversion.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java index 3cfed3796..cf6f5c883 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDetectionDropdownConversion.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDivideInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDivideInteger.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDivideInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDivideInteger.java index 6ad811c00..cfd554e65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackDivideInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDivideInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java index f93228b75..67bf6d11b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityCastTimeAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityDataAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityDataAsInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java index 727be3697..76dcc6a02 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityDataAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java index 8fc77b6bf..1afa5852f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityHandleAsInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityManaCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityManaCost.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java index 754fc8dc1..b0a17fb55 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityManaCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityTargetAttachmentPoints.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityTargetAttachmentPoints.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java index 846759433..0d93b7a13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityTargetAttachmentPoints.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java index 6a7bee67f..ccfd7211f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetAbilityUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java index a04f4fba6..12cf48e7c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffHandleAsInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java index f01bce058..ca0e58aa5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetBuffUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffUniqueValueInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetCastId.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetCastId.java index 78b6568ad..edf7ac514 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetCastId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetCastId.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetIntegerFromList.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetIntegerFromList.java index 5956ded7e..55d8d0e55 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetIntegerFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetIntegerFromList.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java index 3096e785c..41319e12f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java index 0c770f94d..02b712605 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java index 5e0768e42..e4034941d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemMaxCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java index 2753b1688..65aa470b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetItemSlot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetListSize.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetListSize.java index f36ba4d3c..8827b2d29 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetListSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetListSize.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java index 7625e2670..67b9e6613 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralHostilePlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java index a9264d5ab..c40b0622b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetNeutralPassivePlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetPlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetPlayerId.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetPlayerId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetPlayerId.java index d86f35d74..14efbc201 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetPlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetPlayerId.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileDestructableTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileDestructableTargets.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java index a645be081..7db40e374 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileDestructableTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileUnitTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileUnitTargets.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java index 6b7da126a..2407f5051 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetProjectileUnitTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSortableListSize.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSortableListSize.java index b764a4fb7..a20c7c69b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSortableListSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSortableListSize.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSpellLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSpellLevel.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java index 204ab37b7..7b4ee3446 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetSpellLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetStoredIntegerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetStoredIntegerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java index eca70e0e8..57d3d8da2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetStoredIntegerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitGroupSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitGroupSize.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitGroupSize.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitGroupSize.java index 05560b953..1cff13b87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitGroupSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitGroupSize.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitGroupSize extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java index a23e4f220..81c8e97f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitHandleAsInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java index da78e8ce6..e5cc753ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitMaximumHp extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java index cae825107..7231fb78f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitMaximumMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitMaximumMp extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitQueueSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitQueueSize.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitQueueSize.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitQueueSize.java index f1dc0ea54..327637114 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitQueueSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitQueueSize.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeFoodCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeFoodCost.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java index 18d40f547..1986bd02f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeFoodCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitTypeFoodCost extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeGoldCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeGoldCost.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java index e3ecd35ef..3380b75d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeGoldCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitTypeGoldCost extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeLumberCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeLumberCost.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java index 2cdf270f9..f3dac6700 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeLumberCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitTypeLumberCost extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java index 5bdc5905a..d88ad18f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackGetUnitTypeSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitTypeSpeed extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java index 4a5148663..d61f8ae31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackInlineConditionInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java index 8afe632eb..5088bd266 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfFalse.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java index 8783507a8..ea6e0b0f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIntegerZeroIfFalse extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java index 5422bae10..ff00fbfd4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIntegerZeroIfNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java index 011a90fdc..c90b83438 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackIterator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMaxInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMaxInteger.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMaxInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMaxInteger.java index e9b93bdbc..a96be5579 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMaxInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMaxInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMinInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMinInteger.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMinInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMinInteger.java index 9d422f2d4..81e640fb4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMinInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMinInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMultiplyInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMultiplyInteger.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMultiplyInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMultiplyInteger.java index 1b677b86e..b845edf63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackMultiplyInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMultiplyInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackOrInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackOrInteger.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackOrInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackOrInteger.java index 2c840b890..e5bc1e789 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackOrInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackOrInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackPlayerToStateModValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackPlayerToStateModValue.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackPlayerToStateModValue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackPlayerToStateModValue.java index 80d959cfd..355a4137c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackPlayerToStateModValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackPlayerToStateModValue.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRandomInteger.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRandomInteger.java index 397441c01..cecaa4132 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRandomInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRandomInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRawInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRawInteger.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRawInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRawInteger.java index e5957873a..017caacf4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackRawInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRawInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java index 980425716..b7c1d791a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java index e7e191979..bc983a22b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackReuseIntegerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackSubtractInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackSubtractInteger.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackSubtractInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackSubtractInteger.java index b7a0a11ac..c9f4ef9e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackSubtractInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackSubtractInteger.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java index dabc92426..c20cebb72 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABCallbackTruncateFloatToInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackTruncateFloatToInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABIntegerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABIntegerCallback.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABIntegerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABIntegerCallback.java index 4d833ea60..3b83e3d7f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integercallbacks/ABIntegerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABIntegerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java index c5c94e8a1..cc1b7768a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java index 5430dbf94..a69077bdf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java index cb3b1bfb2..5f71de6f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java index 07350edd3..fb1d269cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java index 82619d7b3..1c2e8354c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java index 956319935..c635612b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java index 3d6b4b05b..44cf56127 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java @@ -3,8 +3,8 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java index 3895ca9c5..31b69197a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java @@ -3,8 +3,8 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java index ab6e5f660..1f2a6163b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java index d40b122fc..e08ded273 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java index 2e67cb092..1e1ac975c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java index 8fde1bc96..13fc52073 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java index 18e251911..aeede4953 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java @@ -5,8 +5,8 @@ import java.util.stream.IntStream; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIntegerListOfRange extends ABIntegerListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityEffectReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityEffectReactionListenerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java index 2941ee11f..f615e7dd1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityEffectReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityProjReactionListenerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java index db093e37b..7e9741e2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAbilityProjReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPostDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPostDamageListenerCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPostDamageListenerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPostDamageListenerCallback.java index 451ffacf5..d777c6580 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPostDamageListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPostDamageListenerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPreDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPreDamageListenerCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPreDamageListenerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPreDamageListenerCallback.java index 5d21d0979..efc609165 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackPreDamageListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPreDamageListenerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackProjReactionListenerCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackProjReactionListenerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackProjReactionListenerCallback.java index 5de63c377..6f4822fb1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABAttackProjReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackProjReactionListenerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABBehaviorChangeListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABBehaviorChangeListenerCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABBehaviorChangeListenerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABBehaviorChangeListenerCallback.java index 1fad2be56..3822c10b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABBehaviorChangeListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABBehaviorChangeListenerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityEffectReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java index 72c787fcb..575d4e8df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityProjReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java index 852caa81c..ed224a9c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPostDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java index e0c531891..9e2c73e8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPreDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java index 2526cb4fe..1f185aae1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackProjReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java index 05597d359..8269960b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedBehaviorChangeListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java index e790127fa..7b4c40b8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java index 76d66bbbd..f28e1f9c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenModificationListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java index 6c2c22af3..ba15ad1fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDeathReplacement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDeathReplacement.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java index 058dc4c86..62cb898c3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedDeathReplacement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedEvasionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java index 86e23bad7..b5362e96f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java index cb8a2c244..e518d045e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetLastCreatedUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java index 554e76ef2..8a0c30a8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityProjReactionListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java index 1738f4140..9f1c45f5e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAbilityProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPostDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPostDamageListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java index a57b04ac2..44b7c6a03 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPostDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPreDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPreDamageListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java index 363000bc2..f799450a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackPreDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackProjReactionListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java index d9b960ae0..c5434c931 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredAttackProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredBehaviorChangeListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredBehaviorChangeListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java index e301943e2..bbd07b129 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredBehaviorChangeListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java index 0fb774ba5..4a4b7eb94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenModificationListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenModificationListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java index 65d7ec8ec..2c84aa342 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDamageTakenModificationListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDeathReplacementByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDeathReplacementByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java index 9d025a792..fc794aedd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredDeathReplacementByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredEvasionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredEvasionListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java index 447c357d6..1b5dde477 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredEvasionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java index efa177b1e..2ed8ee7d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABCallbackGetStoredUnitStateListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenListenerCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenListenerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenListenerCallback.java index acb1f19a0..65e639faf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenListenerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenModificationListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenModificationListenerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java index fba1e9acf..f3148db1e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDamageTakenModificationListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDeathReplacementCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDeathReplacementCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDeathReplacementCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDeathReplacementCallback.java index fa0a5c76d..9830721c8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABDeathReplacementCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDeathReplacementCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABEvasionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABEvasionListenerCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABEvasionListenerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABEvasionListenerCallback.java index 063d983e6..3d3f30449 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABEvasionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABEvasionListenerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABUnitStateListenerCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABUnitStateListenerCallback.java index ad814b8f2..bb11a9aba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listenercallbacks/ABUnitStateListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABUnitStateListenerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java index 4c570e6ec..194c96866 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackArgumentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java index a929bb524..3ef268065 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateLocationFromOffset extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromTarget.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromTarget.java index 63570a1a7..fa46ac48d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromTarget.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks.ABTargetCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target.ABTargetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateLocationFromTarget extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXY.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXY.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXY.java index 296a4b991..628b6211f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXY.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateLocationFromXY extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java index c5916b1ed..505b7ad98 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackCreateLocationFromXYOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateLocationFromXYOffset extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java index 62a69fac7..ed3fd6d22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackImpactLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java index c3d107fa4..bf0e38f8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetAttackTargetLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java index d333350e4..8e0dd1ee7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetGroundAttackedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetLocationFromList.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetLocationFromList.java index ff4900e44..b7f8d9922 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetLocationFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetLocationFromList.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetProjectileCurrentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetProjectileCurrentLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java index 6f3dec8f7..5fa8957db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetProjectileCurrentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetStoredLocationByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetStoredLocationByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java index cec14dc36..c8a80fe3e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetStoredLocationByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetTargetedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetTargetedLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java index 461e6d343..d2a3b3152 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetTargetedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetUnitLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetUnitLocation.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetUnitLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetUnitLocation.java index 82c614e10..27fd9dfc5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackGetUnitLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetUnitLocation.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java index d93ce8b67..10d627d5a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackInlineConditionLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java index 6097007ff..8cd45b24c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackModifyLocationWithOffset extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java index 4eb067039..14ebeb389 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackModifyLocationWithXYOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackModifyLocationWithXYOffset extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackRandomLocationInRange.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackRandomLocationInRange.java index 5555f6d6b..66b5d5784 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackRandomLocationInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackRandomLocationInRange.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackRandomLocationInRange extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java index ce3c71fa3..0771228a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java index 40ecd771d..ac4311a1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABCallbackReuseLocationWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import java.util.Map; @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABLocationCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABLocationCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABLocationCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABLocationCallback.java index dd7ae589d..5cc780764 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/locationcallbacks/ABLocationCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABLocationCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAddLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAddLong.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAddLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAddLong.java index 0899a71a8..843d34d97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAddLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAddLong.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAndLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAndLong.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAndLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAndLong.java index 86d256449..daed6a80c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackAndLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAndLong.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java index 4320d331b..22f5d0407 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackArgumentLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectedData.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectedData.java index 25c68262f..fdd0d7f13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectedData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectedData.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateDetectedData extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectorData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectorData.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectorData.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectorData.java index 98560be0a..0467cb7c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateDetectorData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectorData.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateDetectorData extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateOwnershipData.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateOwnershipData.java index f7d91f9a8..0b6b9d7c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackCreateOwnershipData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateOwnershipData.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackCreateOwnershipData extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackDivideLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackDivideLong.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackDivideLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackDivideLong.java index 5f9b815a7..56ee307dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackDivideLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackDivideLong.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java index c10747602..16e6d1456 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityDataAsLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java index 86ab95110..ab1af1841 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetAbilityUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java index c76b1bb87..a4e6e7318 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetBuffUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffUniqueValueLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetStoredLongByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetStoredLongByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java index 8e91a511e..7eefd1e74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackGetStoredLongByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java index 5bf259b56..fabc3fbef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackInlineConditionLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMaxLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMaxLong.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMaxLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMaxLong.java index 9b979f4ed..48fc23c80 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMaxLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMaxLong.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMinLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMinLong.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMinLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMinLong.java index 850a990e1..24dc1ad82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMinLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMinLong.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMultiplyLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMultiplyLong.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMultiplyLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMultiplyLong.java index b1d08c66d..0ddd189e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackMultiplyLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMultiplyLong.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackOrLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackOrLong.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackOrLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackOrLong.java index f18171ffe..64b147593 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackOrLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackOrLong.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java index 8dc4f0e07..3bcbbb72c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskAllPlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java index 0792fb8f5..c235a56d7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskExcludePlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java index ac5466b43..b05b726fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackPlayerMaskIncludePlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackRawLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackRawLong.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackRawLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackRawLong.java index 412536874..16741bf31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackRawLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackRawLong.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java index c424a0356..063b029c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLongWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLongWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java index 49e05b935..a65aaaa3f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackReuseLongWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackSubtractLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackSubtractLong.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackSubtractLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackSubtractLong.java index 61fd98d4b..f3a438d5c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABCallbackSubtractLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackSubtractLong.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABLongCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABLongCallback.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABLongCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABLongCallback.java index b853a6009..88ea8f6a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longcallbacks/ABLongCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABLongCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java index a6bd22467..477f104b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java index 74a45d017..353171ab4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java index 10859008b..cad9ec4ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIdUtils; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java index ef53e1a7b..6801ac321 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java index f4e565772..57a63efc9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java index fb04fd605..aae93db48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java index 775da81fd..a3e6793ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java index 49d2d519d..f5de47b2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java index 590150295..b567f6b61 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java index 804d26203..59bb35d34 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java index 206691cd7..aaf7d08f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java index fd09d1e0a..05d33a881 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java index c716cb9f7..11c4409fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java index dd2a3be47..312b2b49d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java index f243b78c0..f7fd539fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java index 946df3d47..c1b57d8d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackArgumentNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetLastCreatedNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetLastCreatedNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java index 53edf1173..53e3c8d2f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetLastCreatedNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetStoredNonStackingStatBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetStoredNonStackingStatBuffByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java index 712e21c22..fd7bb2362 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackGetStoredNonStackingStatBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java index 6ed082774..1bda5b336 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackInlineConditionNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java index a07708b10..e7a643c16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java index 8a21ce51d..bdbc4a77c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABCallbackReuseNonStackingStatBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABNonStackingStatBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABNonStackingStatBuffCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java index b6377868b..cafe8617d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuffcallbacks/ABNonStackingStatBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java index 4da6a464c..cff1dccd8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackArgumentStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetLastCreatedStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetLastCreatedStateModBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java index 537122f11..e36d6f3e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetLastCreatedStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetStoredStateModBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetStoredStateModBuffByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java index 25b15615d..3b454cd07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackGetStoredStateModBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java index 57e42290e..4ccb535b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackInlineConditionStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java index 98946b406..af6082e74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java index 831854104..ca11c4207 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABCallbackReuseStateModBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABStateModBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABStateModBuffCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABStateModBuffCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABStateModBuffCallback.java index 84e0c4e66..fb79f663b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemodcallbacks/ABStateModBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABStateModBuffCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java index 6dfb6f0be..dfc9b116f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackArgumentString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackBooleanToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackBooleanToString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java index ad12b4e2c..2fc36fc1c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackBooleanToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackBooleanToString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackCatStrings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackCatStrings.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackCatStrings.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackCatStrings.java index 3d53f88a3..acc7f61dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackCatStrings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackCatStrings.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackFloatToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackFloatToString.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackFloatToString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackFloatToString.java index 0dc034814..c5207682e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackFloatToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackFloatToString.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackFloatToString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityDataAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityDataAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java index e16bb7fd4..f939eecf3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityDataAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java index 9a933b65c..be5532184 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityHandleAsString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java index 8c75edee8..4f3f7bd8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAbilityUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetAbilityUniqueValueString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAliasAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAliasAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java index a4e7d1d16..a4e959f76 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAliasAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAllowStackingKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAllowStackingKey.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAllowStackingKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAllowStackingKey.java index 634324974..219692caf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetAllowStackingKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAllowStackingKey.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java index 5629cb57c..08818b198 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffHandleAsString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java index 55175ed28..e2e38fca8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetBuffUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetBuffUniqueValueString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetCodeAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetCodeAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java index 887348ceb..1c49e4745 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetCodeAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java index 444b0ccce..f96573da2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetStoredStringByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetUnitHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetUnitHandleAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java index 7ec4b03b1..fe949f5a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackGetUnitHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackGetUnitHandleAsString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIdToString.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIdToString.java index a85d43718..be4ba2515 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIdToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIdToString.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIdToString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java index 05abd01eb..5a50f6246 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackInlineConditionString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIntegerToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIntegerToString.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIntegerToString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIntegerToString.java index 62647051b..b2803afed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackIntegerToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIntegerToString.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackIntegerToString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackLongToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackLongToString.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackLongToString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackLongToString.java index 54edae3f1..81f029219 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackLongToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackLongToString.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.ABLongCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.ABLongCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackLongToString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackRawString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackRawString.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackRawString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackRawString.java index 592a0a331..97efbd81a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackRawString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackRawString.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java index 8432a2dd7..9abfe7413 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseStringWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseStringWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java index 49878b1db..f4a6f42ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABCallbackReuseStringWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import java.util.Map; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABStringCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABStringCallback.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABStringCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABStringCallback.java index bea38ea7e..4fd52a700 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/stringcallbacks/ABStringCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABStringCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java index 9a100015e..36c0f827f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackArgumentTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetAbilityTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetAbilityTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java index ebaff7b19..be7b2cead 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetAbilityTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetStoredTargetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetStoredTargetByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java index 28e631573..4c3358e7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackGetStoredTargetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java index ef8747ced..c71d2f0f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackInlineConditionTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java index c6863e5e4..265f1df01 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java index 45d5c0cba..123bda990 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABCallbackReuseTargetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; import java.util.Map; @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABTargetCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABTargetCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABTargetCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABTargetCallback.java index 8779fc6f3..b4501a2af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/targetcallbacks/ABTargetCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABTargetCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java index 4b70fc3d3..41e43c132 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackArgumentTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetFiringTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetFiringTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java index ccc037b51..2cfe69ec3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetFiringTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastCreatedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastCreatedTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java index 875179932..0d752bd92 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastCreatedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastStartedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastStartedTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java index d14d94c6b..ba6e4352e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetLastStartedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetStoredTimerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetStoredTimerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java index eb7802629..284e9e86c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackGetStoredTimerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java index 674d86ad3..66e530e21 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackInlineConditionTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java index f0909a5d2..e2c7fa224 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java index 937c4787d..d0d39251a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABCallbackReuseTimerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABTimerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABTimerCallback.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABTimerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABTimerCallback.java index eed668032..abb10f0ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timercallbacks/ABTimerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABTimerCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java index 69ac73f42..7d3ea3170 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackArgumentUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityPairedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityPairedUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java index 6972ed701..a0b15ab77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityPairedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityTargetedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityTargetedUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java index 036e31e86..314fb8222 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAbilityTargetedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java index 55f1b7f22..3c5bfd0d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java index 68c296d2e..90ebf7e42 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetAttackingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffCastingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java index f6b23df8a..ce1c270d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffedUnit.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffedUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffedUnit.java index 498fadd3a..d6a7a7775 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetBuffedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffedUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCastingUnit.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCastingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCastingUnit.java index 746007352..c8f22bac6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCastingUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java index 837532dd3..dd9b490be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetChainUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java index f93d61cde..7552293d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit1.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java index 7f70c32f2..cf21dfe49 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetCompUnit2.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java index 3e7b838e0..d051dbd97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java index cf8936f44..388387cfb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDamagingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDyingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDyingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java index abca60fe5..aabf776f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetDyingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetEnumUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetEnumUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java index 31138a4da..49592ab2f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetEnumUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetKillingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetKillingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java index 9a280dcae..f36987903 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetKillingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetLastCreatedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetLastCreatedUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java index 53fc080dd..24c52c30d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetLastCreatedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetListenerUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetListenerUnit.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetListenerUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetListenerUnit.java index fedbff8ea..496267019 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetListenerUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetListenerUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetMatchingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetMatchingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java index 2c413df46..a142b246d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetMatchingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java index 693cbdc2d..f43c8ad6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestCorpseInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import java.util.List; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java index 547f0c89d..514d60a25 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetNearestUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import java.util.List; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetParentCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetParentCastingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java index b1be6d932..b74aaae65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetParentCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileHitUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileHitUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java index 61f4d901b..b2e13abcf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileHitUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java index 8b3215db2..b2ee012d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetProjectileSourceUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityCastingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java index f298cd6eb..4502e4a28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityTargetUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java index 2967a6468..35c2b7029 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetReactionAbilityTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetStoredUnitByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetStoredUnitByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java index 4fbbeacee..70cefd2c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackGetStoredUnitByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java index 5714264eb..5654d81bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackInlineConditionUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackPollUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackPollUnitQueue.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackPollUnitQueue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackPollUnitQueue.java index efbe8c337..5404ef1d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackPollUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackPollUnitQueue.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java index 95f921462..614192911 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java index 652fd7337..6545c18ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABCallbackReuseUnitWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABUnitCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABUnitCallback.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABUnitCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABUnitCallback.java index ac524ae49..b01ef33ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitcallbacks/ABUnitCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABUnitCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java index 9524cf7be..67cfd28d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackArgumentUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetLastCreatedUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetLastCreatedUnitGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java index a88252795..489998ab9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetLastCreatedUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; import java.util.Set; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java index 60cb65866..338c5b6a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetStoredUnitGroupByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetUnitGroupByName.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetUnitGroupByName.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java index 410dfcdca..85f4ec096 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackGetUnitGroupByName.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; import java.util.Set; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java index 856205096..b749a2fff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackInlineConditionUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; import java.util.Set; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java index 0b921637e..f00433bf0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java index 64e55e05f..bf5583254 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABCallbackReuseUnitGroupWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; import java.util.Map; import java.util.Set; @@ -6,7 +6,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABUnitGroupCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABUnitGroupCallback.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABUnitGroupCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABUnitGroupCallback.java index eb21bdc23..36c100a81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroupcallbacks/ABUnitGroupCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABUnitGroupCallback.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; import java.util.Set; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java index bc8d72913..6a18e12ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java index 1496d6856..a332af01b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java index 2a978657a..50a5b80d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java index f8a5f8b70..020349b3f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java index cb9a43c40..92b45a728 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java index 5adc855a1..10b36308e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java index 26e3370fa..881fa5ca0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java index 0984f49a1..893aa0c60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java index c1fdb9229..d50aafce8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java index 8e3604742..5e4f9dff7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java index fc17b9c01..e691a6e34 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java index a6152a1e6..744cc978f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java index 06dc79fd5..6a251dce8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABCallbackUnitToWidget extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java index e60e75502..ebb1ad54e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java index 0d959a210..2d70001e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java index 3b8f4023f..4d0548127 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java index 41b938930..7396f74cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java index 7d0b5bb9c..d156a6018 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java index ee0248b7a..45a2c9c38 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java index de9e33118..27b1cf309 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java index 7007884d3..e44c370d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java index ad2a85b4c..f61b29405 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java index 82d233a80..9ce17a460 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java index e30465925..b37d0b53e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDefenseTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDefenseTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java index de1cfdeab..842851d19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java @@ -3,7 +3,7 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABDefenseTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDefenseTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java index 7d3728e49..ad56d3faa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java index 247c51809..56f13b1f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABMovementTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABMovementTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java index c828a8a60..6048bcba1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java index 078ea0a62..64ce8beac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABWeaponTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java index ac13f91a8..19bd1c444 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionSuccessfullyChargeResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.cost; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java index 7222a8625..99d992e3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java index 763565ea4..269478cbb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java index 2b9f299cd..327694061 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java index 117d35c01..559de3d0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java index 8dbd3fc0e..2be3ce56d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java index 25006c250..35fd22782 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unittype/ABConditionIsLocationPathableForUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unittype; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java index de0c1485d..2f9978b3e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java index 134c1ffdf..b55483e46 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java index 94d14d4e2..6b7a1ce6c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java index aab2bc8e5..05905b329 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java index 3e4a585b1..3afb471fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.membership; import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.ABUnitGroupCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java index 60f3d5c79..23a0208f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.membership; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java index 6eb556290..65806fecb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingCorpseExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.membership; import java.util.List; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java index 935c81471..24b2da253 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionMatchingUnitExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.membership; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java index ff733364f..6e8bddead 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java index e7f94e028..73c4ca579 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java index f5ad9f40c..9346d3fb4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java index 5adf5c0ce..ec957f815 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java index c703b442d..1660da0d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java index 862a07238..faa3e8b4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java index 7ca5ac0d5..e46618e98 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java index 7642ddb4d..7e597a6a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java index 9ea124d70..1eec9c172 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java index c90c3c7ea..8b43646fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java index a9a6b947e..d3a6b6670 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java index 43b6d41bb..55cda1200 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java index e2c689da7..b558924c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java index a3207c087..523bfc422 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java index 93a14f75a..3c3fa1e6c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java index 7a134c5fb..556f7e978 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java index 8d6a719c4..aa1714102 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java index 117b490ef..6ea6a2ec0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java index b743c3f0d..633747929 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java index 581d31437..e7f4b5f91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java index c7a3e2e0e..230e13f94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsDestructableValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting; import java.util.EnumSet; import java.util.List; @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java index 9600ec117..fa492838e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java index ce624e235..b7d235ac8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java index 6fc5e0c96..bcc50ce80 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsUnitValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting; import java.util.EnumSet; import java.util.List; @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java index c43f4ed54..51f03a7cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionIsValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting; import java.util.EnumSet; import java.util.List; @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java index 462234cd5..b902f514b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java index 044312875..4fb74fa3c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionDoesAbilityHaveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.uniqueflag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java index cf3cee33f..9bb9469bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionDoesBuffHaveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.uniqueflag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java index 1ac4c011a..29a5945dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java index 08dc6d640..07c1612bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveAbilityMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java index 5aad4a1d6..81449e7d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.alliance; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java index 68404ecdd..d371edf04 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitFriend.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.alliance; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java index 1e5595623..8bddeb61a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitShareSpells.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.alliance; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java index 40588f83a..b9102eb86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java @@ -3,7 +3,7 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java index be742435f..2e4478e9a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.buff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java index 14ac45667..8e4bd4395 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionDoesUnitHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.buff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java index 706d11aaa..6ac6538d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitBuilding.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java index e4902f8eb..0cfea8442 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHero.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java index c40533180..1f586d308 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java index dd10252d6..3ceecaaaf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitHidden.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java index 047d28807..f1fdbae24 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMagicImmune.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java index 00ba1dbf2..efca600cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMorphImmune.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java index 9f26fd602..93a73a9b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSummoned.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java index 1e130776f..e9b52dedd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitAlive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java index 0d96eb30d..065937413 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitDead.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java index 5b21eae65..74a3173e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java index 6582dac95..cd3293675 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitMaxMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java index 9b2cb3e46..8831212e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitPolymorphed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java index 79603651d..e1cc3e541 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitSleeping.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java index a278a80f2..3a5054086 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java index edacc873d..436c95e01 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitVisible.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java index 7023c5e76..d4b0c181b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.tech; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java index a4a70604a..127178f82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitConstructingOrUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.tech; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java index 6320b537a..b3ba6342b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitTraining.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.tech; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java index d54b04734..9566b0d78 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionUnitHasResearch.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.tech; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffSlow.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffSlow.java index 524a4bf12..6c61e2231 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffSlow.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffSlow.java @@ -1,9 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericTimedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffStun.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffStun.java index 2ec44830f..f43ef9407 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuffStun.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffStun.java @@ -1,9 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericTimedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java index 9fa505b21..94acd3a06 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorExpr; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public abstract class ABCondition extends ABBooleanCallback implements JassTextGeneratorExpr { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java index 08890304a..28cd6d1f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java @@ -1,69 +1,100 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilities.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attack.internal.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.datastore.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructablebuff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.floatingtext.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.group.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.lightning.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.sound.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.splat.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.terrain.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.gamestate.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.item.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.destructable.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.order.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.reaction.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniqueflag.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniquevalue.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.animation.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.movement.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.worker.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitgroup.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalActions.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalCallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.internalConditions.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcondition.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior.internalcallback.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior.internalcondition.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalaction.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalcondition.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death.internalaction.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.evasion.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.internalaction.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.internalcallback.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalactions.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalcallbacks.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.state.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitqueue.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ABCallbackNull; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.abilitycallbacks.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buffcallbacks.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.timeeventcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.eventcallbacks.widgetcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fxcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.integer.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.location.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listenercallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.locationcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longcallbacks.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuffcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemodcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.targetcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timercallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroupcallbacks.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.*; @@ -72,18 +103,27 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.cost.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructablebuff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.membership.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.projectile.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.timer.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.uniqueflag.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.ability.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.alliance.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.behavior.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unittype.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.buff.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.tech.*; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.typeadapters.RuntimeTypeAdapterFactory; @@ -1593,11 +1633,11 @@ public static Gson create() { .of(ABDamageTypeCallback.class, "type"); dtTypeFactory.registerSubtype(ABCallbackGetDamageTypeFromString.class, "getDamageTypeFromString") .registerSubtype(ABCallbackGetStoredDamageTypeByKey.class, "getStoredDamageTypeByKey") - .registerSubtype(ABCallbackGetDamageType.class, "getDamageType") + .registerSubtype(ABCallbackGetAttackDamageType.class, "getAttackDamageType") .registerSubtype(ABCallbackGetTriggeringDamageType.class, "getTriggeringDamageType") .registerSubtype(ABCallbackGetModifiedAttackDamageType.class, "getModifiedAttackDamageType"); gsonBuilder.registerTypeAdapterFactory(dtTypeFactory); - callbackTypeFactory.registerSubtype(ABCallbackGetDamageType.class, "getDamageType"); + callbackTypeFactory.registerSubtype(ABCallbackGetAttackDamageType.class, "getAttackDamageType"); final RuntimeTypeAdapterFactory defTypeFactory = RuntimeTypeAdapterFactory .of(ABDefenseTypeCallback.class, "type"); @@ -1610,7 +1650,7 @@ public static Gson create() { .of(ABWeaponTypeCallback.class, "type"); wtTypeFactory.registerSubtype(ABCallbackGetWeaponTypeFromString.class, "getWeaponTypeFromString") .registerSubtype(ABCallbackGetStoredWeaponTypeByKey.class, "getStoredWeaponTypeByKey") - .registerSubtype(ABCallbackGetWeaponType.class, "getWeaponType") + .registerSubtype(ABCallbackGetAttackWeaponType.class, "getAttackWeaponType") .registerSubtype(ABCallbackRawWeaponType.class, "rawWeaponType") .registerSubtype(ABCallbackGetModifiedAttackWeaponType.class, "getModifiedAttackWeaponType"); gsonBuilder.registerTypeAdapterFactory(wtTypeFactory); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java index 3dd927ead..750ed5772 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java @@ -3,7 +3,7 @@ import java.util.Comparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java index cdd0b9489..65575121c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java index ba2807983..ef575fcb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java index d4e4148b7..506f32244 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java index e43f7eec9..aa0b13d3c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java index 731a4eb9f..aad342011 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java @@ -4,10 +4,13 @@ import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderOverrideFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderSpecialConfigFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderSpecialDisplayFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.definitions.impl.CAbilityTypeDefinitionAbilityBuilder; public class AbilityBuilderConfiguration { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java index f94279238..7d302eb10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java @@ -5,10 +5,14 @@ import java.util.Map; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.stringcallbacks.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderOverrideFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderParserTemplateFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderSpecialConfigFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderSpecialDisplayFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.MeleeRangeTargetOverride; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.StatBuffFromDataField; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderOverrideFields.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderOverrideFields.java index 82222e984..1574b9251 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderOverrideFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderOverrideFields.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABAutocastTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enumcallbacks.ABTargetTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAutocastTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABTargetTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; public class AbilityBuilderOverrideFields { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserTemplateFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderParserTemplateFields.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserTemplateFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderParserTemplateFields.java index fef092d85..c0f3d024a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserTemplateFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderParserTemplateFields.java @@ -1,10 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields; import java.util.List; import java.util.Map; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderTemplateType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.MeleeRangeTargetOverride; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.StatBuffFromDataField; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialConfigFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialConfigFields.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialConfigFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialConfigFields.java index fc9e22367..e096a502e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialConfigFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialConfigFields.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid.ABOrderIdCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialDisplayFields.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialDisplayFields.java index b9955b443..e1d6a6786 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderSpecialDisplayFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialDisplayFields.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleancallbacks.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floatcallbacks.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.idcallbacks.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integercallbacks.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; public class AbilityBuilderSpecialDisplayFields { From ece9a2287f4394005efd4c99a473495103ba4781 Mon Sep 17 00:00:00 2001 From: Glasir Date: Sat, 13 Dec 2025 00:30:58 -0500 Subject: [PATCH 35/44] Minor missed items and moved Visitors --- .../com/etheller/warsmash/parsers/jass/Jass2.java | 2 +- .../behavior/CBehaviorAbilityBuilderBase.java | 1 + .../action/ability/ABActionResetCooldown.java | 2 +- .../action/ability/ABActionStartCooldown.java | 2 +- .../abilitydata/ABActionDisableAbilityById.java | 2 +- .../abilitydata/ABActionEnableAbilityById.java | 2 +- .../state/ABActionCreateUnitStateListener.java | 7 +++---- .../callback/ability/ABCallbackGetAbilityById.java | 2 +- .../handler/TransformationHandler.java | 2 +- .../listener/ABUnitStateListener.java | 13 +++++-------- .../ABAbilityTargetStillTargetableVisitor.java | 2 +- .../GetABAbilityByRawcodeVisitor.java | 4 +++- .../GetInstantTransformationBuffVisitor.java | 9 +++++++-- 13 files changed, 27 insertions(+), 23 deletions(-) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/{behavior => visitor}/ABAbilityTargetStillTargetableVisitor.java (99%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/{ability => visitor}/GetABAbilityByRawcodeVisitor.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/{ability => visitor}/GetInstantTransformationBuffVisitor.java (92%) diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index 655d8ab07..9da47be8e 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -141,7 +141,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.jass.CodeJassValueBehaviorExpr; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTargetingBuff; @@ -166,6 +165,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.ai.AIDifficulty; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java index 821c4d5c9..3695f8112 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java @@ -15,6 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABAbilityTargetStillTargetableVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CAbstractRangedBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java index f59b06143..8fe47064b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; public class ABActionResetCooldown implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java index c7258ef3c..801c89afa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java @@ -5,13 +5,13 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; public class ABActionStartCooldown implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java index b1ff8e8b1..66f877371 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; public class ABActionDisableAbilityById implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java index 8247671b4..de48b69bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; public class ABActionEnableAbilityById implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java index cdd37f635..53497ddf8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java @@ -25,10 +25,9 @@ public class ABActionCreateUnitStateListener implements ABAction { private List onHideStateChanged; public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - ABUnitStateListener modifier = new ABUnitStateListener(localStore.game, caster, localStore, castId, - onLifeChanged, onManaChanged, onOrdersChanged, onQueueChanged, onRallyPointChanged, onWaypointsChanged, - onHeroStatsChanged, onInventoryChanged, onAttacksChanged, onAbilitiesChanged, onUpgradesChanged, - onHideStateChanged); + ABUnitStateListener modifier = new ABUnitStateListener(caster, localStore, castId, onLifeChanged, onManaChanged, + onOrdersChanged, onQueueChanged, onRallyPointChanged, onWaypointsChanged, onHeroStatsChanged, + onInventoryChanged, onAttacksChanged, onAbilitiesChanged, onUpgradesChanged, onHideStateChanged); localStore.put(ABLocalStoreKeys.LASTCREATEDUSL, modifier); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java index df47ae3c2..26ed9d2cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetABAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; public class ABCallbackGetAbilityById extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java index da2fd060f..c1aeb02de 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java @@ -11,7 +11,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.GetInstantTransformationBuffVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTransformationBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; @@ -20,6 +19,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.AltitudeAdjustmentTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.DelayTimerTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.TransformationMorphAnimationTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetInstantTransformationBuffVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java index 5471424af..43311859c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java @@ -2,14 +2,12 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitStateListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; public class ABUnitStateListener implements CUnitStateListener { - private CSimulation game; private CUnit caster; private LocalDataStore localStore; private int castId; @@ -27,13 +25,12 @@ public class ABUnitStateListener implements CUnitStateListener { private List onUpgradesChanged = null; private List onHideStateChanged = null; - public ABUnitStateListener(CSimulation game, CUnit caster, LocalDataStore localStore, int castId, - List onLifeChanged, List onManaChanged, List onOrdersChanged, - List onQueueChanged, List onRallyPointChanged, List onWaypointsChanged, - List onHeroStatsChanged, List onInventoryChanged, List onAttacksChanged, - List onAbilitiesChanged, List onUpgradesChanged, List onHideStateChanged) { + public ABUnitStateListener(CUnit caster, LocalDataStore localStore, int castId, List onLifeChanged, + List onManaChanged, List onOrdersChanged, List onQueueChanged, + List onRallyPointChanged, List onWaypointsChanged, List onHeroStatsChanged, + List onInventoryChanged, List onAttacksChanged, List onAbilitiesChanged, + List onUpgradesChanged, List onHideStateChanged) { super(); - this.game = game; this.caster = caster; this.localStore = localStore; this.castId = castId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABAbilityTargetStillTargetableVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABAbilityTargetStillTargetableVisitor.java similarity index 99% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABAbilityTargetStillTargetableVisitor.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABAbilityTargetStillTargetableVisitor.java index cdc2f3530..12168b6ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABAbilityTargetStillTargetableVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABAbilityTargetStillTargetableVisitor.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetABAbilityByRawcodeVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetABAbilityByRawcodeVisitor.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetABAbilityByRawcodeVisitor.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetABAbilityByRawcodeVisitor.java index 57383a7a7..e0590af37 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetABAbilityByRawcodeVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetABAbilityByRawcodeVisitor.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityAttack; @@ -24,6 +24,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; public class GetABAbilityByRawcodeVisitor implements CAbilityVisitor { private static final GetABAbilityByRawcodeVisitor INSTANCE = new GetABAbilityByRawcodeVisitor(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetInstantTransformationBuffVisitor.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetInstantTransformationBuffVisitor.java index 158deacd0..8653a141a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/GetInstantTransformationBuffVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetInstantTransformationBuffVisitor.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -16,7 +16,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.build.CAbilityOrcBuild; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.build.CAbilityUndeadBuild; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.combat.CAbilityColdArrows; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.GenericNoIconAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.GenericSingleIconActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.GenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityReturnResources; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.hero.CAbilityHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.item.shop.CAbilityNeutralBuilding; @@ -27,6 +30,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedInstantTransformationBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTransformationBuff; From 795a4455afb017f39b290e5f9eeec451c65d1cb1 Mon Sep 17 00:00:00 2001 From: Glasir Date: Sat, 13 Dec 2025 00:52:50 -0500 Subject: [PATCH 36/44] Major AB Refactor: Part 4 - Class Prefix * Standardized class names to start with AB --- .../etheller/warsmash/parsers/jass/Jass2.java | 276 +++++++++--------- .../scope/CommonTriggerExecutionScope.java | 8 +- .../CommandCardPopulatingAbilityVisitor.java | 4 +- .../simulation/abilities/CAbilityVisitor.java | 4 +- .../abilities/GetAbilityByRawcodeVisitor.java | 4 +- ...lity.java => ABAbilityBuilderAbility.java} | 14 +- ...ava => ABAbilityBuilderActiveAbility.java} | 14 +- ... => ABAbilityBuilderActiveAutoTarget.java} | 14 +- ... => ABAbilityBuilderActiveFlexTarget.java} | 24 +- ...va => ABAbilityBuilderActiveNoTarget.java} | 14 +- ...ava => ABAbilityBuilderActivePairing.java} | 24 +- ...=> ABAbilityBuilderActivePointTarget.java} | 14 +- ... => ABAbilityBuilderActiveUnitTarget.java} | 14 +- ...ava => ABAbilityBuilderGenericActive.java} | 44 +-- ...oIcon.java => ABAbilityBuilderNoIcon.java} | 26 +- ...sive.java => ABAbilityBuilderPassive.java} | 28 +- ...va => ABAbilityBuilderPassiveAbility.java} | 2 +- ...java => ABAbilityBuilderAuraTemplate.java} | 14 +- ...> ABAbilityBuilderSimpleAuraTemplate.java} | 14 +- ... => ABAbilityBuilderStatAuraTemplate.java} | 42 +-- ... ABAbilityBuilderStatPassiveTemplate.java} | 32 +- ...java => ABBehaviorAbilityBuilderBase.java} | 14 +- ... => ABBehaviorAbilityBuilderNoTarget.java} | 14 +- ...va => ABBehaviorFinishTransformation.java} | 32 +- ...endOrder.java => ABBehaviorSendOrder.java} | 4 +- ...n.java => ABOrderStartTransformation.java} | 6 +- .../ABActionAbilityAttemptToApplyEffect.java | 10 +- .../ABActionAbilityRunEndCastingActions.java | 10 +- .../ABActionActivateToggledAbility.java | 8 +- .../action/ability/ABActionAddAbility.java | 4 +- .../action/ability/ABActionAddNewAbility.java | 4 +- .../ability/ABActionAddRallyAbility.java | 4 +- .../ability/ABActionBeginChanneling.java | 4 +- .../ability/ABActionCleanUpCastInstance.java | 4 +- .../ability/ABActionClickDisableAbility.java | 8 +- .../ability/ABActionClickEnableAbility.java | 8 +- .../ability/ABActionCreateAbilityFromId.java | 4 +- .../ABActionDeactivateToggledAbility.java | 8 +- .../ability/ABActionFinishChanneling.java | 4 +- .../ABActionPrepUnownedAbilityForUse.java | 4 +- .../action/ability/ABActionRemoveAbility.java | 4 +- .../action/ability/ABActionResetCooldown.java | 14 +- .../ABActionSendStartCastingEvents.java | 4 +- .../action/ability/ABActionStartCooldown.java | 14 +- .../ABActionAbilitySetShowIcon.java | 8 +- .../abilitydata/ABActionAddTargetAllowed.java | 18 +- .../abilitydata/ABActionDisableAbility.java | 8 +- .../ABActionDisableAbilityById.java | 14 +- .../abilitydata/ABActionEnableAbility.java | 8 +- .../ABActionEnableAbilityById.java | 14 +- .../ABActionRemoveTargetAllowed.java | 18 +- .../ABActionSetAbilityCastRange.java | 8 +- .../ABActionSetAutoTargetDestructable.java | 4 +- .../ABActionSetAutoTargetUnit.java | 4 +- .../ABActionSetPreventEndEvents.java | 4 +- .../ABActionAddAttackModifier.java | 4 +- .../ABActionCreateAttackModifier.java | 4 +- .../ABActionFireModifiedAttack.java | 4 +- .../ABActionRemoveAttackModifier.java | 4 +- .../ABActionStartModifiedAttack.java | 4 +- ...ABActionAttackModifierAddAnimationTag.java | 4 +- ...onAttackModifierAddPostDamageListener.java | 4 +- ...ionAttackModifierAddPreDamageListener.java | 4 +- ...ActionAttackModifierApplyAllArtFields.java | 8 +- .../ABActionAttackModifierApplyArt.java | 8 +- ...BActionAttackModifierApplyArtAndSpeed.java | 8 +- ...ActionAttackModifierApplyDefaultSpeed.java | 4 +- ...tackModifierPreventOtherModifications.java | 4 +- ...PreventOtherSamePriorityModifications.java | 4 +- ...ctionAttackModifierRemoveAnimationTag.java | 4 +- ...ttackModifierRemovePostDamageListener.java | 4 +- ...AttackModifierRemovePreDamageListener.java | 4 +- .../ABActionAttackModifierSetAttackArc.java | 4 +- ...ctionAttackModifierSetAttackDeathTime.java | 4 +- ...ABActionAttackModifierSetAttackHoming.java | 4 +- ...BActionAttackModifierSetAttackImpactZ.java | 4 +- ...ABActionAttackModifierSetAttackStartZ.java | 4 +- ...ABActionAttackModifierSetSplashFields.java | 4 +- ...ABCallbackGetModifiedAttackAttackType.java | 4 +- ...ABCallbackGetModifiedAttackDamageType.java | 4 +- ...ABCallbackGetModifiedAttackWeaponType.java | 4 +- ...ctionAttemptToReOrderPreviousBehavior.java | 4 +- ...ActionAttemptToResumePreviousBehavior.java | 4 +- .../ABActionChangeAttackActionToMovement.java | 4 +- .../ABActionForceBeginCreatedBehavior.java | 4 +- .../behavior/action/buff/ABActionAddBuff.java | 4 +- .../ABActionAddNonStackingDisplayBuff.java | 4 +- .../action/buff/ABActionAddSlowBuff.java | 4 +- .../action/buff/ABActionAddStunBuff.java | 4 +- .../buff/ABActionCreatePassiveBuff.java | 4 +- .../buff/ABActionCreateTargetingBuff.java | 4 +- .../buff/ABActionCreateTimedArtBuff.java | 4 +- .../action/buff/ABActionCreateTimedBuff.java | 4 +- .../buff/ABActionCreateTimedLifeBuff.java | 4 +- ...ActionCreateTimedPausedExpirationBuff.java | 4 +- .../ABActionCreateTimedTargetingBuff.java | 4 +- .../buff/ABActionCreateTimedTickingBuff.java | 4 +- .../ABActionCreateTimedTickingPausedBuff.java | 4 +- ...ActionCreateTimedTickingPostDeathBuff.java | 4 +- .../action/buff/ABActionDispelBuffs.java | 4 +- .../action/buff/ABActionRemoveBuff.java | 4 +- .../ABActionRemoveNonStackingDisplayBuff.java | 4 +- .../action/damage/ABActionDamageArea.java | 4 +- .../damage/ABActionDamageAttackSplash.java | 4 +- .../action/damage/ABActionDamageBurst.java | 4 +- .../action/damage/ABActionDamageSplash.java | 4 +- .../action/damage/ABActionDamageTarget.java | 4 +- .../behavior/action/damage/ABActionHeal.java | 4 +- .../datastore/ABActionDeleteStoredKey.java | 4 +- .../datastore/ABActionStoreValueLocally.java | 4 +- .../ABActionCreateDestructable.java | 4 +- .../ABActionDamageDestructable.java | 4 +- .../ABActionKillDestructable.java | 4 +- .../ABActionRemoveDestructable.java | 4 +- .../ABActionAddDestructableBuff.java | 4 +- .../ABActionCreateDestructableBuff.java | 4 +- .../ABActionDispelDestructableBuffs.java | 4 +- .../ABActionRemoveDestructableBuff.java | 4 +- .../ABActionCreateTimeOfDayEvent.java | 4 +- .../ABActionRegisterTimeOfDayEvent.java | 4 +- .../ABActionRegisterUniqueTimeOfDayEvent.java | 4 +- .../ABActionUnregisterTimeOfDayEvent.java | 4 +- .../widget/ABActionCreateWidgetEvent.java | 4 +- .../widget/ABActionRegisterWidgetEvent.java | 4 +- .../widget/ABActionUnregisterWidgetEvent.java | 4 +- .../ABActionCreateFloatingTextOnUnit.java | 4 +- ...ActionCreateNumericFloatingTextOnUnit.java | 4 +- .../ABActionCreateSpellEffectAtLocation.java | 4 +- .../fx/ABActionCreateSpellEffectAtPoint.java | 4 +- .../fx/ABActionCreateSpellEffectOnUnit.java | 4 +- ...nCreateTemporarySpellEffectAtLocation.java | 4 +- ...tionCreateTemporarySpellEffectAtPoint.java | 4 +- ...ctionCreateTemporarySpellEffectOnUnit.java | 4 +- .../action/fx/ABActionRemoveEffect.java | 4 +- .../ABActionCreateGroupEffectAtLocation.java | 4 +- .../ABActionCreateLightningEffect.java | 4 +- .../ABActionRemoveLightningEffect.java | 4 +- ...ionCreateLoopingSoundEffectAtLocation.java | 4 +- ...BActionCreateLoopingSoundEffectOnUnit.java | 4 +- .../ABActionCreateSoundEffectAtLocation.java | 4 +- .../ABActionCreateSoundEffectOnUnit.java | 4 +- .../fx/splat/ABActionCreateUberSplat.java | 4 +- .../ABActionCreateTerrainBowlAtLocation.java | 4 +- ...ABActionCreateTerrainRippleAtLocation.java | 4 +- .../ABActionCreateTerrainWaveAtLocation.java | 4 +- .../terrain/ABActionModifyTerrainVertex.java | 4 +- .../gamestate/ABActionSetFalseTimeOfDay.java | 4 +- .../action/item/ABActionChargeItem.java | 8 +- .../action/item/ABActionTransformItem.java | 4 +- ...IterateDestructablesInRangeOfLocation.java | 4 +- .../unit/ABActionIterateUnitsInGroup.java | 4 +- .../unit/ABActionIterateUnitsInQueue.java | 4 +- ...itsInRangeOfLocationMatchingCondition.java | 4 +- ...geOfLocationMatchingConditionWithSort.java | 4 +- ...teUnitsInRangeOfUnitMatchingCondition.java | 4 +- ...nRangeOfUnitMatchingConditionWithSort.java | 4 +- .../unit/ABActionIterateUnitsInRect.java | 4 +- .../action/list/ABActionListRemove.java | 4 +- .../action/list/ABActionLocationListAdd.java | 4 +- .../list/ABActionSortableListRemove.java | 4 +- .../action/order/ABActionIssueStopOrder.java | 4 +- .../player/ABActionGiveResourcesToPlayer.java | 4 +- .../ABActionSetAbilityEnabledForPlayer.java | 4 +- ...teLocationTargetedCollisionProjectile.java | 4 +- ...ctionCreateLocationTargetedProjectile.java | 4 +- ...reateLocationTargetedPseudoProjectile.java | 4 +- ...nCreateUnitTargetedBouncingProjectile.java | 8 +- ...CreateUnitTargetedCollisionProjectile.java | 4 +- .../ABActionCreateUnitTargetedProjectile.java | 4 +- ...ionCreateUnitTargetedPseudoProjectile.java | 4 +- .../ABActionSetAttackProjectileDamage.java | 4 +- .../projectile/ABActionSetProjectileDone.java | 4 +- .../ABActionSetProjectileReflected.java | 4 +- .../ABActionSetProjectileTarget.java | 4 +- .../ABActionCheckAbilityEffectReaction.java | 4 +- .../ABActionCheckAbilityProjReaction.java | 4 +- .../action/stats/ABActionAddDefenseBonus.java | 4 +- .../stats/ABActionAddNonStackingStatBuff.java | 4 +- .../ABActionCreateNonStackingStatBuff.java | 4 +- .../ABActionRecomputeStatBuffsOnUnit.java | 4 +- .../stats/ABActionRemoveDefenseBonus.java | 4 +- .../ABActionRemoveNonStackingStatBuff.java | 4 +- .../ABActionUpdateNonStackingStatBuff.java | 4 +- .../action/structural/ABActionBreak.java | 4 +- .../structural/ABActionChainEffect.java | 8 +- .../structural/ABActionCreateSubroutine.java | 4 +- .../action/structural/ABActionFor.java | 4 +- .../action/structural/ABActionIf.java | 4 +- .../structural/ABActionPeriodicExecute.java | 4 +- .../ABActionResetPeriodicExecute.java | 4 +- .../structural/ABActionRunReuseAction.java | 10 +- .../ABActionRunReuseActionWithArguments.java | 10 +- .../structural/ABActionRunSubroutine.java | 4 +- .../action/structural/ABActionWhile.java | 4 +- .../action/timer/ABActionCreateTimer.java | 4 +- .../action/timer/ABActionKillTimer.java | 4 +- .../action/timer/ABActionRemoveTimer.java | 4 +- .../action/timer/ABActionStartTimer.java | 4 +- .../timer/ABActionUpdateTimerTimeout.java | 4 +- .../ABActionAbilityAddUniqueFlag.java | 10 +- .../ABActionAbilityRemoveUniqueFlag.java | 10 +- .../uniqueflag/ABActionBuffAddUniqueFlag.java | 4 +- .../ABActionBuffRemoveUniqueFlag.java | 4 +- .../ABActionAbilityRemoveUniqueValue.java | 8 +- .../ABActionAbilityStoreUniqueValue.java | 8 +- .../ABActionBuffRemoveUniqueValue.java | 4 +- .../ABActionBuffStoreUniqueValue.java | 4 +- .../action/unit/ABActionCreateUnit.java | 4 +- .../action/unit/ABActionHideUnit.java | 4 +- .../action/unit/ABActionKillUnit.java | 4 +- .../action/unit/ABActionRemoveUnit.java | 4 +- .../action/unit/ABActionResurrect.java | 4 +- .../unit/ABActionSetExplodesOnDeath.java | 4 +- .../unit/ABActionStartSacrificingUnit.java | 4 +- .../unit/ABActionStartTrainingUnit.java | 4 +- .../action/unit/ABActionUnhideUnit.java | 4 +- .../ABActionAddSecondaryAnimationTag.java | 4 +- .../unit/animation/ABActionPlayAnimation.java | 4 +- .../animation/ABActionQueueAnimation.java | 4 +- .../ABActionRemoveSecondaryAnimationTag.java | 4 +- .../unit/art/ABActionDivideUnitAlpha.java | 4 +- .../unit/art/ABActionMultiplyUnitAlpha.java | 4 +- .../unit/art/ABActionMultiplyUnitScale.java | 4 +- .../action/unit/art/ABActionSetUnitAlpha.java | 4 +- .../movement/ABActionSetUnitFlyHeight.java | 4 +- ...BActionSetUnitMovementTypeNoCollision.java | 4 +- .../action/unit/stats/ABActionAddMp.java | 4 +- .../action/unit/stats/ABActionSetHp.java | 4 +- .../action/unit/stats/ABActionSetMp.java | 4 +- .../action/unit/stats/ABActionSetSpeed.java | 4 +- .../action/unit/stats/ABActionSubtractMp.java | 4 +- .../transformation/ABActionMergeUnits.java | 4 +- .../transformation/ABActionTransformUnit.java | 26 +- .../ABActionTransformUnitAppearance.java | 4 +- .../ABActionTransformUnitInstant.java | 22 +- .../ABActionTransformedUnitAbilityAdd.java | 18 +- .../ABActionTransformedUnitAbilityRemove.java | 12 +- .../ABActionDisableWorkerAbilities.java | 4 +- .../worker/ABActionEnableWorkerAbilities.java | 4 +- .../ABActionInstantReturnResources.java | 4 +- .../worker/ABActionSendUnitBackToWork.java | 4 +- .../unitgroup/ABActionAddUnitToGroup.java | 4 +- .../unitgroup/ABActionCreateUnitGroup.java | 4 +- .../ABActionRemoveUnitFromGroup.java | 4 +- .../ABActionAddAttackPostDamageListener.java | 4 +- .../ABActionAddAttackPreDamageListener.java | 4 +- ...BActionCreateAttackPostDamageListener.java | 4 +- ...ABActionCreateAttackPreDamageListener.java | 4 +- ...BActionRemoveAttackPostDamageListener.java | 4 +- ...ABActionRemoveAttackPreDamageListener.java | 4 +- ...ActionPreDamageListenerAddBonusDamage.java | 4 +- ...nPreDamageListenerAddDamageMultiplier.java | 4 +- ...DamageListenerLockDamageModifications.java | 4 +- .../ABActionPreDamageListenerSetMiss.java | 4 +- .../ABActionSetPreDamageStacking.java | 4 +- .../ABCallbackGetAttackBaseDamage.java | 4 +- .../ABCallbackGetAttackDamageType.java | 4 +- ...BCallbackGetAttackMaximumSplashRadius.java | 4 +- .../ABCallbackGetAttackType.java | 4 +- .../ABCallbackGetAttackWeaponType.java | 4 +- .../ABConditionIsAttackArtillery.java | 4 +- .../ABConditionIsAttackHoming.java | 4 +- ...onditionIsUnitValidSplashDamageTarget.java | 4 +- .../ABActionAddBehaviorChangeListener.java | 4 +- .../ABActionCreateBehaviorChangeListener.java | 4 +- .../ABActionRemoveBehaviorChangeListener.java | 4 +- .../ABCallbackGetNewBehaviorTarget.java | 4 +- ...BConditionIsNewBehaviorCategoryInList.java | 4 +- .../ABActionAddDamageTakenListener.java | 4 +- ...ionAddDamageTakenModificationListener.java | 4 +- .../ABActionCreateDamageTakenListener.java | 4 +- ...CreateDamageTakenModificationListener.java | 4 +- .../ABActionRemoveDamageTakenListener.java | 4 +- ...RemoveDamageTakenModificationListener.java | 4 +- ...nModificationMultiplyDamageMultiplier.java | 4 +- ...eTakenModificationSetDamageMultiplier.java | 4 +- ...ABConditionIsTriggeringDamageAnAttack.java | 4 +- .../ABConditionIsTriggeringDamageRanged.java | 4 +- .../ABActionAddDeathReplacementEffect.java | 4 +- .../ABActionCreateDeathReplacementEffect.java | 4 +- .../ABActionRemoveDeathReplacementEffect.java | 4 +- ...onDeathReplacementFinishReincarnating.java | 4 +- ...ctionDeathReplacementSetReincarnating.java | 4 +- .../ABActionDeathReplacementSetReviving.java | 4 +- .../evasion/ABActionAddEvasionListener.java | 4 +- .../ABActionCreateEvasionListener.java | 4 +- .../ABActionRemoveEvasionListener.java | 4 +- ...ctionAddAbilityEffectReactionListener.java | 4 +- ...BActionAddAbilityProjReactionListener.java | 4 +- ...ABActionAddAttackProjReactionListener.java | 4 +- ...onCreateAbilityEffectReactionListener.java | 4 +- ...tionCreateAbilityProjReactionListener.java | 4 +- ...ctionCreateAttackProjReactionListener.java | 4 +- ...onRemoveAbilityEffectReactionListener.java | 4 +- ...tionRemoveAbilityProjReactionListener.java | 4 +- ...ctionRemoveAttackProjReactionListener.java | 4 +- .../ABActionReactionPreventHit.java | 4 +- ...GetReactionAttackProjectileAttackType.java | 4 +- ...backGetReactionAttackProjectileDamage.java | 4 +- .../ABActionSubtractTotalDamageDealt.java | 4 +- .../ABCallbackGetFinalTotalDamageDealt.java | 4 +- .../ABCallbackGetRawTotalDamageDealt.java | 4 +- .../ABCallbackGetTriggeringAttackType.java | 4 +- .../ABCallbackGetTriggeringDamageType.java | 4 +- .../state/ABActionAddUnitStateListener.java | 4 +- .../ABActionCreateUnitStateListener.java | 4 +- .../ABActionRemoveUnitStateListener.java | 4 +- .../unitqueue/ABActionAddUnitToQueue.java | 4 +- .../unitqueue/ABActionClearUnitQueue.java | 4 +- .../unitqueue/ABActionCreateUnitQueue.java | 4 +- .../ABActionRemoveUnitFromQueue.java | 4 +- .../unitstate/ABActionAddStateModBuff.java | 4 +- .../unitstate/ABActionCreateStateModBuff.java | 4 +- .../unitstate/ABActionRemoveStateModBuff.java | 4 +- .../unitstate/ABActionSetUnitFadeTimer.java | 4 +- .../unitstate/ABActionUpdateStateModBuff.java | 4 +- .../ABActionCreateLocationVisionModifier.java | 4 +- ...BActionCreateProjectileVisionModifier.java | 4 +- .../ABActionCreateUnitVisionModifier.java | 4 +- .../vision/ABActionRemoveVisionModifier.java | 4 +- .../vision/ABActionSetBurrowPlaceholder.java | 4 +- .../behavior/callback/ABCallbackNull.java | 4 +- .../callback/ability/ABAbilityCallback.java | 4 +- .../ability/ABCallbackArgumentAbility.java | 4 +- .../ability/ABCallbackGetAbilityById.java | 8 +- .../ABCallbackGetBuffSourceAbility.java | 4 +- .../ABCallbackGetLastCreatedAbility.java | 4 +- .../ability/ABCallbackGetMatchingAbility.java | 4 +- .../ability/ABCallbackGetPartnerAbility.java | 4 +- .../ability/ABCallbackGetReactionAbility.java | 4 +- .../ABCallbackGetStoredAbilityByKey.java | 4 +- .../ability/ABCallbackGetThisAbility.java | 4 +- .../ABCallbackInlineConditionAbility.java | 4 +- .../ability/ABCallbackReuseAbility.java | 10 +- .../ABCallbackReuseAbilityWithArguments.java | 10 +- .../attack/ABAttackModifierCallback.java | 4 +- ...BCallbackGetLastCreatedAttackModifier.java | 4 +- ...BCallbackGetStoredAttackModifierByKey.java | 4 +- .../ABAttackSettingsCallback.java | 4 +- .../ABCallbackGetCurrentAttackSettings.java | 4 +- ...BCallbackGetLastCreatedAttackSettings.java | 4 +- ...BCallbackGetStoredAttackSettingsByKey.java | 4 +- .../callback/booleans/ABBooleanCallback.java | 4 +- .../ABCallbackGetAbilityDataAsBoolean.java | 12 +- ...BCallbackGetAbilityUniqueValueBoolean.java | 4 +- .../ABCallbackGetBuffUniqueValueBoolean.java | 4 +- ...CallbackGetParentAbilityDataAsBoolean.java | 10 +- .../ABCallbackGetStoredBooleanByKey.java | 4 +- .../ABCallbackInlineConditionBoolean.java | 4 +- .../booleans/ABCallbackIntegerToBoolean.java | 4 +- .../booleans/ABCallbackRawBoolean.java | 4 +- .../callback/buff/ABBuffCallback.java | 4 +- .../callback/buff/ABCallbackArgumentBuff.java | 4 +- .../callback/buff/ABCallbackEnumBuff.java | 4 +- .../callback/buff/ABCallbackGetBuffById.java | 4 +- .../buff/ABCallbackGetLastCreatedBuff.java | 4 +- .../buff/ABCallbackGetMatchingBuff.java | 4 +- .../buff/ABCallbackGetStoredBuffByKey.java | 4 +- .../buff/ABCallbackInlineConditionBuff.java | 4 +- .../callback/buff/ABCallbackReuseBuff.java | 10 +- .../ABCallbackReuseBuffWithArguments.java | 10 +- .../callback/buff/ABCallbackThisBuff.java | 4 +- .../ABCallbackArgumentDestructable.java | 4 +- ...allbackGetAbilityTargetedDestructable.java | 4 +- .../ABCallbackGetAttackedDestructable.java | 4 +- .../ABCallbackGetEnumDestructable.java | 4 +- .../ABCallbackGetLastCreatedDestructable.java | 4 +- ...BCallbackGetProjectileHitDestructable.java | 4 +- .../ABCallbackGetStoredDestructableByKey.java | 4 +- ...ABCallbackInlineConditionDestructable.java | 4 +- .../ABCallbackReuseDestructable.java | 10 +- ...allbackReuseDestructableWithArguments.java | 10 +- .../destructable/ABDestructableCallback.java | 4 +- .../ABCallbackArgumentDestructableBuff.java | 4 +- .../ABCallbackEnumDestructableBuff.java | 4 +- ...allbackGetLastCreatedDestructableBuff.java | 4 +- ...allbackGetStoredDestructableBuffByKey.java | 4 +- ...llbackInlineConditionDestructableBuff.java | 4 +- .../ABCallbackMatchingDestructableBuff.java | 4 +- .../ABCallbackReuseDestructableBuff.java | 10 +- ...ackReuseDestructableBuffWithArguments.java | 10 +- .../ABDestructableBuffCallback.java | 4 +- ...tackPreDamageListenerPriorityCallback.java | 4 +- .../callback/enums/ABAttackTypeCallback.java | 4 +- .../enums/ABAutocastTypeCallback.java | 4 +- .../ABCallbackConditionalAutocastType.java | 4 +- .../ABCallbackGetAttackTypeFromString.java | 4 +- .../ABCallbackGetAutocastTypeFromString.java | 4 +- .../ABCallbackGetDamageTypeFromString.java | 4 +- .../ABCallbackGetDefenseTypeFromString.java | 4 +- .../ABCallbackGetMovementTypeFromString.java | 4 +- ...kGetNonStackingStatBuffTypeFromString.java | 4 +- .../ABCallbackGetStoredAttackTypeByKey.java | 4 +- .../ABCallbackGetStoredDamageTypeByKey.java | 4 +- .../ABCallbackGetStoredDefenseTypeByKey.java | 4 +- .../ABCallbackGetStoredMovementTypeByKey.java | 4 +- .../ABCallbackGetStoredTargetTypeByKey.java | 4 +- .../ABCallbackGetStoredWeaponTypeByKey.java | 4 +- .../ABCallbackGetTargetTypeFromString.java | 4 +- .../enums/ABCallbackGetUnitDefenseType.java | 4 +- .../enums/ABCallbackGetUnitMovementType.java | 4 +- .../ABCallbackGetUnitTypeMovementType.java | 4 +- .../ABCallbackGetWeaponTypeFromString.java | 4 +- .../ABCallbackRawDeathEffectPriority.java | 4 +- ...BCallbackRawPreDamageListenerPriority.java | 4 +- .../enums/ABCallbackRawTargetType.java | 4 +- .../enums/ABCallbackRawWeaponType.java | 4 +- .../callback/enums/ABDamageTypeCallback.java | 4 +- .../ABDeathReplacementPriorityCallback.java | 4 +- .../callback/enums/ABDefenseTypeCallback.java | 4 +- .../enums/ABMovementTypeCallback.java | 4 +- .../ABNonStackingStatBuffTypeCallback.java | 4 +- .../callback/enums/ABTargetTypeCallback.java | 4 +- .../callback/enums/ABWeaponTypeCallback.java | 4 +- .../ABCallbackArgumentTimeOfDayEvent.java | 4 +- ...BCallbackGetLastCreatedTimeOfDayEvent.java | 4 +- ...BCallbackGetStoredTimeOfDayEventByKey.java | 4 +- ...CallbackInlineConditionTimeOfDayEvent.java | 4 +- .../ABCallbackReuseTimeOfDayEvent.java | 10 +- ...lbackReuseTimeOfDayEventWithArguments.java | 10 +- .../timeevent/ABTimeOfDayEventCallback.java | 4 +- .../ABCallbackArgumentWidgetEvent.java | 4 +- .../ABCallbackGetLastCreatedWidgetEvent.java | 4 +- .../ABCallbackGetStoredWidgetEventByKey.java | 4 +- .../ABCallbackInlineConditionWidgetEvent.java | 4 +- .../ABCallbackReuseWidgetEvent.java | 10 +- ...CallbackReuseWidgetEventWithArguments.java | 10 +- .../widgetevent/ABWidgetEventCallback.java | 4 +- .../callback/floats/ABCallbackAddFloat.java | 4 +- .../floats/ABCallbackArgumentFloat.java | 4 +- .../callback/floats/ABCallbackCeilFloat.java | 4 +- .../callback/floats/ABCallbackCos.java | 4 +- .../callback/floats/ABCallbackDegToRad.java | 4 +- .../floats/ABCallbackDivideFloat.java | 4 +- .../callback/floats/ABCallbackFMaxValue.java | 4 +- .../callback/floats/ABCallbackFloorFloat.java | 4 +- .../floats/ABCallbackGetAbilityArea.java | 12 +- .../floats/ABCallbackGetAbilityCastRange.java | 12 +- .../floats/ABCallbackGetAbilityCastTime.java | 12 +- .../floats/ABCallbackGetAbilityCooldown.java | 12 +- .../ABCallbackGetAbilityDataAsFloat.java | 12 +- .../floats/ABCallbackGetAbilityDuration.java | 8 +- .../ABCallbackGetAbilityHeroDuration.java | 8 +- .../ABCallbackGetAbilityProjectileSpeed.java | 4 +- .../ABCallbackGetAbilityUniqueValueFloat.java | 4 +- .../ABCallbackGetAngleBetweenLocations.java | 4 +- .../ABCallbackGetBuffDurationElapsed.java | 4 +- .../ABCallbackGetBuffUniqueValueFloat.java | 4 +- ...ABCallbackGetDistanceBetweenLocations.java | 4 +- .../ABCallbackGetDistanceBetweenUnits.java | 4 +- .../floats/ABCallbackGetLocationX.java | 4 +- .../floats/ABCallbackGetLocationY.java | 4 +- ...ABCallbackGetParentAbilityDataAsFloat.java | 14 +- .../floats/ABCallbackGetStoredFloatByKey.java | 4 +- .../ABCallbackGetUnitAcquisitionRange.java | 4 +- .../floats/ABCallbackGetUnitCastPoint.java | 4 +- .../floats/ABCallbackGetUnitCurrentHp.java | 4 +- .../floats/ABCallbackGetUnitCurrentMana.java | 4 +- .../floats/ABCallbackGetUnitFacing.java | 4 +- .../floats/ABCallbackGetUnitInitialMana.java | 4 +- .../floats/ABCallbackGetUnitLocationX.java | 4 +- .../floats/ABCallbackGetUnitLocationY.java | 4 +- .../ABCallbackInlineConditionFloat.java | 4 +- .../callback/floats/ABCallbackIntToFloat.java | 4 +- .../callback/floats/ABCallbackMaxFloat.java | 4 +- .../callback/floats/ABCallbackMinFloat.java | 4 +- .../floats/ABCallbackMultiplyFloat.java | 4 +- .../floats/ABCallbackNegativeFloat.java | 4 +- .../floats/ABCallbackOneGameTick.java | 4 +- .../callback/floats/ABCallbackPi.java | 4 +- .../floats/ABCallbackRandomBoundedFloat.java | 4 +- .../floats/ABCallbackRandomFloat.java | 4 +- .../callback/floats/ABCallbackRawFloat.java | 4 +- .../callback/floats/ABCallbackReuseFloat.java | 10 +- .../ABCallbackReuseFloatWithArguments.java | 10 +- .../callback/floats/ABCallbackSin.java | 4 +- .../floats/ABCallbackSubtractFloat.java | 4 +- .../callback/floats/ABCallbackTan.java | 4 +- .../floats/ABCallbackTicksForDuration.java | 4 +- .../callback/floats/ABFloatCallback.java | 4 +- .../callback/fx/ABCallbackArgumentFX.java | 4 +- .../fx/ABCallbackGetLastCreatedFX.java | 4 +- ...CallbackGetLastCreatedLightningEffect.java | 4 +- .../fx/ABCallbackGetStoredFXByKey.java | 4 +- .../fx/ABCallbackGetStoredLightningByKey.java | 4 +- .../fx/ABCallbackInlineConditionFX.java | 4 +- .../callback/fx/ABCallbackReuseFX.java | 10 +- .../fx/ABCallbackReuseFXWithArguments.java | 10 +- .../behavior/callback/fx/ABFXCallback.java | 4 +- .../callback/fx/ABLightningCallback.java | 4 +- .../callback/id/ABCallbackArgumentID.java | 4 +- .../id/ABCallbackGetAbilityDataAsID.java | 12 +- .../ABCallbackGetAbilityDataAsIDFromList.java | 12 +- ...lbackGetAbilityDataAsRandomIDFromList.java | 12 +- .../id/ABCallbackGetAbilityUniqueValueId.java | 4 +- .../id/ABCallbackGetAbilityUnitId.java | 8 +- .../callback/id/ABCallbackGetAlias.java | 4 +- .../callback/id/ABCallbackGetBuffAlias.java | 4 +- .../id/ABCallbackGetBuffIdFromCode.java | 4 +- .../callback/id/ABCallbackGetCode.java | 4 +- .../callback/id/ABCallbackGetFirstBuffId.java | 8 +- .../id/ABCallbackGetFirstEffectId.java | 8 +- .../callback/id/ABCallbackGetItemType.java | 4 +- .../ABCallbackGetNonCurrentTransformType.java | 4 +- .../callback/id/ABCallbackGetParentAlias.java | 6 +- .../id/ABCallbackGetSecondBuffId.java | 8 +- .../id/ABCallbackGetStoredIDByKey.java | 4 +- .../callback/id/ABCallbackGetUnitType.java | 4 +- .../id/ABCallbackGetWar3IDFromString.java | 4 +- .../id/ABCallbackInlineConditionID.java | 4 +- .../callback/id/ABCallbackNullIfFalse.java | 4 +- .../callback/id/ABCallbackRandomItemId.java | 10 +- .../ABCallbackRandomMechanicalCritterId.java | 8 +- .../callback/id/ABCallbackReuseID.java | 10 +- .../id/ABCallbackReuseIDWithArguments.java | 10 +- .../behavior/callback/id/ABIDCallback.java | 4 +- .../integers/ABCallbackAddInteger.java | 4 +- .../integers/ABCallbackAndInteger.java | 4 +- .../integers/ABCallbackArgumentInteger.java | 4 +- ...backCountBuffsOnUnitMatchingCondition.java | 4 +- ...ABCallbackCountUnitsInRangeOfLocation.java | 4 +- .../ABCallbackCountUnitsInRangeOfUnit.java | 4 +- ...ABCallbackDetectionDropdownConversion.java | 4 +- .../integers/ABCallbackDivideInteger.java | 4 +- ...ABCallbackGetAbilityCastTimeAsInteger.java | 12 +- .../ABCallbackGetAbilityDataAsInteger.java | 12 +- .../ABCallbackGetAbilityHandleAsInteger.java | 4 +- .../ABCallbackGetAbilityManaCost.java | 12 +- ...lbackGetAbilityTargetAttachmentPoints.java | 12 +- ...BCallbackGetAbilityUniqueValueInteger.java | 4 +- .../ABCallbackGetBuffHandleAsInteger.java | 4 +- .../ABCallbackGetBuffUniqueValueInteger.java | 4 +- .../integers/ABCallbackGetCastId.java | 4 +- .../ABCallbackGetIntegerFromList.java | 4 +- .../integers/ABCallbackGetItemCharges.java | 4 +- .../integers/ABCallbackGetItemLevel.java | 4 +- .../integers/ABCallbackGetItemMaxCharges.java | 4 +- .../integers/ABCallbackGetItemSlot.java | 4 +- .../integers/ABCallbackGetListSize.java | 4 +- .../ABCallbackGetNeutralHostilePlayerId.java | 4 +- .../ABCallbackGetNeutralPassivePlayerId.java | 4 +- .../integers/ABCallbackGetPlayerId.java | 4 +- ...lbackGetProjectileDestructableTargets.java | 4 +- .../ABCallbackGetProjectileUnitTargets.java | 4 +- .../ABCallbackGetSortableListSize.java | 4 +- .../integers/ABCallbackGetSpellLevel.java | 4 +- .../ABCallbackGetStoredIntegerByKey.java | 4 +- .../integers/ABCallbackGetUnitGroupSize.java | 4 +- .../ABCallbackGetUnitHandleAsInteger.java | 4 +- .../integers/ABCallbackGetUnitMaximumHp.java | 4 +- .../integers/ABCallbackGetUnitMaximumMp.java | 4 +- .../integers/ABCallbackGetUnitQueueSize.java | 4 +- .../ABCallbackGetUnitTypeFoodCost.java | 4 +- .../ABCallbackGetUnitTypeGoldCost.java | 4 +- .../ABCallbackGetUnitTypeLumberCost.java | 4 +- .../integers/ABCallbackGetUnitTypeSpeed.java | 4 +- .../ABCallbackInlineConditionInteger.java | 4 +- .../integers/ABCallbackIntegerIf.java | 4 +- .../ABCallbackIntegerZeroIfFalse.java | 4 +- .../integers/ABCallbackIntegerZeroIfNull.java | 4 +- .../callback/integers/ABCallbackIterator.java | 4 +- .../integers/ABCallbackMaxInteger.java | 4 +- .../integers/ABCallbackMinInteger.java | 4 +- .../integers/ABCallbackMultiplyInteger.java | 4 +- .../integers/ABCallbackOrInteger.java | 4 +- .../ABCallbackPlayerToStateModValue.java | 4 +- .../integers/ABCallbackRandomInteger.java | 4 +- .../integers/ABCallbackRawInteger.java | 4 +- .../integers/ABCallbackReuseInteger.java | 10 +- .../ABCallbackReuseIntegerWithArguments.java | 10 +- .../integers/ABCallbackSubtractInteger.java | 4 +- .../ABCallbackTruncateFloatToInteger.java | 4 +- .../callback/integers/ABIntegerCallback.java | 4 +- .../callback/item/ABCallbackArgumentItem.java | 4 +- .../ABCallbackGetAbilityTargetedItem.java | 4 +- .../item/ABCallbackGetAttackedItem.java | 4 +- .../item/ABCallbackGetLastCreatedItem.java | 4 +- .../item/ABCallbackGetStoredItemByKey.java | 4 +- .../item/ABCallbackInlineConditionItem.java | 4 +- .../callback/item/ABCallbackReuseItem.java | 10 +- .../ABCallbackReuseItemWithArguments.java | 10 +- .../callback/item/ABItemCallback.java | 4 +- .../callback/list/ABCallbackArgumentList.java | 4 +- .../list/ABCallbackArgumentSortableList.java | 4 +- .../list/ABCallbackGetStoredListByKey.java | 4 +- .../ABCallbackGetStoredSortableListByKey.java | 4 +- .../list/ABCallbackInlineConditionList.java | 4 +- ...ABCallbackInlineConditionSortableList.java | 4 +- .../callback/list/ABCallbackListSorted.java | 4 +- .../callback/list/ABCallbackReuseList.java | 10 +- .../ABCallbackReuseListWithArguments.java | 10 +- .../list/ABCallbackReuseSortableList.java | 10 +- ...allbackReuseSortableListWithArguments.java | 10 +- .../callback/list/ABListCallback.java | 4 +- .../callback/list/ABSortableListCallback.java | 4 +- .../integer/ABCallbackEmptyIntegerList.java | 4 +- .../integer/ABCallbackIntegerListOfRange.java | 4 +- .../list/integer/ABIntegerListCallback.java | 4 +- .../location/ABCallbackEmptyLocationList.java | 4 +- .../list/location/ABLocationListCallback.java | 4 +- ...AbilityEffectReactionListenerCallback.java | 4 +- ...ABAbilityProjReactionListenerCallback.java | 4 +- .../ABAttackPostDamageListenerCallback.java | 4 +- .../ABAttackPreDamageListenerCallback.java | 4 +- .../ABAttackProjReactionListenerCallback.java | 4 +- .../ABBehaviorChangeListenerCallback.java | 4 +- ...tCreatedAbilityEffectReactionListener.java | 4 +- ...astCreatedAbilityProjReactionListener.java | 4 +- ...etLastCreatedAttackPostDamageListener.java | 4 +- ...GetLastCreatedAttackPreDamageListener.java | 4 +- ...LastCreatedAttackProjReactionListener.java | 4 +- ...kGetLastCreatedBehaviorChangeListener.java | 4 +- ...backGetLastCreatedDamageTakenListener.java | 4 +- ...reatedDamageTakenModificationListener.java | 4 +- ...allbackGetLastCreatedDeathReplacement.java | 4 +- ...CallbackGetLastCreatedEvasionListener.java | 4 +- ...llbackGetLastCreatedUnitStateListener.java | 4 +- ...redAbilityEffectReactionListenerByKey.java | 4 +- ...toredAbilityProjReactionListenerByKey.java | 4 +- ...etStoredAttackPostDamageListenerByKey.java | 4 +- ...GetStoredAttackPreDamageListenerByKey.java | 4 +- ...StoredAttackProjReactionListenerByKey.java | 4 +- ...kGetStoredBehaviorChangeListenerByKey.java | 4 +- ...backGetStoredDamageTakenListenerByKey.java | 4 +- ...dDamageTakenModificationListenerByKey.java | 4 +- ...allbackGetStoredDeathReplacementByKey.java | 4 +- ...CallbackGetStoredEvasionListenerByKey.java | 4 +- ...llbackGetStoredUnitStateListenerByKey.java | 4 +- .../ABDamageTakenListenerCallback.java | 4 +- ...mageTakenModificationListenerCallback.java | 4 +- .../listener/ABDeathReplacementCallback.java | 4 +- .../listener/ABEvasionListenerCallback.java | 4 +- .../listener/ABUnitStateListenerCallback.java | 4 +- .../location/ABCallbackArgumentLocation.java | 4 +- .../ABCallbackCreateLocationFromOffset.java | 4 +- .../ABCallbackCreateLocationFromTarget.java | 4 +- .../ABCallbackCreateLocationFromXY.java | 4 +- .../ABCallbackCreateLocationFromXYOffset.java | 4 +- .../ABCallbackGetAttackImpactLocation.java | 4 +- .../ABCallbackGetAttackTargetLocation.java | 4 +- .../ABCallbackGetGroundAttackedLocation.java | 4 +- .../ABCallbackGetLocationFromList.java | 4 +- ...BCallbackGetProjectileCurrentLocation.java | 4 +- .../ABCallbackGetStoredLocationByKey.java | 4 +- .../ABCallbackGetTargetedLocation.java | 4 +- .../location/ABCallbackGetUnitLocation.java | 4 +- .../ABCallbackInlineConditionLocation.java | 4 +- .../ABCallbackModifyLocationWithOffset.java | 4 +- .../ABCallbackModifyLocationWithXYOffset.java | 4 +- .../ABCallbackRandomLocationInRange.java | 4 +- .../location/ABCallbackReuseLocation.java | 10 +- .../ABCallbackReuseLocationWithArguments.java | 10 +- .../callback/location/ABLocationCallback.java | 4 +- .../callback/longs/ABCallbackAddLong.java | 4 +- .../callback/longs/ABCallbackAndLong.java | 4 +- .../longs/ABCallbackArgumentLong.java | 4 +- .../longs/ABCallbackCreateDetectedData.java | 4 +- .../longs/ABCallbackCreateDetectorData.java | 4 +- .../longs/ABCallbackCreateOwnershipData.java | 4 +- .../callback/longs/ABCallbackDivideLong.java | 4 +- .../longs/ABCallbackGetAbilityDataAsLong.java | 12 +- .../ABCallbackGetAbilityUniqueValueLong.java | 4 +- .../ABCallbackGetBuffUniqueValueLong.java | 4 +- .../longs/ABCallbackGetStoredLongByKey.java | 4 +- .../longs/ABCallbackInlineConditionLong.java | 4 +- .../callback/longs/ABCallbackMaxLong.java | 4 +- .../callback/longs/ABCallbackMinLong.java | 4 +- .../longs/ABCallbackMultiplyLong.java | 4 +- .../callback/longs/ABCallbackOrLong.java | 4 +- .../longs/ABCallbackPlayerMaskAllPlayers.java | 4 +- .../ABCallbackPlayerMaskExcludePlayers.java | 4 +- .../ABCallbackPlayerMaskIncludePlayers.java | 4 +- .../callback/longs/ABCallbackRawLong.java | 4 +- .../callback/longs/ABCallbackReuseLong.java | 10 +- .../ABCallbackReuseLongWithArguments.java | 10 +- .../longs/ABCallbackSubtractLong.java | 4 +- .../callback/longs/ABLongCallback.java | 4 +- .../orderid/ABCallbackArgumentOrderId.java | 4 +- .../ABCallbackGetStoredOrderIdByKey.java | 4 +- .../callback/orderid/ABCallbackIdString.java | 4 +- .../ABCallbackInlineConditionOrderId.java | 4 +- .../callback/orderid/ABCallbackRawID.java | 4 +- .../orderid/ABCallbackReuseOrderId.java | 10 +- .../ABCallbackReuseOrderIdWithArguments.java | 10 +- .../callback/orderid/ABOrderIdCallback.java | 4 +- .../player/ABCallbackArgumentPlayer.java | 4 +- .../player/ABCallbackGetCastingPlayer.java | 4 +- .../player/ABCallbackGetOwnerOfUnit.java | 4 +- .../player/ABCallbackGetPlayerById.java | 4 +- .../ABCallbackGetStoredPlayerByKey.java | 4 +- .../ABCallbackInlineConditionPlayer.java | 4 +- .../player/ABCallbackReusePlayer.java | 10 +- .../ABCallbackReusePlayerWithArguments.java | 10 +- .../callback/player/ABPlayerCallback.java | 4 +- .../ABCallbackArgumentProjectile.java | 4 +- .../ABCallbackGetLastCreatedProjectile.java | 4 +- ...BCallbackGetReactionAbilityProjectile.java | 4 +- ...ABCallbackGetReactionAttackProjectile.java | 4 +- .../ABCallbackGetStoredProjectileByKey.java | 4 +- .../ABCallbackGetThisProjectile.java | 4 +- .../ABCallbackInlineConditionProjectile.java | 4 +- .../projectile/ABCallbackReuseProjectile.java | 10 +- ...BCallbackReuseProjectileWithArguments.java | 10 +- .../projectile/ABProjectileCallback.java | 4 +- ...ABCallbackArgumentNonStackingStatBuff.java | 4 +- ...backGetLastCreatedNonStackingStatBuff.java | 4 +- ...backGetStoredNonStackingStatBuffByKey.java | 4 +- ...ackInlineConditionNonStackingStatBuff.java | 4 +- .../ABCallbackReuseNonStackingStatBuff.java | 10 +- ...ReuseNonStackingStatBuffWithArguments.java | 10 +- .../ABNonStackingStatBuffCallback.java | 4 +- .../ABCallbackArgumentStateModBuff.java | 4 +- .../ABCallbackGetLastCreatedStateModBuff.java | 4 +- .../ABCallbackGetStoredStateModBuffByKey.java | 4 +- ...ABCallbackInlineConditionStateModBuff.java | 4 +- .../statemod/ABCallbackReuseStateModBuff.java | 10 +- ...allbackReuseStateModBuffWithArguments.java | 10 +- .../statemod/ABStateModBuffCallback.java | 4 +- .../strings/ABCallbackArgumentString.java | 4 +- .../strings/ABCallbackBooleanToString.java | 4 +- .../strings/ABCallbackCatStrings.java | 4 +- .../strings/ABCallbackFloatToString.java | 4 +- .../ABCallbackGetAbilityDataAsString.java | 12 +- .../ABCallbackGetAbilityHandleAsString.java | 4 +- ...ABCallbackGetAbilityUniqueValueString.java | 4 +- .../strings/ABCallbackGetAliasAsString.java | 4 +- .../ABCallbackGetAllowStackingKey.java | 4 +- .../ABCallbackGetBuffHandleAsString.java | 4 +- .../ABCallbackGetBuffUniqueValueString.java | 4 +- .../strings/ABCallbackGetCodeAsString.java | 4 +- .../ABCallbackGetStoredStringByKey.java | 4 +- .../ABCallbackGetUnitHandleAsString.java | 4 +- .../strings/ABCallbackIdToString.java | 4 +- .../ABCallbackInlineConditionString.java | 4 +- .../strings/ABCallbackIntegerToString.java | 4 +- .../strings/ABCallbackLongToString.java | 4 +- .../callback/strings/ABCallbackRawString.java | 4 +- .../strings/ABCallbackReuseString.java | 10 +- .../ABCallbackReuseStringWithArguments.java | 10 +- .../callback/strings/ABStringCallback.java | 4 +- .../target/ABCallbackArgumentTarget.java | 4 +- .../target/ABCallbackGetAbilityTarget.java | 4 +- .../ABCallbackGetStoredTargetByKey.java | 4 +- .../ABCallbackInlineConditionTarget.java | 4 +- .../target/ABCallbackReuseTarget.java | 10 +- .../ABCallbackReuseTargetWithArguments.java | 10 +- .../callback/target/ABTargetCallback.java | 4 +- .../timer/ABCallbackArgumentTimer.java | 4 +- .../timer/ABCallbackGetFiringTimer.java | 4 +- .../timer/ABCallbackGetLastCreatedTimer.java | 4 +- .../timer/ABCallbackGetLastStartedTimer.java | 4 +- .../timer/ABCallbackGetStoredTimerByKey.java | 4 +- .../timer/ABCallbackInlineConditionTimer.java | 4 +- .../callback/timer/ABCallbackReuseTimer.java | 10 +- .../ABCallbackReuseTimerWithArguments.java | 10 +- .../callback/timer/ABTimerCallback.java | 4 +- .../callback/unit/ABCallbackArgumentUnit.java | 4 +- .../unit/ABCallbackGetAbilityPairedUnit.java | 4 +- .../ABCallbackGetAbilityTargetedUnit.java | 4 +- .../unit/ABCallbackGetAttackedUnit.java | 4 +- .../unit/ABCallbackGetAttackingUnit.java | 4 +- .../unit/ABCallbackGetBuffCastingUnit.java | 4 +- .../unit/ABCallbackGetBuffedUnit.java | 4 +- .../unit/ABCallbackGetCastingUnit.java | 4 +- .../callback/unit/ABCallbackGetChainUnit.java | 4 +- .../callback/unit/ABCallbackGetCompUnit1.java | 4 +- .../callback/unit/ABCallbackGetCompUnit2.java | 4 +- .../unit/ABCallbackGetDamagedUnit.java | 4 +- .../unit/ABCallbackGetDamagingUnit.java | 4 +- .../callback/unit/ABCallbackGetDyingUnit.java | 4 +- .../callback/unit/ABCallbackGetEnumUnit.java | 4 +- .../unit/ABCallbackGetKillingUnit.java | 4 +- .../unit/ABCallbackGetLastCreatedUnit.java | 4 +- .../unit/ABCallbackGetListenerUnit.java | 4 +- .../unit/ABCallbackGetMatchingUnit.java | 4 +- ...CallbackGetNearestCorpseInRangeOfUnit.java | 8 +- ...ABCallbackGetNearestUnitInRangeOfUnit.java | 8 +- .../unit/ABCallbackGetParentCastingUnit.java | 4 +- .../unit/ABCallbackGetProjectileHitUnit.java | 4 +- .../ABCallbackGetProjectileSourceUnit.java | 4 +- ...CallbackGetReactionAbilityCastingUnit.java | 4 +- ...BCallbackGetReactionAbilityTargetUnit.java | 4 +- .../unit/ABCallbackGetStoredUnitByKey.java | 4 +- .../unit/ABCallbackInlineConditionUnit.java | 4 +- .../unit/ABCallbackPollUnitQueue.java | 4 +- .../callback/unit/ABCallbackReuseUnit.java | 10 +- .../ABCallbackReuseUnitWithArguments.java | 10 +- .../callback/unit/ABUnitCallback.java | 4 +- .../ABCallbackArgumentUnitGroup.java | 4 +- .../ABCallbackGetLastCreatedUnitGroup.java | 4 +- .../ABCallbackGetStoredUnitGroupByKey.java | 4 +- .../ABCallbackGetUnitGroupByName.java | 4 +- .../ABCallbackInlineConditionUnitGroup.java | 4 +- .../unitgroup/ABCallbackReuseUnitGroup.java | 10 +- ...ABCallbackReuseUnitGroupWithArguments.java | 10 +- .../unitgroup/ABUnitGroupCallback.java | 4 +- .../ABCallbackArgumentUnitQueue.java | 4 +- .../ABCallbackGetLastCreatedUnitQueue.java | 4 +- .../ABCallbackGetStoredUnitQueueByKey.java | 4 +- .../ABCallbackGetUnitQueueByName.java | 4 +- .../ABCallbackInlineConditionUnitQueue.java | 4 +- .../unitqueue/ABCallbackReuseUnitQueue.java | 10 +- ...ABCallbackReuseUnitQueueWithArguments.java | 10 +- .../unitqueue/ABUnitQueueCallback.java | 4 +- .../ABCallbackArgumentVisionModifier.java | 4 +- ...BCallbackGetLastCreatedVisionModifier.java | 4 +- ...BCallbackGetStoredVisionModifierByKey.java | 4 +- ...CallbackInlineConditionVisionModifier.java | 4 +- .../ABCallbackReuseVisionModifier.java | 10 +- ...lbackReuseVisionModifierWithArguments.java | 10 +- .../ABVisionModifierCallback.java | 4 +- .../widget/ABCallbackArgumentWidget.java | 4 +- .../ABCallbackDestructableToWidget.java | 4 +- .../ABCallbackGetProjectileHitWidget.java | 4 +- .../ABCallbackGetStoredWidgetByKey.java | 4 +- .../ABCallbackInlineConditionWidget.java | 4 +- .../widget/ABCallbackItemToWidget.java | 4 +- .../widget/ABCallbackReuseWidget.java | 10 +- .../ABCallbackReuseWidgetWithArguments.java | 10 +- .../widget/ABCallbackUnitToWidget.java | 4 +- .../callback/widget/ABWidgetCallback.java | 4 +- .../condition/ABCallbackArgumentBoolean.java | 4 +- .../condition/ABCallbackReuseBoolean.java | 10 +- .../ABCallbackReuseBooleanWithArguments.java | 10 +- .../ABConditionSetCantUseReasonOnFailure.java | 4 +- .../ABConditionIsAutoCastCurrentlyActive.java | 4 +- .../ability/ABConditionIsDisabled.java | 8 +- ...BConditionIsFlexAbilityNonPointTarget.java | 8 +- .../ABConditionIsFlexAbilityNonTargeted.java | 8 +- .../ABConditionIsFlexAbilityPointTarget.java | 8 +- .../ABConditionIsFlexAbilityTargeted.java | 8 +- .../ability/ABConditionIsOnCooldown.java | 8 +- .../ABConditionIsToggleAbilityActive.java | 8 +- .../ABConditionIsTransformingToAlternate.java | 4 +- .../ability/ABConditionWasAutoCast.java | 4 +- ...BConditionWasAutoCastPreviouslyActive.java | 4 +- .../ABConditionWasCastingInterrupted.java | 4 +- .../attack/ABConditionIsAttackProjectile.java | 4 +- .../attack/ABConditionIsAttackRanged.java | 4 +- .../condition/buff/ABConditionIsBuffAlly.java | 4 +- .../buff/ABConditionIsBuffEnemy.java | 4 +- .../buff/ABConditionIsBuffMagic.java | 4 +- .../buff/ABConditionIsBuffNegative.java | 4 +- .../buff/ABConditionIsBuffPositive.java | 4 +- .../ABConditionIsAttackTypeEqual.java | 4 +- .../ABConditionIsDamageTypeEqual.java | 4 +- .../ABConditionIsDefenseTypeEqual.java | 4 +- .../ABConditionIsDefenseTypeInList.java | 4 +- .../comparison/ABConditionIsIdEqual.java | 4 +- .../ABConditionIsMovementTypeEqual.java | 4 +- .../comparison/ABConditionIsUnitEqual.java | 4 +- .../ABConditionIsWeaponTypeEqual.java | 4 +- ...BConditionSuccessfullyChargeResources.java | 4 +- .../ABConditionDoesDestructableHaveBuff.java | 4 +- ...DestructableHaveBuffMatchingCondition.java | 4 +- .../destructable/ABConditionIsTree.java | 4 +- .../ABConditionIsDestructableBuffMagic.java | 4 +- ...ameplayConstantCanDisableDivineShield.java | 4 +- ...ionGameplayConstantIsDefendCanDeflect.java | 4 +- ...ameplayConstantIsRelativeUpgradeCosts.java | 4 +- ...tionGameplayConstantSmartAbolishMagic.java | 4 +- .../game/ABConditionIsTimeOfDayInRange.java | 4 +- .../item/ABConditionIsItemAbility.java | 8 +- .../item/ABConditionItemHasCharges.java | 8 +- .../item/ABConditionItemIsCharged.java | 8 +- .../ABConditionIsLocationDeepWater.java | 4 +- .../ABConditionIsLocationFlyingOnly.java | 4 +- ...onditionIsLocationPathableForUnitType.java | 4 +- .../ABConditionIsLocationShallowWater.java | 4 +- .../ABConditionIsLocationWalkable.java | 4 +- ...ABConditionIsLocationWalkableNonWater.java | 4 +- .../condition/logical/ABConditionAnd.java | 4 +- .../condition/logical/ABConditionBool.java | 4 +- .../condition/logical/ABConditionIsNull.java | 4 +- .../condition/logical/ABConditionNot.java | 4 +- .../condition/logical/ABConditionNotNull.java | 4 +- .../condition/logical/ABConditionOr.java | 4 +- .../membership/ABConditionIsUnitInGroup.java | 4 +- .../ABConditionIsUnitInRangeOfUnit.java | 4 +- ...tionMatchingCorpseExistsInRangeOfUnit.java | 8 +- ...ditionMatchingUnitExistsInRangeOfUnit.java | 8 +- .../numeric/ABConditionFloatEq0.java | 4 +- .../numeric/ABConditionFloatEqual.java | 4 +- .../condition/numeric/ABConditionFloatGt.java | 4 +- .../numeric/ABConditionFloatGt0.java | 4 +- .../numeric/ABConditionFloatGte.java | 4 +- .../condition/numeric/ABConditionFloatLt.java | 4 +- .../numeric/ABConditionFloatLte.java | 4 +- .../condition/numeric/ABConditionFloatNe.java | 4 +- .../numeric/ABConditionFloatNe0.java | 4 +- .../numeric/ABConditionIntegerEq.java | 4 +- .../numeric/ABConditionIntegerEq0.java | 4 +- .../numeric/ABConditionIntegerGt.java | 4 +- .../numeric/ABConditionIntegerGt0.java | 4 +- .../numeric/ABConditionIntegerGte.java | 4 +- .../numeric/ABConditionIntegerIsEven.java | 4 +- .../numeric/ABConditionIntegerIsOdd.java | 4 +- .../numeric/ABConditionIntegerLt.java | 4 +- .../numeric/ABConditionIntegerLte.java | 4 +- .../numeric/ABConditionIntegerNe.java | 4 +- .../numeric/ABConditionIntegerNe0.java | 4 +- .../ABConditionIsProjectileReflected.java | 4 +- .../ABConditionIsDestructableValidTarget.java | 18 +- ...ConditionIsPassAllAbilityTargetChecks.java | 8 +- ...itionIsUnitPassAllAbilityTargetChecks.java | 8 +- .../ABConditionIsUnitValidTarget.java | 18 +- .../targeting/ABConditionIsValidTarget.java | 18 +- .../timer/ABConditionIsTimerActive.java | 4 +- .../ABConditionDoesAbilityHaveUniqueFlag.java | 4 +- .../ABConditionDoesBuffHaveUniqueFlag.java | 4 +- .../condition/unit/ABConditionIsUnitType.java | 4 +- ...nDoesUnitHaveAbilityMatchingCondition.java | 4 +- .../unit/alliance/ABConditionIsUnitEnemy.java | 4 +- .../alliance/ABConditionIsUnitFriend.java | 4 +- .../ABConditionIsUnitShareSpells.java | 4 +- ...ditionIsCurrentBehaviorCategoryInList.java | 4 +- .../buff/ABConditionDoesUnitHaveBuff.java | 4 +- ...tionDoesUnitHaveBuffMatchingCondition.java | 4 +- .../ABConditionIsUnitBuilding.java | 4 +- .../classification/ABConditionIsUnitHero.java | 4 +- .../ABConditionIsUnitHeroDuration.java | 4 +- .../ABConditionIsUnitHidden.java | 4 +- .../ABConditionIsUnitMagicImmune.java | 4 +- .../ABConditionIsUnitMorphImmune.java | 4 +- .../ABConditionIsUnitSummoned.java | 4 +- .../unit/state/ABConditionIsUnitAlive.java | 4 +- .../unit/state/ABConditionIsUnitDead.java | 4 +- .../unit/state/ABConditionIsUnitMaxHp.java | 4 +- .../unit/state/ABConditionIsUnitMaxMp.java | 4 +- .../state/ABConditionIsUnitPolymorphed.java | 4 +- .../unit/state/ABConditionIsUnitSleeping.java | 4 +- .../state/ABConditionIsUnitUpgrading.java | 4 +- .../unit/state/ABConditionIsUnitVisible.java | 4 +- .../tech/ABConditionIsUnitConstructing.java | 4 +- ...onditionIsUnitConstructingOrUpgrading.java | 4 +- .../unit/tech/ABConditionIsUnitTraining.java | 4 +- .../unit/tech/ABConditionUnitHasResearch.java | 4 +- .../abilitybuilder/buff/ABBuff.java | 6 +- .../buff/ABDestructableBuff.java | 6 +- .../abilitybuilder/buff/ABGenericArtBuff.java | 4 +- .../buff/ABGenericAuraBuff.java | 4 +- .../buff/ABGenericPermanentBuff.java | 6 +- .../buff/ABGenericTimedBuff.java | 4 +- .../buff/ABPermanentPassiveBuff.java | 6 +- .../abilitybuilder/buff/ABTargetingBuff.java | 4 +- .../abilitybuilder/buff/ABTimedArtBuff.java | 6 +- .../abilitybuilder/buff/ABTimedBuff.java | 6 +- .../ABTimedInstantTransformationBuff.java | 24 +- .../buff/ABTimedPausedExpirationBuff.java | 6 +- .../buff/ABTimedTargetingBuff.java | 4 +- .../buff/ABTimedTickingBuff.java | 6 +- .../buff/ABTimedTickingPausedBuff.java | 6 +- .../buff/ABTimedTickingPostDeathBuff.java | 6 +- .../buff/ABTimedTransformationBuff.java | 42 +-- .../buff/defaultbuffs/ABBuffSlow.java | 6 +- .../buff/defaultbuffs/ABBuffStun.java | 4 +- ....java => ABAbilityBuilderGsonBuilder.java} | 2 +- .../abilitybuilder/core/ABAction.java | 4 +- .../abilitybuilder/core/ABCallback.java | 4 +- .../abilitybuilder/core/ABCondition.java | 4 +- .../{DataStore.java => ABDataStore.java} | 2 +- ...lDataStore.java => ABGlobalDataStore.java} | 6 +- ...alDataStore.java => ABLocalDataStore.java} | 2 +- ...ataStore.java => ABMapLocalDataStore.java} | 6 +- .../event/ABGlobalWidgetEvent.java | 6 +- .../abilitybuilder/event/ABPlayerEvent.java | 6 +- .../event/ABTimeOfDayEvent.java | 6 +- .../abilitybuilder/event/ABWidgetEvent.java | 6 +- ...eHandler.java => ABRandomTypeHandler.java} | 2 +- ...dler.java => ABTransformationHandler.java} | 68 ++--- ...nge.java => ABUnitAndRangeComparator.java} | 2 +- .../iterstructs/ABUnitComparator.java | 6 +- .../abilitybuilder/jass/ABActionJass.java | 4 +- .../abilitybuilder/jass/ABConditionJass.java | 4 +- .../ABAbilityEffectReactionListener.java | 6 +- .../ABAbilityProjReactionListener.java | 6 +- .../listener/ABAttackEvasionListener.java | 6 +- .../listener/ABAttackModifier.java | 6 +- .../listener/ABAttackPostDamageListener.java | 6 +- .../listener/ABAttackPreDamageListener.java | 6 +- .../ABAttackProjReactionListener.java | 6 +- .../listener/ABBehaviorChangeListener.java | 6 +- .../listener/ABDamageTakenListener.java | 6 +- .../ABDamageTakenModificationListener.java | 6 +- .../listener/ABDeathReplacementEffect.java | 6 +- .../listener/ABUnitStateListener.java | 6 +- ...ava => ABAbilityBuilderConfiguration.java} | 40 +-- ...derDupe.java => ABAbilityBuilderDupe.java} | 2 +- .../parser/ABAbilityBuilderFile.java | 15 + ...arser.java => ABAbilityBuilderParser.java} | 68 ++--- ...l.java => ABAbilityBuilderParserUtil.java} | 14 +- ...java => ABAbilityBuilderTemplateType.java} | 2 +- ...derType.java => ABAbilityBuilderType.java} | 4 +- .../parser/AbilityBuilderFile.java | 15 - ...va => ABAbilityBuilderOverrideFields.java} | 4 +- ...ABAbilityBuilderParserTemplateFields.java} | 28 +- ... ABAbilityBuilderSpecialConfigFields.java} | 4 +- ...ABAbilityBuilderSpecialDisplayFields.java} | 4 +- ...ieldLetter.java => ABDataFieldLetter.java} | 6 +- ...e.java => ABMeleeRangeTargetOverride.java} | 2 +- ...ield.java => ABStatBuffFromDataField.java} | 46 +-- ...{StatBuffType.java => ABStatBuffType.java} | 2 +- .../ABCollisionProjectileListener.java | 6 +- .../projectile/ABProjectileListener.java | 6 +- ...er.java => ABAltitudeAdjustmentTimer.java} | 4 +- ...=> ABDelayInstantTransformationTimer.java} | 22 +- ...TimerTimer.java => ABDelayTimerTimer.java} | 8 +- ...mer.java => ABManaDepletedCheckTimer.java} | 8 +- .../abilitybuilder/timer/ABTimer.java | 6 +- ... ABTransformationMorphAnimationTimer.java} | 4 +- ...AbilityBuilderTemplateTypeDefinition.java} | 26 +- ...va => ABAbilityBuilderTypeDefinition.java} | 26 +- ....java => ABAbilityBuilderAbilityType.java} | 30 +- ...ABAbilityBuilderAbilityTypeLevelData.java} | 4 +- ...java => ABAbilityBuilderTemplateType.java} | 30 +- ...ABAbilityTargetStillTargetableVisitor.java | 8 +- ...va => ABGetABAbilityByRawcodeVisitor.java} | 74 ++--- ...BGetInstantTransformationBuffVisitor.java} | 28 +- .../behaviors/BehaviorAbilityVisitor.java | 8 +- .../BehaviorNextBehaviorVisitor.java | 8 +- .../behaviors/BehaviorTargetUnitVisitor.java | 8 +- .../behaviors/BehaviorTargetVisitor.java | 8 +- .../behaviors/CBehaviorVisitor.java | 8 +- ...yDisableWhileUnderConstructionVisitor.java | 4 +- .../AbilityDisableWhileUpgradingVisitor.java | 4 +- .../w3x/simulation/data/CAbilityData.java | 76 ++--- .../viewer5/handlers/w3x/ui/MeleeUI.java | 4 +- .../AbilityBuilderConfigTree.java | 6 +- .../AbilityBuilderDupeCellRenderer.java | 6 +- .../AbilityBuilderJassBrainstorm.java | 36 +-- .../AbilityBuilderSmashJassBrainstorm.java | 36 +-- .../abilitybuilder/AbilityBuilderUIPanel.java | 34 +-- .../abilitybuilder/JassGeneratorForType.java | 8 +- 1033 files changed, 3186 insertions(+), 3186 deletions(-) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{AbilityBuilderAbility.java => ABAbilityBuilderAbility.java} (78%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{AbilityBuilderActiveAbility.java => ABAbilityBuilderActiveAbility.java} (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{CAbilityAbilityBuilderActiveAutoTarget.java => ABAbilityBuilderActiveAutoTarget.java} (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{CAbilityAbilityBuilderActiveFlexTarget.java => ABAbilityBuilderActiveFlexTarget.java} (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{CAbilityAbilityBuilderActiveNoTarget.java => ABAbilityBuilderActiveNoTarget.java} (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{CAbilityAbilityBuilderActivePairing.java => ABAbilityBuilderActivePairing.java} (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{CAbilityAbilityBuilderActivePointTarget.java => ABAbilityBuilderActivePointTarget.java} (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{CAbilityAbilityBuilderActiveUnitTarget.java => ABAbilityBuilderActiveUnitTarget.java} (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{CAbilityAbilityBuilderGenericActive.java => ABAbilityBuilderGenericActive.java} (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{CAbilityAbilityBuilderNoIcon.java => ABAbilityBuilderNoIcon.java} (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{CAbilityAbilityBuilderPassive.java => ABAbilityBuilderPassive.java} (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/{AbilityBuilderPassiveAbility.java => ABAbilityBuilderPassiveAbility.java} (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/{CAbilityAbilityBuilderAuraTemplate.java => ABAbilityBuilderAuraTemplate.java} (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/{CAbilityAbilityBuilderSimpleAuraTemplate.java => ABAbilityBuilderSimpleAuraTemplate.java} (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/{CAbilityAbilityBuilderStatAuraTemplate.java => ABAbilityBuilderStatAuraTemplate.java} (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/{CAbilityAbilityBuilderStatPassiveTemplate.java => ABAbilityBuilderStatPassiveTemplate.java} (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{CBehaviorAbilityBuilderBase.java => ABBehaviorAbilityBuilderBase.java} (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{CBehaviorAbilityBuilderNoTarget.java => ABBehaviorAbilityBuilderNoTarget.java} (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{CBehaviorFinishTransformation.java => ABBehaviorFinishTransformation.java} (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{CBehaviorSendOrder.java => ABBehaviorSendOrder.java} (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{COrderStartTransformation.java => ABOrderStartTransformation.java} (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/{AbilityBuilderGsonBuilder.java => ABAbilityBuilderGsonBuilder.java} (99%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/{DataStore.java => ABDataStore.java} (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/{GlobalDataStore.java => ABGlobalDataStore.java} (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/{LocalDataStore.java => ABLocalDataStore.java} (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/{MapLocalDataStore.java => ABMapLocalDataStore.java} (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/{RandomTypeHandler.java => ABRandomTypeHandler.java} (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/{TransformationHandler.java => ABTransformationHandler.java} (78%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/{UnitAndRange.java => ABUnitAndRangeComparator.java} (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/{AbilityBuilderConfiguration.java => ABAbilityBuilderConfiguration.java} (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/{AbilityBuilderDupe.java => ABAbilityBuilderDupe.java} (97%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderFile.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/{AbilityBuilderParser.java => ABAbilityBuilderParser.java} (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/{AbilityBuilderParserUtil.java => ABAbilityBuilderParserUtil.java} (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/{AbilityBuilderTemplateType.java => ABAbilityBuilderTemplateType.java} (76%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/{AbilityBuilderType.java => ABAbilityBuilderType.java} (75%) delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderFile.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/{AbilityBuilderOverrideFields.java => ABAbilityBuilderOverrideFields.java} (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/{AbilityBuilderParserTemplateFields.java => ABAbilityBuilderParserTemplateFields.java} (76%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/{AbilityBuilderSpecialConfigFields.java => ABAbilityBuilderSpecialConfigFields.java} (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/{AbilityBuilderSpecialDisplayFields.java => ABAbilityBuilderSpecialDisplayFields.java} (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/{DataFieldLetter.java => ABDataFieldLetter.java} (72%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/{MeleeRangeTargetOverride.java => ABMeleeRangeTargetOverride.java} (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/{StatBuffFromDataField.java => ABStatBuffFromDataField.java} (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/{StatBuffType.java => ABStatBuffType.java} (99%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/{AltitudeAdjustmentTimer.java => ABAltitudeAdjustmentTimer.java} (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/{DelayInstantTransformationTimer.java => ABDelayInstantTransformationTimer.java} (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/{DelayTimerTimer.java => ABDelayTimerTimer.java} (77%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/{ManaDepletedCheckTimer.java => ABManaDepletedCheckTimer.java} (72%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/{TransformationMorphAnimationTimer.java => ABTransformationMorphAnimationTimer.java} (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/{CAbilityTypeDefinitionAbilityTemplateBuilder.java => ABAbilityBuilderTemplateTypeDefinition.java} (79%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/{CAbilityTypeDefinitionAbilityBuilder.java => ABAbilityBuilderTypeDefinition.java} (79%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/{CAbilityTypeAbilityBuilder.java => ABAbilityBuilderAbilityType.java} (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/{CAbilityTypeAbilityBuilderLevelData.java => ABAbilityBuilderAbilityTypeLevelData.java} (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/{CAbilityTypeAbilityTemplateBuilder.java => ABAbilityBuilderTemplateType.java} (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/{GetABAbilityByRawcodeVisitor.java => ABGetABAbilityByRawcodeVisitor.java} (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/{GetInstantTransformationBuffVisitor.java => ABGetInstantTransformationBuffVisitor.java} (87%) diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index 9da47be8e..ef0b627e9 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -139,8 +139,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.jass.CAbilityTypeJassDefinition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.jass.CodeJassValueBehaviorExpr; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTargetingBuff; @@ -151,21 +151,21 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPausedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPostDeathBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.MapLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABMapLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.jass.ABActionJass; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.jass.ABConditionJass; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderDupe; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParser; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderDupe; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTimer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.ai.AIDifficulty; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -6470,7 +6470,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AbilityTypeLevelDataAddTargetAllowed", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); final CTargetType targetType = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); @@ -6482,7 +6482,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("AbilityTypeLevelDataRemoveTargetAllowed", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); final CTargetType targetType = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); @@ -6495,14 +6495,14 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("ConvertDataFieldLetter", (arguments, globalScope, triggerScope) -> { final int i = arguments.get(0).visit(IntegerJassValueVisitor.getInstance()); - return new HandleJassValue(datafieldletterType, DataFieldLetter.VALUES[i]); + return new HandleJassValue(datafieldletterType, ABDataFieldLetter.VALUES[i]); }); jassProgramVisitor.getJassNativeManager().createNative("GetAbilityTypeLevelDataReal", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); - final DataFieldLetter dataField = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); + final ABDataFieldLetter dataField = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); if ((levelData != null) && (dataField != null)) { final String data = levelData.get(level).getData().get(dataField.getIndex()); if (data.equals("-") || data.isEmpty()) { @@ -6514,10 +6514,10 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetAbilityTypeLevelDataInteger", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); - final DataFieldLetter dataField = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); + final ABDataFieldLetter dataField = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); if ((levelData != null) && (dataField != null)) { final String data = levelData.get(level).getData().get(dataField.getIndex()); if (data.equals("-") || data.isEmpty()) { @@ -6529,10 +6529,10 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetAbilityTypeLevelDataAsID", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); - final DataFieldLetter dataField = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); + final ABDataFieldLetter dataField = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); if ((levelData != null) && (dataField != null)) { final String data = levelData.get(level).getData().get(dataField.getIndex()); if (data.equals("-") || data.isEmpty()) { @@ -6544,10 +6544,10 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetAbilityTypeLevelDataBoolean", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); - final DataFieldLetter dataField = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); + final ABDataFieldLetter dataField = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); if ((levelData != null) && (dataField != null)) { final String data = levelData.get(level).getData().get(dataField.getIndex()); if (data.equals("-") || data.isEmpty()) { @@ -6559,10 +6559,10 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetAbilityTypeLevelDataString", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); - final DataFieldLetter dataField = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); + final ABDataFieldLetter dataField = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); if ((levelData != null) && (dataField != null)) { final String data = levelData.get(level).getData().get(dataField.getIndex()); if (data.isEmpty()) { @@ -6574,7 +6574,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetAbilityTypeLevelDataFirstBuffId", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); if (levelData != null) { @@ -6588,7 +6588,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetAbilityTypeLevelDataDurationNormal", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); if (levelData != null) { @@ -6598,7 +6598,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetAbilityTypeLevelDataDurationHero", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); if (levelData != null) { @@ -6608,7 +6608,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetAbilityTypeLevelDataCastTime", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); if (levelData != null) { @@ -6618,7 +6618,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetAbilityTypeLevelUnitID", (arguments, globalScope, triggerScope) -> { - final List levelData = nullable(arguments, 0, + final List levelData = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); if (levelData != null) { @@ -6633,9 +6633,9 @@ public HandleJassValue accept(final CItem target) { (arguments, globalScope, triggerScope) -> { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final LocalDataStore localStore = ability.getLocalStore(); + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; + final ABLocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.get(childKey); if (object != null) { return new StringJassValue((String) object); @@ -6647,9 +6647,9 @@ public HandleJassValue accept(final CItem target) { (arguments, globalScope, triggerScope) -> { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final LocalDataStore localStore = ability.getLocalStore(); + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; + final ABLocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.get(childKey); if (object != null) { return IntegerJassValue.of((Integer) object); @@ -6661,9 +6661,9 @@ public HandleJassValue accept(final CItem target) { (arguments, globalScope, triggerScope) -> { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final LocalDataStore localStore = ability.getLocalStore(); + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; + final ABLocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.get(childKey); if (object != null) { return BooleanJassValue.of((Boolean) object); @@ -6688,7 +6688,7 @@ public HandleJassValue accept(final CItem target) { // TODO below is overwriting what already exists jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreLocationHandle", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); Object object = localStore.get(childKey); @@ -6704,7 +6704,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreHandle", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object unwrappedHandleUnderlyingJavaObject = nullable(arguments, 2, @@ -6717,9 +6717,9 @@ public HandleJassValue accept(final CItem target) { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final String value = nullable(arguments, 2, StringJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final LocalDataStore localStore = ability.getLocalStore(); + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; + final ABLocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.put(childKey, value); return BooleanJassValue.of(object != null); } @@ -6730,9 +6730,9 @@ public HandleJassValue accept(final CItem target) { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Integer value = arguments.get(2).visit(IntegerJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final LocalDataStore localStore = ability.getLocalStore(); + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; + final ABLocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.put(childKey, value); return BooleanJassValue.of(object != null); } @@ -6743,9 +6743,9 @@ public HandleJassValue accept(final CItem target) { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Boolean value = arguments.get(2).visit(BooleanJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final LocalDataStore localStore = ability.getLocalStore(); + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; + final ABLocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.put(childKey, value); return BooleanJassValue.of(object != null); } @@ -6755,9 +6755,9 @@ public HandleJassValue accept(final CItem target) { (arguments, globalScope, triggerScope) -> { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final LocalDataStore localStore = ability.getLocalStore(); + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; + final ABLocalDataStore localStore = ability.getLocalStore(); return BooleanJassValue.of(localStore.containsKey(childKey)); } return BooleanJassValue.FALSE; @@ -6765,10 +6765,10 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("FlushParentAbilityUserData", (arguments, globalScope, triggerScope) -> { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; if (ability != null) { - final LocalDataStore localStore = ability.getLocalStore(); + final ABLocalDataStore localStore = ability.getLocalStore(); localStore.clear(); } } @@ -6778,9 +6778,9 @@ public HandleJassValue accept(final CItem target) { (arguments, globalScope, triggerScope) -> { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final LocalDataStore localStore = ability.getLocalStore(); + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; + final ABLocalDataStore localStore = ability.getLocalStore(); return BooleanJassValue.of(localStore.remove(childKey) != null); } return BooleanJassValue.FALSE; @@ -6789,11 +6789,11 @@ public HandleJassValue accept(final CItem target) { // ===== local store ===== jassProgramVisitor.getJassNativeManager().createNative("CreateLocalStore", (arguments, globalScope, triggerScope) -> { - return new HandleJassValue(localstoreType, new MapLocalDataStore(CommonEnvironment.this.simulation)); + return new HandleJassValue(localstoreType, new ABMapLocalDataStore(CommonEnvironment.this.simulation)); }); jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreString", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -6804,7 +6804,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreInteger", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -6818,7 +6818,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreReal", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -6829,7 +6829,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreCode", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -6840,7 +6840,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("GetLocalStoreBoolean", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -6851,7 +6851,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreString", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final String value = nullable(arguments, 2, StringJassValueVisitor.getInstance()); @@ -6860,7 +6860,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreInteger", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Integer value = arguments.get(2).visit(IntegerJassValueVisitor.getInstance()); @@ -6869,7 +6869,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreReal", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final float value = arguments.get(2).visit(RealJassValueVisitor.getInstance()).floatValue(); @@ -6878,7 +6878,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreBoolean", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Boolean value = arguments.get(2).visit(BooleanJassValueVisitor.getInstance()); @@ -6887,7 +6887,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStoreCode", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final CodeJassValue value = arguments.get(2).visit(CodeJassValueVisitor.getInstance()); @@ -6896,14 +6896,14 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("LocalStoreContainsKey", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); return BooleanJassValue.of(localStore.containsKey(childKey)); }); final JassFunction flushParentLocalStore = (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); localStore.clear(); return null; }; @@ -6911,7 +6911,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("DestroyLocalStore", flushParentLocalStore); jassProgramVisitor.getJassNativeManager().createNative("FlushChildLocalStore", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); return BooleanJassValue.of(localStore.remove(childKey) != null); @@ -6919,7 +6919,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("LocalStoreCleanUpCastInstance", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); final Set keySet = new HashSet<>(localStore.keySet()); @@ -6933,9 +6933,9 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("GetAbilityLocalStore", (arguments, globalScope, triggerScope) -> { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final LocalDataStore localStore = ability.getLocalStore(); + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; + final ABLocalDataStore localStore = ability.getLocalStore(); return new HandleJassValue(localstoreType, localStore); } return localstoreType.getNullValue(); @@ -6951,14 +6951,14 @@ public HandleJassValue accept(final CItem target) { // Ability Builder Configuration jassProgramVisitor.getJassNativeManager().createNative("CreateAbilityBuilderConfiguration", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration emptyConfiguration = new AbilityBuilderConfiguration( - new AbilityBuilderParser(), new AbilityBuilderDupe()); + final ABAbilityBuilderConfiguration emptyConfiguration = new ABAbilityBuilderConfiguration( + new ABAbilityBuilderParser(), new ABAbilityBuilderDupe()); return new HandleJassValue(abilitybuilderconfigurationType, emptyConfiguration); }); jassProgramVisitor.getJassNativeManager().createNative("SetABConfCastId", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String castId = nullable(arguments, 1, StringJassValueVisitor.getInstance()); @@ -6967,7 +6967,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetABConfUncastId", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String castId = nullable(arguments, 1, StringJassValueVisitor.getInstance()); @@ -6976,7 +6976,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetABConfAutoCastOnId", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String castId = nullable(arguments, 1, StringJassValueVisitor.getInstance()); @@ -6985,7 +6985,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetABConfAutoCastOffId", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String castId = nullable(arguments, 1, StringJassValueVisitor.getInstance()); @@ -6994,7 +6994,7 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetABConfAutoCastType", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final AutocastType whichAutocastType = nullable(arguments, 1, ObjectJassValueVisitor.getInstance()); @@ -7004,9 +7004,9 @@ public HandleJassValue accept(final CItem target) { }); jassProgramVisitor.getJassNativeManager().createNative("SetABConfType", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); - final AbilityBuilderType whichType = nullable(arguments, 1, + final ABAbilityBuilderType whichType = nullable(arguments, 1, ObjectJassValueVisitor.getInstance()); abConf.setType(whichType); @@ -7020,13 +7020,13 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("ConvertABConfType", (arguments, globalScope, triggerScope) -> { final int i = arguments.get(0).visit(IntegerJassValueVisitor.getInstance()); - return new HandleJassValue(abconftypeType, AbilityBuilderType.VALUES[i]); + return new HandleJassValue(abconftypeType, ABAbilityBuilderType.VALUES[i]); }); // ==Begin section of generated code (these were all the same and not created // manually)=== jassProgramVisitor.getJassNativeManager().createNative("AddABConfAddAbilityAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7042,7 +7042,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfAddDisabledAbilityAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7058,7 +7058,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfRemoveAbilityAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7074,7 +7074,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfRemoveDisabledAbilityAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7090,7 +7090,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfDeathPreCastAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7106,7 +7106,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfCancelPreCastAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7122,7 +7122,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfOrderIssuedAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7138,7 +7138,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfActivateAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7154,7 +7154,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfDeactivateAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7170,7 +7170,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfLevelChangeAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7186,7 +7186,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfBeginCastingAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7202,7 +7202,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfEndCastingAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7218,7 +7218,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfChannelTickAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7234,7 +7234,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("AddABConfEndChannelAction", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderConfiguration abConf = nullable(arguments, 0, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CodeJassValue callback = nullable(arguments, 1, CodeJassValueVisitor.getInstance()); if ((abConf != null) && (callback != null)) { @@ -7252,7 +7252,7 @@ public HandleJassValue accept(final CItem target) { jassProgramVisitor.getJassNativeManager().createNative("RegisterABConf", (arguments, globalScope, triggerScope) -> { final int rawcode = arguments.get(0).visit(IntegerJassValueVisitor.getInstance()); - final AbilityBuilderConfiguration abConf = nullable(arguments, 1, + final ABAbilityBuilderConfiguration abConf = nullable(arguments, 1, ObjectJassValueVisitor.getInstance()); this.simulation.getAbilityData().registerAbilityBuilderType(new War3ID(rawcode), abConf); return null; @@ -7469,8 +7469,8 @@ public void remove() { final JassFunction endUnitAbilityCooldown = (arguments, globalScope, triggerScope) -> { final CUnit theUnit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); final int aliasId = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); - final AbilityBuilderAbility abil = theUnit - .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(new War3ID(aliasId))); + final ABAbilityBuilderAbility abil = theUnit + .getAbility(ABGetABAbilityByRawcodeVisitor.getInstance().reset(new War3ID(aliasId))); if (abil != null) { abil.resetCooldown(this.simulation, theUnit); } @@ -7482,7 +7482,7 @@ public void remove() { jassProgramVisitor.getJassNativeManager().createNative("EndAbilityCooldown", (arguments, globalScope, triggerScope) -> { final CUnit unit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); - final AbilityBuilderAbility ability = arguments.get(1) + final ABAbilityBuilderAbility ability = arguments.get(1) .visit(ObjectJassValueVisitor.getInstance()); ability.resetCooldown(this.simulation, unit); return null; @@ -7506,8 +7506,8 @@ public void remove() { final CUnit theUnit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); final int aliasIdRawcode = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); final War3ID aliasId = new War3ID(aliasIdRawcode); - final AbilityBuilderAbility abil = theUnit - .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); + final ABAbilityBuilderAbility abil = theUnit + .getAbility(ABGetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); if (abil != null) { abil.startCooldown(this.simulation, theUnit); } @@ -7518,8 +7518,8 @@ public void remove() { (arguments, globalScope, triggerScope) -> { final CUnit unit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); final CAbility ability = arguments.get(1).visit(ObjectJassValueVisitor.getInstance()); - if (ability instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility abilityBuilderAbility = (AbilityBuilderAbility) ability; + if (ability instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility abilityBuilderAbility = (ABAbilityBuilderAbility) ability; abilityBuilderAbility.startCooldown(this.simulation, unit); } return null; @@ -7560,7 +7560,7 @@ public void remove() { jassProgramVisitor.getJassNativeManager().createNative("AbilityActivate", (arguments, globalScope, triggerScope) -> { final CUnit unit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); - final AbilityBuilderActiveAbility ability = arguments.get(1) + final ABAbilityBuilderActiveAbility ability = arguments.get(1) .visit(ObjectJassValueVisitor.getInstance()); ability.activate(this.simulation, unit); return null; @@ -7569,7 +7569,7 @@ public void remove() { jassProgramVisitor.getJassNativeManager().createNative("AbilityDeactivate", (arguments, globalScope, triggerScope) -> { final CUnit unit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); - final AbilityBuilderActiveAbility ability = arguments.get(1) + final ABAbilityBuilderActiveAbility ability = arguments.get(1) .visit(ObjectJassValueVisitor.getInstance()); ability.deactivate(this.simulation, unit); return null; @@ -7584,7 +7584,7 @@ public void remove() { jassProgramVisitor.getJassNativeManager().createNative("SetAbilityCastRange", (arguments, globalScope, triggerScope) -> { - final AbilityBuilderActiveAbility ability = arguments.get(0) + final ABAbilityBuilderActiveAbility ability = arguments.get(0) .visit(ObjectJassValueVisitor.getInstance()); final float range = arguments.get(1).visit(RealJassValueVisitor.getInstance()).floatValue(); ability.setCastRange(range); @@ -7595,7 +7595,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { int argIndex = 0; final CUnit casterUnit = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, argIndex++, + final ABLocalDataStore localStore = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(argIndex++).visit(IntegerJassValueVisitor.getInstance()); @@ -7648,7 +7648,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { int argIndex = 0; final CUnit casterUnit = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, argIndex++, + final ABLocalDataStore localStore = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(argIndex++).visit(IntegerJassValueVisitor.getInstance()); @@ -7685,7 +7685,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { int argIndex = 0; final CUnit casterUnit = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, argIndex++, + final ABLocalDataStore localStore = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(argIndex++).visit(IntegerJassValueVisitor.getInstance()); @@ -7746,7 +7746,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { int argIndex = 0; final CUnit casterUnit = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, argIndex++, + final ABLocalDataStore localStore = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(argIndex++).visit(IntegerJassValueVisitor.getInstance()); @@ -7796,7 +7796,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { int argIndex = 0; final CUnit casterUnit = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, argIndex++, + final ABLocalDataStore localStore = nullable(arguments, argIndex++, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(argIndex++).visit(IntegerJassValueVisitor.getInstance()); @@ -7949,7 +7949,7 @@ public void remove() { final CEffectType artType = nullable(arguments, 4, ObjectJassValueVisitor.getInstance()); final boolean showFx = arguments.get(5).visit(BooleanJassValueVisitor.getInstance()); final boolean playSfx = arguments.get(6).visit(BooleanJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, 7, + final ABLocalDataStore localStore = nullable(arguments, 7, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(8).visit(IntegerJassValueVisitor.getInstance()); final boolean leveled = arguments.get(9).visit(BooleanJassValueVisitor.getInstance()); @@ -7971,7 +7971,7 @@ public void remove() { jassProgramVisitor.getJassNativeManager().createNative("CreateTargetingBuff", (arguments, globalScope, triggerScope) -> { final int buffRawcode = arguments.get(0).visit(IntegerJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, 1, + final ABLocalDataStore localStore = nullable(arguments, 1, ObjectJassValueVisitor.getInstance()); final CBuff ability = new ABTargetingBuff( @@ -7990,7 +7990,7 @@ public void remove() { final boolean leveled = arguments.get(4).visit(BooleanJassValueVisitor.getInstance()); final boolean positive = arguments.get(5).visit(BooleanJassValueVisitor.getInstance()); final boolean dispellable = arguments.get(6).visit(BooleanJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, 7, + final ABLocalDataStore localStore = nullable(arguments, 7, ObjectJassValueVisitor.getInstance()); final ABTimedArtBuff ability = new ABTimedArtBuff( @@ -8012,7 +8012,7 @@ public void remove() { final CodeJassValue onExpireAction = nullable(arguments, 5, CodeJassValueVisitor.getInstance()); final boolean showIcon = arguments.get(6).visit(BooleanJassValueVisitor.getInstance()); final CEffectType artType = nullable(arguments, 7, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, 8, + final ABLocalDataStore localStore = nullable(arguments, 8, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(9).visit(IntegerJassValueVisitor.getInstance()); final boolean leveled = arguments.get(10).visit(BooleanJassValueVisitor.getInstance()); @@ -8043,7 +8043,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { final int buffRawcode = arguments.get(0).visit(IntegerJassValueVisitor.getInstance()); final float duration = arguments.get(1).visit(RealJassValueVisitor.getInstance()).floatValue(); - final LocalDataStore localStore = nullable(arguments, 2, + final ABLocalDataStore localStore = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); final CBuff ability = new ABTimedTargetingBuff( @@ -8063,7 +8063,7 @@ public void remove() { final CodeJassValue onTickAction = nullable(arguments, 6, CodeJassValueVisitor.getInstance()); final boolean showIcon = arguments.get(7).visit(BooleanJassValueVisitor.getInstance()); final CEffectType artType = nullable(arguments, 8, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, 9, + final ABLocalDataStore localStore = nullable(arguments, 9, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(10).visit(IntegerJassValueVisitor.getInstance()); final boolean leveled = arguments.get(11).visit(BooleanJassValueVisitor.getInstance()); @@ -8090,7 +8090,7 @@ public void remove() { final CodeJassValue onTickAction = nullable(arguments, 6, CodeJassValueVisitor.getInstance()); final boolean showIcon = arguments.get(7).visit(BooleanJassValueVisitor.getInstance()); final CEffectType artType = nullable(arguments, 8, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, 9, + final ABLocalDataStore localStore = nullable(arguments, 9, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(10).visit(IntegerJassValueVisitor.getInstance()); final boolean leveled = arguments.get(11).visit(BooleanJassValueVisitor.getInstance()); @@ -8117,7 +8117,7 @@ public void remove() { final CodeJassValue onTickAction = nullable(arguments, 6, CodeJassValueVisitor.getInstance()); final boolean showIcon = arguments.get(7).visit(BooleanJassValueVisitor.getInstance()); final CEffectType artType = nullable(arguments, 8, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, 9, + final ABLocalDataStore localStore = nullable(arguments, 9, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(10).visit(IntegerJassValueVisitor.getInstance()); final boolean leveled = arguments.get(11).visit(BooleanJassValueVisitor.getInstance()); @@ -8163,7 +8163,7 @@ public void remove() { final CUnit casterUnit = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final int buffRawcode = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); final int level = arguments.get(2).visit(IntegerJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, 3, + final ABLocalDataStore localStore = nullable(arguments, 3, ObjectJassValueVisitor.getInstance()); final CodeJassValue onAddAction = nullable(arguments, 4, CodeJassValueVisitor.getInstance()); final CodeJassValue onRemoveAction = nullable(arguments, 5, CodeJassValueVisitor.getInstance()); @@ -8186,7 +8186,7 @@ public void remove() { final float endTime = arguments.get(2).visit(RealJassValueVisitor.getInstance()).floatValue(); final String equalityId = nullable(arguments, 3, StringJassValueVisitor.getInstance()); final CUnit casterUnit = nullable(arguments, 4, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, 5, + final ABLocalDataStore localStore = nullable(arguments, 5, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(6).visit(IntegerJassValueVisitor.getInstance()); @@ -8426,7 +8426,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { final CUnit targetUnit = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CUnit casterUnit = nullable(arguments, 1, ObjectJassValueVisitor.getInstance()); - final List levelData = nullable(arguments, 2, + final List levelData = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(3).visit(IntegerJassValueVisitor.getInstance()); final boolean targetedEffect = arguments.get(4).visit(BooleanJassValueVisitor.getInstance()); @@ -8466,7 +8466,7 @@ public void remove() { (arguments, globalScope, triggerScope) -> { final CWidget targetUnit = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final CUnit casterUnit = nullable(arguments, 1, ObjectJassValueVisitor.getInstance()); - final List levelData = nullable(arguments, 2, + final List levelData = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); final int level = arguments.get(3).visit(IntegerJassValueVisitor.getInstance()); if (targetUnit != null) { @@ -8995,7 +8995,7 @@ public boolean call(final CUnit unit) { final CodeJassValue threadFunction = arguments.get(0).visit(CodeJassValueVisitor.getInstance()); final CUnit casterUnit = nullable(arguments, 1, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, 2, + final ABLocalDataStore localStore = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(3).visit(IntegerJassValueVisitor.getInstance()); @@ -9007,7 +9007,7 @@ public boolean call(final CUnit unit) { jassProgramVisitor.getJassNativeManager().createNative("CreateABTimer", (arguments, globalScope, triggerScope) -> { final CUnit casterUnit = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); - final LocalDataStore localStore = nullable(arguments, 1, + final ABLocalDataStore localStore = nullable(arguments, 1, ObjectJassValueVisitor.getInstance()); final int castId = arguments.get(2).visit(IntegerJassValueVisitor.getInstance()); final CodeJassValue threadFunction = nullable(arguments, 3, CodeJassValueVisitor.getInstance()); @@ -9248,9 +9248,9 @@ private static void registerAbilityUserDataHandleNatives(final JassProgram jassP (arguments, globalScope, triggerScope) -> { final CAbility abilityFromHandle = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final LocalDataStore localStore = ability.getLocalStore(); + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; + final ABLocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.get(childKey); if (object != null) { return new HandleJassValue(handleType, object); @@ -9264,9 +9264,9 @@ private static void registerAbilityUserDataHandleNatives(final JassProgram jassP final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object unwrappedHandleUnderlyingJavaObject = nullable(arguments, 2, ObjectJassValueVisitor.getInstance()); - if (abilityFromHandle instanceof AbilityBuilderAbility) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) abilityFromHandle; - final LocalDataStore localStore = ability.getLocalStore(); + if (abilityFromHandle instanceof ABAbilityBuilderAbility) { + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) abilityFromHandle; + final ABLocalDataStore localStore = ability.getLocalStore(); final Object object = localStore.put(childKey, unwrappedHandleUnderlyingJavaObject); return BooleanJassValue.of(object != null); } @@ -9275,7 +9275,7 @@ private static void registerAbilityUserDataHandleNatives(final JassProgram jassP jassProgramVisitor.getJassNativeManager().createNative("GetLocalStore" + nameSuffix + "Handle", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object object = localStore.get(childKey); @@ -9286,7 +9286,7 @@ private static void registerAbilityUserDataHandleNatives(final JassProgram jassP }); jassProgramVisitor.getJassNativeManager().createNative("SetLocalStore" + nameSuffix + "Handle", (arguments, globalScope, triggerScope) -> { - final LocalDataStore localStore = nullable(arguments, 0, + final ABLocalDataStore localStore = nullable(arguments, 0, ObjectJassValueVisitor.getInstance()); final String childKey = nullable(arguments, 1, StringJassValueVisitor.getInstance()); final Object unwrappedHandleUnderlyingJavaObject = nullable(arguments, 2, diff --git a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java index 28711e37c..7424bfc1d 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java +++ b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java @@ -13,7 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.COrderButton.JassOrderButtonType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerJass; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.region.CRegion; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; @@ -89,7 +89,7 @@ public class CommonTriggerExecutionScope extends TriggerExecutionScope { private JassOrderButtonType spellAbilityTargetType; // Warsmash only private COrderButton spellAbilityOrderCommandCard; // Warsmash only private String enumFilePath; // Warsmash only - private LocalDataStore triggerLocalStore; // warsmash only + private ABLocalDataStore triggerLocalStore; // warsmash only private int triggerCastId; // Warsmash only private float damageTaken; private CUnit damageSource; @@ -449,7 +449,7 @@ public String getEnumFilePath() { return this.enumFilePath; } - public LocalDataStore getTriggerLocalStore() { + public ABLocalDataStore getTriggerLocalStore() { return this.triggerLocalStore; } @@ -927,7 +927,7 @@ public static CommonTriggerExecutionScope jassAbilityBasicScope(final CAbility s return scope; } - public static TriggerExecutionScope abilityBuilder(final CUnit caster, final LocalDataStore localStore, + public static TriggerExecutionScope abilityBuilder(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CommonTriggerExecutionScope scope = new CommonTriggerExecutionScope(null, TriggerExecutionScope.EMPTY); scope.spellAbilityUnit = caster; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java index 746250cfd..94aa3c82a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java @@ -48,7 +48,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; @@ -90,7 +90,7 @@ public CommandCardPopulatingAbilityVisitor reset(final CSimulation game, final G } @Override - public Void accept(final AbilityBuilderActiveAbility ability) { + public Void accept(final ABAbilityBuilderActiveAbility ability) { if ((this.menuBaseOrderId == 0 || this.menuBaseOrderId == ability.getIconVisibleMenuId()) && ability.isIconShowing()) { final AbilityUI ui = this.abilityDataUI.getUI(ability.getAlias()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityVisitor.java index 531fdefd3..f5d8993d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityVisitor.java @@ -22,7 +22,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; /** * A visitor for the lowest level inherent types of an ability. It's a bit of a @@ -83,5 +83,5 @@ public interface CAbilityVisitor { T accept(CAbilityNeutralBuilding ability); - T accept(AbilityBuilderActiveAbility ability); + T accept(ABAbilityBuilderActiveAbility ability); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java index bdda0b550..ec2cd24ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java @@ -20,7 +20,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; public class GetAbilityByRawcodeVisitor implements CAbilityVisitor { private static final GetAbilityByRawcodeVisitor INSTANCE = new GetAbilityByRawcodeVisitor(); @@ -119,7 +119,7 @@ public CLevelingAbility accept(final CAbilityReviveHero ability) { } @Override - public CLevelingAbility accept(final AbilityBuilderActiveAbility ability) { + public CLevelingAbility accept(final ABAbilityBuilderActiveAbility ability) { if (this.rawcode.equals(ability.getAlias())) { return ability; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderAbility.java similarity index 78% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderAbility.java index 5b02ac3fc..9df2a4974 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderAbility.java @@ -7,16 +7,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; -public interface AbilityBuilderAbility extends CLevelingAbility, Aliased { - public List getLevelData(); +public interface ABAbilityBuilderAbility extends CLevelingAbility, Aliased { + public List getLevelData(); - public AbilityBuilderConfiguration getConfig(); + public ABAbilityBuilderConfiguration getConfig(); - public LocalDataStore getLocalStore(); + public ABLocalDataStore getLocalStore(); public float getArea(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAbility.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAbility.java index 1dfdaaf56..40bc363b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderActiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAbility.java @@ -13,18 +13,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.GenericSingleIconActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; -public interface AbilityBuilderActiveAbility extends AbilityBuilderAbility, CAutocastAbility, GenericSingleIconActiveAbility { - public List getLevelData(); +public interface ABAbilityBuilderActiveAbility extends ABAbilityBuilderAbility, CAutocastAbility, GenericSingleIconActiveAbility { + public List getLevelData(); - public AbilityBuilderConfiguration getConfig(); + public ABAbilityBuilderConfiguration getConfig(); - public LocalDataStore getLocalStore(); + public ABLocalDataStore getLocalStore(); public int getChargedManaCost(); public void setCastRange(float castRange); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAutoTarget.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAutoTarget.java index 631a1addd..4970399d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveAutoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAutoTarget.java @@ -11,19 +11,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; -public class CAbilityAbilityBuilderActiveAutoTarget extends CAbilityAbilityBuilderGenericActive { +public class ABAbilityBuilderActiveAutoTarget extends ABAbilityBuilderGenericActive { private ABBehavior behavior; - public CAbilityAbilityBuilderActiveAutoTarget(int handleId, War3ID code, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - LocalDataStore localStore) { + public ABAbilityBuilderActiveAutoTarget(int handleId, War3ID code, War3ID alias, + List levelData, ABAbilityBuilderConfiguration config, + ABLocalDataStore localStore) { super(handleId, code, alias, levelData, config, localStore); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java index 56c577e12..a1addbd4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java @@ -10,27 +10,27 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; -public class CAbilityAbilityBuilderActiveFlexTarget extends CAbilityAbilityBuilderGenericActive { +public class ABAbilityBuilderActiveFlexTarget extends ABAbilityBuilderGenericActive { private ABBehavior behavior; private boolean targetedSpell = false; private boolean pointTarget = false; private boolean castless; - public CAbilityAbilityBuilderActiveFlexTarget(int handleId, War3ID alias, War3ID code, - List levelData, AbilityBuilderConfiguration config, - LocalDataStore localStore) { + public ABAbilityBuilderActiveFlexTarget(int handleId, War3ID alias, War3ID code, + List levelData, ABAbilityBuilderConfiguration config, + ABLocalDataStore localStore) { super(handleId, alias, code, levelData, config, localStore); } @@ -59,14 +59,14 @@ protected void determineCastless(CUnit unit) { this.behavior = null; } else { this.castless = false; - if (this.behavior == null || !(this.behavior instanceof CBehaviorAbilityBuilderNoTarget)) { + if (this.behavior == null || !(this.behavior instanceof ABBehaviorAbilityBuilderNoTarget)) { this.behavior = this.createNoTargetBehavior(unit); } } } private void setBehavior(final CUnit unit) { if (this.targetedSpell) { - if (this.behavior == null || !(this.behavior instanceof CBehaviorAbilityBuilderBase)) { + if (this.behavior == null || !(this.behavior instanceof ABBehaviorAbilityBuilderBase)) { this.behavior = this.createRangedBehavior(unit); } } else { @@ -99,7 +99,7 @@ public void onAddDisabled(CSimulation game, CUnit unit) { @Override public void onAdd(CSimulation game, CUnit unit) { - this.behavior = new CBehaviorAbilityBuilderBase(unit, localStore, this); + this.behavior = new ABBehaviorAbilityBuilderBase(unit, localStore, this); this.setTargeted(game, unit); this.setPointTarget(game, unit); this.setBehavior(unit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveNoTarget.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveNoTarget.java index f81f8fe49..ac008f305 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveNoTarget.java @@ -10,23 +10,23 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; -public class CAbilityAbilityBuilderActiveNoTarget extends CAbilityAbilityBuilderGenericActive { +public class ABAbilityBuilderActiveNoTarget extends ABAbilityBuilderGenericActive { private ABBehavior behavior; private boolean castless; - public CAbilityAbilityBuilderActiveNoTarget(int handleId, War3ID code, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - LocalDataStore localStore) { + public ABAbilityBuilderActiveNoTarget(int handleId, War3ID code, War3ID alias, + List levelData, ABAbilityBuilderConfiguration config, + ABLocalDataStore localStore) { super(handleId, code, alias, levelData, config, localStore); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePairing.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePairing.java index a4f5dbf07..6880d2a07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePairing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePairing.java @@ -17,19 +17,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorSendOrder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorSendOrder; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeysEnum; -public class CAbilityAbilityBuilderActivePairing extends CAbilityAbilityBuilderGenericActive +public class ABAbilityBuilderActivePairing extends ABAbilityBuilderGenericActive implements CPairingAbility { private ABBehavior behavior; @@ -48,9 +48,9 @@ public class CAbilityAbilityBuilderActivePairing extends CAbilityAbilityBuilderG private int internalOffOrderId = -1; private int orderPairedUnitOffOrderId = -1; - public CAbilityAbilityBuilderActivePairing(int handleId, War3ID code, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - LocalDataStore localStore) { + public ABAbilityBuilderActivePairing(int handleId, War3ID code, War3ID alias, + List levelData, ABAbilityBuilderConfiguration config, + ABLocalDataStore localStore) { super(handleId, code, alias, levelData, config, localStore); if (this.castingPrimaryTag == null) { @@ -235,10 +235,10 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool && (isOffId ? this.getPairOffOrderId(game, caster) : this.getPairOrderId(game, caster)) >= 0) { // System.err.println(caster.getUnitType().getName() + " Have final partner, issuing self order behavior"); if (isOffId) { - return new CBehaviorSendOrder(caster, this, this.getPairOffOrderId(game, caster), + return new ABBehaviorSendOrder(caster, this, this.getPairOffOrderId(game, caster), this.getBaseOrderId(), finalPartner); } - return new CBehaviorSendOrder(caster, this, this.getPairOrderId(game, caster), this.getBaseOrderId(), + return new ABBehaviorSendOrder(caster, this, this.getPairOrderId(game, caster), this.getBaseOrderId(), finalPartner); } else { return null; @@ -381,7 +381,7 @@ public Set findPairUnits(CSimulation game, CUnit caster) { return maxPartners(game, caster) != 0 && retSet.size() >= maxPartners(game, caster); }); } else { - final UnitAndRange ur = new UnitAndRange(); + final ABUnitAndRangeComparator ur = new ABUnitAndRangeComparator(); Rectangle rect = new Rectangle(); float rangeVal = this.getPairSearchRadius(game, caster); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePointTarget.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePointTarget.java index 3974bf46c..57d20a3e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActivePointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePointTarget.java @@ -11,20 +11,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; -public class CAbilityAbilityBuilderActivePointTarget extends CAbilityAbilityBuilderGenericActive { +public class ABAbilityBuilderActivePointTarget extends ABAbilityBuilderGenericActive { private ABBehavior behavior; - public CAbilityAbilityBuilderActivePointTarget(int handleId, War3ID code, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - LocalDataStore localStore) { + public ABAbilityBuilderActivePointTarget(int handleId, War3ID code, War3ID alias, + List levelData, ABAbilityBuilderConfiguration config, + ABLocalDataStore localStore) { super(handleId, code, alias, levelData, config, localStore); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveUnitTarget.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveUnitTarget.java index 7b7541056..4399cc469 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderActiveUnitTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveUnitTarget.java @@ -11,20 +11,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; -public class CAbilityAbilityBuilderActiveUnitTarget extends CAbilityAbilityBuilderGenericActive { +public class ABAbilityBuilderActiveUnitTarget extends ABAbilityBuilderGenericActive { private ABBehavior behavior; - public CAbilityAbilityBuilderActiveUnitTarget(int handleId, War3ID code, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - LocalDataStore localStore) { + public ABAbilityBuilderActiveUnitTarget(int handleId, War3ID code, War3ID alias, + List levelData, ABAbilityBuilderConfiguration config, + ABLocalDataStore localStore) { super(handleId, code, alias, levelData, config, localStore); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java index 345612011..b2d6aaf57 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java @@ -28,17 +28,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABTargetTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ManaDepletedCheckTimer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABManaDepletedCheckTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIdUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; @@ -50,11 +50,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.MeleeUIAbilityActivationReceiver; -public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGenericSingleIconNoSmartActiveAbility - implements AbilityBuilderActiveAbility { - protected List levelData; - protected AbilityBuilderConfiguration config; - protected LocalDataStore localStore; +public abstract class ABAbilityBuilderGenericActive extends AbstractGenericSingleIconNoSmartActiveAbility + implements ABAbilityBuilderActiveAbility { + protected List levelData; + protected ABAbilityBuilderConfiguration config; + protected ABLocalDataStore localStore; protected int orderId; protected int unorderId = 0; protected int autoCastOnId = 0; @@ -83,7 +83,7 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri private Float areaCursorOverride; protected int bufferMana = 0; - private ManaDepletedCheckTimer timer; + private ABManaDepletedCheckTimer timer; private NonStackingStatBuff manaDrain; protected int castId = 0; @@ -100,9 +100,9 @@ public abstract class CAbilityAbilityBuilderGenericActive extends AbstractGeneri private boolean isMenu = false; private int visibleMenuId = 0; - public CAbilityAbilityBuilderGenericActive(int handleId, War3ID code, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - LocalDataStore localStore) { + public ABAbilityBuilderGenericActive(int handleId, War3ID code, War3ID alias, + List levelData, ABAbilityBuilderConfiguration config, + ABLocalDataStore localStore) { super(handleId, code, alias); this.levelData = levelData; this.config = config; @@ -258,7 +258,7 @@ private void determineToggleableFields(CSimulation game, CUnit unit) { manaDrain.setValue((-1 * manaPerSec)); } if (this.timer == null) { - timer = new ManaDepletedCheckTimer(unit, this); + timer = new ABManaDepletedCheckTimer(unit, this); } } else { this.manaDrain = null; @@ -275,7 +275,7 @@ private void determineToggleableFields(CSimulation game, CUnit unit) { } protected void setSpellFields(CSimulation game, CUnit unit) { - CAbilityTypeAbilityBuilderLevelData levelDataLevel = this.levelData.get(this.getLevel() - 1); + ABAbilityBuilderAbilityTypeLevelData levelDataLevel = this.levelData.get(this.getLevel() - 1); this.manaCost = levelDataLevel.getManaCost(); this.cooldown = levelDataLevel.getCooldown(); this.range = levelDataLevel.getCastRange(); @@ -446,15 +446,15 @@ public EnumSet getCastingSecondaryTags() { return this.castingSecondaryTags; } - public List getLevelData() { + public List getLevelData() { return this.levelData; } - public AbilityBuilderConfiguration getConfig() { + public ABAbilityBuilderConfiguration getConfig() { return this.config; } - public LocalDataStore getLocalStore() { + public ABLocalDataStore getLocalStore() { return this.localStore; } @@ -624,7 +624,7 @@ public AutocastType getAutocastType() { } protected ABBehavior createNoTargetBehavior(CUnit unit) { - ABBehavior beh = new CBehaviorAbilityBuilderNoTarget(unit, localStore, this); + ABBehavior beh = new ABBehaviorAbilityBuilderNoTarget(unit, localStore, this); if (this.item != null || (this.config.getDisplayFields() != null && this.config.getDisplayFields().getInstantCast() != null && this.config.getDisplayFields().getInstantCast().callback(unit, localStore, castId))) { @@ -637,7 +637,7 @@ protected ABBehavior createNoTargetBehavior(CUnit unit) { } protected ABBehavior createRangedBehavior(CUnit unit) { - ABBehavior beh = new CBehaviorAbilityBuilderBase(unit, localStore, this); + ABBehavior beh = new ABBehaviorAbilityBuilderBase(unit, localStore, this); if (this.item != null || (this.config.getDisplayFields() != null && this.config.getDisplayFields().getInstantCast() != null && this.config.getDisplayFields().getInstantCast().callback(unit, localStore, castId))) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderNoIcon.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderNoIcon.java index b2e215bce..f78dc32e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderNoIcon.java @@ -18,19 +18,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; -public class CAbilityAbilityBuilderNoIcon extends AbstractGenericNoIconAbility implements AbilityBuilderPassiveAbility { +public class ABAbilityBuilderNoIcon extends AbstractGenericNoIconAbility implements ABAbilityBuilderPassiveAbility { - protected List levelData; - protected AbilityBuilderConfiguration config; - protected LocalDataStore localStore; + protected List levelData; + protected ABAbilityBuilderConfiguration config; + protected ABLocalDataStore localStore; protected CItem item = null; @@ -43,8 +43,8 @@ public class CAbilityAbilityBuilderNoIcon extends AbstractGenericNoIconAbility i private int visibleMenuId = 0; - public CAbilityAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, List levelData, - AbilityBuilderConfiguration config, LocalDataStore localStore) { + public ABAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, List levelData, + ABAbilityBuilderConfiguration config, ABLocalDataStore localStore) { super(handleId, code, alias); this.levelData = levelData; this.config = config; @@ -67,7 +67,7 @@ private void addInitialUniqueFlags(CSimulation game, CUnit unit) { } protected void setSpellFields(CSimulation game, CUnit unit) { - CAbilityTypeAbilityBuilderLevelData levelDataLevel = this.levelData.get(this.getLevel() - 1); + ABAbilityBuilderAbilityTypeLevelData levelDataLevel = this.levelData.get(this.getLevel() - 1); this.cooldown = levelDataLevel.getCooldown(); this.area = levelDataLevel.getArea(); this.range = levelDataLevel.getCastRange(); @@ -112,17 +112,17 @@ public boolean getAbilityBooleanField(String field) { } @Override - public List getLevelData() { + public List getLevelData() { return this.levelData; } @Override - public AbilityBuilderConfiguration getConfig() { + public ABAbilityBuilderConfiguration getConfig() { return this.config; } @Override - public LocalDataStore getLocalStore() { + public ABLocalDataStore getLocalStore() { return this.localStore; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassive.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassive.java index 8fdc1e244..79eb824e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/CAbilityAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassive.java @@ -17,17 +17,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; -public class CAbilityAbilityBuilderPassive extends AbilityGenericSingleIconPassiveAbility implements AbilityBuilderPassiveAbility { +public class ABAbilityBuilderPassive extends AbilityGenericSingleIconPassiveAbility implements ABAbilityBuilderPassiveAbility { - protected List levelData; - protected AbilityBuilderConfiguration config; - protected LocalDataStore localStore; + protected List levelData; + protected ABAbilityBuilderConfiguration config; + protected ABLocalDataStore localStore; protected CItem item = null; @@ -42,9 +42,9 @@ public class CAbilityAbilityBuilderPassive extends AbilityGenericSingleIconPassi private int visibleMenuId = 0; - public CAbilityAbilityBuilderPassive(int handleId, War3ID code, War3ID alias, - List levelData, AbilityBuilderConfiguration config, - LocalDataStore localStore) { + public ABAbilityBuilderPassive(int handleId, War3ID code, War3ID alias, + List levelData, ABAbilityBuilderConfiguration config, + ABLocalDataStore localStore) { super(code, alias, handleId); this.levelData = levelData; this.config = config; @@ -68,7 +68,7 @@ private void addInitialUniqueFlags(CSimulation game, CUnit unit) { protected void setSpellFields(CSimulation game, CUnit unit) { if (this.levelData.size() > 0) { - CAbilityTypeAbilityBuilderLevelData levelDataLevel = this.levelData.get(this.getLevel() - 1); + ABAbilityBuilderAbilityTypeLevelData levelDataLevel = this.levelData.get(this.getLevel() - 1); this.cooldown = levelDataLevel.getCooldown(); this.area = levelDataLevel.getArea(); this.range = levelDataLevel.getCastRange(); @@ -118,17 +118,17 @@ public boolean getAbilityBooleanField(String field) { } @Override - public List getLevelData() { + public List getLevelData() { return this.levelData; } @Override - public AbilityBuilderConfiguration getConfig() { + public ABAbilityBuilderConfiguration getConfig() { return this.config; } @Override - public LocalDataStore getLocalStore() { + public ABLocalDataStore getLocalStore() { return this.localStore; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderPassiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassiveAbility.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderPassiveAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassiveAbility.java index 47a2001ba..8f37f8440 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/AbilityBuilderPassiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassiveAbility.java @@ -1,5 +1,5 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; -public interface AbilityBuilderPassiveAbility extends AbilityBuilderAbility { +public interface ABAbilityBuilderPassiveAbility extends ABAbilityBuilderAbility { } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderAuraTemplate.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderAuraTemplate.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderAuraTemplate.java index d14454b32..6f6a6b13e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderAuraTemplate.java @@ -16,14 +16,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; -public class CAbilityAbilityBuilderAuraTemplate extends AbilityGenericSingleIconPassiveAbility { +public class ABAbilityBuilderAuraTemplate extends AbilityGenericSingleIconPassiveAbility { - private List levelData; - private LocalDataStore localStore; + private List levelData; + private ABLocalDataStore localStore; private Set auraGroup; private int lastSeenLevel = 0; @@ -43,8 +43,8 @@ public class CAbilityAbilityBuilderAuraTemplate extends AbilityGenericSingleIcon private final int ENTER_GROUP_TICKS = (int) (0.4 / WarsmashConstants.SIMULATION_STEP_TIME); private final int RESET_GROUP_TICKS = LEAVE_GROUP_TICKS * 2; - public CAbilityAbilityBuilderAuraTemplate(int handleId, War3ID code, War3ID alias, - List levelData, LocalDataStore localStore, + public ABAbilityBuilderAuraTemplate(int handleId, War3ID code, War3ID alias, + List levelData, ABLocalDataStore localStore, List addToAuraActions, List updateAuraLevelActions, List removeFromAuraActions) { super(code, alias, handleId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderSimpleAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderSimpleAuraTemplate.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderSimpleAuraTemplate.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderSimpleAuraTemplate.java index 275277bc8..1111949f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderSimpleAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderSimpleAuraTemplate.java @@ -19,14 +19,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; -public class CAbilityAbilityBuilderSimpleAuraTemplate extends AbilityGenericSingleIconPassiveAbility { +public class ABAbilityBuilderSimpleAuraTemplate extends AbilityGenericSingleIconPassiveAbility { - private List levelData; - private LocalDataStore localStore; + private List levelData; + private ABLocalDataStore localStore; private Set auraGroup; private int lastSeenLevel = 0; @@ -48,8 +48,8 @@ public class CAbilityAbilityBuilderSimpleAuraTemplate extends AbilityGenericSing private final int ENTER_GROUP_TICKS = (int) (0.4 / WarsmashConstants.SIMULATION_STEP_TIME); private final int RESET_GROUP_TICKS = LEAVE_GROUP_TICKS * 2; - public CAbilityAbilityBuilderSimpleAuraTemplate(int handleId, War3ID code, War3ID alias, - List levelData, LocalDataStore localStore, + public ABAbilityBuilderSimpleAuraTemplate(int handleId, War3ID code, War3ID alias, + List levelData, ABLocalDataStore localStore, Map> abilityIdsToAddPerLevel, List levellingAbilityIdsToAdd) { super(code, alias, handleId); this.levelData = levelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatAuraTemplate.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatAuraTemplate.java index 57a30f2e8..76c4c4d9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatAuraTemplate.java @@ -16,10 +16,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericAuraBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.MeleeRangeTargetOverride; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.StatBuffFromDataField; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABMeleeRangeTargetOverride; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABStatBuffFromDataField; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; @@ -27,10 +27,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; -public class CAbilityAbilityBuilderStatAuraTemplate extends AbilityGenericSingleIconPassiveAbility { +public class ABAbilityBuilderStatAuraTemplate extends AbilityGenericSingleIconPassiveAbility { - private List levelData; - private LocalDataStore localStore; + private List levelData; + private ABLocalDataStore localStore; private Set auraGroup; private int loopTick = 0; @@ -46,20 +46,20 @@ public class CAbilityAbilityBuilderStatAuraTemplate extends AbilityGenericSingle private boolean targetMelee = false; private boolean targetRange = false; - private MeleeRangeTargetOverride rangeOverride; + private ABMeleeRangeTargetOverride rangeOverride; private String auraStackingKey; - private List statBuffDataFields; + private List statBuffDataFields; private final int LEAVE_GROUP_TICKS = (int) (3 / WarsmashConstants.SIMULATION_STEP_TIME); private final int ENTER_GROUP_TICKS = (int) (0.4 / WarsmashConstants.SIMULATION_STEP_TIME); private final int RESET_GROUP_TICKS = LEAVE_GROUP_TICKS * 2; private boolean leveled; - public CAbilityAbilityBuilderStatAuraTemplate(int handleId, War3ID code, War3ID alias, - List levelData, LocalDataStore localStore, - List statBuffDataFields, MeleeRangeTargetOverride meleeRangeTargetOverride) { + public ABAbilityBuilderStatAuraTemplate(int handleId, War3ID code, War3ID alias, + List levelData, ABLocalDataStore localStore, + List statBuffDataFields, ABMeleeRangeTargetOverride meleeRangeTargetOverride) { super(code, alias, handleId); this.levelData = levelData; this.localStore = localStore; @@ -69,8 +69,8 @@ public CAbilityAbilityBuilderStatAuraTemplate(int handleId, War3ID code, War3ID this.auraStackingKey = ""; this.statBuffDataFields = new ArrayList<>(); - for (StatBuffFromDataField statBuff : statBuffDataFields) { - this.statBuffDataFields.add(new StatBuffFromDataField(statBuff)); + for (ABStatBuffFromDataField statBuff : statBuffDataFields) { + this.statBuffDataFields.add(new ABStatBuffFromDataField(statBuff)); } if (!this.levelData.get(getLevel() - 1).getBuffs().isEmpty()) { @@ -78,7 +78,7 @@ public CAbilityAbilityBuilderStatAuraTemplate(int handleId, War3ID code, War3ID this.auraStackingKey = buffId.asStringValue(); } - for (StatBuffFromDataField statBuff : this.statBuffDataFields) { + for (ABStatBuffFromDataField statBuff : this.statBuffDataFields) { createNewBuffs(statBuff); } @@ -90,7 +90,7 @@ public CAbilityAbilityBuilderStatAuraTemplate(int handleId, War3ID code, War3ID this.leveled = levelData.size() > 1; } - private void removeExistingBuffs(CSimulation game, StatBuffFromDataField statBuff) { + private void removeExistingBuffs(CSimulation game, ABStatBuffFromDataField statBuff) { for (CUnit unit : auraGroup) { unit.removeNonStackingStatBuff(game, statBuff.getBuff()); if (statBuff.getSecondAtkBuff() != null) { @@ -99,7 +99,7 @@ private void removeExistingBuffs(CSimulation game, StatBuffFromDataField statBuf } } - private void addNewBuffs(CSimulation game, StatBuffFromDataField statBuff) { + private void addNewBuffs(CSimulation game, ABStatBuffFromDataField statBuff) { for (CUnit unit : auraGroup) { unit.addNonStackingStatBuff(game, statBuff.getBuff()); if (statBuff.getSecondAtkBuff() != null) { @@ -108,7 +108,7 @@ private void addNewBuffs(CSimulation game, StatBuffFromDataField statBuff) { } } - private void createNewBuffs(StatBuffFromDataField parsedBuff) { + private void createNewBuffs(ABStatBuffFromDataField parsedBuff) { NonStackingStatBuffType type = parsedBuff.convertToNonStackingType(levelData.get(getLevel() - 1)); NonStackingStatBuff newBuff = null; switch (type) { @@ -164,7 +164,7 @@ public void setLevel(CSimulation game, CUnit unit, int level) { range = levelData.get(getLevel() - 1).getArea(); this.targetMelee = false; this.targetRange = false; - for (StatBuffFromDataField statBuff : this.statBuffDataFields) { + for (ABStatBuffFromDataField statBuff : this.statBuffDataFields) { NonStackingStatBuffType type = statBuff.convertToNonStackingType(levelData.get(getLevel() - 1)); if (type == null) { continue; @@ -301,7 +301,7 @@ public void emptyAura(CSimulation game, CUnit unit) { } public void addUnitToAura(CSimulation game, CUnit unit) { - for (StatBuffFromDataField statBuff : this.statBuffDataFields) { + for (ABStatBuffFromDataField statBuff : this.statBuffDataFields) { unit.addNonStackingStatBuff(game, statBuff.getBuff()); if (statBuff.getSecondAtkBuff() != null) { unit.addNonStackingStatBuff(game, statBuff.getSecondAtkBuff()); @@ -317,7 +317,7 @@ public void removeUnitFromAura(CSimulation game, CUnit unit) { if (buff != null) { unit.removeNonStackingDisplayBuff(game, auraStackingKey, buff); } - for (StatBuffFromDataField statBuff : this.statBuffDataFields) { + for (ABStatBuffFromDataField statBuff : this.statBuffDataFields) { unit.removeNonStackingStatBuff(game, statBuff.getBuff()); if (statBuff.getSecondAtkBuff() != null) { unit.removeNonStackingStatBuff(game, statBuff.getSecondAtkBuff()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatPassiveTemplate.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatPassiveTemplate.java index a3528f046..34276b958 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/CAbilityAbilityBuilderStatPassiveTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatPassiveTemplate.java @@ -8,16 +8,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.StatBuffFromDataField; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABStatBuffFromDataField; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; -public class CAbilityAbilityBuilderStatPassiveTemplate extends AbilityGenericSingleIconPassiveAbility { +public class ABAbilityBuilderStatPassiveTemplate extends AbilityGenericSingleIconPassiveAbility { - private List levelData; - private LocalDataStore localStore; + private List levelData; + private ABLocalDataStore localStore; private War3ID buffId; private CBuff buff; @@ -26,11 +26,11 @@ public class CAbilityAbilityBuilderStatPassiveTemplate extends AbilityGenericSin private String auraStackingKey; - private List statBuffDataFields; + private List statBuffDataFields; - public CAbilityAbilityBuilderStatPassiveTemplate(int handleId, War3ID code, War3ID alias, - List levelData, LocalDataStore localStore, - List statBuffDataFields) { + public ABAbilityBuilderStatPassiveTemplate(int handleId, War3ID code, War3ID alias, + List levelData, ABLocalDataStore localStore, + List statBuffDataFields) { super(code, alias, handleId); this.levelData = levelData; this.localStore = localStore; @@ -42,19 +42,19 @@ public CAbilityAbilityBuilderStatPassiveTemplate(int handleId, War3ID code, War3 this.auraStackingKey = buffId.asStringValue(); } - for (StatBuffFromDataField statBuff : statBuffDataFields) { + for (ABStatBuffFromDataField statBuff : statBuffDataFields) { createNewBuffs(statBuff); } } - private void removeExistingBuffs(CSimulation game, StatBuffFromDataField statBuff) { + private void removeExistingBuffs(CSimulation game, ABStatBuffFromDataField statBuff) { this.caster.removeNonStackingStatBuff(game, statBuff.getBuff()); if (statBuff.getSecondAtkBuff() != null) { this.caster.removeNonStackingStatBuff(game, statBuff.getSecondAtkBuff()); } } - private void createNewBuffs(StatBuffFromDataField parsedBuff) { + private void createNewBuffs(ABStatBuffFromDataField parsedBuff) { NonStackingStatBuffType type = parsedBuff.convertToNonStackingType(levelData.get(getLevel() - 1)); NonStackingStatBuff newBuff = null; switch (type) { @@ -97,7 +97,7 @@ private void createNewBuffs(StatBuffFromDataField parsedBuff) { public void setLevel(CSimulation game, CUnit unit, int level) { super.setLevel(game, unit, level); localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); - for (StatBuffFromDataField statBuff : this.statBuffDataFields) { + for (ABStatBuffFromDataField statBuff : this.statBuffDataFields) { NonStackingStatBuffType type = statBuff.convertToNonStackingType(levelData.get(getLevel() - 1)); if (type == null) { continue; @@ -160,7 +160,7 @@ public void onAdd(CSimulation game, CUnit unit) { this.caster = unit; game.getAbilityData().createAbility(getAlias(), game.getHandleIdAllocator().createId()); - for (StatBuffFromDataField statBuff : this.statBuffDataFields) { + for (ABStatBuffFromDataField statBuff : this.statBuffDataFields) { unit.addNonStackingStatBuff(game, statBuff.getBuff()); } } @@ -178,7 +178,7 @@ public void removeBuffFromUnit(CSimulation game, CUnit unit) { if (this.buff != null) { unit.removeNonStackingDisplayBuff(game, auraStackingKey, buff); } - for (StatBuffFromDataField statBuff : this.statBuffDataFields) { + for (ABStatBuffFromDataField statBuff : this.statBuffDataFields) { unit.removeNonStackingStatBuff(game, statBuff.getBuff()); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderBase.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderBase.java index 3695f8112..509e9a376 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderBase.java @@ -12,9 +12,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABAbilityTargetStillTargetableVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CAbstractRangedBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -22,9 +22,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; -public class CBehaviorAbilityBuilderBase extends CAbstractRangedBehavior implements ABBehavior { - private LocalDataStore localStore; - private AbilityBuilderActiveAbility ability; +public class ABBehaviorAbilityBuilderBase extends CAbstractRangedBehavior implements ABBehavior { + private ABLocalDataStore localStore; + private ABAbilityBuilderActiveAbility ability; private ABAbilityTargetStillTargetableVisitor preCastTargetableVisitor; private int castBehaviorNotifyTick = 0; @@ -47,8 +47,8 @@ public class CBehaviorAbilityBuilderBase extends CAbstractRangedBehavior impleme private EnumSet channelTags; private boolean firstAnimation; - public CBehaviorAbilityBuilderBase(final CUnit unit, final LocalDataStore localStore, - AbilityBuilderActiveAbility ability) { + public ABBehaviorAbilityBuilderBase(final CUnit unit, final ABLocalDataStore localStore, + ABAbilityBuilderActiveAbility ability) { super(unit); this.localStore = localStore; this.ability = ability; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderNoTarget.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderNoTarget.java index 3bc49b0f9..0af716633 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorAbilityBuilderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderNoTarget.java @@ -11,18 +11,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; -public class CBehaviorAbilityBuilderNoTarget implements ABBehavior { - private LocalDataStore localStore; - private AbilityBuilderActiveAbility ability; +public class ABBehaviorAbilityBuilderNoTarget implements ABBehavior { + private ABLocalDataStore localStore; + private ABAbilityBuilderActiveAbility ability; private int castStartTick = 0; private int castTimeEndTick = 0; @@ -42,8 +42,8 @@ public class CBehaviorAbilityBuilderNoTarget implements ABBehavior { private EnumSet channelTags; private boolean firstAnimation; - public CBehaviorAbilityBuilderNoTarget(final CUnit unit, final LocalDataStore localStore, - AbilityBuilderActiveAbility ability) { + public ABBehaviorAbilityBuilderNoTarget(final CUnit unit, final ABLocalDataStore localStore, + ABAbilityBuilderActiveAbility ability) { this.unit = unit; this.localStore = localStore; this.ability = ability; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorFinishTransformation.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorFinishTransformation.java index 8a01b19bc..a030a66b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorFinishTransformation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorFinishTransformation.java @@ -6,23 +6,23 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; -public class CBehaviorFinishTransformation implements CBehavior { +public class ABBehaviorFinishTransformation implements CBehavior { private CUnit sourceUnit; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private OnTransformationActions actions; private CUnit unit; - private AbilityBuilderAbility ability; + private ABAbilityBuilderAbility ability; private CUnitType baseTypeForDuration; private CUnitType newType; private boolean keepRatios; @@ -48,8 +48,8 @@ public class CBehaviorFinishTransformation implements CBehavior { private int castStartTick = 0; - public CBehaviorFinishTransformation(CUnit sourceUnit, LocalDataStore localStore, final CUnit unit, - AbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, OnTransformationActions actions, + public ABBehaviorFinishTransformation(CUnit sourceUnit, ABLocalDataStore localStore, final CUnit unit, + ABAbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, OnTransformationActions actions, boolean addAlternateTagAfter, final int visibleOrderId, boolean permanent, float duration, float transformationTime, float landingDelay, float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, boolean immediateLanding, boolean immediateTakeoff, War3ID buffId, @@ -94,22 +94,22 @@ public CBehaviorFinishTransformation(CUnit sourceUnit, LocalDataStore localStore public CBehavior update(CSimulation game) { if (this.castStartTick == 0) { this.castStartTick = game.getGameTurnTick(); - TransformationHandler.startSlowTransformation(localStore, unit, newType, keepRatios, actions, ability, + ABTransformationHandler.startSlowTransformation(localStore, unit, newType, keepRatios, actions, ability, addAlternateTagAfter, takingOff, landing, immediateTakeoff, immediateLanding, altitudeAdjustmentDelay, landingDelay, altitudeAdjustmentDuration); } final int ticksSinceCast = game.getGameTurnTick() - this.castStartTick; if (ticksSinceCast >= this.transformationTickDuration) { - TransformationHandler.finishSlowTransformation(localStore, unit, newType, keepRatios, actions, ability, + ABTransformationHandler.finishSlowTransformation(localStore, unit, newType, keepRatios, actions, ability, addAlternateTagAfter, permanent, takingOff); if (instantTransformAtDurationEnd) { - TransformationHandler.createInstantTransformBackBuff(sourceUnit, localStore, unit, baseTypeForDuration, + ABTransformationHandler.createInstantTransformBackBuff(sourceUnit, localStore, unit, baseTypeForDuration, keepRatios, actions.createUntransformActions(), ability, buffId, addAlternateTagAfter, transformationTime, duration, permanent); } else { - TransformationHandler.createSlowTransformBackBuff(sourceUnit, localStore, unit, baseTypeForDuration, + ABTransformationHandler.createSlowTransformBackBuff(sourceUnit, localStore, unit, baseTypeForDuration, keepRatios, actions.createUntransformActions(), ability, buffId, addAlternateTagAfter, transformationTime, duration, permanent, takingOff, landing, immediateTakeoff, immediateLanding, altitudeAdjustmentDelay, landingDelay, altitudeAdjustmentDuration); @@ -133,8 +133,8 @@ public CBehavior update(CSimulation game) { } private void cleanupInputs() { - if (this.ability instanceof AbilityBuilderActiveAbility) { - ((AbilityBuilderActiveAbility) this.ability).cleanupInputs(this.actions.getCastId()); + if (this.ability instanceof ABAbilityBuilderActiveAbility) { + ((ABAbilityBuilderActiveAbility) this.ability).cleanupInputs(this.actions.getCastId()); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorSendOrder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorSendOrder.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorSendOrder.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorSendOrder.java index a5e3c00bb..82796c7cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/CBehaviorSendOrder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorSendOrder.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorVisitor; -public class CBehaviorSendOrder implements CBehavior { +public class ABBehaviorSendOrder implements CBehavior { private CUnit unit; private CAbility ability; @@ -16,7 +16,7 @@ public class CBehaviorSendOrder implements CBehavior { private int visibleOrderId; private CWidget target; - public CBehaviorSendOrder(final CUnit unit, CAbility ability, final int orderId, final int visibleOrderId, + public ABBehaviorSendOrder(final CUnit unit, CAbility ability, final int orderId, final int visibleOrderId, final CWidget target) { this.unit = unit; this.ability = ability; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/COrderStartTransformation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABOrderStartTransformation.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/COrderStartTransformation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABOrderStartTransformation.java index 192ce1f9a..6b80427d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/COrderStartTransformation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABOrderStartTransformation.java @@ -6,10 +6,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.COrderNoTarget; -public class COrderStartTransformation extends COrderNoTarget { +public class ABOrderStartTransformation extends COrderNoTarget { private CBehavior transformBehavior; - public COrderStartTransformation(final CBehavior transformBehavior, final int orderId) { + public ABOrderStartTransformation(final CBehavior transformBehavior, final int orderId) { super(0, orderId, false); this.transformBehavior = transformBehavior; } @@ -45,7 +45,7 @@ public boolean equals(final Object obj) { if (getClass() != obj.getClass()) { return false; } - final COrderStartTransformation other = (COrderStartTransformation) obj; + final ABOrderStartTransformation other = (ABOrderStartTransformation) obj; if (this.transformBehavior.equals(other.transformBehavior)) { return false; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java index beca2653d..929dd4ae4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; @@ -20,15 +20,15 @@ public class ABActionAbilityAttemptToApplyEffect implements ABSingleAction { private ABUnitCallback target; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theCaster = caster; if (source != null) { theCaster = source.callback(theCaster, localStore, castId); } CUnit theTarget = target.callback(theCaster, localStore, castId); final CAbility theAbility = this.ability.callback(caster, localStore, castId); - if (theAbility instanceof AbilityBuilderActiveAbility) { - AbilityBuilderActiveAbility active = ((AbilityBuilderActiveAbility) theAbility); + if (theAbility instanceof ABAbilityBuilderActiveAbility) { + ABAbilityBuilderActiveAbility active = ((ABAbilityBuilderActiveAbility) theAbility); int orderId = active.getBaseOrderId(); final BooleanAbilityActivationReceiver activationReceiver = BooleanAbilityActivationReceiver.INSTANCE; active.checkCanUse(localStore.game, theCaster, orderId, false, activationReceiver); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityRunEndCastingActions.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityRunEndCastingActions.java index 95bfc67df..266f3b36e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityRunEndCastingActions.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityRunEndCastingActions.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAbilityRunEndCastingActions implements ABSingleAction { @@ -24,7 +24,7 @@ public class ABActionAbilityRunEndCastingActions implements ABSingleAction { private ABDestructableCallback targetDest; @Override - public void runAction(final CUnit originalCaster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit originalCaster, final ABLocalDataStore localStore, final int castId) { CUnit theCaster = originalCaster; if (caster != null) { theCaster = caster.callback(originalCaster, localStore, castId); @@ -42,8 +42,8 @@ public void runAction(final CUnit originalCaster, final LocalDataStore localStor } final CAbility theAbility = this.ability.callback(originalCaster, localStore, castId); - if (theAbility instanceof AbilityBuilderActiveAbility) { - AbilityBuilderActiveAbility active = ((AbilityBuilderActiveAbility) theAbility); + if (theAbility instanceof ABAbilityBuilderActiveAbility) { + ABAbilityBuilderActiveAbility active = ((ABAbilityBuilderActiveAbility) theAbility); int orderId = active.getBaseOrderId(); active.internalBegin(localStore.game, theCaster, orderId, false, tar); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java index c8aac7255..339e94b95 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java @@ -3,17 +3,17 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionActivateToggledAbility implements ABSingleAction { @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore + ABAbilityBuilderActiveAbility ability = (ABAbilityBuilderActiveAbility) localStore .get(ABLocalStoreKeys.ABILITY); ability.activate(localStore.game, caster); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java index 89831f9f7..8a87d0295 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddAbility implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionAddAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CAbility theAbility = this.ability.callback(caster, localStore, castId); CUnit theUnit = caster; if (unit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java index 3543de8e5..f2c59b8f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddNewAbility implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionAddNewAbility implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CAbility ability = localStore.game.getAbilityData() .getAbilityType(this.id.callback(caster, localStore, castId)) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddRallyAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddRallyAbility.java index f9f50a20d..966776e50 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddRallyAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddRallyAbility.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddRallyAbility implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CAbility ability = new CAbilityRally(localStore.game.getHandleIdAllocator().createId()); this.unit.callback(caster, localStore, castId).add(localStore.game, ability); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java index a8893fb77..51a0c89b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionBeginChanneling implements ABSingleAction { @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.CHANNELING, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCleanUpCastInstance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCleanUpCastInstance.java index f609212f1..9f39e3cf2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCleanUpCastInstance.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCleanUpCastInstance.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCleanUpCastInstance implements ABSingleAction { @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Set keySet = new HashSet<>(localStore.keySet()); for (final String key : keySet) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java index 076625cee..2fb30a8ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java @@ -4,25 +4,25 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionClickDisableAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if (this.ability != null) { final CAbility abil = ability.callback(caster, localStore, castId); if (abil != null) { abil.setClickDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } } else { - final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setClickDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java index 165249189..c79b4bd73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java @@ -4,25 +4,25 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionClickEnableAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if (this.ability != null) { final CAbility abil = ability.callback(caster, localStore, castId); if (abil != null) { abil.setClickDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } } else { - final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setClickDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java index 6ecafeeeb..dbc765923 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java @@ -8,14 +8,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCreateAbilityFromId implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { War3ID theId = this.id.callback(caster, localStore, castId); CAbilityType type = localStore.game.getAbilityData().getAbilityType(theId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java index f959c5f6e..50e081f4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java @@ -3,17 +3,17 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionDeactivateToggledAbility implements ABSingleAction { @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore + ABAbilityBuilderActiveAbility ability = (ABAbilityBuilderActiveAbility) localStore .get(ABLocalStoreKeys.ABILITY); ability.deactivate(localStore.game, caster); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java index cd432b22a..8943f26e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionFinishChanneling implements ABSingleAction { @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.CHANNELING, false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java index c0d08b789..00f093c6c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionPrepUnownedAbilityForUse implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionPrepUnownedAbilityForUse implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CAbility theAbility = this.ability.callback(caster, localStore, castId); CUnit theUnit = caster; if (unit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveAbility.java index f7cd47953..8256a07bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveAbility.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveAbility implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionRemoveAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java index 8fe47064b..9b0b49d4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionResetCooldown implements ABSingleAction { @@ -18,7 +18,7 @@ public class ABActionResetCooldown implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { @@ -26,14 +26,14 @@ public void runAction(final CUnit caster, final LocalDataStore localStore, } if (this.alias != null) { final War3ID aliasId = this.alias.callback(caster, localStore, castId); - final AbilityBuilderAbility abil = theUnit - .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); + final ABAbilityBuilderAbility abil = theUnit + .getAbility(ABGetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); if (abil != null) { abil.resetCooldown(localStore.game, theUnit); } } else { - final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.resetCooldown(localStore.game, theUnit); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java index 9996626e1..2ad4ed3eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABActionSendStartCastingEvents implements ABAction { @@ -15,7 +15,7 @@ public class ABActionSendStartCastingEvents implements ABAction { private ABUnitCallback caster; private ABWidgetCallback target; @Override - public void runAction(final CUnit basecaster, final LocalDataStore localStore, + public void runAction(final CUnit basecaster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = basecaster; CWidget theTarget = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java index 801c89afa..42ed7e523 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionStartCooldown implements ABSingleAction { @@ -20,7 +20,7 @@ public class ABActionStartCooldown implements ABSingleAction { private ABFloatCallback cooldown; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { @@ -31,8 +31,8 @@ public void runAction(final CUnit caster, final LocalDataStore localStore, if (this.cooldown != null) { theUnit.beginCooldown(localStore.game, aliasId, this.cooldown.callback(caster, localStore, castId)); } else { - final AbilityBuilderAbility abil = theUnit - .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); + final ABAbilityBuilderAbility abil = theUnit + .getAbility(ABGetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); if (abil != null) { abil.startCooldown(localStore.game, theUnit); } @@ -42,7 +42,7 @@ public void runAction(final CUnit caster, final LocalDataStore localStore, final War3ID aliasId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); theUnit.beginCooldown(localStore.game, aliasId, this.cooldown.callback(caster, localStore, castId)); } else { - final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.startCooldown(localStore.game, theUnit); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java index a6575e273..c29c28242 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAbilitySetShowIcon implements ABSingleAction { @@ -16,14 +16,14 @@ public class ABActionAbilitySetShowIcon implements ABSingleAction { private ABBooleanCallback show; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if (this.ability != null) { final CAbility abil = ability.callback(caster, localStore, castId); if (abil != null) { abil.setIconShowing(show.callback(caster, localStore, castId)); } } else { - final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setIconShowing(show.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java index 2cc35f5f5..e84a9568c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABActionAddTargetAllowed implements ABSingleAction { @@ -20,12 +20,12 @@ public class ABActionAddTargetAllowed implements ABSingleAction { @Override @SuppressWarnings("unchecked") - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - if (ability != null && ability instanceof AbilityBuilderActiveAbility) { - ((AbilityBuilderActiveAbility)ability).getTargetsAllowed().add(this.targetType); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null && ability instanceof ABAbilityBuilderActiveAbility) { + ((ABAbilityBuilderActiveAbility)ability).getTargetsAllowed().add(this.targetType); } else { - final List levelData = (List) localStore + final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final EnumSet targetsAllowed = levelData .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getTargetsAllowed(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java index 41d723f87..769ab4e86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java @@ -4,25 +4,25 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionDisableAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if (this.ability != null) { final CAbility abil = ability.callback(caster, localStore, castId); if (abil != null) { abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } } else { - final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java index 66f877371..a14c3950b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionDisableAbilityById implements ABSingleAction { @@ -18,7 +18,7 @@ public class ABActionDisableAbilityById implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { @@ -26,14 +26,14 @@ public void runAction(final CUnit caster, final LocalDataStore localStore, } if (this.alias != null) { final War3ID aliasId = this.alias.callback(caster, localStore, castId); - final AbilityBuilderAbility abil = theUnit - .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); + final ABAbilityBuilderAbility abil = theUnit + .getAbility(ABGetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); if (abil != null) { abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } } else { - final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java index 09582d61e..80ef1c8e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java @@ -4,25 +4,25 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionEnableAbility implements ABSingleAction { private ABAbilityCallback ability; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if (this.ability != null) { final CAbility abil = ability.callback(caster, localStore, castId); if (abil != null) { abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } } else { - final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java index de48b69bb..c074efa97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionEnableAbilityById implements ABSingleAction { @@ -18,7 +18,7 @@ public class ABActionEnableAbilityById implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { @@ -26,14 +26,14 @@ public void runAction(final CUnit caster, final LocalDataStore localStore, } if (this.alias != null) { final War3ID aliasId = this.alias.callback(caster, localStore, castId); - final AbilityBuilderAbility abil = theUnit - .getAbility(GetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); + final ABAbilityBuilderAbility abil = theUnit + .getAbility(ABGetABAbilityByRawcodeVisitor.getInstance().reset(aliasId)); if (abil != null) { abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } } else { - final AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java index 5fa53b9b8..92713d356 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABActionRemoveTargetAllowed implements ABSingleAction { @@ -20,13 +20,13 @@ public class ABActionRemoveTargetAllowed implements ABSingleAction { @Override @SuppressWarnings("unchecked") - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - if (ability != null && ability instanceof AbilityBuilderActiveAbility) { - ((AbilityBuilderActiveAbility)ability).getTargetsAllowed().remove(this.targetType); + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null && ability instanceof ABAbilityBuilderActiveAbility) { + ((ABAbilityBuilderActiveAbility)ability).getTargetsAllowed().remove(this.targetType); } else { - final List levelData = (List) localStore + final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final EnumSet targetsAllowed = levelData .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getTargetsAllowed(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java index 7ba2d5507..bba259256 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java @@ -3,20 +3,20 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetAbilityCastRange implements ABSingleAction { private ABFloatCallback range; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore + ABAbilityBuilderActiveAbility ability = (ABAbilityBuilderActiveAbility) localStore .get(ABLocalStoreKeys.ISTOGGLEDABILITY); ability.setCastRange(range.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java index da17e8f69..0b4c5fa9e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetAutoTargetDestructable implements ABSingleAction { private ABDestructableCallback dest; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, this.dest.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java index 657f49f94..1777ad8f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetAutoTargetUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, this.unit.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java index 5cb9bfb86..7d4ec312b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetPreventEndEvents implements ABSingleAction { @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.PREVENTENDEVENTS+castId, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionAddAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionAddAttackModifier.java index df9011bfa..18f93ec0c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionAddAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionAddAttackModifier.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddAttackModifier implements ABAction { private ABUnitCallback unit; private ABAttackModifierCallback modifier; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = unit.callback(caster, localStore, castId); target.addAttackModifier(modifier.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java index 6a01b7f51..403cf361a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; public class ABActionCreateAttackModifier implements ABAction { @@ -22,7 +22,7 @@ public class ABActionCreateAttackModifier implements ABAction { private ABBooleanCallback useCastId; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean isUseCastId = true; if (useCastId != null) { isUseCastId = useCastId.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java index 8d5a82eae..dd218e41e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorAttackListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; @@ -21,7 +21,7 @@ public class ABActionFireModifiedAttack implements ABAction { private ABBooleanCallback showMissOnFailure; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java index 3906cb95d..a2e084edc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveAttackModifier implements ABAction { private ABUnitCallback unit; private ABAttackModifierCallback modifier; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = unit.callback(caster, localStore, castId); target.removeAttackModifier(modifier.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java index 688740903..e2cab0672 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorAttackListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; @@ -22,7 +22,7 @@ public class ABActionStartModifiedAttack implements ABAction { private ABBooleanCallback stopOnFailure; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java index 62e4bdce4..a4be3e012 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddAnimationTag implements ABAction { private ABStringCallback tag; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.addAnimationName(SecondaryTag.valueOf(tag.callback(caster, localStore, castId))); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java index 0fdae038c..3c42ad988 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddPostDamageListener implements ABAction { private ABAttackPostDamageListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.addPostDamageListener(listener.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java index 9f3227b28..f8f5ab227 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddPreDamageListener implements ABAction { private ABAttackPreDamageListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.addPreDamageListener(listener.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java index a395f97d6..ce4886157 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java @@ -2,21 +2,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyAllArtFields implements ABAction { private ABBooleanCallback applyArtIfMissing; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); String art = abil.getAbilityStringField("Missileart"); if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { settings.setProjectileArt(art); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java index 3742c93b0..33439a1b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java @@ -2,21 +2,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyArt implements ABAction { private ABBooleanCallback applyArtIfMissing; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); String art = abil.getAbilityStringField("Missileart"); if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { settings.setProjectileArt(art); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java index 13dceb002..f0a4a8e5e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java @@ -2,21 +2,21 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyArtAndSpeed implements ABAction { private ABBooleanCallback applyArtIfMissing; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); String art = abil.getAbilityStringField("Missileart"); if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { settings.setProjectileArt(art); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java index e6b56cfc3..2e715bb3e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyDefaultSpeed implements ABAction { - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (settings.getProjectileSpeed() == 0) { settings.setProjectileSpeed(900); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java index 698876ce8..df67a2a18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public class ABActionAttackModifierPreventOtherModifications implements ABAction { - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore.get(ABLocalStoreKeys.ATTACKMODLOOP + castId); if (loop != null) loop.preventAllOtherModifications(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java index 964b45e9c..6e7868302 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public class ABActionAttackModifierPreventOtherSamePriorityModifications implements ABAction { - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore.get(ABLocalStoreKeys.ATTACKMODLOOP + castId); if (loop != null) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java index 7500b001a..4b40a18ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemoveAnimationTag implements ABAction { private ABStringCallback tag; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.removeAnimationName(SecondaryTag.valueOf(tag.callback(caster, localStore, castId))); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java index 344e6ec05..742f07d20 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemovePostDamageListener implements ABAction { private ABAttackPostDamageListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.removePostDamageListener(listener.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java index 3525fd86c..3d95b7598 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemovePreDamageListener implements ABAction { private ABAttackPreDamageListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); settings.removePreDamageListener(listener.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java index 0a3defadf..f56a308f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackArc implements ABAction { private ABFloatCallback arc; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (arc != null) { settings.setProjectileArc(arc.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java index 87fb52aec..93d3c7708 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackDeathTime implements ABAction { private ABFloatCallback deathTime; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (deathTime != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java index dcdca45f4..d6ef4fd02 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackHoming implements ABAction { private ABBooleanCallback homing; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (homing != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java index a79cadcfc..e3c4ae38c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackImpactZ implements ABAction { private ABFloatCallback impactZ; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (impactZ != null) { settings.setImpactZ(impactZ.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java index 19b2431d8..8a8704878 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackStartZ implements ABAction { private ABFloatCallback z; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (z != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java index 87611a2f5..d1f4c2b43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetSplashFields implements ABAction { @@ -17,7 +17,7 @@ public class ABActionAttackModifierSetSplashFields implements ABAction { private ABFloatCallback damageFactorMedium; private ABFloatCallback damageFactorSmall; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); if (areaOfEffectFullDamage != null) { settings.setAreaOfEffectFullDamage(areaOfEffectFullDamage.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java index 092b3e691..c5e5a5cf8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABCallbackGetModifiedAttackAttackType extends ABAttackTypeCallback { @Override - public CAttackType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java index bcbe64575..669b5f8fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetModifiedAttackDamageType extends ABDamageTypeCallback { @Override - public CDamageType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDamageType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().getDamageType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java index 028c48d73..efa961c92 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABCallbackGetModifiedAttackWeaponType extends ABWeaponTypeCallback { @Override - public CWeaponType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CWeaponType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java index a577d8964..b3d76c703 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -13,7 +13,7 @@ public class ABActionAttemptToReOrderPreviousBehavior implements ABAction { private ABBooleanCallback checkForOrders; @Override - public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { CBehavior b = (CBehavior) localStore.get(ABLocalStoreKeys.PREVIOUSBEHAVIOR); if (b != null && b != caster.getCurrentBehavior()) { if (checkForOrders == null || checkForOrders.callback(caster, localStore, castId)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java index 94735dbdf..df7ad5764 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAttemptToResumePreviousBehavior implements ABAction { private ABBooleanCallback checkForOrders; @Override - public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { if (checkForOrders == null || checkForOrders.callback(caster, localStore, castId)) { if (caster.getOrderQueue().isEmpty()) { localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, localStore.get(ABLocalStoreKeys.PREVIOUSBEHAVIOR)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionChangeAttackActionToMovement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionChangeAttackActionToMovement.java index 74ed8061e..6bd80a174 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionChangeAttackActionToMovement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionChangeAttackActionToMovement.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorNextBehaviorVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; @@ -14,7 +14,7 @@ public class ABActionChangeAttackActionToMovement implements ABAction { private ABUnitCallback unit; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (unit != null) { targetUnit = this.unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java index aba575ebb..af533e8ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; public class ABActionForceBeginCreatedBehavior implements ABAction { @@ -12,7 +12,7 @@ public class ABActionForceBeginCreatedBehavior implements ABAction { private ABUnitCallback unit; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (unit != null) { targetUnit = this.unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java index eaaac593d..abd003860 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddBuff implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionAddBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CBuff ability = this.buff.callback(caster, localStore, castId); if (ability != null) { this.target.callback(caster, localStore, castId).add(localStore.game, ability); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java index 0b4cd15c7..ec6e33f18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddNonStackingDisplayBuff implements ABSingleAction { @@ -17,7 +17,7 @@ public class ABActionAddNonStackingDisplayBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CBuff ability = this.buff.callback(caster, localStore, castId); this.target.callback(caster, localStore, castId).addNonStackingDisplayBuff(localStore.game, this.key.callback(caster, localStore, castId), ability); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java index 045fabde6..931aab912 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java @@ -11,7 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs.ABBuffSlow; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddSlowBuff implements ABSingleAction { @@ -23,7 +23,7 @@ public class ABActionAddSlowBuff implements ABSingleAction { private ABBooleanCallback leveled; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { War3ID alias = null; boolean isLeveled = false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java index bf6f2d0eb..8244622cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java @@ -11,7 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs.ABBuffStun; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddStunBuff implements ABSingleAction { @@ -23,7 +23,7 @@ public class ABActionAddStunBuff implements ABSingleAction { private ABBooleanCallback leveled; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { War3ID alias = null; boolean isLeveled = false; boolean isShowIcon = true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java index 364f63355..4731fd765 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreatePassiveBuff implements ABSingleAction { @@ -37,7 +37,7 @@ public class ABActionCreatePassiveBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { ABPermanentPassiveBuff ability = null; boolean isLeveled = false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java index b80f76ec4..d0c8abcfb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java @@ -12,7 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCreateTargetingBuff implements ABSingleAction { @@ -22,7 +22,7 @@ public class ABActionCreateTargetingBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final ABTargetingBuff ability = new ABTargetingBuff(localStore.game.getHandleIdAllocator().createId(), this.buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java index eb3830b9b..1144bd0ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTimedArtBuff implements ABSingleAction { @@ -34,7 +34,7 @@ public class ABActionCreateTimedArtBuff implements ABSingleAction { private List uniqueFlags; private Map uniqueValues; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean isLeveled = false; if (leveled != null) { isLeveled = leveled.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java index 9718b7ca2..f5ff2272d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java @@ -18,7 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -52,7 +52,7 @@ public class ABActionCreateTimedBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java index 5e22631c7..948d79601 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCreateTimedLifeBuff implements ABSingleAction { @@ -17,7 +17,7 @@ public class ABActionCreateTimedLifeBuff implements ABSingleAction { private ABBooleanCallback explode; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CBuffTimedLife ability = new CBuffTimedLife(localStore.game.getHandleIdAllocator().createId(), this.buffId.callback(caster, localStore, castId), this.duration.callback(caster, localStore, castId), this.explode.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java index 5056d0be7..57ab56edf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java @@ -17,7 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -51,7 +51,7 @@ public class ABActionCreateTimedPausedExpirationBuff implements ABAction { private Map uniqueValues; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { showTimedLife = this.showTimedLifeBar.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java index d565254a9..76a2af217 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCreateTimedTargetingBuff implements ABSingleAction { @@ -27,7 +27,7 @@ public class ABActionCreateTimedTargetingBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final ABTimedTargetingBuff ability = new ABTimedTargetingBuff(localStore.game.getHandleIdAllocator().createId(), this.buffId.callback(caster, localStore, castId), localStore, (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java index efb964cc4..b71757373 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java @@ -18,7 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -52,7 +52,7 @@ public class ABActionCreateTimedTickingBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java index 554021682..639cf93f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java @@ -18,7 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -52,7 +52,7 @@ public class ABActionCreateTimedTickingPausedBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { showTimedLife = this.showTimedLifeBar.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java index 114091da9..466755878 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java @@ -18,7 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -52,7 +52,7 @@ public class ABActionCreateTimedTickingPostDeathBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { showTimedLife = this.showTimedLifeBar.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java index 3c6bc24bf..f48dad7f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java @@ -11,7 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionDispelBuffs implements ABAction { @@ -20,7 +20,7 @@ public class ABActionDispelBuffs implements ABAction { private ABCondition filter; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theCaster = caster; if (source != null) { theCaster = source.callback(theCaster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java index ddb143e31..e9f96481d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveBuff implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionRemoveBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CBuff theBuff = this.buff.callback(caster, localStore, castId); if (theBuff != null) { (this.target.callback(caster, localStore, castId)).remove(localStore.game, theBuff); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java index 295e09c69..556f23346 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveNonStackingDisplayBuff implements ABSingleAction { @@ -16,7 +16,7 @@ public class ABActionRemoveNonStackingDisplayBuff implements ABSingleAction { private ABBuffCallback buff; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CBuff ability = this.buff.callback(caster, localStore, castId); this.target.callback(caster, localStore, castId).removeNonStackingDisplayBuff(localStore.game, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java index 92dc42ae4..73689f251 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; @@ -46,7 +46,7 @@ public class ABActionDamageArea implements ABAction { private List extraActions; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java index 474d81e91..e06de873b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; @@ -50,7 +50,7 @@ public class ABActionDamageAttackSplash implements ABAction { private List extraActions; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java index eb4dd67f2..1f0c936d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; @@ -48,7 +48,7 @@ public class ABActionDamageBurst implements ABAction { private List extraActions; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java index b4393f4ed..a22fa52cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; @@ -50,7 +50,7 @@ public class ABActionDamageSplash implements ABAction { private List extraActions; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; final CDamageFlags flags = new CGenericDamageFlags(false, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java index 27205f394..67897c5b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; @@ -32,7 +32,7 @@ public class ABActionDamageTarget implements ABSingleAction { private ABBooleanCallback nonlethal; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CAttackType theAttackType = CAttackType.SPELLS; CDamageType theDamageType = CDamageType.MAGIC; CDamageFlags flags = new CGenericDamageFlags(false, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java index 89fa29406..0a3c25f21 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionHeal implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionHeal implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { percent = this.isPercent.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionDeleteStoredKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionDeleteStoredKey.java index b3721a726..a2f534e8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionDeleteStoredKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionDeleteStoredKey.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionDeleteStoredKey implements ABAction { private ABStringCallback key; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.remove(key.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java index 2e4eccd60..db163bba3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java @@ -10,7 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionStoreValueLocally implements ABSingleAction { @@ -19,7 +19,7 @@ public class ABActionStoreValueLocally implements ABSingleAction { private ABCallback valueToStore; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { localStore.put(ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), this.valueToStore.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java index 73d0b9d1e..bcd751927 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java @@ -12,7 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCreateDestructable implements ABAction { @@ -25,7 +25,7 @@ public class ABActionCreateDestructable implements ABAction { private ABBooleanCallback playBirthAnim; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { float theFacing = 0; float theScale = 1; int theVariation = 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java index a4040d27c..017b8da7e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -26,7 +26,7 @@ public class ABActionDamageDestructable implements ABSingleAction { private ABFloatCallback damage; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean isItAttack = false; boolean isItRanged = true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java index 560a3b040..025a4221c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionKillDestructable implements ABAction { private ABDestructableCallback dest; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { dest.callback(caster, localStore, castId).setLife(localStore.game, 0); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java index 97c8fe037..2442ce005 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveDestructable implements ABAction { private ABDestructableCallback dest; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.game.removeDestructable(dest.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionAddDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionAddDestructableBuff.java index 8c99ab5a4..d99c09cf4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionAddDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionAddDestructableBuff.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddDestructableBuff implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionAddDestructableBuff implements ABSingleAction { private ABDestructableBuffCallback buff; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CDestructableBuff ability = this.buff.callback(caster, localStore, castId); this.target.callback(caster, localStore, castId).add(localStore.game, ability); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java index 1aee785e9..2ae098785 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java @@ -11,7 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCreateDestructableBuff implements ABSingleAction { @@ -22,7 +22,7 @@ public class ABActionCreateDestructableBuff implements ABSingleAction { private ABBooleanCallback dispellable; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean isDispellable = false; if (dispellable != null) { isDispellable = dispellable.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java index 06c04654a..35e464f39 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java @@ -11,7 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionDispelDestructableBuffs implements ABAction { @@ -20,7 +20,7 @@ public class ABActionDispelDestructableBuffs implements ABAction { private ABCondition filter; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theCaster = caster; if (source != null) { theCaster = source.callback(theCaster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java index 3523f2e4c..b570aae3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveDestructableBuff implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionRemoveDestructableBuff implements ABSingleAction { private ABDestructableBuffCallback buff; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CDestructableBuff ability = this.buff.callback(caster, localStore, castId); this.target.callback(caster, localStore, castId).remove(localStore.game, ability); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java index 956b18197..05bdebd93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABActionCreateTimeOfDayEvent implements ABSingleAction { @@ -21,7 +21,7 @@ public class ABActionCreateTimeOfDayEvent implements ABSingleAction { private ABStringCallback equalityId; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { String eqId = null; float st = 0; float et = Float.MAX_VALUE; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java index c72701309..46229cbff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRegisterTimeOfDayEvent implements ABSingleAction { private ABTimeOfDayEventCallback event; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.game.registerTimeOfDayEvent(this.event.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java index 94631a565..af50fb9b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABActionRegisterUniqueTimeOfDayEvent implements ABSingleAction { @@ -12,7 +12,7 @@ public class ABActionRegisterUniqueTimeOfDayEvent implements ABSingleAction { private ABTimeOfDayEventCallback event; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final ABTimeOfDayEvent ev = this.event.callback(caster, localStore, castId); if (!localStore.game.isTimeOfDayEventRegistered(ev)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java index 6d6a99511..f8697010d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionUnregisterTimeOfDayEvent implements ABSingleAction { private ABTimeOfDayEventCallback event; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.game.unregisterTimeOfDayEvent(this.event.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java index 7330a2a4a..1210d95bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; @@ -20,7 +20,7 @@ public class ABActionCreateWidgetEvent implements ABAction { private JassGameEventsWar3 eventType; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final ABWidgetEvent event = new ABWidgetEvent(caster, localStore, castId, this.widget.callback(caster, localStore, castId), this.eventType, this.condition, this.actions); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java index 269cdf7f5..cf14665be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent.ABWidgetEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABActionRegisterWidgetEvent implements ABSingleAction { @@ -12,7 +12,7 @@ public class ABActionRegisterWidgetEvent implements ABSingleAction { private ABWidgetEventCallback event; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { ABWidgetEvent theEvent = event.callback(caster, localStore, castId); theEvent.getWidget().addEvent(theEvent); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java index ec74c36f9..28d1ae7ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent.ABWidgetEventCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABActionUnregisterWidgetEvent implements ABSingleAction { @@ -12,7 +12,7 @@ public class ABActionUnregisterWidgetEvent implements ABSingleAction { private ABWidgetEventCallback event; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { ABWidgetEvent theEvent = event.callback(caster, localStore, castId); theEvent.remove(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java index 8cabb1195..e971a3ee7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; public class ABActionCreateFloatingTextOnUnit implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionCreateFloatingTextOnUnit implements ABSingleAction { private ABStringCallback message; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.game.spawnTextTag(this.target.callback(caster, localStore, castId), caster.getPlayerIndex(), this.textType, this.message.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java index 69ff293a5..f7ec2094e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; public class ABActionCreateNumericFloatingTextOnUnit implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionCreateNumericFloatingTextOnUnit implements ABSingleAction { private ABFloatCallback amount; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { float theAmount = 0; if (this.amount != null) { theAmount = this.amount.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java index 15dbb9cfe..69b90ad07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -20,7 +20,7 @@ public class ABActionCreateSpellEffectAtLocation implements ABAction { private CEffectType effectType; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); float dir = 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java index 82f1eed7f..2cfe1e63b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -18,7 +18,7 @@ public class ABActionCreateSpellEffectAtPoint implements ABAction { private ABIDCallback id; private CEffectType effectType; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { float dir = 0; if (facing != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java index 57874c717..d166d7ab2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -18,7 +18,7 @@ public class ABActionCreateSpellEffectOnUnit implements ABAction { private CEffectType effectType; private ABIntegerCallback index; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { War3ID theId = null; if (id == null) { theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java index d420357e2..d511299f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTemporarySpellEffectAtLocation implements ABSingleAction { @@ -20,7 +20,7 @@ public class ABActionCreateTemporarySpellEffectAtLocation implements ABSingleAct private CEffectType effectType; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); float dir = 0; if (this.facing != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java index a9df24668..f067b41c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTemporarySpellEffectAtPoint implements ABSingleAction { @@ -19,7 +19,7 @@ public class ABActionCreateTemporarySpellEffectAtPoint implements ABSingleAction private CEffectType effectType; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { float dir = 0; if (this.facing != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java index ded17d489..acf7b7b25 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTemporarySpellEffectOnUnit implements ABSingleAction { @@ -17,7 +17,7 @@ public class ABActionCreateTemporarySpellEffectOnUnit implements ABSingleAction private CEffectType effectType; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { War3ID theId = null; if (id == null) { theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java index d96a577bd..fd6d3c651 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx.ABFXCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveEffect implements ABSingleAction { private ABFXCallback effect; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { this.effect.callback(caster, localStore, castId).remove(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java index 315ddf5af..a0f562fb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABGroupEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -20,7 +20,7 @@ public class ABActionCreateGroupEffectAtLocation implements ABAction { private CEffectType effectType; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); float rad = radius.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java index be9993d14..920a930bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABActionCreateLightningEffect implements ABAction { @@ -19,7 +19,7 @@ public class ABActionCreateLightningEffect implements ABAction { private ABFloatCallback duration; private ABIntegerCallback index; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { int i = 0; if (index != null) { i = index.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java index 6c76761b5..7e9fb98e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java @@ -3,13 +3,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx.ABLightningCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveLightningEffect implements ABAction { private ABLightningCallback effect; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { effect.callback(caster, localStore, castId).remove(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java index b05fc27fd..b86828fc8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateLoopingSoundEffectAtLocation implements ABAction { @@ -14,7 +14,7 @@ public class ABActionCreateLoopingSoundEffectAtLocation implements ABAction { private ABLocationCallback location; private ABIDCallback id; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(caster, localStore, castId); SimulationRenderComponent ret = localStore.game.locationSoundEffectEvent(loc.getX(), loc.getY(), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java index fb8b52fd6..d3fd17185 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateLoopingSoundEffectOnUnit implements ABAction { @@ -13,7 +13,7 @@ public class ABActionCreateLoopingSoundEffectOnUnit implements ABAction { private ABUnitCallback unit; private ABIDCallback id; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { SimulationRenderComponent ret = localStore.game.unitLoopSoundEffectEvent( (unit.callback(caster, localStore, castId)), this.id.callback(caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java index 8d2d256b1..ba45a28e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateSoundEffectAtLocation implements ABAction { @@ -14,7 +14,7 @@ public class ABActionCreateSoundEffectAtLocation implements ABAction { private ABLocationCallback location; private ABIDCallback id; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(caster, localStore, castId); SimulationRenderComponent ret = localStore.game.locationSoundEffectEvent(loc.getX(), loc.getY(), this.id.callback(caster, localStore, castId), false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java index 21edad3a2..d2b49a746 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateSoundEffectOnUnit implements ABAction { @@ -13,7 +13,7 @@ public class ABActionCreateSoundEffectOnUnit implements ABAction { private ABUnitCallback unit; private ABIDCallback id; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { SimulationRenderComponent ret = localStore.game.unitSoundEffectEvent( (unit.callback(caster, localStore, castId)), this.id.callback(caster, localStore, castId)); localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java index 777ed6a5a..8915d44b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateUberSplat implements ABAction { @@ -15,7 +15,7 @@ public class ABActionCreateUberSplat implements ABAction { private ABLocationCallback location; @Override - public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { AbilityPointTarget loc = location.callback(caster, localStore, castId); SimulationRenderComponent splat = localStore.game.createStaticUberSplat(loc.getX(), loc.getY(), id.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java index e826f6be8..d89d42e14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainBowlEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; @@ -23,7 +23,7 @@ public class ABActionCreateTerrainBowlAtLocation implements ABAction { private ABFloatCallback startDepth; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); final float rad = radius.callback(caster, localStore, castId); final float theDepth = -1 * depth.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java index 5c3b18514..1ea27f6cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainRippleEffect; @@ -32,7 +32,7 @@ public class ABActionCreateTerrainRippleAtLocation implements ABAction { private ABBooleanCallback onlyNegative; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); float startRad = 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java index 2a9f66c66..99baa73ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainWaveEffect; @@ -23,7 +23,7 @@ public class ABActionCreateTerrainWaveAtLocation implements ABAction { private ABIntegerCallback count; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.startLocation.callback(caster, localStore, castId); final AbilityPointTarget tarloc = this.targetLocation.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java index 57f812d96..e1501bdfc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionModifyTerrainVertex implements ABAction { @@ -13,7 +13,7 @@ public class ABActionModifyTerrainVertex implements ABAction { private ABFloatCallback dz; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); localStore.game.adjustTerrain(loc.x, loc.y, dz.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java index 6c2ff4508..9c435c04c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetFalseTimeOfDay implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionSetFalseTimeOfDay implements ABSingleAction { private ABFloatCallback duration; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.game.addFalseTimeOfDay(this.hour.callback(caster, localStore, castId), this.minute.callback(caster, localStore, castId), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java index 78073be4f..3e89776de 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionChargeItem implements ABSingleAction { @@ -16,10 +16,10 @@ public class ABActionChargeItem implements ABSingleAction { private ABBooleanCallback checkForPerish; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CItem it = null; if (this.item == null) { - final AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); it = ability.getItem(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java index d32f585d6..ed2f75ca0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionTransformItem implements ABAction { @@ -14,7 +14,7 @@ public class ABActionTransformItem implements ABAction { private ABIDCallback newType; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CItem it = this.item.callback(caster, localStore, castId); War3ID type = newType.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java index 44ce0f878..9e2e7bf25 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java @@ -15,7 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionIterateDestructablesInRangeOfLocation implements ABAction { @@ -26,7 +26,7 @@ public class ABActionIterateDestructablesInRangeOfLocation implements ABAction { private List iterationActions; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final AbilityPointTarget target = this.location.callback(caster, localStore, castId); final Float rangeVal = this.range.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java index fefcd92a1..af407de5a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java @@ -12,7 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionIterateUnitsInGroup implements ABAction { private static final boolean ALLOW_BREAK_JASS = true; @@ -21,7 +21,7 @@ public class ABActionIterateUnitsInGroup implements ABAction { private List iterationActions; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Set unitSet = this.unitGroup.callback(caster, localStore, castId); final List unitList = new ArrayList<>(unitSet); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java index ebeab836f..66e8ea6a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java @@ -10,7 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionIterateUnitsInQueue implements ABAction { @@ -18,7 +18,7 @@ public class ABActionIterateUnitsInQueue implements ABAction { private List iterationActions; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Queue unitQueue = this.queue.callback(caster, localStore, castId); final List unitList = new ArrayList<>(unitQueue); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java index df35d0e61..880ac5752 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java @@ -15,7 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionIterateUnitsInRangeOfLocationMatchingCondition implements ABAction { @@ -27,7 +27,7 @@ public class ABActionIterateUnitsInRangeOfLocationMatchingCondition implements A private ABCondition condition; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final AbilityPointTarget target = this.location.callback(caster, localStore, castId); final Float rangeVal = this.range.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java index eecf57131..ac1c01efe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java @@ -16,7 +16,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; public class ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort implements ABAction { @@ -31,7 +31,7 @@ public class ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort impl private ABIntegerCallback sort; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final AbilityPointTarget target = this.location.callback(caster, localStore, castId); final Float rangeVal = this.range.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java index 4b408fe8a..de0b4fb0c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionIterateUnitsInRangeOfUnitMatchingCondition implements ABAction { @@ -26,7 +26,7 @@ public class ABActionIterateUnitsInRangeOfUnitMatchingCondition implements ABAct private ABFloatCallback range; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit originUnitTarget = this.originUnit.callback(caster, localStore, castId); final Float rangeVal = this.range.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java index afc0d51e0..aca508e0a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java @@ -15,7 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; public class ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort implements ABAction { @@ -30,7 +30,7 @@ public class ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort implemen private ABFloatCallback range; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit originUnitTarget = this.originUnit.callback(caster, localStore, castId); final Float rangeVal = this.range.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java index 8f04382bb..fd51dbc79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java @@ -11,7 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionIterateUnitsInRect implements ABAction { @@ -23,7 +23,7 @@ public class ABActionIterateUnitsInRect implements ABAction { private List iterationActions; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { recycleRect.set(this.x1, this.y1, this.x2 - this.x1, this.y2 - this.y1); localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java index b4a7cfa31..659dc779d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionListRemove implements ABAction { @@ -16,7 +16,7 @@ public class ABActionListRemove implements ABAction { private ABCallback object; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final List l = this.list.callback(caster, localStore, castId); if (object != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java index 71c1990b9..7aca44f8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionLocationListAdd implements ABAction { @@ -17,7 +17,7 @@ public class ABActionLocationListAdd implements ABAction { private ABIntegerCallback index; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final List l = this.list.callback(caster, localStore, castId); if (index != null) { l.add(index.callback(caster, localStore, castId), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java index 882d75b1d..46d034447 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSortableListRemove implements ABAction { @@ -16,7 +16,7 @@ public class ABActionSortableListRemove implements ABAction { private ABCallback object; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final List l = this.list.callback(caster, localStore, castId); if (object != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/order/ABActionIssueStopOrder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/order/ABActionIssueStopOrder.java index f7a6e9f2f..27a7d7368 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/order/ABActionIssueStopOrder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/order/ABActionIssueStopOrder.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionIssueStopOrder implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); targetUnit.performDefaultBehavior(localStore.game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java index c97d809a0..8e321742a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionGiveResourcesToPlayer implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionGiveResourcesToPlayer implements ABSingleAction { private ABIntegerCallback lumber; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CPlayer p = this.player.callback(caster, localStore, castId); if (this.gold != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java index 4b56157e9..cdb827577 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionSetAbilityEnabledForPlayer implements ABSingleAction { @@ -16,7 +16,7 @@ public class ABActionSetAbilityEnabledForPlayer implements ABSingleAction { private ABBooleanCallback enabled; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CPlayer p = this.player.callback(caster, localStore, castId); boolean e = true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java index 567ff6cae..60840e017 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java @@ -16,7 +16,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -43,7 +43,7 @@ public class ABActionCreateLocationTargetedCollisionProjectile implements ABSing private ABBooleanCallback provideCounts; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { Float theSpeed = null; Boolean isHoming = null; int theMaxHits = 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java index 666e9be36..8858215ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -32,7 +32,7 @@ public class ABActionCreateLocationTargetedProjectile implements ABSingleAction private List onHit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { Float theSpeed = null; Boolean isHoming = null; final CUnit theSource = this.source.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java index e4aa25cba..522914e9a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java @@ -18,7 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -49,7 +49,7 @@ public class ABActionCreateLocationTargetedPseudoProjectile implements ABSingleA private ABBooleanCallback provideCounts; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { float theSpeed = 0; boolean isHoming = false; int theMaxHits = 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java index e7a8d240e..2c0dd2398 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java @@ -23,7 +23,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABNearestUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; @@ -56,7 +56,7 @@ public class ABActionCreateUnitTargetedBouncingProjectile implements ABAction { private ABBooleanCallback allowMultipleBouncesPerUnit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theSource = caster; if (source != null) { theSource = this.source.callback(caster, localStore, castId); @@ -142,7 +142,7 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); } - private void startPerformJump(final CUnit caster, final LocalDataStore localStore, final int castId, + private void startPerformJump(final CUnit caster, final ABLocalDataStore localStore, final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (remainingJumps <= 0) { @@ -166,7 +166,7 @@ public void onFire(CSimulation simulation) { } } - private void performJump(final CUnit caster, final LocalDataStore localStore, final int castId, + private void performJump(final CUnit caster, final ABLocalDataStore localStore, final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (originUnitTarget == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java index f3ccce3c2..161bd82b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java @@ -15,7 +15,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -42,7 +42,7 @@ public class ABActionCreateUnitTargetedCollisionProjectile implements ABSingleAc private ABBooleanCallback provideCounts; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { Float theSpeed = null; Boolean isHoming = null; int theMaxHits = 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java index 56b0fed52..ac65fd508 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -33,7 +33,7 @@ public class ABActionCreateUnitTargetedProjectile implements ABSingleAction { private List onHit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit theSource = this.source.callback(caster, localStore, castId); AbilityTarget sourceLocation = theSource; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java index d324fff43..50cae283b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java @@ -17,7 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; @@ -48,7 +48,7 @@ public class ABActionCreateUnitTargetedPseudoProjectile implements ABSingleActio private ABBooleanCallback provideCounts; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { float theSpeed = 0; boolean isHoming = false; int theMaxHits = 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java index b490774d5..80214f751 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -15,7 +15,7 @@ public class ABActionSetAttackProjectileDamage implements ABSingleAction { private ABFloatCallback damage; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CProjectile proj = this.projectile.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java index 378b7f593..6d0182883 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABActionSetProjectileDone implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionSetProjectileDone implements ABSingleAction { private ABBooleanCallback done; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CProjectile proj = this.projectile.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java index eb5a80499..026371d46 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABActionSetProjectileReflected implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionSetProjectileReflected implements ABSingleAction { private ABBooleanCallback reflected; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CProjectile proj = this.projectile.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java index 9de562f4d..1b0590457 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABActionSetProjectileTarget implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionSetProjectileTarget implements ABSingleAction { private ABUnitCallback target; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CProjectile proj = this.projectile.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java index 85928fb35..8fbf12396 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java @@ -10,7 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCheckAbilityEffectReaction implements ABSingleAction { @@ -19,7 +19,7 @@ public class ABActionCheckAbilityEffectReaction implements ABSingleAction { private List onBlockActions; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit tarU = caster; if (this.target != null) { tarU = this.target.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityProjReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityProjReaction.java index 777eabe51..e2d2102b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityProjReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityProjReaction.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCheckAbilityProjReaction implements ABSingleAction { @@ -18,7 +18,7 @@ public class ABActionCheckAbilityProjReaction implements ABSingleAction { private List onBlockActions; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit tarU = caster; if (this.target != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java index 284f0af87..4cbe0b2c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddDefenseBonus implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionAddDefenseBonus implements ABSingleAction { private ABBooleanCallback percentage; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit target = this.targetUnit.callback(caster, localStore, castId); if (this.percentage.callback(caster, localStore, castId)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java index 65e625238..12ba0789a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddNonStackingStatBuff implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionAddNonStackingStatBuff implements ABSingleAction { private ABNonStackingStatBuffCallback buff; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit target = this.targetUnit.callback(caster, localStore, castId); target.addNonStackingStatBuff(localStore.game, this.buff.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java index 5f4db8287..c5d1e9408 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABActionCreateNonStackingStatBuff implements ABSingleAction { @@ -18,7 +18,7 @@ public class ABActionCreateNonStackingStatBuff implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final NonStackingStatBuff buff = new NonStackingStatBuff( this.buffType.callback(caster, localStore, castId), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java index be87faf94..60bc37f12 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABNonStackingStatBuffTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; public class ABActionRecomputeStatBuffsOnUnit implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionRecomputeStatBuffsOnUnit implements ABSingleAction { private ABNonStackingStatBuffTypeCallback buffType; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit unit = this.targetUnit.callback(caster, localStore, castId); NonStackingStatBuffType btype = this.buffType.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java index ee531cbb7..4444e93fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveDefenseBonus implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionRemoveDefenseBonus implements ABSingleAction { private ABBooleanCallback percentage; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit target = this.targetUnit.callback(caster, localStore, castId); if (this.percentage.callback(caster, localStore, castId)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java index c26dae6ff..45e54a992 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveNonStackingStatBuff implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionRemoveNonStackingStatBuff implements ABSingleAction { private ABNonStackingStatBuffCallback buff; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit target = this.targetUnit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java index 504d35a56..7a14036f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABActionUpdateNonStackingStatBuff implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionUpdateNonStackingStatBuff implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final NonStackingStatBuff buffObj = this.buff.callback(caster, localStore, castId); buffObj.setValue(this.value.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java index d607d4b4e..b95660f32 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionBreak implements ABSingleAction { @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.BREAK, true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java index b94c74e87..0d38890b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java @@ -17,7 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABNearestUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; @@ -42,7 +42,7 @@ public class ABActionChainEffect implements ABAction { private ABBooleanCallback allowMultipleBouncesPerUnit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit originUnitTarget = this.target.callback(caster, localStore, castId); boolean multiBounce = localStore.game.getGameplayConstants().isAllowMultiBounce(); if (allowMultipleBouncesPerUnit != null) { @@ -76,7 +76,7 @@ public void runAction(final CUnit caster, final LocalDataStore localStore, final } - private void startPerformJump(final CUnit caster, final LocalDataStore localStore, final int castId, + private void startPerformJump(final CUnit caster, final ABLocalDataStore localStore, final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (remainingJumps <= 0) { @@ -101,7 +101,7 @@ public void onFire(CSimulation simulation) { } } - private void performJump(final CUnit caster, final LocalDataStore localStore, final int castId, + private void performJump(final CUnit caster, final ABLocalDataStore localStore, final int castId, final CUnit originUnitTarget, final boolean multiBounce, final Set hitUnits, final int remainingJumps) { if (originUnitTarget == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java index 53b71d667..92029103b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCreateSubroutine implements ABSingleAction { @@ -18,7 +18,7 @@ public class ABActionCreateSubroutine implements ABSingleAction { private List actions; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { localStore.put(ABLocalStoreKeys.combineSubroutineInstanceKey( diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java index f2c0fef31..d62d86954 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionFor implements ABAction { @@ -19,7 +19,7 @@ public class ABActionFor implements ABAction { private ABCallback unique; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final int max = this.times.callback(caster, localStore, castId); for (int i = 0; i < max; i++) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java index 965c78151..9b69954c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionIf implements ABAction { @@ -15,7 +15,7 @@ public class ABActionIf implements ABAction { private List elseActions; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if (condition.callback(caster, localStore, castId)) { if (this.thenActions != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java index e77ff588d..3bfb6d0d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java @@ -10,7 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionPeriodicExecute implements ABAction { private final static int HARD_LOOP_CAP = 100; @@ -22,7 +22,7 @@ public class ABActionPeriodicExecute implements ABAction { private ABCallback unique; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { float nextActiveTick = 0; Object u = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java index 834afb4a2..4b754fb5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionResetPeriodicExecute implements ABAction { private ABCallback unique; @Override - public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { if (this.unique != null) { localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + this.unique.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java index 8a9b161a8..7c71c7763 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java @@ -4,22 +4,22 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABActionRunReuseAction implements ABSingleAction { private ABStringCallback name; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseActions() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java index 1912a01d9..209629b7f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABActionRunReuseActionWithArguments implements ABSingleAction { @@ -20,8 +20,8 @@ public class ABActionRunReuseActionWithArguments implements ABSingleAction { private Map arguments; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseActions() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java index 969de311c..8cd55a394 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRunSubroutine implements ABSingleAction { @@ -18,7 +18,7 @@ public class ABActionRunSubroutine implements ABSingleAction { @Override @SuppressWarnings("unchecked") - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { List actions; if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { actions = (List) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java index a03380c7c..ba7f4d05c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionWhile implements ABAction { @@ -16,7 +16,7 @@ public class ABActionWhile implements ABAction { private List loopActions; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { while (condition.callback(caster, localStore, castId)) { for (ABAction periodicAction : loopActions) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java index 1896efff0..a7d866034 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; @@ -22,7 +22,7 @@ public class ABActionCreateTimer implements ABSingleAction { private ABFloatCallback delay; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CTimer timer = new ABTimer(caster, localStore, this.actions, castId); timer.setTimeoutTime(this.timeout.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java index 68cb30a67..485b830d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionKillTimer implements ABSingleAction { private ABTimerCallback timer; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { this.timer.callback(caster, localStore, castId).kill(localStore.game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java index 6fe9c1348..5520688c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveTimer implements ABSingleAction { private ABTimerCallback timer; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { this.timer.callback(caster, localStore, castId).pause(localStore.game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java index abe632d12..282f49a09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionStartTimer implements ABSingleAction { @@ -13,7 +13,7 @@ public class ABActionStartTimer implements ABSingleAction { private ABTimerCallback timer; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CTimer t = this.timer.callback(caster, localStore, castId); t.start(localStore.game); localStore.put(ABLocalStoreKeys.LASTSTARTEDTIMER, t); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java index ab286d93d..55826be62 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionUpdateTimerTimeout implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionUpdateTimerTimeout implements ABSingleAction { private ABFloatCallback timeout; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CTimer theT = this.timer.callback(caster, localStore, castId); theT.resetTimeoutTime(this.timeout.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java index af2bf2168..a81951c22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAbilityAddUniqueFlag implements ABSingleAction { @@ -15,10 +15,10 @@ public class ABActionAbilityAddUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CAbility theAbility = this.ability.callback(caster, localStore, castId); - if (theAbility instanceof AbilityBuilderAbility) { - ((AbilityBuilderAbility) theAbility).addUniqueFlag(flag.callback(caster, localStore, castId)); + if (theAbility instanceof ABAbilityBuilderAbility) { + ((ABAbilityBuilderAbility) theAbility).addUniqueFlag(flag.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java index c89d1c088..a36c9d860 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAbilityRemoveUniqueFlag implements ABSingleAction { @@ -15,10 +15,10 @@ public class ABActionAbilityRemoveUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CAbility theAbility = this.ability.callback(caster, localStore, castId); - if (theAbility instanceof AbilityBuilderAbility) { - ((AbilityBuilderAbility) theAbility).removeUniqueFlag(flag.callback(caster, localStore, castId)); + if (theAbility instanceof ABAbilityBuilderAbility) { + ((ABAbilityBuilderAbility) theAbility).removeUniqueFlag(flag.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java index 3edfdec34..df9545320 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionBuffAddUniqueFlag implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionBuffAddUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CBuff theBuff = this.buff.callback(caster, localStore, castId); if (theBuff instanceof ABBuff) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java index 07ad57626..263b209ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionBuffRemoveUniqueFlag implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionBuffRemoveUniqueFlag implements ABSingleAction { private ABStringCallback flag; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CBuff theBuff = this.buff.callback(caster, localStore, castId); if (theBuff instanceof ABBuff) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java index 16f004f3f..165325964 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAbilityRemoveUniqueValue implements ABAction { @@ -15,12 +15,12 @@ public class ABActionAbilityRemoveUniqueValue implements ABAction { private ABStringCallback key; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CAbility theAbility = null; if (ability != null) { theAbility = ability.callback(caster, localStore, castId); } else { - theAbility = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + theAbility = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); } theAbility.removeUniqueValue(key.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java index 38a4eff8e..d2f37ad4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAbilityStoreUniqueValue implements ABAction { @@ -17,12 +17,12 @@ public class ABActionAbilityStoreUniqueValue implements ABAction { private ABCallback valueToStore; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CAbility theAbility = null; if (ability != null) { theAbility = ability.callback(caster, localStore, castId); } else { - theAbility = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + theAbility = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); } theAbility.addUniqueValue(valueToStore.callback(caster, localStore, castId), key.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java index 78975669d..24883d72f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionBuffRemoveUniqueValue implements ABAction { @@ -13,7 +13,7 @@ public class ABActionBuffRemoveUniqueValue implements ABAction { private ABStringCallback key; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CBuff theAbility = buff.callback(caster, localStore, castId); theAbility.removeUniqueValue(key.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java index 65a76182e..9579e393c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionBuffStoreUniqueValue implements ABAction { @@ -15,7 +15,7 @@ public class ABActionBuffStoreUniqueValue implements ABAction { private ABCallback valueToStore; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CBuff theAbility = buff.callback(caster, localStore, castId); theAbility.addUniqueValue(valueToStore.callback(caster, localStore, castId), key.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java index 8d7485ad8..570f8e1b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java @@ -12,7 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionCreateUnit implements ABSingleAction { @@ -26,7 +26,7 @@ public class ABActionCreateUnit implements ABSingleAction { private ABBooleanCallback removeFood; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { War3ID theId = id.callback(caster, localStore, castId); if (theId == null) { return; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java index 98b96a80d..b69f8bba0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionHideUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); targetUnit.setHidden(true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java index 1eacc4847..cd9dd8152 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionKillUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); targetUnit.kill(localStore.game); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java index 8317abb28..8586a66e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); localStore.game.removeUnit(targetUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java index d85291740..8fa6b25fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionResurrect implements ABSingleAction { private ABUnitCallback target; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.target.callback(caster, localStore, castId); if (targetUnit.isDead()) { targetUnit.resurrect(localStore.game); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java index 1968b48bf..e10ce0c45 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetExplodesOnDeath implements ABAction { @@ -15,7 +15,7 @@ public class ABActionSetExplodesOnDeath implements ABAction { private ABIDCallback buffId; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); targetUnit.setExplodesOnDeath(this.explodes.callback(caster, localStore, castId)); if (this.buffId != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java index 737e02e7b..dde4d000f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionStartSacrificingUnit implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionStartSacrificingUnit implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit theUnit = this.unit.callback(caster, localStore, castId); theUnit.queueSacrificingUnit(localStore.game, this.id.callback(caster, localStore, castId), this.sacrifice.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java index 29ba4c866..2c1c85603 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionStartTrainingUnit implements ABSingleAction { @@ -13,7 +13,7 @@ public class ABActionStartTrainingUnit implements ABSingleAction { private ABIDCallback id; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit theUnit = this.unit.callback(caster, localStore, castId); theUnit.queueTrainingUnit(localStore.game, this.id.callback(caster, localStore, castId)); theUnit.notifyOrdersChanged(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java index 39a3e5b79..24afcd918 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionUnhideUnit implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); targetUnit.setHidden(false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java index 38f9848dd..b12841c4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddSecondaryAnimationTag implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionAddSecondaryAnimationTag implements ABSingleAction { private ABStringCallback tag; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); if (targetUnit.getUnitAnimationListener() .addSecondaryTag(SecondaryTag.valueOf(this.tag.callback(caster, localStore, castId)))) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java index 339db9f95..299afa163 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionPlayAnimation implements ABSingleAction { @@ -21,7 +21,7 @@ public class ABActionPlayAnimation implements ABSingleAction { private ABBooleanCallback allowVariations; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); boolean f = true; float s = 1f; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java index 3ea4ee83c..1de9c3c06 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionQueueAnimation implements ABAction { @@ -17,7 +17,7 @@ public class ABActionQueueAnimation implements ABAction { private ABBooleanCallback allowVariations; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); boolean av = false; if (this.allowVariations != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java index 41e31926b..cb9891268 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveSecondaryAnimationTag implements ABSingleAction { @@ -14,7 +14,7 @@ public class ABActionRemoveSecondaryAnimationTag implements ABSingleAction { private ABStringCallback tag; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); if (targetUnit.getUnitAnimationListener() diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java index 1f1bdb8ca..75efbd47e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionDivideUnitAlpha implements ABSingleAction { @@ -13,7 +13,7 @@ public class ABActionDivideUnitAlpha implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); final float[] color = localStore.game.getUnitVertexColor(targetUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java index 37d531eb3..ade886ee8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionMultiplyUnitAlpha implements ABSingleAction { @@ -13,7 +13,7 @@ public class ABActionMultiplyUnitAlpha implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); final float[] color = localStore.game.getUnitVertexColor(targetUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitScale.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitScale.java index 96a6aab9b..88466e7b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitScale.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitScale.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionMultiplyUnitScale implements ABSingleAction { @@ -13,7 +13,7 @@ public class ABActionMultiplyUnitScale implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); localStore.game.changeUnitScale(targetUnit, value.callback(caster, localStore, castId), true); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java index b563418e5..aec1e7575 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetUnitAlpha implements ABSingleAction { @@ -13,7 +13,7 @@ public class ABActionSetUnitAlpha implements ABSingleAction { private ABFloatCallback value; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); final float[] color = localStore.game.getUnitVertexColor(targetUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java index ddf13421a..3657425d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetUnitFlyHeight implements ABSingleAction { @@ -13,7 +13,7 @@ public class ABActionSetUnitFlyHeight implements ABSingleAction { private ABFloatCallback height; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); targetUnit.setFlyHeight(this.height.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java index ed7dd015d..8d09ffa93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetUnitMovementTypeNoCollision implements ABSingleAction { @@ -13,7 +13,7 @@ public class ABActionSetUnitMovementTypeNoCollision implements ABSingleAction { private ABBooleanCallback active; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); if (this.active != null) { targetUnit.setNoCollisionMovementType(this.active.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java index b02755d01..1ddcaf98b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddMp implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionAddMp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { percent = this.isPercent.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java index f5e17cd76..9aae2d07a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetHp implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionSetHp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { percent = this.isPercent.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java index 6156f0ea0..c3a147323 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetMp implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionSetMp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { percent = this.isPercent.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetSpeed.java index 3ddbe943b..1eeb08282 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetSpeed.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetSpeed implements ABAction { @@ -12,7 +12,7 @@ public class ABActionSetSpeed implements ABAction { private ABIntegerCallback value; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); targetUnit.setSpeed(value.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java index 66676a06a..116c6e5a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSubtractMp implements ABSingleAction { @@ -15,7 +15,7 @@ public class ABActionSubtractMp implements ABSingleAction { private ABBooleanCallback isPercent; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { boolean percent = false; if (this.isPercent != null) { percent = this.isPercent.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java index 3a12109f6..374e83b83 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java @@ -11,7 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionMergeUnits implements ABSingleAction { @@ -25,7 +25,7 @@ public class ABActionMergeUnits implements ABSingleAction { private ABBooleanCallback resetHpMp; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { int thePlayerId = caster.getPlayerIndex(); float theFacing = caster.getFacing(); AbilityPointTarget loc = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java index d35f3a2d3..827fc4c40 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java @@ -5,18 +5,18 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorFinishTransformation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorFinishTransformation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; @@ -52,7 +52,7 @@ public class ABActionTransformUnit implements ABAction { private List onUntransformActions; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { u1 = unit.callback(caster, localStore, castId); @@ -65,7 +65,7 @@ public void runAction(CUnit caster, LocalDataStore localStore, final int castId) if (this.requiresPayment != null) { charge = this.requiresPayment.callback(caster, localStore, castId); } - AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (baseId == null || altId == null) { localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); @@ -167,23 +167,23 @@ public void runAction(CUnit caster, LocalDataStore localStore, final int castId) if (transTime > 0) { int orderId = -1; - if (abil instanceof AbilityBuilderActiveAbility) { - AbilityBuilderActiveAbility activeabil = (AbilityBuilderActiveAbility) abil; + if (abil instanceof ABAbilityBuilderActiveAbility) { + ABAbilityBuilderActiveAbility activeabil = (ABAbilityBuilderActiveAbility) abil; orderId = addAlternateTagAfter ? activeabil.getBaseOrderId() : activeabil.getOffOrderId(); } localStore.put(ABLocalStoreKeys.TRANSFORMINGTOALT + castId, addAlternateTagAfter); localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, - new CBehaviorFinishTransformation(caster, localStore, u1, abil, targetType, isKeepRatios, actions, + new ABBehaviorFinishTransformation(caster, localStore, u1, abil, targetType, isKeepRatios, actions, addAlternateTagAfter, orderId, perm, dur, transTime, landTime, atlAdDelay, altAdTime, imLand, imTakeOff, theBuffId, localStore.game.getUnitData().getUnitType(baseId), instant)); } else { - TransformationHandler.instantTransformation(localStore, u1, targetType, isKeepRatios, actions, abil, + ABTransformationHandler.instantTransformation(localStore, u1, targetType, isKeepRatios, actions, abil, addAlternateTagAfter, perm, true); if (dur > 0) { OnTransformationActions unActions = new OnTransformationActions(-goldCost, -lumberCost, null, null, onUntransformActions, castId); - TransformationHandler.createInstantTransformBackBuff(caster, localStore, u1, + ABTransformationHandler.createInstantTransformBackBuff(caster, localStore, u1, localStore.game.getUnitData().getUnitType(baseId), isKeepRatios, unActions, abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java index 3453fd1df..a8cf1eea2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionTransformUnitAppearance implements ABAction { @@ -12,7 +12,7 @@ public class ABActionTransformUnitAppearance implements ABAction { private ABIDCallback id; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit = this.unit.callback(caster, localStore, castId); localStore.game.unitUpdatedType(targetUnit, id.callback(caster, localStore, castId), false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java index 9e36df12e..88d9b1128 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java @@ -5,17 +5,17 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.DelayInstantTransformationTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABDelayInstantTransformationTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionTransformUnitInstant implements ABAction { @@ -40,7 +40,7 @@ public class ABActionTransformUnitInstant implements ABAction { private List onUntransformActions; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { u1 = unit.callback(caster, localStore, castId); @@ -57,7 +57,7 @@ public void runAction(CUnit caster, LocalDataStore localStore, final int castId) if (this.requiresPayment != null) { charge = this.requiresPayment.callback(caster, localStore, castId); } - AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); CUnitType baseType = null; if (baseUnitId == null) { @@ -147,14 +147,14 @@ public void runAction(CUnit caster, LocalDataStore localStore, final int castId) localStore.put(ABLocalStoreKeys.TRANSFORMINGTOALT + castId, addAlternateTagAfter); if (transTime > 0) { - TransformationHandler.playMorphAnimation(u1, addAlternateTagAfter); - new DelayInstantTransformationTimer(caster, localStore, u1, actions, addAlternateTagAfter, transTime, + ABTransformationHandler.playMorphAnimation(u1, addAlternateTagAfter); + new ABDelayInstantTransformationTimer(caster, localStore, u1, actions, addAlternateTagAfter, transTime, baseType, targetType, isKeepRatios, abil, theBuffId, transTime, dur).start(localStore.game); } else { - TransformationHandler.instantTransformation(localStore, u1, targetType, isKeepRatios, actions, abil, + ABTransformationHandler.instantTransformation(localStore, u1, targetType, isKeepRatios, actions, abil, addAlternateTagAfter, perm, true); if (dur > 0) { - TransformationHandler.createInstantTransformBackBuff(caster, localStore, u1, baseType, isKeepRatios, + ABTransformationHandler.createInstantTransformBackBuff(caster, localStore, u1, baseType, isKeepRatios, unActions, abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java index 2349f8029..a6faf759a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java @@ -6,16 +6,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; public class ABActionTransformedUnitAbilityAdd implements ABAction { @@ -47,14 +47,14 @@ public class ABActionTransformedUnitAbilityAdd implements ABAction { private List onUntransformActions; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { u1 = unit.callback(caster, localStore, castId); } War3ID baseId = baseUnitId.callback(caster, localStore, castId); War3ID altId = alternateUnitId.callback(caster, localStore, castId); - AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (baseId == null || altId == null) { localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); @@ -119,7 +119,7 @@ public void runAction(CUnit caster, LocalDataStore localStore, final int castId) theBuffId = buffId.callback(caster, localStore, castId); } - TransformationHandler.setTags(u1, true); + ABTransformationHandler.setTags(u1, true); if (perm) { u1.remove(localStore.game, abil); } @@ -150,14 +150,14 @@ public void runAction(CUnit caster, LocalDataStore localStore, final int castId) } if (instant) { - TransformationHandler.createInstantTransformBackBuff(caster, localStore, u1, baseType, isKeepRatios, + ABTransformationHandler.createInstantTransformBackBuff(caster, localStore, u1, baseType, isKeepRatios, actions, abil, theBuffId, true, transTime, dur, perm); } else { boolean takingOff = u1.getMovementType() != MovementType.FLY && baseType.getMovementType() == MovementType.FLY; boolean landing = u1.getMovementType() == MovementType.FLY && baseType.getMovementType() != MovementType.FLY; - TransformationHandler.createSlowTransformBackBuff(caster, localStore, u1, baseType, isKeepRatios, + ABTransformationHandler.createSlowTransformBackBuff(caster, localStore, u1, baseType, isKeepRatios, actions, abil, theBuffId, true, transTime, dur, perm, takingOff, landing, imTakeOff, imLand, atlAdDelay, landTime, altAdTime); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java index 77bd03964..c6793e8c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; public class ABActionTransformedUnitAbilityRemove implements ABAction { @@ -27,7 +27,7 @@ public class ABActionTransformedUnitAbilityRemove implements ABAction { private List onUntransformActions; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { boolean perm = false; if (permanent != null) { perm = permanent.callback(caster, localStore, castId); @@ -39,7 +39,7 @@ public void runAction(CUnit caster, LocalDataStore localStore, final int castId) } War3ID baseId = baseUnitId.callback(caster, localStore, castId); War3ID altId = alternateUnitId.callback(caster, localStore, castId); - AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (baseId == null || altId == null) { return; @@ -63,7 +63,7 @@ public void runAction(CUnit caster, LocalDataStore localStore, final int castId) action.runAction(u1, localStore, castId); } } - TransformationHandler.setUnitID(localStore, u1, baseType, isKeepRatios, perm, null, abil, true); + ABTransformationHandler.setUnitID(localStore, u1, baseType, isKeepRatios, perm, null, abil, true); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java index a12617e9d..483d41960 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java @@ -17,7 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityWispHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionDisableWorkerAbilities implements ABSingleAction { @@ -25,7 +25,7 @@ public class ABActionDisableWorkerAbilities implements ABSingleAction { @SuppressWarnings({ "rawtypes", "unchecked" }) @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (this.unit != null) { targetUnit = this.unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java index 1bdf58089..98cd7e114 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java @@ -17,7 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityWispHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionEnableWorkerAbilities implements ABSingleAction { @@ -25,7 +25,7 @@ public class ABActionEnableWorkerAbilities implements ABSingleAction { @SuppressWarnings({ "rawtypes", "unchecked" }) @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (this.unit != null) { targetUnit = this.unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionInstantReturnResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionInstantReturnResources.java index 09c56bfc4..e0611c717 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionInstantReturnResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionInstantReturnResources.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.ResourceType; @@ -14,7 +14,7 @@ public class ABActionInstantReturnResources implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit targetUnit = caster; if (this.unit != null) { targetUnit = this.unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionSendUnitBackToWork.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionSendUnitBackToWork.java index 65def3e38..24dd20fcd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionSendUnitBackToWork.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionSendUnitBackToWork.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTimer; public class ABActionSendUnitBackToWork implements ABSingleAction { @@ -13,7 +13,7 @@ public class ABActionSendUnitBackToWork implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(CUnit caster, LocalDataStore localStore, final int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit targetUnit; if (this.unit != null) { targetUnit = this.unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java index 4af3dd0b0..bc9e3829d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddUnitToGroup implements ABSingleAction { @@ -16,7 +16,7 @@ public class ABActionAddUnitToGroup implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Set groupSet = this.group.callback(caster, localStore, castId); final CUnit rUnit = this.unit.callback(caster, localStore, castId); groupSet.add(rUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java index e0219534a..201979118 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java @@ -7,14 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCreateUnitGroup implements ABSingleAction { private String name; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Set group = new HashSet<>(); if (this.name != null) { localStore.put("_unitgroup_" + this.name, group); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java index e88480b82..346df2cdb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveUnitFromGroup implements ABSingleAction { @@ -16,7 +16,7 @@ public class ABActionRemoveUnitFromGroup implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Set groupSet = this.group.callback(caster, localStore, castId); final CUnit rUnit = this.unit.callback(caster, localStore, castId); groupSet.remove(rUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java index b52698f47..0db20117d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddAttackPostDamageListener implements ABAction { private ABUnitCallback unit; private ABAttackPostDamageListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java index 428ec5f52..4a0643db3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddAttackPreDamageListener implements ABAction { @@ -14,7 +14,7 @@ public class ABActionAddAttackPreDamageListener implements ABAction { private ABAttackPreDamageListenerPriorityCallback priority; private ABAttackPreDamageListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); target.addPreDamageListener(priority.callback(caster, localStore, castId), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java index 253863eee..5021eead4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public class ABActionCreateAttackPostDamageListener implements ABAction { @@ -17,7 +17,7 @@ public class ABActionCreateAttackPostDamageListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java index 8ac83b30e..501d8733f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; public class ABActionCreateAttackPreDamageListener implements ABAction { @@ -15,7 +15,7 @@ public class ABActionCreateAttackPreDamageListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java index 855394b79..b249a91df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveAttackPostDamageListener implements ABAction { private ABUnitCallback unit; private ABAttackPostDamageListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java index bcc5574aa..3c2c4eb65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveAttackPreDamageListener implements ABAction { @@ -14,7 +14,7 @@ public class ABActionRemoveAttackPreDamageListener implements ABAction { private ABAttackPreDamageListenerPriorityCallback priority; private ABAttackPreDamageListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); target.removePreDamageListener(priority.callback(caster, localStore, castId), diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java index 4700c1cf9..87e54dc1f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; @@ -30,7 +30,7 @@ public class ABActionPreDamageListenerAddBonusDamage implements ABAction { private ABBooleanCallback isNonlethal; private ABBooleanCallback isPassLimitedMagicImmune; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CDamageType theDamageType = null; if (damageType != null) { theDamageType = damageType.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java index 7589b5984..73ae34023 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerAddDamageMultiplier implements ABAction { private ABFloatCallback value; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); damage.addDamageMultiplier(value.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java index c307fde38..0de4860f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerLockDamageModifications implements ABAction { - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); damage.lock(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java index cf77f9f07..74f846389 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerSetMiss implements ABAction { private ABBooleanCallback miss; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); if (miss != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java index 256187a9c..3086db0e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionSetPreDamageStacking implements ABAction { @@ -13,7 +13,7 @@ public class ABActionSetPreDamageStacking implements ABAction { private ABBooleanCallback allowStacking; private ABBooleanCallback allowSamePriorityStacking; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); if (allowStacking != null && !allowStacking.callback(caster, localStore, castId)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java index faca6dd39..69edf1365 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java @@ -3,13 +3,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetAttackBaseDamage extends ABFloatCallback { @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); return settings.getBaseDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java index 91d9b9460..5a943274f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetAttackDamageType extends ABDamageTypeCallback { @Override - public CDamageType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDamageType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().getDamageType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java index c0265b8f7..e6d82ac28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java @@ -3,13 +3,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetAttackMaximumSplashRadius extends ABIntegerCallback { @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); return Math.max(settings.getAreaOfEffectFullDamage(), Math.max(settings.getAreaOfEffectMediumDamage(), settings.getAreaOfEffectSmallDamage())); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java index 543adcf5b..22be26fa1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABCallbackGetAttackType extends ABAttackTypeCallback { @Override - public CAttackType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java index 923b01610..587cc95ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABCallbackGetAttackWeaponType extends ABWeaponTypeCallback { @Override - public CWeaponType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CWeaponType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java index 7eb90dbf2..6eab86c53 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileLine; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; @@ -11,7 +11,7 @@ public class ABConditionIsAttackArtillery extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnitAttack attack = (CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId); if (attack instanceof CUnitAttackMissileSplash) { return ((CUnitAttackMissileSplash)attack).isArtillery(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java index a4e8a053d..9fd8f3b82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java @@ -3,13 +3,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABConditionIsAttackHoming extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); return settings.isProjectileHomingEnabled(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java index e06de7ea9..770bfc39e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; @@ -21,7 +21,7 @@ public class ABConditionIsUnitValidSplashDamageTarget extends ABCondition { private ABBooleanCallback targetedEffect; @Override - public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java index d2cf315e7..0b1f6e911 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABBehaviorChangeListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddBehaviorChangeListener implements ABAction { private ABUnitCallback unit; private ABBehaviorChangeListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java index 001b5557c..3853e7a14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; public class ABActionCreateBehaviorChangeListener implements ABAction { @@ -15,7 +15,7 @@ public class ABActionCreateBehaviorChangeListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java index 9892690c7..615e14714 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABBehaviorChangeListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveBehaviorChangeListener implements ABAction { private ABUnitCallback unit; private ABBehaviorChangeListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = unit.callback(caster, localStore, castId); target.removeBehaviorChangeListener(listener.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java index e696a982d..c97eacfbe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target.ABTargetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; public class ABCallbackGetNewBehaviorTarget extends ABTargetCallback { @Override - public AbilityTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CBehavior beh = (CBehavior) localStore.get(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + castId); AbilityTarget tar = beh.visit(BehaviorTargetVisitor.INSTANCE); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java index 556a05f7c..16838cde1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; @@ -14,7 +14,7 @@ public class ABConditionIsNewBehaviorCategoryInList extends ABCondition { private List list; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, int castId) { CBehavior beh = (CBehavior) localStore.get(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + castId); CBehaviorCategory cat = CBehaviorCategory.IDLE; if (beh != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java index 003962ae7..95ba1e2d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddDamageTakenListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java index 40cf02a97..55d17b907 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenModificationListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddDamageTakenModificationListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenModificationListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java index 77e80f79e..08e735a71 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public class ABActionCreateDamageTakenListener implements ABAction { @@ -17,7 +17,7 @@ public class ABActionCreateDamageTakenListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java index 9e1d235fb..7729f7821 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; public class ABActionCreateDamageTakenModificationListener implements ABAction { @@ -17,7 +17,7 @@ public class ABActionCreateDamageTakenModificationListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java index 729ca7d1d..bba4c86af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveDamageTakenListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java index 5ad2a0a91..766883504 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenModificationListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveDamageTakenModificationListener implements ABAction { private ABUnitCallback targetUnit; private ABDamageTakenModificationListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java index 471ad4660..04a709ed1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionDamageTakenModificationMultiplyDamageMultiplier implements ABAction { private ABFloatCallback multiplier; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); damage.addDamageMultiplier(multiplier.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java index 59a62bda3..2d6c8e1db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionDamageTakenModificationSetDamageMultiplier implements ABAction { private ABFloatCallback multiplier; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java index 99d2e63c2..876a902fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java @@ -3,13 +3,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABConditionIsTriggeringDamageAnAttack extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).getPrimaryDamageFlags() .isAttack(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java index 4b2af2a17..40326fb8b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java @@ -3,13 +3,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABConditionIsTriggeringDamageRanged extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getPrimaryDamageFlags().isRanged(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java index 38f9b1317..1bfd5a3c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDeathReplacementCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddDeathReplacementEffect implements ABAction { @@ -14,7 +14,7 @@ public class ABActionAddDeathReplacementEffect implements ABAction { private ABDeathReplacementPriorityCallback priority; private ABDeathReplacementCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit targetUnit = target.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java index 8f5adf57d..fcff5cd2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; public class ABActionCreateDeathReplacementEffect implements ABAction { @@ -15,7 +15,7 @@ public class ABActionCreateDeathReplacementEffect implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java index 73582bcdc..8ff3b8365 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDeathReplacementCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveDeathReplacementEffect implements ABAction { @@ -14,7 +14,7 @@ public class ABActionRemoveDeathReplacementEffect implements ABAction { private ABDeathReplacementPriorityCallback priority; private ABDeathReplacementCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { target.callback(caster, localStore, castId).removeDeathReplacementEffect( priority.callback(caster, localStore, castId), listener.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java index 70555465a..1c4e9e941 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java @@ -5,11 +5,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionDeathReplacementFinishReincarnating implements ABAction { - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { caster.setFalseDeath(false); localStore.game.getWorldCollision().addUnit(caster); caster.getUnitAnimationListener().playAnimation(true, PrimaryTag.STAND, SequenceUtils.EMPTY, 1.0f, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java index d3ae32cb2..131198463 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; public class ABActionDeathReplacementSetReincarnating implements ABAction { - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitDeathReplacementResult result = (CUnitDeathReplacementResult)localStore.get(ABLocalStoreKeys.DEATHRESULT+castId); CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking)localStore.get(ABLocalStoreKeys.DEATHSTACKING+castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java index 3dcf8b550..591b51a1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; public class ABActionDeathReplacementSetReviving implements ABAction { - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitDeathReplacementResult result = (CUnitDeathReplacementResult)localStore.get(ABLocalStoreKeys.DEATHRESULT+castId); CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking)localStore.get(ABLocalStoreKeys.DEATHSTACKING+castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java index b8718edfe..ace7e1d1f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABEvasionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddEvasionListener implements ABAction { private ABUnitCallback targetUnit; private ABEvasionListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java index f3342808b..95e4b8fd3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public class ABActionCreateEvasionListener implements ABAction { @@ -16,7 +16,7 @@ public class ABActionCreateEvasionListener implements ABAction { private List conditions; private ABBooleanCallback useCastId; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java index 287d5971a..8e7e14dc9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABEvasionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveEvasionListener implements ABAction { private ABUnitCallback targetUnit; private ABEvasionListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java index 0aaeed5bb..6d4f6cc75 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityEffectReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddAbilityEffectReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityEffectReactionListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); target.addAbilityEffectReactionListener(listener.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java index 94ecdf355..930fce7ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddAbilityProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityProjReactionListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); target.addAbilityProjReactionListener(listener.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java index 2f807161d..e7b9048ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddAttackProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAttackProjReactionListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java index 6eeb0951e..7c0c096a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; public class ABActionCreateAbilityEffectReactionListener implements ABAction { @@ -15,7 +15,7 @@ public class ABActionCreateAbilityEffectReactionListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java index c45a3ad1d..259ea055a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; public class ABActionCreateAbilityProjReactionListener implements ABAction { @@ -15,7 +15,7 @@ public class ABActionCreateAbilityProjReactionListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java index c4079b058..633d4d474 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; public class ABActionCreateAttackProjReactionListener implements ABAction { @@ -15,7 +15,7 @@ public class ABActionCreateAttackProjReactionListener implements ABAction { private List actions; private ABBooleanCallback useCastId; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean ucid = true; if (useCastId != null) { ucid = useCastId.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java index 155bb5120..98fee304d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityEffectReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveAbilityEffectReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityEffectReactionListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java index 520acc0fc..b9048fbb0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveAbilityProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAbilityProjReactionListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); target.removeAbilityProjReactionListener(listener.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java index f4f070098..92bff6c14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackProjReactionListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveAttackProjReactionListener implements ABAction { private ABUnitCallback targetUnit; private ABAttackProjReactionListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); target.removeAttackProjReactionListener(listener.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java index 9f45b5ba5..58d32e716 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java @@ -4,11 +4,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionReactionPreventHit implements ABAction { - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { localStore.put(ABLocalStoreKeys.REACTIONALLOWHIT+castId, false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java index fa267555c..ed4ef7a32 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; public class ABCallbackGetReactionAttackProjectileAttackType extends ABAttackTypeCallback { @Override - public CAttackType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ + castId)).getUnitAttack() .getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java index 8aeb7196e..8486fc850 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java @@ -3,13 +3,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; public class ABCallbackGetReactionAttackProjectileDamage extends ABFloatCallback { @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ+castId)).getDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java index 974f26fb0..de1f535ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; /* @@ -20,7 +20,7 @@ public class ABActionSubtractTotalDamageDealt implements ABAction { private ABFloatCallback amount; private ABFloatCallback minimum; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { float theMin = 0; if (minimum != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java index ecffa99a8..99e28cf52 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; /* @@ -15,7 +15,7 @@ public class ABCallbackGetFinalTotalDamageDealt extends ABFloatCallback { @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)) .computeFinalDamage(localStore.game, caster); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java index 5a8773683..c9d2c9a2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; /* @@ -15,7 +15,7 @@ public class ABCallbackGetRawTotalDamageDealt extends ABFloatCallback { @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).computeRawTotalDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java index f780b5edc..1bb386fcc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; @@ -15,7 +15,7 @@ public class ABCallbackGetTriggeringAttackType extends ABAttackTypeCallback { @Override - public CAttackType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java index 17c27d61e..0171bc0d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; @@ -15,7 +15,7 @@ public class ABCallbackGetTriggeringDamageType extends ABDamageTypeCallback { @Override - public CDamageType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDamageType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).getPrimaryDamageType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java index c9ff3a6ae..2abd312f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddUnitStateListener implements ABAction { private ABUnitCallback unit; private ABUnitStateListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java index 53497ddf8..8c2d7e4b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; public class ABActionCreateUnitStateListener implements ABAction { @@ -24,7 +24,7 @@ public class ABActionCreateUnitStateListener implements ABAction { private List onUpgradesChanged; private List onHideStateChanged; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { ABUnitStateListener modifier = new ABUnitStateListener(caster, localStore, castId, onLifeChanged, onManaChanged, onOrdersChanged, onQueueChanged, onRallyPointChanged, onWaypointsChanged, onHeroStatsChanged, onInventoryChanged, onAttacksChanged, onAbilitiesChanged, onUpgradesChanged, onHideStateChanged); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java index b9d829bc0..f08d4ca62 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABUnitStateListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveUnitStateListener implements ABAction { private ABUnitCallback unit; private ABUnitStateListenerCallback listener; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java index 5f542c228..3d2c2828d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionAddUnitToQueue implements ABSingleAction { @@ -16,7 +16,7 @@ public class ABActionAddUnitToQueue implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Queue groupQueue = this.queue.callback(caster, localStore, castId); final CUnit rUnit = this.unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java index 56322fd17..046023cc5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionClearUnitQueue implements ABSingleAction { private ABUnitQueueCallback queue; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Queue groupQueue = this.queue.callback(caster, localStore, castId); groupQueue.clear(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java index c88f9256e..d6bf85396 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java @@ -7,14 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionCreateUnitQueue implements ABSingleAction { private String name; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Queue queue = new LinkedList<>(); if (this.name != null) { localStore.put("_unitqueue_" + this.name, queue); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java index ad9ed817a..8dd881cbe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveUnitFromQueue implements ABSingleAction { @@ -16,7 +16,7 @@ public class ABActionRemoveUnitFromQueue implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Queue groupQueue = this.queue.callback(caster, localStore, castId); final CUnit rUnit = this.unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java index 7b60db40e..3c2adb3cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABActionAddStateModBuff implements ABAction { @@ -13,7 +13,7 @@ public class ABActionAddStateModBuff implements ABAction { private ABUnitCallback targetUnit; private ABStateModBuffCallback buff; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); StateModBuff theBuff = buff.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java index bc5980719..393fdb482 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.ABLongCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuffType; @@ -14,7 +14,7 @@ public class ABActionCreateStateModBuff implements ABAction { private StateModBuffType buffType; private ABLongCallback value; - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { StateModBuff buff = null; if (value != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java index 0b67b5e98..a45f9a9e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABActionRemoveStateModBuff implements ABAction { @@ -13,7 +13,7 @@ public class ABActionRemoveStateModBuff implements ABAction { private ABUnitCallback targetUnit; private ABStateModBuffCallback buff; - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit target = targetUnit.callback(caster, localStore, castId); StateModBuff theBuff = buff.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java index 2e67dcc4b..518b5bfbf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionSetUnitFadeTimer implements ABAction { @@ -13,7 +13,7 @@ public class ABActionSetUnitFadeTimer implements ABAction { private ABTimerCallback timer; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CUnit target = this.targetUnit.callback(caster, localStore, castId); final CTimer theTimer = this.timer.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java index 443ad92f7..6aae3cf19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.ABLongCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABActionUpdateStateModBuff implements ABAction { @@ -14,7 +14,7 @@ public class ABActionUpdateStateModBuff implements ABAction { private ABLongCallback value; @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final StateModBuff buffObj = this.buff.callback(caster, localStore, castId); buffObj.setValue(this.value.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java index 74d546d3e..cc01402d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CCircleFogModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CTimedCircleFogModifier; @@ -21,7 +21,7 @@ public class ABActionCreateLocationVisionModifier implements ABAction { private ABPlayerCallback player; @Override - public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { CFogModifier vision; final AbilityPointTarget loc = this.location.callback(caster, localStore, castId); if (this.duration == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java index a674a3eee..26a24d1ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CProjectileVisionFogModifier; public class ABActionCreateProjectileVisionModifier implements ABAction { @@ -16,7 +16,7 @@ public class ABActionCreateProjectileVisionModifier implements ABAction { private ABFloatCallback radius; @Override - public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { final CProjectileVisionFogModifier vision = new CProjectileVisionFogModifier( this.projectile.callback(caster, localStore, castId), radius.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java index 461f4c2a9..44813d8d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CUnitVisionFogModifier; public class ABActionCreateUnitVisionModifier implements ABAction { @@ -16,7 +16,7 @@ public class ABActionCreateUnitVisionModifier implements ABAction { private ABBooleanCallback alwaysNightVision; @Override - public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { boolean alwaysNight = false; if (this.alwaysNightVision != null) { alwaysNight = this.alwaysNightVision.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java index b8972b82d..e1128a60c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier.ABVisionModifierCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionRemoveVisionModifier implements ABAction { @@ -12,7 +12,7 @@ public class ABActionRemoveVisionModifier implements ABAction { private ABPlayerCallback player; @Override - public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { player.callback(caster, localStore, castId).removeFogModifer(localStore.game, modifier.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java index ba0b2dbf4..6e5043e18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionSetBurrowPlaceholder implements ABAction { @Override - public void runAction(CUnit caster, LocalDataStore localStore, int castId) { + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { // TODO Auto-generated method stub } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java index 6e90f3ca3..fba272e8b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackNull implements ABCallback { @Override - public Object callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Object callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABAbilityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABAbilityCallback.java index a28ff5e3e..53780aa91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABAbilityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABAbilityCallback.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABAbilityCallback implements ABCallback { - abstract public CAbility callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CAbility callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java index d15c1700e..5577e0643 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentAbility extends ABAbilityCallback { private ABStringCallback name; @Override - public CAbility callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CAbility callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABAbilityCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java index 26ed9d2cc..2d50d7369 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; public class ABCallbackGetAbilityById extends ABAbilityCallback { @@ -13,13 +13,13 @@ public class ABCallbackGetAbilityById extends ABAbilityCallback { private ABUnitCallback unit; @Override - public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { theUnit = this.unit.callback(caster, localStore, castId); } return theUnit.getAbility( - GetABAbilityByRawcodeVisitor.getInstance().reset(this.id.callback(caster, localStore, castId))); + ABGetABAbilityByRawcodeVisitor.getInstance().reset(this.id.callback(caster, localStore, castId))); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java index 5797f2ee4..906ad095a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffSourceAbility extends ABAbilityCallback { private ABBuffCallback buff; @Override - public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return buff.callback(caster, localStore, castId).getSourceAbility(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java index 5c8449beb..77574f05c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetLastCreatedAbility extends ABAbilityCallback { @Override - public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.LASTCREATEDABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java index e36afdd87..eaefe9c43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetMatchingAbility extends ABAbilityCallback { @Override - public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.MATCHINGABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java index 738ef0fd5..b3467fff9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetPartnerAbility extends ABAbilityCallback { @Override - public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.LASTPARTNERABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java index 6d1672867..0852a8976 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetReactionAbility extends ABAbilityCallback { @Override - public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.REACTIONABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java index d0669f104..6ce7f3e83 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredAbilityByKey extends ABAbilityCallback { @@ -14,7 +14,7 @@ public class ABCallbackGetStoredAbilityByKey extends ABAbilityCallback { private ABBooleanCallback instanceValue; @Override - public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CAbility) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java index 6c4acb934..e02a656d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetThisAbility extends ABAbilityCallback { @Override - public CAbility callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CAbility) localStore.get(ABLocalStoreKeys.ABILITY); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java index 6d78f8f8e..fd83ce1d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionAbility extends ABAbilityCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionAbility extends ABAbilityCallback { private ABAbilityCallback fail; @Override - public CAbility callback(CUnit caster, LocalDataStore localStore, int castId) { + public CAbility callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java index 1c6196f82..3ca78bab3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java @@ -3,20 +3,20 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseAbility extends ABAbilityCallback { private ABStringCallback name; @Override - public CAbility callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public CAbility callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java index ac368df08..b78675b5c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseAbilityWithArguments extends ABAbilityCallback { @@ -18,9 +18,9 @@ public class ABCallbackReuseAbilityWithArguments extends ABAbilityCallback { private Map arguments; @Override - public CAbility callback(final CUnit caster, final LocalDataStore localStore, + public CAbility callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java index 8a73a4a5f..ff88b92a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; public abstract class ABAttackModifierCallback implements ABCallback { - abstract public ABAttackModifier callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABAttackModifier callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java index c24ace5e8..23cf21b6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; public class ABCallbackGetLastCreatedAttackModifier extends ABAttackModifierCallback { @Override - public ABAttackModifier callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABAttackModifier callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABAttackModifier) localStore.get(ABLocalStoreKeys.LASTCREATEDAMod); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java index afa1f31ff..7ec3123db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; public class ABCallbackGetStoredAttackModifierByKey extends ABAttackModifierCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredAttackModifierByKey extends ABAttackModifierCall private ABBooleanCallback instanceValue; @Override - public ABAttackModifier callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABAttackModifier callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABAttackModifier) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java index fa7837264..14d94714c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public abstract class ABAttackSettingsCallback implements ABCallback { - abstract public CUnitAttackSettings callback(final CUnit caster, final LocalDataStore localStore, + abstract public CUnitAttackSettings callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java index 09ebca90d..f41ff6189 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetCurrentAttackSettings extends ABAttackSettingsCallback { @Override - public CUnitAttackSettings callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnitAttackSettings callback(CUnit caster, ABLocalDataStore localStore, final int castId) { System.err.println("Getting: " + localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId)); return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java index d9001d6b9..7e1463b62 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetLastCreatedAttackSettings extends ABAttackSettingsCallback { @Override - public CUnitAttackSettings callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnitAttackSettings callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.LASTCREATEDASettings); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java index 4d082f44b..77fcda15c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetStoredAttackSettingsByKey extends ABAttackSettingsCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredAttackSettingsByKey extends ABAttackSettingsCall private ABBooleanCallback instanceValue; @Override - public CUnitAttackSettings callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnitAttackSettings callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABBooleanCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABBooleanCallback.java index 005706436..ccd9bcf60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABBooleanCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABBooleanCallback.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABBooleanCallback implements ABCallback { - abstract public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityDataAsBoolean.java index 49f348436..bd588ad9a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityDataAsBoolean.java @@ -6,18 +6,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsBoolean extends ABCondition { - private DataFieldLetter dataField; + private ABDataFieldLetter dataField; @SuppressWarnings("unchecked") @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { - final List levelData = (List) localStore + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityUniqueValueBoolean.java index 90e6d37ea..29871445d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityUniqueValueBoolean.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueBoolean extends ABBooleanCallback { @@ -14,7 +14,7 @@ public class ABCallbackGetAbilityUniqueValueBoolean extends ABBooleanCallback { private ABBooleanCallback allowNull; @Override - public Boolean callback(final CUnit caster, final LocalDataStore localStore, + public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = key.callback(caster, localStore, castId); final CAbility theAbility = ability.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetBuffUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetBuffUniqueValueBoolean.java index 1941adb50..3353d569d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetBuffUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetBuffUniqueValueBoolean.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueBoolean extends ABBooleanCallback { @@ -14,7 +14,7 @@ public class ABCallbackGetBuffUniqueValueBoolean extends ABBooleanCallback { private ABBooleanCallback allowNull; @Override - public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = key.callback(caster, localStore, castId); final CBuff theBuff = buff.callback(caster, localStore, castId); Boolean theVal = theBuff.getUniqueValue(keyS, Boolean.class); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetParentAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetParentAbilityDataAsBoolean.java index 7e8f32459..557eacd0c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetParentAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetParentAbilityDataAsBoolean.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetParentAbilityDataAsBoolean extends ABCondition { @@ -16,10 +16,10 @@ public class ABCallbackGetParentAbilityDataAsBoolean extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { - final List levelData = (List) localStore + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + final List levelData = (List) localStore .get(ABLocalStoreKeys.PARENTLEVELDATA); - final int parentLevel = (int) ((LocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) + final int parentLevel = (int) ((ABLocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) .get(ABLocalStoreKeys.CURRENTLEVEL); final String data = levelData.get(parentLevel - 1).getData() diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetStoredBooleanByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetStoredBooleanByKey.java index 23dc92a59..a9da1e42f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetStoredBooleanByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetStoredBooleanByKey.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredBooleanByKey extends ABCondition { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredBooleanByKey extends ABCondition { private ABBooleanCallback instanceValue; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Boolean) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackInlineConditionBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackInlineConditionBoolean.java index 6fe28024c..0657ff9d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackInlineConditionBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackInlineConditionBoolean.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionBoolean extends ABBooleanCallback { @@ -11,7 +11,7 @@ public class ABCallbackInlineConditionBoolean extends ABBooleanCallback { private ABBooleanCallback fail; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, int castBoolean) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, int castBoolean) { if (condition != null && condition.callback(caster, localStore, castBoolean)) { return pass.callback(caster, localStore, castBoolean); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackIntegerToBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackIntegerToBoolean.java index 3fc83e3dd..e6c3b06db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackIntegerToBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackIntegerToBoolean.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIntegerToBoolean extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return this.value.callback(caster, localStore, castId) != 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackRawBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackRawBoolean.java index 50c979d5b..bc6829543 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackRawBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackRawBoolean.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackRawBoolean extends ABCondition { private Boolean value; @Override - public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABBuffCallback.java index a62f65ccc..a364ca780 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABBuffCallback.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABBuffCallback implements ABCallback { - abstract public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java index a82241058..54fb43f69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentBuff extends ABBuffCallback { private ABStringCallback name; @Override - public CBuff callback(final CUnit caster, final LocalDataStore localStore, + public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java index fa994e214..952825424 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackEnumBuff extends ABBuffCallback { @Override - public CBuff callback(final CUnit caster, final LocalDataStore localStore, + public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.ENUMBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetBuffById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetBuffById.java index 484c1c899..af047a0d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetBuffById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetBuffById.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffById extends ABBuffCallback { @@ -14,7 +14,7 @@ public class ABCallbackGetBuffById extends ABBuffCallback { private ABIDCallback id; @Override - public CBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(caster, localStore, castId); War3ID theId = id.callback(caster, localStore, castId); if (theUnit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java index 47ebe1d8f..8b9fa9654 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetLastCreatedBuff extends ABBuffCallback { @Override - public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java index 90d980c23..b1dfd8695 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetMatchingBuff extends ABBuffCallback { @Override - public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.MATCHINGBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java index a60ac379b..fd354dd6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredBuffByKey extends ABBuffCallback { @@ -14,7 +14,7 @@ public class ABCallbackGetStoredBuffByKey extends ABBuffCallback { private ABBooleanCallback instanceValue; @Override - public CBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CBuff) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java index 5dfb73f13..130cf3154 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionBuff extends ABBuffCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionBuff extends ABBuffCallback { private ABBuffCallback fail; @Override - public CBuff callback(CUnit caster, LocalDataStore localStore, int castId) { + public CBuff callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java index d19bcc47c..2d10ecc10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java @@ -3,21 +3,21 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBuff extends ABBuffCallback { private ABStringCallback name; @Override - public CBuff callback(final CUnit caster, final LocalDataStore localStore, + public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java index 6c2146d92..b2d36e801 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBuffWithArguments extends ABBuffCallback { @@ -18,8 +18,8 @@ public class ABCallbackReuseBuffWithArguments extends ABBuffCallback { private Map arguments; @Override - public CBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java index e05908780..737413725 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackThisBuff extends ABBuffCallback { @Override - public CBuff callback(final CUnit caster, final LocalDataStore localStore, + public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (CBuff) localStore.get(ABLocalStoreKeys.BUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java index 8a8102021..3835f0484 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentDestructable extends ABDestructableCallback { private ABStringCallback name; @Override - public CDestructable callback(final CUnit caster, final LocalDataStore localStore, + public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java index 10f99892c..b6fdc338b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityTargetedDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java index 853a9ca6d..e926b3d0c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAttackedDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.DESTRUCTABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java index f2ca02f67..ca13bf93d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetEnumDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.ENUMDESTRUCTABLE+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java index b760286cc..533bdce0a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetLastCreatedDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.LASTCREATEDDESTRUCTABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java index fdeb96519..88409701f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetProjectileHitDestructable extends ABDestructableCallback { @Override - public CDestructable callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CDestructable) localStore.get(ABLocalStoreKeys.PROJECTILEHITDEST+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java index 72713a893..d9c037586 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredDestructableByKey extends ABDestructableCallback { @@ -14,7 +14,7 @@ public class ABCallbackGetStoredDestructableByKey extends ABDestructableCallback private ABBooleanCallback instanceValue; @Override - public CDestructable callback(final CUnit caster, final LocalDataStore localStore, + public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CDestructable) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java index beb5130c1..315d629e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionDestructable extends ABDestructableCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionDestructable extends ABDestructableCallbac private ABDestructableCallback fail; @Override - public CDestructable callback(CUnit caster, LocalDataStore localStore, int castId) { + public CDestructable callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java index 8a4571db7..6c39870a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java @@ -3,21 +3,21 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructable extends ABDestructableCallback { private ABStringCallback name; @Override - public CDestructable callback(final CUnit caster, final LocalDataStore localStore, + public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java index 79a1e97c7..cdcd619fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructableWithArguments extends ABDestructableCallback { @@ -18,9 +18,9 @@ public class ABCallbackReuseDestructableWithArguments extends ABDestructableCall private Map arguments; @Override - public CDestructable callback(final CUnit caster, final LocalDataStore localStore, + public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java index 598833c98..0ce17ed1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABDestructableCallback implements ABCallback { - abstract public CDestructable callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java index 59f560912..85fb7f7a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentDestructableBuff extends ABDestructableBuffCallback { private ABStringCallback name; @Override - public CDestructableBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CDestructableBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABDestructableBuffCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java index 42ce959a6..7d6268655 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackEnumDestructableBuff extends ABDestructableBuffCallback { @Override - public CDestructableBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructableBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CDestructableBuff) localStore.get(ABLocalStoreKeys.ENUMDESTBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java index bb60f3a42..65e92ad46 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetLastCreatedDestructableBuff extends ABDestructableBuffCallback { @Override - public CDestructableBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructableBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CDestructableBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDDESTBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java index c6b6ef7b6..bd431cc19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredDestructableBuffByKey extends ABDestructableBuffCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredDestructableBuffByKey extends ABDestructableBuff private ABBooleanCallback instanceValue; @Override - public CDestructableBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructableBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (CDestructableBuff) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java index 8e60f9c61..60973224f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionDestructableBuff extends ABDestructableBuffCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionDestructableBuff extends ABDestructableBuf private ABDestructableBuffCallback fail; @Override - public CDestructableBuff callback(CUnit caster, LocalDataStore localStore, int castId) { + public CDestructableBuff callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java index 07475df1a..ec0800be8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackMatchingDestructableBuff extends ABDestructableBuffCallback { @Override - public CDestructableBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CDestructableBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CDestructableBuff) localStore.get(ABLocalStoreKeys.MATCHINGDESTBUFF); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java index 32944704b..96e2bacbe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java @@ -3,21 +3,21 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructableBuff extends ABDestructableBuffCallback { private ABStringCallback name; @Override - public CDestructableBuff callback(final CUnit caster, final LocalDataStore localStore, + public CDestructableBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java index c5b2f28c3..ba77c8d67 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructableBuffWithArguments extends ABDestructableBuffCallback { @@ -18,8 +18,8 @@ public class ABCallbackReuseDestructableBuffWithArguments extends ABDestructable private Map arguments; @Override - public CDestructableBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public CDestructableBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java index 2fbabdf07..fa489165b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABDestructableBuffCallback implements ABCallback { - abstract public CDestructableBuff callback(final CUnit caster, final LocalDataStore localStore, + abstract public CDestructableBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java index d6bc7ae14..737fc2849 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerPriority; public abstract class ABAttackPreDamageListenerPriorityCallback implements ABCallback { - abstract public CUnitAttackPreDamageListenerPriority callback(final CUnit caster, final LocalDataStore localStore, + abstract public CUnitAttackPreDamageListenerPriority callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackTypeCallback.java index 4fb9a21ea..b5bbc43b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackTypeCallback.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public abstract class ABAttackTypeCallback implements ABCallback { - abstract public CAttackType callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CAttackType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAutocastTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAutocastTypeCallback.java index b41d4e7f5..079ebbf97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAutocastTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAutocastTypeCallback.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABAutocastTypeCallback implements ABCallback { - abstract public AutocastType callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public AutocastType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java index 38f7421db..7012306f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackConditionalAutocastType extends ABAutocastTypeCallback { @@ -12,7 +12,7 @@ public class ABCallbackConditionalAutocastType extends ABAutocastTypeCallback { private ABAutocastTypeCallback value2; @Override - public AutocastType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AutocastType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (condition.callback(caster, localStore, castId)) { return value1.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java index 4188f49ea..f7d02c470 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public class ABCallbackGetAttackTypeFromString extends ABAttackTypeCallback { @@ -10,7 +10,7 @@ public class ABCallbackGetAttackTypeFromString extends ABAttackTypeCallback { private ABStringCallback id; @Override - public CAttackType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return CAttackType.valueOf(id.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java index 96305d571..eb10be6bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAutocastTypeFromString extends ABAutocastTypeCallback { private ABStringCallback id; @Override - public AutocastType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AutocastType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return AutocastType.valueOf(id.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java index 6f928a8d4..e592e2911 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABCallbackRawString; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetDamageTypeFromString extends ABDamageTypeCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetDamageTypeFromString extends ABDamageTypeCallback { private ABStringCallback id; @Override - public CDamageType callback(final CUnit caster, final LocalDataStore localStore, + public CDamageType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return CDamageType.valueOf(this.id.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java index ca7ab37b1..2dda9fe19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABCallbackGetDefenseTypeFromString extends ABDefenseTypeCallback { @@ -10,7 +10,7 @@ public class ABCallbackGetDefenseTypeFromString extends ABDefenseTypeCallback { private ABStringCallback id; @Override - public CDefenseType callback(final CUnit caster, final LocalDataStore localStore, + public CDefenseType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return CDefenseType.valueOf(this.id.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java index b1cca5ed2..63f0eda9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetMovementTypeFromString extends ABMovementTypeCallback { private ABStringCallback id; @Override - public MovementType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public MovementType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return MovementType.valueOf(this.id.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java index 3d8239752..00339f17d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABCallbackRawString; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; public class ABCallbackGetNonStackingStatBuffTypeFromString extends ABNonStackingStatBuffTypeCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetNonStackingStatBuffTypeFromString extends ABNonStackin private ABStringCallback id; @Override - public NonStackingStatBuffType callback(final CUnit caster, final LocalDataStore localStore, + public NonStackingStatBuffType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return NonStackingStatBuffType.valueOf(this.id.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java index 0224644d3..7aae82c9e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public class ABCallbackGetStoredAttackTypeByKey extends ABAttackTypeCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredAttackTypeByKey extends ABAttackTypeCallback { private ABBooleanCallback instanceValue; @Override - public CAttackType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CAttackType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CAttackType) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java index dd20f9e0d..d58aa3db4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetStoredDamageTypeByKey extends ABDamageTypeCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredDamageTypeByKey extends ABDamageTypeCallback { private ABBooleanCallback instanceValue; @Override - public CDamageType callback(final CUnit caster, final LocalDataStore localStore, + public CDamageType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CDamageType) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java index 74ebf5c5e..fa1f9b0d7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABCallbackGetStoredDefenseTypeByKey extends ABDefenseTypeCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredDefenseTypeByKey extends ABDefenseTypeCallback { private ABBooleanCallback instanceValue; @Override - public CDefenseType callback(final CUnit caster, final LocalDataStore localStore, + public CDefenseType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CDefenseType) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java index 7340a62f9..40f22b72e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredMovementTypeByKey extends ABMovementTypeCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredMovementTypeByKey extends ABMovementTypeCallback private ABBooleanCallback instanceValue; @Override - public MovementType callback(final CUnit caster, final LocalDataStore localStore, + public MovementType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (MovementType) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java index b18005389..40cb34b97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABCallbackGetStoredTargetTypeByKey extends ABTargetTypeCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredTargetTypeByKey extends ABTargetTypeCallback { private ABBooleanCallback instanceValue; @Override - public CTargetType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CTargetType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CTargetType) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java index 3f99a8ada..a3782a89d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABCallbackGetStoredWeaponTypeByKey extends ABWeaponTypeCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredWeaponTypeByKey extends ABWeaponTypeCallback { private ABBooleanCallback instanceValue; @Override - public CWeaponType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CWeaponType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CWeaponType) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java index 8cf57ef4d..8978bf78c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABCallbackGetTargetTypeFromString extends ABTargetTypeCallback { @@ -10,7 +10,7 @@ public class ABCallbackGetTargetTypeFromString extends ABTargetTypeCallback { private ABStringCallback id; @Override - public CTargetType callback(final CUnit caster, final LocalDataStore localStore, + public CTargetType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return CTargetType.valueOf(this.id.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitDefenseType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitDefenseType.java index a9b56b95f..f589e8146 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitDefenseType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitDefenseType.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABCallbackGetUnitDefenseType extends ABDefenseTypeCallback { @@ -10,7 +10,7 @@ public class ABCallbackGetUnitDefenseType extends ABDefenseTypeCallback { private ABUnitCallback unit; @Override - public CDefenseType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CDefenseType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return unit.callback(caster, localStore, castId).getDefenseType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitMovementType.java index abc395435..e7b7661c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitMovementType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitMovementType.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitMovementType extends ABMovementTypeCallback { private ABUnitCallback unit; @Override - public MovementType callback(final CUnit caster, final LocalDataStore localStore, + public MovementType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return unit.callback(caster, localStore, castId).getMovementType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java index 6e50e0122..7f0266a0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitTypeMovementType extends ABMovementTypeCallback { private ABIDCallback type; @Override - public MovementType callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public MovementType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { War3ID theType = type.callback(caster, localStore, castId); return localStore.game.getUnitData().getUnitType(theType).getMovementType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java index bb84fc243..a4edbfd7d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABCallbackRawString; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABCallbackGetWeaponTypeFromString extends ABWeaponTypeCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetWeaponTypeFromString extends ABWeaponTypeCallback { private ABStringCallback id; @Override - public CWeaponType callback(final CUnit caster, final LocalDataStore localStore, + public CWeaponType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return CWeaponType.valueOf(this.id.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java index f74ffc5d8..a39a1470b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffectPriority; public class ABCallbackRawDeathEffectPriority extends ABDeathReplacementPriorityCallback { @@ -9,7 +9,7 @@ public class ABCallbackRawDeathEffectPriority extends ABDeathReplacementPriority private CUnitDeathReplacementEffectPriority priority; @Override - public CUnitDeathReplacementEffectPriority callback(CUnit caster, LocalDataStore localStore, + public CUnitDeathReplacementEffectPriority callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return priority; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java index d8249bb6e..9d7cd5692 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerPriority; public class ABCallbackRawPreDamageListenerPriority extends ABAttackPreDamageListenerPriorityCallback { @@ -9,7 +9,7 @@ public class ABCallbackRawPreDamageListenerPriority extends ABAttackPreDamageLis private CUnitAttackPreDamageListenerPriority priority; @Override - public CUnitAttackPreDamageListenerPriority callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnitAttackPreDamageListenerPriority callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return priority; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawTargetType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawTargetType.java index eb081641e..9762f928e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawTargetType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawTargetType.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABCallbackRawTargetType extends ABTargetTypeCallback { @@ -9,7 +9,7 @@ public class ABCallbackRawTargetType extends ABTargetTypeCallback { private CTargetType value; @Override - public CTargetType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CTargetType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawWeaponType.java index fa83f6643..d6d286e96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawWeaponType.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABCallbackRawWeaponType extends ABWeaponTypeCallback { @@ -9,7 +9,7 @@ public class ABCallbackRawWeaponType extends ABWeaponTypeCallback { private CWeaponType value; @Override - public CWeaponType callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CWeaponType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDamageTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDamageTypeCallback.java index 69d5123a0..57c14017d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDamageTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDamageTypeCallback.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public abstract class ABDamageTypeCallback implements ABCallback { - abstract public CDamageType callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CDamageType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDeathReplacementPriorityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDeathReplacementPriorityCallback.java index c5298d79f..7c3b74bdd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDeathReplacementPriorityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDeathReplacementPriorityCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffectPriority; public abstract class ABDeathReplacementPriorityCallback implements ABCallback { - abstract public CUnitDeathReplacementEffectPriority callback(final CUnit caster, final LocalDataStore localStore, + abstract public CUnitDeathReplacementEffectPriority callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDefenseTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDefenseTypeCallback.java index 0845217ae..1210aa7e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDefenseTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDefenseTypeCallback.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public abstract class ABDefenseTypeCallback implements ABCallback { - abstract public CDefenseType callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CDefenseType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABMovementTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABMovementTypeCallback.java index e614ae5b0..061b311c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABMovementTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABMovementTypeCallback.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABMovementTypeCallback implements ABCallback { - abstract public MovementType callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public MovementType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java index e63106c23..e9087541c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; public abstract class ABNonStackingStatBuffTypeCallback implements ABCallback { - abstract public NonStackingStatBuffType callback(final CUnit caster, final LocalDataStore localStore, + abstract public NonStackingStatBuffType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABTargetTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABTargetTypeCallback.java index 6f5b59872..98979dea1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABTargetTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABTargetTypeCallback.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public abstract class ABTargetTypeCallback implements ABCallback { - abstract public CTargetType callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CTargetType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABWeaponTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABWeaponTypeCallback.java index 49b65e3ce..8119469c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABWeaponTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABWeaponTypeCallback.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public abstract class ABWeaponTypeCallback implements ABCallback { - abstract public CWeaponType callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CWeaponType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java index 989c2e30b..03f91f2c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackArgumentTimeOfDayEvent extends ABTimeOfDayEventCallback { @@ -13,7 +13,7 @@ public class ABCallbackArgumentTimeOfDayEvent extends ABTimeOfDayEventCallback { private ABStringCallback name; @Override - public ABTimeOfDayEvent callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public ABTimeOfDayEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABTimeOfDayEventCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java index 934ff8956..fd3ee29ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackGetLastCreatedTimeOfDayEvent extends ABTimeOfDayEventCallback { @Override - public ABTimeOfDayEvent callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABTimeOfDayEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABTimeOfDayEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDTODEVENT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java index 1fca2dd22..88e677096 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackGetStoredTimeOfDayEventByKey extends ABTimeOfDayEventCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredTimeOfDayEventByKey extends ABTimeOfDayEventCall private ABBooleanCallback instanceValue; @Override - public ABTimeOfDayEvent callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABTimeOfDayEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABTimeOfDayEvent) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java index c639de023..a19f8518c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackInlineConditionTimeOfDayEvent extends ABTimeOfDayEventCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionTimeOfDayEvent extends ABTimeOfDayEventCal private ABTimeOfDayEventCallback fail; @Override - public ABTimeOfDayEvent callback(CUnit caster, LocalDataStore localStore, int castId) { + public ABTimeOfDayEvent callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java index 8f26dcc15..5862a05f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java @@ -2,22 +2,22 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseTimeOfDayEvent extends ABTimeOfDayEventCallback { private ABStringCallback name; @Override - public ABTimeOfDayEvent callback(final CUnit caster, final LocalDataStore localStore, + public ABTimeOfDayEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java index 55c2e584f..c613a4d6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseTimeOfDayEventWithArguments extends ABTimeOfDayEventCallback { @@ -18,9 +18,9 @@ public class ABCallbackReuseTimeOfDayEventWithArguments extends ABTimeOfDayEvent private Map arguments; @Override - public ABTimeOfDayEvent callback(final CUnit caster, final LocalDataStore localStore, + public ABTimeOfDayEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java index a878b7ff7..e822a825d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public abstract class ABTimeOfDayEventCallback implements ABCallback { - abstract public ABTimeOfDayEvent callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABTimeOfDayEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java index 25f1d6df2..739c0cdd6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackArgumentWidgetEvent extends ABWidgetEventCallback { @@ -13,7 +13,7 @@ public class ABCallbackArgumentWidgetEvent extends ABWidgetEventCallback { private ABStringCallback name; @Override - public ABWidgetEvent callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public ABWidgetEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABWidgetEventCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java index 1a22e2f86..67d9b94f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackGetLastCreatedWidgetEvent extends ABWidgetEventCallback { @Override - public ABWidgetEvent callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABWidgetEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABWidgetEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDWIDEVENT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java index f6ab8e5ce..7b4861c45 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackGetStoredWidgetEventByKey extends ABWidgetEventCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredWidgetEventByKey extends ABWidgetEventCallback { private ABBooleanCallback instanceValue; @Override - public ABWidgetEvent callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABWidgetEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABWidgetEvent) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java index 36ff56c15..515175638 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackInlineConditionWidgetEvent extends ABWidgetEventCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionWidgetEvent extends ABWidgetEventCallback private ABWidgetEventCallback fail; @Override - public ABWidgetEvent callback(CUnit caster, LocalDataStore localStore, int castId) { + public ABWidgetEvent callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java index c360cf643..e2a0b6b69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java @@ -2,21 +2,21 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseWidgetEvent extends ABWidgetEventCallback { private ABStringCallback name; @Override - public ABWidgetEvent callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public ABWidgetEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java index b590b22a6..0b91bb94e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseWidgetEventWithArguments extends ABWidgetEventCallback { @@ -18,9 +18,9 @@ public class ABCallbackReuseWidgetEventWithArguments extends ABWidgetEventCallba private Map arguments; @Override - public ABWidgetEvent callback(final CUnit caster, final LocalDataStore localStore, + public ABWidgetEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABWidgetEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABWidgetEventCallback.java index 3f1937687..73f02450f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABWidgetEventCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABWidgetEventCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public abstract class ABWidgetEventCallback implements ABCallback { - abstract public ABWidgetEvent callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public ABWidgetEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackAddFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackAddFloat.java index bb4240a51..4ece80e57 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackAddFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackAddFloat.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackAddFloat extends ABFloatCallback { @@ -9,7 +9,7 @@ public class ABCallbackAddFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) + value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java index dcfa90b34..0b26e0ef4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentFloat extends ABFloatCallback { private ABStringCallback name; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCeilFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCeilFloat.java index ea16a932e..9d65f52d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCeilFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCeilFloat.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCeilFloat extends ABFloatCallback { private ABFloatCallback value; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (float) Math.ceil(value.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCos.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCos.java index eaaba4c35..b6b8e8a6c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCos.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCos.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCos extends ABFloatCallback { private ABFloatCallback angle; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (float) StrictMath.cos(angle.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDegToRad.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDegToRad.java index f15812418..4e30be237 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDegToRad.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDegToRad.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackDegToRad extends ABFloatCallback { private ABFloatCallback angle; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (float) StrictMath.toRadians(angle.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDivideFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDivideFloat.java index 1025ce0f1..c44e069ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDivideFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDivideFloat.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackDivideFloat extends ABFloatCallback { @@ -10,7 +10,7 @@ public class ABCallbackDivideFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return this.value1.callback(caster, localStore, castId) / this.value2.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFMaxValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFMaxValue.java index 3c05e1baa..84ac784e3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFMaxValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFMaxValue.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackFMaxValue extends ABFloatCallback { @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return Float.MAX_VALUE; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFloorFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFloorFloat.java index 456ca1b7b..758c5c580 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFloorFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFloorFloat.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackFloorFloat extends ABFloatCallback { private ABFloatCallback value; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (float) Math.floor(value.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java index cff6e36e1..135197dfa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java @@ -2,24 +2,24 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityArea extends ABFloatCallback { private ABAbilityCallback ability; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (ability == null) { - AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getArea(); } else { CAbility abil = ability.callback(caster, localStore, castId); - if (abil instanceof AbilityBuilderAbility) { - return ((AbilityBuilderAbility)abil).getArea(); + if (abil instanceof ABAbilityBuilderAbility) { + return ((ABAbilityBuilderAbility)abil).getArea(); } else { return 0f; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java index 35ddadbdd..ee18055a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java @@ -2,24 +2,24 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityCastRange extends ABFloatCallback { private ABAbilityCallback ability; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (ability == null) { - AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getCastRange(); } else { CAbility abil = ability.callback(caster, localStore, castId); - if (abil instanceof AbilityBuilderAbility) { - return ((AbilityBuilderAbility) abil).getCastRange(); + if (abil instanceof ABAbilityBuilderAbility) { + return ((ABAbilityBuilderAbility) abil).getCastRange(); } else { return 0f; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java index ab04ab1c7..6b4f1d61f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java @@ -4,21 +4,21 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityCastTime extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (ability != null) { return ability.getCastTime(); } else { - final List levelData = (List) localStore + final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getCastTime(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java index 8a790f094..e788739e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java @@ -2,24 +2,24 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityCooldown extends ABFloatCallback { private ABAbilityCallback ability; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (ability == null) { - AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getCooldown(); } else { CAbility abil = ability.callback(caster, localStore, castId); - if (abil instanceof AbilityBuilderAbility) { - return ((AbilityBuilderAbility) abil).getCooldown(); + if (abil instanceof ABAbilityBuilderAbility) { + return ((ABAbilityBuilderAbility) abil).getCooldown(); } else { return 0f; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java index 71c1a1c8c..d99275907 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java @@ -5,19 +5,19 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsFloat extends ABFloatCallback { - private DataFieldLetter dataField; + private ABDataFieldLetter dataField; @SuppressWarnings("unchecked") @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final List levelData = (List) localStore + final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java index fd191759c..6d15f62b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABCallbackGetAbilityDuration extends ABFloatCallback { @@ -16,9 +16,9 @@ public class ABCallbackGetAbilityDuration extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final List levelData = (List) localStore + final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); if (this.target != null) { final CUnit tar = this.target.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java index 9296b7e9c..f4f6c9cd8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java @@ -4,15 +4,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityHeroDuration extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { - List levelData = (List) localStore + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getDurationHero(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java index 8d34da22e..5d609cb49 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityProjectileSpeed extends ABFloatCallback { @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java index ce74684b7..bf8b35271 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueFloat extends ABFloatCallback { @@ -15,7 +15,7 @@ public class ABCallbackGetAbilityUniqueValueFloat extends ABFloatCallback { private ABBooleanCallback allowNull; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = key.callback(caster, localStore, castId); final CAbility theAbility = ability.callback(caster, localStore, castId); Float theVal = theAbility.getUniqueValue(keyS, Float.class); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java index 9a2bd8269..fc3fac9e3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAngleBetweenLocations extends ABFloatCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetAngleBetweenLocations extends ABFloatCallback { private ABLocationCallback target; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final AbilityPointTarget o = this.origin.callback(caster, localStore, castId); final AbilityPointTarget t = this.target.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java index 167b48c8a..a0fd79da7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffDurationElapsed extends ABFloatCallback { private ABBuffCallback buff; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final CBuff theBuff = buff.callback(caster, localStore, castId); return theBuff.getDurationMax() - theBuff.getDurationRemaining(localStore.game, caster); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java index 9c94e1e04..fcafcd7a6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueFloat extends ABFloatCallback { @@ -15,7 +15,7 @@ public class ABCallbackGetBuffUniqueValueFloat extends ABFloatCallback { private ABBooleanCallback allowNull; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = key.callback(caster, localStore, castId); final CBuff theBuff = buff.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java index 03c6ea169..0f72deb08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetDistanceBetweenLocations extends ABFloatCallback { @@ -11,7 +11,7 @@ public class ABCallbackGetDistanceBetweenLocations extends ABFloatCallback { private ABLocationCallback target; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityPointTarget o = origin.callback(caster, localStore, castId); AbilityPointTarget t = target.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java index edae8fd8f..8ecdc67eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetDistanceBetweenUnits extends ABFloatCallback { @@ -10,7 +10,7 @@ public class ABCallbackGetDistanceBetweenUnits extends ABFloatCallback { private ABUnitCallback target; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit o = origin.callback(caster, localStore, castId); CUnit t = target.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationX.java index ab5c3ee84..52087ee8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationX.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetLocationX extends ABFloatCallback { private ABLocationCallback location; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return location.callback(caster, localStore, castId).getX(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationY.java index 56c44a807..f58d99501 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationY.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetLocationY extends ABFloatCallback { private ABLocationCallback location; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return location.callback(caster, localStore, castId).getY(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java index 0704cd34c..c5a5c67dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java @@ -4,20 +4,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetParentAbilityDataAsFloat extends ABFloatCallback { - private DataFieldLetter dataField; + private ABDataFieldLetter dataField; @SuppressWarnings("unchecked") @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { - List levelData = (List) localStore + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + List levelData = (List) localStore .get(ABLocalStoreKeys.PARENTLEVELDATA); - int parentLevel = (int) ((LocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) + int parentLevel = (int) ((ABLocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) .get(ABLocalStoreKeys.CURRENTLEVEL); String data = levelData.get(parentLevel - 1).getData().get(dataField.getIndex()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java index 593cf6500..74e1d1410 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredFloatByKey extends ABFloatCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredFloatByKey extends ABFloatCallback { private ABBooleanCallback instanceValue; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Float) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java index a794eea57..79ba332ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitAcquisitionRange extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(caster, localStore, castId); if (theUnit.getAcquisitionRange() > 0) { return theUnit.getAcquisitionRange(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCastPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCastPoint.java index 87a7bade3..c95209ef4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCastPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCastPoint.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitCastPoint extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return unit.callback(caster, localStore, castId).getUnitType().getCastPoint(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java index 8a35ec60d..38195b4b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitCurrentHp extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return unit == null ? caster.getLife() : this.unit.callback(caster, localStore, castId).getLife(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java index 36cb32467..7d547dc88 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitCurrentMana extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return unit == null ? caster.getMana() : unit.callback(caster, localStore, castId).getMana(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitFacing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitFacing.java index d15000cff..e1649a4aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitFacing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitFacing.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitFacing extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return this.unit.callback(caster, localStore, castId).getFacing(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitInitialMana.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitInitialMana.java index a4e02eb79..0ba3b44f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitInitialMana.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitInitialMana.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitInitialMana extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (float) unit.callback(caster, localStore, castId).getUnitType().getManaInitial(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationX.java index 8b5b81586..67e22268f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationX.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitLocationX extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return unit.callback(caster, localStore, castId).getX(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationY.java index de3c41dd1..534ab1ad6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationY.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitLocationY extends ABFloatCallback { private ABUnitCallback unit; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return unit.callback(caster, localStore, castId).getY(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java index da2757ab0..15d8a8a4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionFloat extends ABFloatCallback { @@ -11,7 +11,7 @@ public class ABCallbackInlineConditionFloat extends ABFloatCallback { private ABFloatCallback fail; @Override - public Float callback(CUnit caster, LocalDataStore localStore, int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackIntToFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackIntToFloat.java index 934ce4f97..98913dd84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackIntToFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackIntToFloat.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIntToFloat extends ABFloatCallback { private ABIntegerCallback value; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return this.value.callback(caster, localStore, castId).floatValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMaxFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMaxFloat.java index ca0a3f581..a932e4ad5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMaxFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMaxFloat.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackMaxFloat extends ABFloatCallback { @@ -10,7 +10,7 @@ public class ABCallbackMaxFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return Math.max(this.value1.callback(caster, localStore, castId), this.value2.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMinFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMinFloat.java index c3d8e057c..cab9e5117 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMinFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMinFloat.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackMinFloat extends ABFloatCallback { @@ -10,7 +10,7 @@ public class ABCallbackMinFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return Math.min(this.value1.callback(caster, localStore, castId), this.value2.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMultiplyFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMultiplyFloat.java index 7ab841571..a7b647ee8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMultiplyFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMultiplyFloat.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackMultiplyFloat extends ABFloatCallback { @@ -9,7 +9,7 @@ public class ABCallbackMultiplyFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) * value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackNegativeFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackNegativeFloat.java index c28626e44..04855d096 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackNegativeFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackNegativeFloat.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackNegativeFloat extends ABFloatCallback { private ABFloatCallback value; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return -1 * this.value.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackOneGameTick.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackOneGameTick.java index dac26f31c..e3e1dc7f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackOneGameTick.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackOneGameTick.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackOneGameTick extends ABFloatCallback { @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return WarsmashConstants.SIMULATION_STEP_TIME + 0.000001f; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackPi.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackPi.java index e73e0e34c..36e689e15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackPi.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackPi.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackPi extends ABFloatCallback { @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (float) StrictMath.PI; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomBoundedFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomBoundedFloat.java index 84f77dc9b..e89fbaf6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomBoundedFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomBoundedFloat.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackRandomBoundedFloat extends ABFloatCallback { private ABFloatCallback bound; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getSeededRandom().nextFloat(bound.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomFloat.java index 7f8286f0d..d7b0901a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomFloat.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackRandomFloat extends ABFloatCallback { @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getSeededRandom().nextFloat(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRawFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRawFloat.java index 98595cea1..8fdce9cd8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRawFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRawFloat.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackRawFloat extends ABFloatCallback { private Float value; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java index 05fae0dae..65d3ac270 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java @@ -2,21 +2,21 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseFloat extends ABFloatCallback { private ABStringCallback name; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java index cafdb7f08..2d823626d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseFloatWithArguments extends ABFloatCallback { @@ -17,8 +17,8 @@ public class ABCallbackReuseFloatWithArguments extends ABFloatCallback { private Map arguments; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSin.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSin.java index 034fd543b..7c714352f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSin.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSin.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackSin extends ABFloatCallback { private ABFloatCallback angle; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (float) StrictMath.sin(angle.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSubtractFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSubtractFloat.java index f5e50527b..04e39c196 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSubtractFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSubtractFloat.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackSubtractFloat extends ABFloatCallback { @@ -10,7 +10,7 @@ public class ABCallbackSubtractFloat extends ABFloatCallback { private ABFloatCallback value2; @Override - public Float callback(final CUnit caster, final LocalDataStore localStore, + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return this.value1.callback(caster, localStore, castId) - this.value2.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTan.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTan.java index 65181f421..7d21be451 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTan.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTan.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackTan extends ABFloatCallback { private ABFloatCallback angle; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (float) StrictMath.tan(angle.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTicksForDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTicksForDuration.java index d353e7c06..5d9e7babe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTicksForDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTicksForDuration.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackTicksForDuration extends ABFloatCallback { private ABFloatCallback duration; @Override - public Float callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return duration.callback(caster, localStore, castId) / WarsmashConstants.SIMULATION_STEP_TIME; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABFloatCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABFloatCallback.java index f8a34bbda..5aeabbeb1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABFloatCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABFloatCallback.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABFloatCallback implements ABCallback { - abstract public Float callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java index 98591218f..8bf89c757 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackArgumentFX extends ABFXCallback { @@ -13,7 +13,7 @@ public class ABCallbackArgumentFX extends ABFXCallback { private ABStringCallback name; @Override - public SimulationRenderComponent callback(final CUnit caster, final LocalDataStore localStore, + public SimulationRenderComponent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java index e661f972a..a392683b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackGetLastCreatedFX extends ABFXCallback { @Override - public SimulationRenderComponent callback(CUnit caster, LocalDataStore localStore, + public SimulationRenderComponent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.LASTCREATEDFX); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java index ef43424d0..6356ba9ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABCallbackGetLastCreatedLightningEffect extends ABLightningCallback { @Override - public SimulationRenderComponentLightning callback(CUnit caster, LocalDataStore localStore, final int castId) { + public SimulationRenderComponentLightning callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (SimulationRenderComponentLightning) localStore.get(ABLocalStoreKeys.LASTCREATEDLIGHTNING); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java index 0f3fff9b8..8be18a599 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackGetStoredFXByKey extends ABFXCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredFXByKey extends ABFXCallback { private ABBooleanCallback instanceValue; @Override - public SimulationRenderComponent callback(CUnit caster, LocalDataStore localStore, + public SimulationRenderComponent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java index ead92d66d..f108fcc70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABCallbackGetStoredLightningByKey extends ABLightningCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredLightningByKey extends ABLightningCallback { private ABBooleanCallback instanceValue; @Override - public SimulationRenderComponentLightning callback(CUnit caster, LocalDataStore localStore, final int castId) { + public SimulationRenderComponentLightning callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (SimulationRenderComponentLightning) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java index 7a2a6e3bd..7b6bf1e7f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackInlineConditionFX extends ABFXCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionFX extends ABFXCallback { private ABFXCallback fail; @Override - public SimulationRenderComponent callback(CUnit caster, LocalDataStore localStore, int castId) { + public SimulationRenderComponent callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java index 243e41274..5150f65b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackReuseFX extends ABFXCallback { @@ -15,9 +15,9 @@ public class ABCallbackReuseFX extends ABFXCallback { private ABStringCallback name; @Override - public SimulationRenderComponent callback(final CUnit caster, final LocalDataStore localStore, + public SimulationRenderComponent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java index 713948d99..d2c171957 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackReuseFXWithArguments extends ABFXCallback { @@ -18,9 +18,9 @@ public class ABCallbackReuseFXWithArguments extends ABFXCallback { private Map arguments; @Override - public SimulationRenderComponent callback(final CUnit caster, final LocalDataStore localStore, + public SimulationRenderComponent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABFXCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABFXCallback.java index 7a05dfffd..c9e2b9c04 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABFXCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABFXCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public abstract class ABFXCallback implements ABCallback { - abstract public SimulationRenderComponent callback(final CUnit caster, final LocalDataStore localStore, + abstract public SimulationRenderComponent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABLightningCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABLightningCallback.java index 6bf312826..ae4c25f35 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABLightningCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABLightningCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public abstract class ABLightningCallback implements ABCallback { - abstract public SimulationRenderComponentLightning callback(final CUnit caster, final LocalDataStore localStore, + abstract public SimulationRenderComponentLightning callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java index 7787cc001..5e6f0c11a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentID extends ABIDCallback { private ABStringCallback name; @Override - public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABIDCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java index bfe7eaec6..671c75df9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java @@ -6,18 +6,18 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsID extends ABIDCallback { - private DataFieldLetter dataField; + private ABDataFieldLetter dataField; @SuppressWarnings("unchecked") @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { - final List levelData = (List) localStore + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java index f245032ce..156c251fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java @@ -7,19 +7,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsIDFromList extends ABIDCallback { - private DataFieldLetter dataField; + private ABDataFieldLetter dataField; private ABIntegerCallback index; @SuppressWarnings("unchecked") @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { - final List levelData = (List) localStore + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java index 071cb38ff..c30ccd0cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java @@ -6,18 +6,18 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsRandomIDFromList extends ABIDCallback { - private DataFieldLetter dataField; + private ABDataFieldLetter dataField; @SuppressWarnings("unchecked") @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { - final List levelData = (List) localStore + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java index 88f98c9e0..907d1f9cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueId extends ABIDCallback { @@ -16,7 +16,7 @@ public class ABCallbackGetAbilityUniqueValueId extends ABIDCallback { private ABBooleanCallback allowNull; @Override - public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = key.callback(caster, localStore, castId); final CAbility theAbility = ability.callback(caster, localStore, castId); War3ID theVal = theAbility.getUniqueValue(keyS, War3ID.class); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java index 51c064b60..2a85adc8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java @@ -5,15 +5,15 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityUnitId extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { - List levelData = (List) localStore + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java index 7b6733248..5d3be8854 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAlias extends ABIDCallback { @Override - public War3ID callback(final CUnit caster, final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffAlias.java index c242827cc..6f7512601 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffAlias.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffAlias extends ABIDCallback { private ABBuffCallback buff; @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return buff.callback(caster, localStore, castId).getAlias(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java index e9398d32f..2e0d71983 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffIdFromCode extends ABIDCallback { @Override - public War3ID callback(final CUnit caster, final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return ((War3ID) localStore.get(ABLocalStoreKeys.CODE)).set(0, 'B'); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java index 06963ea77..408201539 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetCode extends ABIDCallback { private ABAbilityCallback ability; @Override - public War3ID callback(final CUnit caster, final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if (ability != null) { return ability.callback(caster, localStore, castId).getCode(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java index b09888dcc..cdfc4759c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetFirstBuffId extends ABIDCallback { @@ -15,9 +15,9 @@ public class ABCallbackGetFirstBuffId extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(final CUnit caster, final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final List buffs = ((List) localStore + final List buffs = ((List) localStore .get(ABLocalStoreKeys.LEVELDATA)).get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1) .getBuffs(); if ((buffs != null) && !buffs.isEmpty()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java index 62be62f4a..d761ebc29 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java @@ -5,15 +5,15 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetFirstEffectId extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { - List effects = ((List) localStore.get(ABLocalStoreKeys.LEVELDATA)) + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + List effects = ((List) localStore.get(ABLocalStoreKeys.LEVELDATA)) .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getEffects(); if (effects != null && !effects.isEmpty()) { return effects.get(0); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetItemType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetItemType.java index bfea14a75..1ff6c55df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetItemType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetItemType.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetItemType extends ABIDCallback { private ABItemCallback item; @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return item.callback(caster, localStore, castId).getTypeId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java index 1831fd4d4..49aaa2ae1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetNonCurrentTransformType extends ABIDCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetNonCurrentTransformType extends ABIDCallback { private ABIDCallback alternateUnitId; @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit u1 = caster; if (unit != null) { u1 = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java index bd0735bff..b8e3e0df4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetParentAlias extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { - return (War3ID) ((LocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (War3ID) ((ABLocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) .get(ABLocalStoreKeys.ALIAS); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java index c0b1b935f..093757924 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java @@ -5,15 +5,15 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetSecondBuffId extends ABIDCallback { @SuppressWarnings("unchecked") @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { - List buffs = ((List) localStore.get(ABLocalStoreKeys.LEVELDATA)) + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + List buffs = ((List) localStore.get(ABLocalStoreKeys.LEVELDATA)) .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getBuffs(); if (buffs != null && buffs.size() > 1) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java index 344c1aabe..b75aea7a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredIDByKey extends ABIDCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredIDByKey extends ABIDCallback { private ABBooleanCallback instanceValue; @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (War3ID) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetUnitType.java index cd7d0d104..8ec7386cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetUnitType.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitType extends ABIDCallback { private ABUnitCallback unit; @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (unit == null) { return caster.getTypeId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetWar3IDFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetWar3IDFromString.java index a8c71bf5b..26f77e994 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetWar3IDFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetWar3IDFromString.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetWar3IDFromString extends ABIDCallback { private String id; @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, final int castId) { + public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return War3ID.fromString(this.id); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java index af3dc4b66..4c8891299 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionID extends ABIDCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionID extends ABIDCallback { private ABIDCallback fail; @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, int castId) { + public War3ID callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java index e6e303cf5..129f31aeb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackNullIfFalse extends ABIDCallback { @@ -11,7 +11,7 @@ public class ABCallbackNullIfFalse extends ABIDCallback { private ABIDCallback value; @Override - public War3ID callback(CUnit caster, LocalDataStore localStore, int castId) { + public War3ID callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return value.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java index b2e311651..8495e0dac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.RandomTypeHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABRandomTypeHandler; public class ABCallbackRandomItemId extends ABIDCallback { @@ -16,9 +16,9 @@ public class ABCallbackRandomItemId extends ABIDCallback { private ABBooleanCallback ignoreRandomFlag; @Override - public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if (previousId == null && level == null && ignoreValidFlag == null && ignoreRandomFlag == null) { - return RandomTypeHandler.getRandomItemType(localStore.game).getTypeId(); + return ABRandomTypeHandler.getRandomItemType(localStore.game).getTypeId(); } War3ID id = null; @@ -37,7 +37,7 @@ public War3ID callback(final CUnit caster, final LocalDataStore localStore, fina if (ignoreRandomFlag != null) { random = ignoreRandomFlag.callback(caster, localStore, castId); } - CItemType type = RandomTypeHandler.getRandomItemType(localStore.game, id, lv, valid, random); + CItemType type = ABRandomTypeHandler.getRandomItemType(localStore.game, id, lv, valid, random); if (type == null) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java index b93a5df74..59de047d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java @@ -3,15 +3,15 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.RandomTypeHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABRandomTypeHandler; public class ABCallbackRandomMechanicalCritterId extends ABIDCallback { @Override - public War3ID callback(final CUnit caster, final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitType id = RandomTypeHandler.getRandomMechanicalCritterType(localStore.game); + CUnitType id = ABRandomTypeHandler.getRandomMechanicalCritterType(localStore.game); if (id == null) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java index ad8021f1a..6a9a604a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java @@ -3,20 +3,20 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseID extends ABIDCallback { private ABStringCallback name; @Override - public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java index 4f08d6675..dd1cd961f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseIDWithArguments extends ABIDCallback { @@ -18,9 +18,9 @@ public class ABCallbackReuseIDWithArguments extends ABIDCallback { private Map arguments; @Override - public War3ID callback(final CUnit caster, final LocalDataStore localStore, + public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABIDCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABIDCallback.java index e903f9308..93878012c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABIDCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABIDCallback.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABIDCallback implements ABCallback { @Override - abstract public War3ID callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAddInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAddInteger.java index 7e07570e0..0204be56d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAddInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAddInteger.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackAddInteger extends ABIntegerCallback { @@ -9,7 +9,7 @@ public class ABCallbackAddInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) + value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAndInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAndInteger.java index e4b9a2212..9815c19f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAndInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAndInteger.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackAndInteger extends ABIntegerCallback { @@ -9,7 +9,7 @@ public class ABCallbackAndInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) & value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java index 54059b6cd..d39dbd949 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentInteger extends ABIntegerCallback { private ABStringCallback name; @Override - public Integer callback(final CUnit caster, final LocalDataStore localStore, + public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java index d83a19162..ad1f1972d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCountBuffsOnUnitMatchingCondition extends ABIntegerCallback { @@ -15,7 +15,7 @@ public class ABCallbackCountBuffsOnUnitMatchingCondition extends ABIntegerCallba private ABCondition condition; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit u = caster; if (unit != null) { u = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java index ff1f900e9..176797164 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCountUnitsInRangeOfLocation extends ABIntegerCallback { @@ -17,7 +17,7 @@ public class ABCallbackCountUnitsInRangeOfLocation extends ABIntegerCallback { private int count = 0; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityPointTarget origin = location.callback(caster, localStore, castId); Float rangeVal = range.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java index 2bfdfc84d..26af2571c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCountUnitsInRangeOfUnit extends ABIntegerCallback { @@ -16,7 +16,7 @@ public class ABCallbackCountUnitsInRangeOfUnit extends ABIntegerCallback { private int count = 0; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit originUnitTarget = unit.callback(caster, localStore, castId); Float rangeVal = range.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java index cf6f5c883..943442c74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackDetectionDropdownConversion extends ABIntegerCallback { private ABIntegerCallback value; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { int val = value.callback(caster, localStore, castId); switch(val) { case 1: diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDivideInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDivideInteger.java index cfd554e65..c00e17438 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDivideInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDivideInteger.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackDivideInteger extends ABIntegerCallback { @@ -9,7 +9,7 @@ public class ABCallbackDivideInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) / value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java index 67bf6d11b..8c98816da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java @@ -3,21 +3,21 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityCastTimeAsInteger extends ABIntegerCallback { @SuppressWarnings("unchecked") @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); if (ability != null) { return (int) ability.getCastTime(); } else { - List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); + List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); return (int) levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL))-1).getCastTime(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java index 76dcc6a02..1e54e488e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java @@ -5,18 +5,18 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsInteger extends ABIntegerCallback { - private DataFieldLetter dataField; + private ABDataFieldLetter dataField; @SuppressWarnings("unchecked") @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { - final List levelData = (List) localStore + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java index 1afa5852f..cf68ac7fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityHandleAsInteger extends ABIntegerCallback { private ABAbilityCallback ability; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ability.callback(caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java index b0a17fb55..2ee7c95cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java @@ -2,24 +2,24 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityManaCost extends ABIntegerCallback { private ABAbilityCallback ability; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (ability == null) { - AbilityBuilderActiveAbility abil = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderActiveAbility abil = (ABAbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getChargedManaCost(); } else { CAbility abil = ability.callback(caster, localStore, castId); - if (abil instanceof AbilityBuilderActiveAbility) { - return ((AbilityBuilderActiveAbility) abil).getChargedManaCost(); + if (abil instanceof ABAbilityBuilderActiveAbility) { + return ((ABAbilityBuilderActiveAbility) abil).getChargedManaCost(); } else { return 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java index 0d93b7a13..087cc394f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java @@ -2,24 +2,24 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityTargetAttachmentPoints extends ABIntegerCallback { private ABAbilityCallback ability; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (ability == null) { - AbilityBuilderAbility abil = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return abil.getAbilityIntField("Targetattachcount"); } else { CAbility abil = ability.callback(caster, localStore, castId); - if (abil instanceof AbilityBuilderAbility) { - return ((AbilityBuilderAbility) abil).getAbilityIntField("Targetattachcount"); + if (abil instanceof ABAbilityBuilderAbility) { + return ((ABAbilityBuilderAbility) abil).getAbilityIntField("Targetattachcount"); } else { return 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java index ccfd7211f..729699947 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueInteger extends ABIntegerCallback { @@ -15,7 +15,7 @@ public class ABCallbackGetAbilityUniqueValueInteger extends ABIntegerCallback { private ABBooleanCallback allowNull; @Override - public Integer callback(final CUnit caster, final LocalDataStore localStore, + public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = key.callback(caster, localStore, castId); final CAbility theAbility = ability.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java index 12cf48e7c..9a3c3aea4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffHandleAsInteger extends ABIntegerCallback { private ABBuffCallback buff; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return buff.callback(caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java index ca0e58aa5..078eba764 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueInteger extends ABIntegerCallback { @@ -15,7 +15,7 @@ public class ABCallbackGetBuffUniqueValueInteger extends ABIntegerCallback { private ABBooleanCallback allowNull; @Override - public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = key.callback(caster, localStore, castId); final CBuff theBuff = buff.callback(caster, localStore, castId); Integer theVal = theBuff.getUniqueValue(keyS, Integer.class); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetCastId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetCastId.java index edf7ac514..6773f8a8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetCastId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetCastId.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetCastId extends ABIntegerCallback { @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return castId; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetIntegerFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetIntegerFromList.java index 55d8d0e55..90e32f2f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetIntegerFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetIntegerFromList.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetIntegerFromList extends ABIntegerCallback { @@ -10,7 +10,7 @@ public class ABCallbackGetIntegerFromList extends ABIntegerCallback { private ABIntegerCallback index; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return list.callback(caster, localStore, castId).get(index.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java index 41319e12f..d714e452b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetItemCharges extends ABIntegerCallback { private ABItemCallback item; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java index 02b712605..0b07815ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetItemLevel extends ABIntegerCallback { private ABItemCallback item; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java index e4034941d..f8fb14a6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetItemMaxCharges extends ABIntegerCallback { private ABItemCallback item; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java index 65aa470b5..7bde486f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetItemSlot extends ABIntegerCallback { private ABItemCallback item; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); if (slot != null) { return slot; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetListSize.java index 8827b2d29..576dbb0d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetListSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetListSize.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetListSize extends ABIntegerCallback { private ABListCallback list; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return list.callback(caster, localStore, castId).size(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java index 67b9e6613..e4ad40f5d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetNeutralHostilePlayerId extends ABIntegerCallback { @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return WarsmashConstants.MAX_PLAYERS - 4; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java index c40b0622b..a1f513629 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetNeutralPassivePlayerId extends ABIntegerCallback { @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return WarsmashConstants.MAX_PLAYERS - 1; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetPlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetPlayerId.java index 14efbc201..bf6ed4b6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetPlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetPlayerId.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetPlayerId extends ABIntegerCallback { private ABPlayerCallback player; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return player.callback(caster, localStore, castId).getId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java index 7db40e374..e76d80e8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetProjectileDestructableTargets extends ABIntegerCallback { @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (Integer) localStore.get(ABLocalStoreKeys.PROJECTILEDESTTARGETS + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java index 2407f5051..2f00f02d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetProjectileUnitTargets extends ABIntegerCallback { @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (Integer) localStore.get(ABLocalStoreKeys.PROJECTILEUNITTARGETS + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSortableListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSortableListSize.java index a20c7c69b..4b4a967ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSortableListSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSortableListSize.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetSortableListSize extends ABIntegerCallback { private ABSortableListCallback list; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return list.callback(caster, localStore, castId).size(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java index 7b4ee3446..092b6f846 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetSpellLevel extends ABIntegerCallback { @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java index 57d3d8da2..f9a6bf61a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredIntegerByKey extends ABIntegerCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredIntegerByKey extends ABIntegerCallback { private ABBooleanCallback instanceValue; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Integer) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitGroupSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitGroupSize.java index 1cff13b87..f3e5f459d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitGroupSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitGroupSize.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitGroupSize extends ABIntegerCallback { private ABUnitGroupCallback group; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return group.callback(caster, localStore, castId).size(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java index 81c8e97f2..1170b2f0d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitHandleAsInteger extends ABIntegerCallback { private ABUnitCallback unit; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return unit.callback(caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java index e5cc753ad..83523e765 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitMaximumHp extends ABIntegerCallback { private ABUnitCallback unit; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return unit == null ? caster.getMaximumLife() : this.unit.callback(caster, localStore, castId).getMaximumLife(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java index 7231fb78f..b26e88b7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitMaximumMp extends ABIntegerCallback { private ABUnitCallback unit; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return unit == null ? caster.getMaximumMana() : unit.callback(caster, localStore, castId).getMaximumMana(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitQueueSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitQueueSize.java index 327637114..9b1fac0c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitQueueSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitQueueSize.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitQueueSize extends ABIntegerCallback { private ABUnitQueueCallback queue; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return queue.callback(caster, localStore, castId).size(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java index 1986bd02f..f74225303 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitTypeFoodCost extends ABIntegerCallback { private ABIDCallback id; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getUnitData().getUnitType(id.callback(caster, localStore, castId)).getFoodUsed(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java index 3380b75d4..31cf6c046 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitTypeGoldCost extends ABIntegerCallback { private ABIDCallback id; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getUnitData().getUnitType(id.callback(caster, localStore, castId)).getGoldCost(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java index f3dac6700..b2f12e2e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitTypeLumberCost extends ABIntegerCallback { private ABIDCallback id; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getUnitData().getUnitType(id.callback(caster, localStore, castId)).getLumberCost(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java index d88ad18f5..70139ca8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitTypeSpeed extends ABIntegerCallback { private ABIDCallback id; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getUnitData().getUnitType(id.callback(caster, localStore, castId)).getSpeed(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java index d61f8ae31..4aa79fe8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionInteger extends ABIntegerCallback { @@ -11,7 +11,7 @@ public class ABCallbackInlineConditionInteger extends ABIntegerCallback { private ABIntegerCallback fail; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java index 5088bd266..1067fec62 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIntegerIf extends ABIntegerCallback { @@ -11,7 +11,7 @@ public class ABCallbackIntegerIf extends ABIntegerCallback { private ABCondition condition; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (condition == null || !condition.callback(caster, localStore, castId)) { return value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java index ea6e0b0f9..bfa3860fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIntegerZeroIfFalse extends ABIntegerCallback { @@ -10,7 +10,7 @@ public class ABCallbackIntegerZeroIfFalse extends ABIntegerCallback { private ABBooleanCallback bool; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (bool == null || !bool.callback(caster, localStore, castId)) { return 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java index ff00fbfd4..bf072754d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIntegerZeroIfNull extends ABIntegerCallback { private ABIntegerCallback value; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v = value.callback(caster, localStore, castId); return v == null ? 0 : v; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java index c90b83438..0fdad694b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIterator extends ABIntegerCallback { private ABCallback unique; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (this.unique != null) { return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT+"$"+this.unique.callback(caster, localStore, castId), castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMaxInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMaxInteger.java index a96be5579..f6e397203 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMaxInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMaxInteger.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackMaxInteger extends ABIntegerCallback { @@ -9,7 +9,7 @@ public class ABCallbackMaxInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return Math.max(value1.callback(caster, localStore, castId), value2.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMinInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMinInteger.java index 81e640fb4..f04c5ffcc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMinInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMinInteger.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackMinInteger extends ABIntegerCallback { @@ -9,7 +9,7 @@ public class ABCallbackMinInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return Math.min(value1.callback(caster, localStore, castId), value2.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMultiplyInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMultiplyInteger.java index b845edf63..1d189ca0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMultiplyInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMultiplyInteger.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackMultiplyInteger extends ABIntegerCallback { @@ -9,7 +9,7 @@ public class ABCallbackMultiplyInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) * value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackOrInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackOrInteger.java index e5bc1e789..3bec57dca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackOrInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackOrInteger.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackOrInteger extends ABIntegerCallback { @@ -9,7 +9,7 @@ public class ABCallbackOrInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) | value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackPlayerToStateModValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackPlayerToStateModValue.java index 355a4137c..a72918b17 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackPlayerToStateModValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackPlayerToStateModValue.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackPlayerToStateModValue extends ABIntegerCallback { private ABPlayerCallback player; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return 1 << player.callback(caster, localStore, castId).getId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRandomInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRandomInteger.java index cecaa4132..6519352de 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRandomInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRandomInteger.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackRandomInteger extends ABIntegerCallback { @@ -11,7 +11,7 @@ public class ABCallbackRandomInteger extends ABIntegerCallback { private ABIntegerCallback bound; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (bound != null) { return localStore.game.getSeededRandom().nextInt(bound.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRawInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRawInteger.java index 017caacf4..6bbe5b5b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRawInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRawInteger.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackRawInteger extends ABIntegerCallback { private Integer value; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java index b7c1d791a..8ae327442 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java @@ -2,21 +2,21 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseInteger extends ABIntegerCallback { private ABStringCallback name; @Override - public Integer callback(final CUnit caster, final LocalDataStore localStore, + public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java index bc983a22b..279ede332 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseIntegerWithArguments extends ABIntegerCallback { @@ -17,9 +17,9 @@ public class ABCallbackReuseIntegerWithArguments extends ABIntegerCallback { private Map arguments; @Override - public Integer callback(final CUnit caster, final LocalDataStore localStore, + public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackSubtractInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackSubtractInteger.java index c9f4ef9e4..907965712 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackSubtractInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackSubtractInteger.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackSubtractInteger extends ABIntegerCallback { @@ -9,7 +9,7 @@ public class ABCallbackSubtractInteger extends ABIntegerCallback { private ABIntegerCallback value2; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) - value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java index c20cebb72..128696a0b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackTruncateFloatToInteger extends ABIntegerCallback { private ABFloatCallback value; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value.callback(caster, localStore, castId).intValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABIntegerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABIntegerCallback.java index 3b83e3d7f..6ef6a948b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABIntegerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABIntegerCallback.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABIntegerCallback implements ABCallback { - abstract public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java index cc1b7768a..2cdedb453 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentItem extends ABItemCallback { private ABStringCallback name; @Override - public CItem callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CItem callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABItemCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java index 3c726906f..f4efd106e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityTargetedItem extends ABItemCallback { @Override - public CItem callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CItem callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CItem) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java index 4b0e17aff..72b54b54e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAttackedItem extends ABItemCallback { @Override - public CItem callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CItem callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.ITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java index 3a608fc18..ff73ddb5c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetLastCreatedItem extends ABItemCallback { @Override - public CItem callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CItem callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CItem) localStore.get(ABLocalStoreKeys.LASTCREATEDITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java index a69077bdf..9b171cb09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredItemByKey extends ABItemCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredItemByKey extends ABItemCallback { private ABBooleanCallback instanceValue; @Override - public CItem callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CItem callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (CItem) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java index 6bb85bc7d..985fd8f0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionItem extends ABItemCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionItem extends ABItemCallback { private ABItemCallback fail; @Override - public CItem callback(CUnit caster, LocalDataStore localStore, int castId) { + public CItem callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java index 5f71de6f7..58623c32b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java @@ -3,20 +3,20 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseItem extends ABItemCallback { private ABStringCallback name; @Override - public CItem callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public CItem callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java index fb1d269cc..4bda2b5f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseItemWithArguments extends ABItemCallback { @@ -18,8 +18,8 @@ public class ABCallbackReuseItemWithArguments extends ABItemCallback { private Map arguments; @Override - public CItem callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public CItem callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java index 0ca0a08e1..3cc1df301 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABItemCallback implements ABCallback { - abstract public CItem callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CItem callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java index 1c2e8354c..0ae3233f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentList extends ABListCallback { @@ -15,7 +15,7 @@ public class ABCallbackArgumentList extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABListCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java index c635612b6..f7cb3073d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentSortableList> extends ABSortableListCallback { @@ -15,7 +15,7 @@ public class ABCallbackArgumentSortableList> ext @SuppressWarnings("unchecked") @Override - public List callback(final CUnit caster, final LocalDataStore localStore, + public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java index 44cf56127..eba929ec7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredListByKey extends ABListCallback { private ABStringCallback key; @@ -14,7 +14,7 @@ public class ABCallbackGetStoredListByKey extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(CUnit caster, LocalDataStore localStore, final int castId) { + public List callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (List) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java index 31b69197a..9dfaa44ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredSortableListByKey> extends ABSortableListCallback { private ABStringCallback key; @@ -14,7 +14,7 @@ public class ABCallbackGetStoredSortableListByKey callback(CUnit caster, LocalDataStore localStore, final int castId) { + public List callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (List) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java index e8d443fd2..0fb50946d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionList extends ABListCallback { @@ -13,7 +13,7 @@ public class ABCallbackInlineConditionList extends ABListCallback { private ABListCallback fail; @Override - public List callback(CUnit caster, LocalDataStore localStore, int castId) { + public List callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java index 5667661b6..3f0486cc2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionSortableList> extends ABSortableListCallback { @@ -13,7 +13,7 @@ public class ABCallbackInlineConditionSortableList fail; @Override - public List callback(CUnit caster, LocalDataStore localStore, int castId) { + public List callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java index 8418502d7..63162f0ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java @@ -4,7 +4,7 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackListSorted> extends ABSortableListCallback { @@ -12,7 +12,7 @@ public class ABCallbackListSorted> extends ABSor private ABListSortType sort; @Override - public List callback(final CUnit caster, final LocalDataStore localStore, + public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { List theList = list.callback(caster, localStore, castId); switch(sort){ diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java index 1f2a6163b..ed1417d06 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseList extends ABListCallback { @@ -17,9 +17,9 @@ public class ABCallbackReuseList extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(final CUnit caster, final LocalDataStore localStore, + public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java index e08ded273..27c058220 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseListWithArguments extends ABListCallback { @@ -19,9 +19,9 @@ public class ABCallbackReuseListWithArguments extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(final CUnit caster, final LocalDataStore localStore, + public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java index 1e1ac975c..155f52d72 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseSortableList> extends ABSortableListCallback { @@ -17,8 +17,8 @@ public class ABCallbackReuseSortableList> extend @SuppressWarnings("unchecked") @Override - public List callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java index 13fc52073..43681c73d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseSortableListWithArguments> extends ABSortableListCallback { @@ -19,9 +19,9 @@ public class ABCallbackReuseSortableListWithArguments callback(final CUnit caster, final LocalDataStore localStore, + public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java index 01a37c740..500c66fb2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java @@ -4,9 +4,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABListCallback implements ABCallback { - abstract public List callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java index 0fd2b8c1c..56ee75e5a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java @@ -4,9 +4,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABSortableListCallback> implements ABCallback { - abstract public List callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java index 5325dbbcd..c2cf0f076 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java @@ -4,12 +4,12 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackEmptyIntegerList extends ABIntegerListCallback { @Override - public List callback(CUnit caster, LocalDataStore localStore, int castId) { + public List callback(CUnit caster, ABLocalDataStore localStore, int castId) { return new ArrayList<>(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java index aeede4953..f316d8dde 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIntegerListOfRange extends ABIntegerListCallback { @@ -17,7 +17,7 @@ public class ABCallbackIntegerListOfRange extends ABIntegerListCallback { private ABBooleanCallback inclusiveEnd; @Override - public List callback(CUnit caster, LocalDataStore localStore, int castId) { + public List callback(CUnit caster, ABLocalDataStore localStore, int castId) { int theStart = 0; if (start != null) { theStart = start.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java index 0d7176a77..819f05edb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABIntegerListCallback extends ABSortableListCallback { - abstract public List callback(final CUnit caster, final LocalDataStore localStore, + abstract public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java index 504f23189..c9db0da7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackEmptyLocationList extends ABLocationListCallback { @Override - public List callback(CUnit caster, LocalDataStore localStore, int castId) { + public List callback(CUnit caster, ABLocalDataStore localStore, int castId) { return new ArrayList<>(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java index bdb197d65..6d05416b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java @@ -5,10 +5,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABLocationListCallback extends ABListCallback { - abstract public List callback(final CUnit caster, final LocalDataStore localStore, + abstract public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java index f615e7dd1..3a0a04a60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; public abstract class ABAbilityEffectReactionListenerCallback implements ABCallback { - abstract public ABAbilityEffectReactionListener callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABAbilityEffectReactionListener callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java index 7e9741e2a..06aecfe1b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; public abstract class ABAbilityProjReactionListenerCallback implements ABCallback { - abstract public ABAbilityProjReactionListener callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABAbilityProjReactionListener callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPostDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPostDamageListenerCallback.java index d777c6580..2bfc13165 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPostDamageListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPostDamageListenerCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public abstract class ABAttackPostDamageListenerCallback implements ABCallback { - abstract public ABAttackPostDamageListener callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABAttackPostDamageListener callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPreDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPreDamageListenerCallback.java index efc609165..f2ee0967e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPreDamageListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPreDamageListenerCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; public abstract class ABAttackPreDamageListenerCallback implements ABCallback { - abstract public ABAttackPreDamageListener callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABAttackPreDamageListener callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackProjReactionListenerCallback.java index 6f4822fb1..64e742e5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackProjReactionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackProjReactionListenerCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; public abstract class ABAttackProjReactionListenerCallback implements ABCallback { - abstract public ABAttackProjReactionListener callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABAttackProjReactionListener callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABBehaviorChangeListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABBehaviorChangeListenerCallback.java index 3822c10b4..ab3f95535 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABBehaviorChangeListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABBehaviorChangeListenerCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; public abstract class ABBehaviorChangeListenerCallback implements ABCallback { - abstract public ABBehaviorChangeListener callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABBehaviorChangeListener callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java index 575d4e8df..a6dcf8165 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; public class ABCallbackGetLastCreatedAbilityEffectReactionListener extends ABAbilityEffectReactionListenerCallback { @Override - public ABAbilityEffectReactionListener callback(CUnit caster, LocalDataStore localStore, + public ABAbilityEffectReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABAbilityEffectReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbERL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java index ed224a9c4..596c6abbf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; public class ABCallbackGetLastCreatedAbilityProjReactionListener extends ABAbilityProjReactionListenerCallback { @Override - public ABAbilityProjReactionListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABAbilityProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbPRL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java index 9e2c73e8d..1449ddd39 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public class ABCallbackGetLastCreatedAttackPostDamageListener extends ABAttackPostDamageListenerCallback { @Override - public ABAttackPostDamageListener callback(CUnit caster, LocalDataStore localStore, + public ABAttackPostDamageListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPoDL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java index 1f185aae1..f7a836329 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; public class ABCallbackGetLastCreatedAttackPreDamageListener extends ABAttackPreDamageListenerCallback { @Override - public ABAttackPreDamageListener callback(CUnit caster, LocalDataStore localStore, + public ABAttackPreDamageListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABAttackPreDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPrDL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java index 8269960b0..d17398eee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; public class ABCallbackGetLastCreatedAttackProjReactionListener extends ABAttackProjReactionListenerCallback { @Override - public ABAttackProjReactionListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABAttackProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAtkPRL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java index 7b4c40b8c..8e416072d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; public class ABCallbackGetLastCreatedBehaviorChangeListener extends ABBehaviorChangeListenerCallback { @Override - public ABBehaviorChangeListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABBehaviorChangeListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.LASTCREATEDBCL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java index f28e1f9c7..1373601be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public class ABCallbackGetLastCreatedDamageTakenListener extends ABDamageTakenListenerCallback { @Override - public ABDamageTakenListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABDamageTakenListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABDamageTakenListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java index ba15ad1fa..4dca60468 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; public class ABCallbackGetLastCreatedDamageTakenModificationListener extends ABDamageTakenModificationListenerCallback { @Override - public ABDamageTakenModificationListener callback(CUnit caster, LocalDataStore localStore, + public ABDamageTakenModificationListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABDamageTakenModificationListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTML); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java index 62cb898c3..6523e8a97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; public class ABCallbackGetLastCreatedDeathReplacement extends ABDeathReplacementCallback { @Override - public ABDeathReplacementEffect callback(CUnit caster, LocalDataStore localStore, + public ABDeathReplacementEffect callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABDeathReplacementEffect) localStore.get(ABLocalStoreKeys.LASTCREATEDDRE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java index b5362e96f..dd82468b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public class ABCallbackGetLastCreatedEvasionListener extends ABEvasionListenerCallback { @Override - public ABAttackEvasionListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABAttackEvasionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAEL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java index e518d045e..148c2facb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; public class ABCallbackGetLastCreatedUnitStateListener extends ABUnitStateListenerCallback { @Override - public ABUnitStateListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABUnitStateListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (ABUnitStateListener) localStore.get(ABLocalStoreKeys.LASTCREATEDUSL); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java index 8a0c30a8f..8bf7f180e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; public class ABCallbackGetStoredAbilityEffectReactionListenerByKey extends ABAbilityEffectReactionListenerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredAbilityEffectReactionListenerByKey extends ABAbi private ABBooleanCallback instanceValue; @Override - public ABAbilityEffectReactionListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABAbilityEffectReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABAbilityEffectReactionListener) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java index 9f1c45f5e..5feb9226c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; public class ABCallbackGetStoredAbilityProjReactionListenerByKey extends ABAbilityProjReactionListenerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredAbilityProjReactionListenerByKey extends ABAbili private ABBooleanCallback instanceValue; @Override - public ABAbilityProjReactionListener callback(CUnit caster, LocalDataStore localStore, + public ABAbilityProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java index 44b7c6a03..d070b12f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public class ABCallbackGetStoredAttackPostDamageListenerByKey extends ABAttackPostDamageListenerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredAttackPostDamageListenerByKey extends ABAttackPo private ABBooleanCallback instanceValue; @Override - public ABAttackPostDamageListener callback(CUnit caster, LocalDataStore localStore, + public ABAttackPostDamageListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java index f799450a8..43e631960 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; public class ABCallbackGetStoredAttackPreDamageListenerByKey extends ABAttackPreDamageListenerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredAttackPreDamageListenerByKey extends ABAttackPre private ABBooleanCallback instanceValue; @Override - public ABAttackPreDamageListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABAttackPreDamageListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABAttackPreDamageListener) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java index c5434c931..f91201010 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; public class ABCallbackGetStoredAttackProjReactionListenerByKey extends ABAttackProjReactionListenerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredAttackProjReactionListenerByKey extends ABAttack private ABBooleanCallback instanceValue; @Override - public ABAttackProjReactionListener callback(CUnit caster, LocalDataStore localStore, + public ABAttackProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java index bbd07b129..f0d1e3966 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; public class ABCallbackGetStoredBehaviorChangeListenerByKey extends ABBehaviorChangeListenerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredBehaviorChangeListenerByKey extends ABBehaviorCh private ABBooleanCallback instanceValue; @Override - public ABBehaviorChangeListener callback(CUnit caster, LocalDataStore localStore, + public ABBehaviorChangeListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java index 4a4b7eb94..dc7f107e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public class ABCallbackGetStoredDamageTakenListenerByKey extends ABDamageTakenListenerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredDamageTakenListenerByKey extends ABDamageTakenLi private ABBooleanCallback instanceValue; @Override - public ABDamageTakenListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABDamageTakenListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABDamageTakenListener) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java index 2c84aa342..ef688d27f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; public class ABCallbackGetStoredDamageTakenModificationListenerByKey extends ABDamageTakenModificationListenerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredDamageTakenModificationListenerByKey extends ABD private ABBooleanCallback instanceValue; @Override - public ABDamageTakenModificationListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABDamageTakenModificationListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABDamageTakenModificationListener) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java index fc794aedd..ac15133d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; public class ABCallbackGetStoredDeathReplacementByKey extends ABDeathReplacementCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredDeathReplacementByKey extends ABDeathReplacement private ABBooleanCallback instanceValue; @Override - public ABDeathReplacementEffect callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABDeathReplacementEffect callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABDeathReplacementEffect) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java index 1b5dde477..fefc18a05 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public class ABCallbackGetStoredEvasionListenerByKey extends ABEvasionListenerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredEvasionListenerByKey extends ABEvasionListenerCa private ABBooleanCallback instanceValue; @Override - public ABAttackEvasionListener callback(CUnit caster, LocalDataStore localStore, + public ABAttackEvasionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java index 2ed8ee7d0..c0ac3c8fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; public class ABCallbackGetStoredUnitStateListenerByKey extends ABUnitStateListenerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredUnitStateListenerByKey extends ABUnitStateListen private ABBooleanCallback instanceValue; @Override - public ABUnitStateListener callback(CUnit caster, LocalDataStore localStore, final int castId) { + public ABUnitStateListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (ABUnitStateListener) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenListenerCallback.java index 65e639faf..4810825ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenListenerCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public abstract class ABDamageTakenListenerCallback implements ABCallback { - abstract public ABDamageTakenListener callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABDamageTakenListener callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java index f3148db1e..4dde0e020 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; public abstract class ABDamageTakenModificationListenerCallback implements ABCallback { - abstract public ABDamageTakenModificationListener callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABDamageTakenModificationListener callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDeathReplacementCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDeathReplacementCallback.java index 9830721c8..24fc83d22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDeathReplacementCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDeathReplacementCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; public abstract class ABDeathReplacementCallback implements ABCallback { - abstract public ABDeathReplacementEffect callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABDeathReplacementEffect callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABEvasionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABEvasionListenerCallback.java index 3d3f30449..79a5b4e51 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABEvasionListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABEvasionListenerCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public abstract class ABEvasionListenerCallback implements ABCallback { - abstract public ABAttackEvasionListener callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABAttackEvasionListener callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABUnitStateListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABUnitStateListenerCallback.java index bb11a9aba..f1e52994f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABUnitStateListenerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABUnitStateListenerCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; public abstract class ABUnitStateListenerCallback implements ABCallback { - abstract public ABUnitStateListener callback(final CUnit caster, final LocalDataStore localStore, + abstract public ABUnitStateListener callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java index 194c96866..61353ac36 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentLocation extends ABLocationCallback { private ABStringCallback name; @Override - public AbilityPointTarget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABLocationCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java index 3ef268065..cf04931c8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCreateLocationFromOffset extends ABLocationCallback { @@ -16,7 +16,7 @@ public class ABCallbackCreateLocationFromOffset extends ABLocationCallback { private ABBooleanCallback angleInDegrees; @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final AbilityPointTarget orig = this.origin.callback(caster, localStore, castId); final float d = this.dist.callback(caster, localStore, castId); final float a = this.angle.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromTarget.java index fa46ac48d..8b9f8ef03 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromTarget.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target.ABTargetCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCreateLocationFromTarget extends ABLocationCallback { private ABTargetCallback target; @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityTarget tar = target.callback(caster, localStore, castId); return new AbilityPointTarget(tar.getX(), tar.getY()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXY.java index 628b6211f..f381074fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXY.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCreateLocationFromXY extends ABLocationCallback { @@ -11,7 +11,7 @@ public class ABCallbackCreateLocationFromXY extends ABLocationCallback { private ABFloatCallback y; @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return new AbilityPointTarget(x.callback(caster, localStore, castId), y.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java index 505b7ad98..9df258b4a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCreateLocationFromXYOffset extends ABLocationCallback { @@ -12,7 +12,7 @@ public class ABCallbackCreateLocationFromXYOffset extends ABLocationCallback { private ABFloatCallback ydist; @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final AbilityPointTarget orig = this.origin.callback(caster, localStore, castId); return new AbilityPointTarget((float) (orig.x + xdist.callback(caster, localStore, castId)), (float) (orig.y + ydist.callback(caster, localStore, castId))); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java index ed3fd6d22..dcccc827c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAttackImpactLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.ATTACKIMPACTLOCATION+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java index bf0e38f8e..130e6cb65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAttackTargetLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); if (tar.visit(AbilityTargetVisitor.POINT) != null) { return tar.visit(AbilityTargetVisitor.POINT); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java index 8e0dd1ee7..6b0f6d94f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetGroundAttackedLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.POINT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetLocationFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetLocationFromList.java index b7f8d9922..a65ffe2f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetLocationFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetLocationFromList.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetLocationFromList extends ABLocationCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetLocationFromList extends ABLocationCallback { private ABIntegerCallback index; @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return list.callback(caster, localStore, castId).get(index.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java index 5fa8957db..7375dc29e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetProjectileCurrentLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java index c8a80fe3e..123b11725 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredLocationByKey extends ABLocationCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java index d2a3b3152..e620cafed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetTargetedLocation extends ABLocationCallback { @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final AbilityPointTarget target = (AbilityPointTarget) localStore .get(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetUnitLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetUnitLocation.java index 27fd9dfc5..318d5e1dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetUnitLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetUnitLocation.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitLocation extends ABLocationCallback { private ABUnitCallback unit; @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final CUnit theUnit = this.unit.callback(caster, localStore, castId); return new AbilityPointTarget(theUnit.getX(), theUnit.getY()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java index 10d627d5a..1915a8ff3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionLocation extends ABLocationCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionLocation extends ABLocationCallback { private ABLocationCallback fail; @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java index 8cd45b24c..9ad20bf39 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackModifyLocationWithOffset extends ABLocationCallback { @@ -15,7 +15,7 @@ public class ABCallbackModifyLocationWithOffset extends ABLocationCallback { private ABBooleanCallback angleInDegrees; @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final AbilityPointTarget orig = this.origin.callback(caster, localStore, castId); final float d = this.dist.callback(caster, localStore, castId); final float a = this.angle.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java index 14ebeb389..54c056804 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackModifyLocationWithXYOffset extends ABLocationCallback { @@ -12,7 +12,7 @@ public class ABCallbackModifyLocationWithXYOffset extends ABLocationCallback { private ABFloatCallback ydist; @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final AbilityPointTarget orig = this.origin.callback(caster, localStore, castId); orig.add(xdist.callback(caster, localStore, castId), ydist.callback(caster, localStore, castId)); return orig; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackRandomLocationInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackRandomLocationInRange.java index 66b5d5784..1b24f251f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackRandomLocationInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackRandomLocationInRange.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackRandomLocationInRange extends ABLocationCallback { @@ -11,7 +11,7 @@ public class ABCallbackRandomLocationInRange extends ABLocationCallback { private ABFloatCallback range; @Override - public AbilityPointTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final AbilityPointTarget orig = this.origin.callback(caster, localStore, castId); final float d = this.range.callback(caster, localStore, castId) * localStore.game.getSeededRandom().nextFloat(); final float a = (float) (Math.PI * 2 * localStore.game.getSeededRandom().nextFloat()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java index 0771228a0..de6d59f57 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java @@ -3,21 +3,21 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLocation extends ABLocationCallback { private ABStringCallback name; @Override - public AbilityPointTarget callback(final CUnit caster, final LocalDataStore localStore, + public AbilityPointTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java index ac4311a1a..e4eeedaea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLocationWithArguments extends ABLocationCallback { @@ -18,9 +18,9 @@ public class ABCallbackReuseLocationWithArguments extends ABLocationCallback { private Map arguments; @Override - public AbilityPointTarget callback(final CUnit caster, final LocalDataStore localStore, + public AbilityPointTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABLocationCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABLocationCallback.java index 5cc780764..cf14cda22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABLocationCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABLocationCallback.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABLocationCallback implements ABCallback { - abstract public AbilityPointTarget callback(final CUnit caster, final LocalDataStore localStore, + abstract public AbilityPointTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAddLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAddLong.java index 843d34d97..86d06f195 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAddLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAddLong.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackAddLong extends ABLongCallback { @@ -9,7 +9,7 @@ public class ABCallbackAddLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) + value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAndLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAndLong.java index daed6a80c..f1d7dc3f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAndLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAndLong.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackAndLong extends ABLongCallback { @@ -9,7 +9,7 @@ public class ABCallbackAndLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) & value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java index 22f5d0407..fe1411a37 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentLong extends ABLongCallback { private ABStringCallback name; @Override - public Long callback(final CUnit caster, final LocalDataStore localStore, + public Long callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectedData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectedData.java index fdd0d7f13..5bb8c1caa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectedData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectedData.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCreateDetectedData extends ABLongCallback { @@ -10,7 +10,7 @@ public class ABCallbackCreateDetectedData extends ABLongCallback { private ABIntegerCallback playerDetectedData; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { long ply = playerDetectedData.callback(caster, localStore, castId); byte val = detectionLevel.callback(caster, localStore, castId).byteValue(); return val + (ply<<8); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectorData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectorData.java index 0467cb7c6..a6892bb64 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectorData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectorData.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCreateDetectorData extends ABLongCallback { @@ -12,7 +12,7 @@ public class ABCallbackCreateDetectorData extends ABLongCallback { private ABFloatCallback range; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { long rng = Math.min(PathingGrid.getFogOfWarDistance(range.callback(caster, localStore, castId)), 8388607); byte val = detectionLevel.callback(caster, localStore, castId).byteValue(); return val + (rng<<8); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateOwnershipData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateOwnershipData.java index 0b6b9d7c6..c61d5d4a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateOwnershipData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateOwnershipData.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCreateOwnershipData extends ABLongCallback { @@ -10,7 +10,7 @@ public class ABCallbackCreateOwnershipData extends ABLongCallback { private ABIntegerCallback playerId; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { long ply = playerId.callback(caster, localStore, castId); int val = Math.min(priority.callback(caster, localStore, castId), 15) & 0b1111; return val + (ply << 4); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackDivideLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackDivideLong.java index 56ee307dc..9417d19bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackDivideLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackDivideLong.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackDivideLong extends ABLongCallback { @@ -9,7 +9,7 @@ public class ABCallbackDivideLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) / value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java index 16e6d1456..36ae39b4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java @@ -5,18 +5,18 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsLong extends ABLongCallback { - private DataFieldLetter dataField; + private ABDataFieldLetter dataField; @SuppressWarnings("unchecked") @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { - final List levelData = (List) localStore + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java index ab1af1841..0f90f930a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueLong extends ABLongCallback { @@ -15,7 +15,7 @@ public class ABCallbackGetAbilityUniqueValueLong extends ABLongCallback { private ABBooleanCallback allowNull; @Override - public Long callback(final CUnit caster, final LocalDataStore localStore, + public Long callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = key.callback(caster, localStore, castId); final CAbility theAbility = ability.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java index a4e6e7318..b745360e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueLong extends ABLongCallback { @@ -15,7 +15,7 @@ public class ABCallbackGetBuffUniqueValueLong extends ABLongCallback { private ABBooleanCallback allowNull; @Override - public Long callback(final CUnit caster, final LocalDataStore localStore, + public Long callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = key.callback(caster, localStore, castId); final CBuff theBuff = buff.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java index 7eefd1e74..a3a39cb17 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredLongByKey extends ABLongCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredLongByKey extends ABLongCallback { private ABBooleanCallback instanceValue; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (Long) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java index fabc3fbef..af914f4c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionLong extends ABLongCallback { @@ -11,7 +11,7 @@ public class ABCallbackInlineConditionLong extends ABLongCallback { private ABLongCallback fail; @Override - public Long callback(CUnit caster, LocalDataStore localStore, int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMaxLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMaxLong.java index 48fc23c80..0bde6d5bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMaxLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMaxLong.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackMaxLong extends ABLongCallback { @@ -9,7 +9,7 @@ public class ABCallbackMaxLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return Math.max(value1.callback(caster, localStore, castId), value2.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMinLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMinLong.java index 24dc1ad82..d3d71c601 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMinLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMinLong.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackMinLong extends ABLongCallback { @@ -9,7 +9,7 @@ public class ABCallbackMinLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return Math.min(value1.callback(caster, localStore, castId), value2.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMultiplyLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMultiplyLong.java index 0ddd189e9..e6a6bae1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMultiplyLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMultiplyLong.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackMultiplyLong extends ABLongCallback { @@ -9,7 +9,7 @@ public class ABCallbackMultiplyLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) * value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackOrLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackOrLong.java index 64b147593..b74bd0d5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackOrLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackOrLong.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackOrLong extends ABLongCallback { @@ -9,7 +9,7 @@ public class ABCallbackOrLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) | value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java index 3bcbbb72c..0c5741fc3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackPlayerMaskAllPlayers extends ABLongCallback { @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { long dat = 0; for (int i = 0; i < WarsmashConstants.MAX_PLAYERS; i++) { dat |= 1 << i; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java index c235a56d7..d29b8c130 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackPlayerMaskExcludePlayers extends ABLongCallback { List players; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { long dat = 0; for (ABPlayerCallback player : players) { dat |= 1 << player.callback(caster, localStore, castId).getId(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java index b05b726fb..0d3afb152 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackPlayerMaskIncludePlayers extends ABLongCallback { List players; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { long dat = 0; for (ABPlayerCallback player : players) { dat |= 1 << player.callback(caster, localStore, castId).getId(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackRawLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackRawLong.java index 16741bf31..04548b8f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackRawLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackRawLong.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackRawLong extends ABLongCallback { private Long value; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java index 063b029c7..2b51e82a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java @@ -2,20 +2,20 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLong extends ABLongCallback { private ABStringCallback name; @Override - public Long callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public Long callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java index a65aaaa3f..7361c0c8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLongWithArguments extends ABLongCallback { @@ -17,9 +17,9 @@ public class ABCallbackReuseLongWithArguments extends ABLongCallback { private Map arguments; @Override - public Long callback(final CUnit caster, final LocalDataStore localStore, + public Long callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackSubtractLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackSubtractLong.java index f3a438d5c..f20734550 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackSubtractLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackSubtractLong.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackSubtractLong extends ABLongCallback { @@ -9,7 +9,7 @@ public class ABCallbackSubtractLong extends ABLongCallback { private ABLongCallback value2; @Override - public Long callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value1.callback(caster, localStore, castId) - value2.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABLongCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABLongCallback.java index 88ea8f6a4..310dd0139 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABLongCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABLongCallback.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABLongCallback implements ABCallback { - abstract public Long callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public Long callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java index 477f104b5..d6a03381d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentOrderId extends ABOrderIdCallback { private ABStringCallback name; @Override - public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABOrderIdCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java index 353171ab4..55c8bbecd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredOrderIdByKey extends ABOrderIdCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredOrderIdByKey extends ABOrderIdCallback { private ABBooleanCallback instanceValue; @Override - public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Integer) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java index cad9ec4ad..5ac164bec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIdUtils; public class ABCallbackIdString extends ABOrderIdCallback { @@ -10,7 +10,7 @@ public class ABCallbackIdString extends ABOrderIdCallback { private ABStringCallback idString; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return OrderIdUtils.getOrderId(idString.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java index fb7f09526..b54daaf0d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionOrderId extends ABOrderIdCallback { @@ -11,7 +11,7 @@ public class ABCallbackInlineConditionOrderId extends ABOrderIdCallback { private ABOrderIdCallback fail; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java index 60e3b83f0..77c6b4904 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackRawID extends ABOrderIdCallback { private Integer id; @Override - public Integer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return id; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java index 6801ac321..1c71edcac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java @@ -2,20 +2,20 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseOrderId extends ABOrderIdCallback { private ABStringCallback name; @Override - public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java index 57a63efc9..1551832fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseOrderIdWithArguments extends ABOrderIdCallback { @@ -17,9 +17,9 @@ public class ABCallbackReuseOrderIdWithArguments extends ABOrderIdCallback { private Map arguments; @Override - public Integer callback(final CUnit caster, final LocalDataStore localStore, + public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java index a208ba295..891571902 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABOrderIdCallback implements ABCallback { - abstract public Integer callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java index aae93db48..11b3acbbc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackArgumentPlayer extends ABPlayerCallback { @@ -13,7 +13,7 @@ public class ABCallbackArgumentPlayer extends ABPlayerCallback { private ABStringCallback name; @Override - public CPlayer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CPlayer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABPlayerCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java index e3fbe24a7..85816fe98 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetCastingPlayer extends ABPlayerCallback { @Override - public CPlayer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CPlayer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getPlayer(caster.getPlayerIndex()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java index a3e6793ca..a687a37c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetOwnerOfUnit extends ABPlayerCallback { @@ -10,7 +10,7 @@ public class ABCallbackGetOwnerOfUnit extends ABPlayerCallback { private ABUnitCallback unit; @Override - public CPlayer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CPlayer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getPlayer(unit.callback(caster, localStore, castId).getPlayerIndex()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java index f5de47b2c..b08b6d783 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetPlayerById extends ABPlayerCallback { @@ -10,7 +10,7 @@ public class ABCallbackGetPlayerById extends ABPlayerCallback { private ABIntegerCallback id; @Override - public CPlayer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CPlayer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getPlayer(id.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java index b567f6b61..f889f49b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetStoredPlayerByKey extends ABPlayerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredPlayerByKey extends ABPlayerCallback { private ABBooleanCallback instanceValue; @Override - public CPlayer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CPlayer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (CPlayer) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java index 4fa349b43..187a8e79b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackInlineConditionPlayer extends ABPlayerCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionPlayer extends ABPlayerCallback { private ABPlayerCallback fail; @Override - public CPlayer callback(CUnit caster, LocalDataStore localStore, int castId) { + public CPlayer callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java index 59bb35d34..b909d5653 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackReusePlayer extends ABPlayerCallback { @@ -15,8 +15,8 @@ public class ABCallbackReusePlayer extends ABPlayerCallback { private ABStringCallback name; @Override - public CPlayer callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public CPlayer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java index aaf7d08f4..dec18579f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackReusePlayerWithArguments extends ABPlayerCallback { @@ -18,9 +18,9 @@ public class ABCallbackReusePlayerWithArguments extends ABPlayerCallback { private Map arguments; @Override - public CPlayer callback(final CUnit caster, final LocalDataStore localStore, + public CPlayer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java index 68268408e..5b5221514 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public abstract class ABPlayerCallback implements ABCallback { - abstract public CPlayer callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CPlayer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java index 05d33a881..c43851569 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackArgumentProjectile extends ABProjectileCallback { @@ -13,7 +13,7 @@ public class ABCallbackArgumentProjectile extends ABProjectileCallback { private ABStringCallback name; @Override - public CProjectile callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CProjectile callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABProjectileCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java index 570d33666..5b3633815 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetLastCreatedProjectile extends ABProjectileCallback { @Override - public CProjectile callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CProjectile callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.LASTCREATEDPROJECTILE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java index 16919c252..b0d546993 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetReactionAbilityProjectile extends ABProjectileCallback { @Override - public CProjectile callback(final CUnit caster, final LocalDataStore localStore, + public CProjectile callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.ABILITYPROJ); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java index 02e34e5dd..d52ff35e3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetReactionAttackProjectile extends ABProjectileCallback { @Override - public CProjectile callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CProjectile callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java index 11c4409fa..a987f16f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetStoredProjectileByKey extends ABProjectileCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredProjectileByKey extends ABProjectileCallback { private ABBooleanCallback instanceValue; @Override - public CProjectile callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CProjectile callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (CProjectile) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java index 9f6341c86..835432439 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetThisProjectile extends ABProjectileCallback { @Override - public CProjectile callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CProjectile callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CProjectile) localStore.get(ABLocalStoreKeys.THISPROJECTILE+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java index f4f5d32c7..83563a400 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackInlineConditionProjectile extends ABProjectileCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionProjectile extends ABProjectileCallback { private ABProjectileCallback fail; @Override - public CProjectile callback(CUnit caster, LocalDataStore localStore, int castId) { + public CProjectile callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java index 312b2b49d..535222ba7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackReuseProjectile extends ABProjectileCallback { @@ -15,8 +15,8 @@ public class ABCallbackReuseProjectile extends ABProjectileCallback { private ABStringCallback name; @Override - public CProjectile callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public CProjectile callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java index f7fd539fc..680cd53c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackReuseProjectileWithArguments extends ABProjectileCallback { @@ -18,9 +18,9 @@ public class ABCallbackReuseProjectileWithArguments extends ABProjectileCallback private Map arguments; @Override - public CProjectile callback(final CUnit caster, final LocalDataStore localStore, + public CProjectile callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java index aa54afd1d..16b0cecb8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public abstract class ABProjectileCallback implements ABCallback { - abstract public CProjectile callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CProjectile callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java index c1b57d8d1..f158bbf63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackArgumentNonStackingStatBuff extends ABNonStackingStatBuffCallback { @@ -13,7 +13,7 @@ public class ABCallbackArgumentNonStackingStatBuff extends ABNonStackingStatBuff private ABStringCallback name; @Override - public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, + public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java index 53e3c8d2f..59018eb65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackGetLastCreatedNonStackingStatBuff extends ABNonStackingStatBuffCallback { @Override - public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (NonStackingStatBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDNSSB); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java index fd7bb2362..53c246c3d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackGetStoredNonStackingStatBuffByKey extends ABNonStackingStatBuffCallback { @@ -13,7 +13,7 @@ public class ABCallbackGetStoredNonStackingStatBuffByKey extends ABNonStackingSt private ABBooleanCallback instanceValue; @Override - public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, + public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (NonStackingStatBuff) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java index 1bda5b336..36e5d23ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackInlineConditionNonStackingStatBuff extends ABNonStackingStatBuffCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionNonStackingStatBuff extends ABNonStackingS private ABNonStackingStatBuffCallback fail; @Override - public NonStackingStatBuff callback(CUnit caster, LocalDataStore localStore, int castId) { + public NonStackingStatBuff callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java index e7a643c16..7a1b073c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackReuseNonStackingStatBuff extends ABNonStackingStatBuffCallback { @@ -15,8 +15,8 @@ public class ABCallbackReuseNonStackingStatBuff extends ABNonStackingStatBuffCal private ABStringCallback name; @Override - public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java index bdbc4a77c..28f663a7c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackReuseNonStackingStatBuffWithArguments extends ABNonStackingStatBuffCallback { @@ -18,8 +18,8 @@ public class ABCallbackReuseNonStackingStatBuffWithArguments extends ABNonStacki private Map arguments; @Override - public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java index cafe8617d..a5bdc6bdc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public abstract class ABNonStackingStatBuffCallback implements ABCallback { - abstract public NonStackingStatBuff callback(final CUnit caster, final LocalDataStore localStore, + abstract public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java index cff1dccd8..1bc3bb4df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackArgumentStateModBuff extends ABStateModBuffCallback { @@ -13,7 +13,7 @@ public class ABCallbackArgumentStateModBuff extends ABStateModBuffCallback { private ABStringCallback name; @Override - public StateModBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public StateModBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABStateModBuffCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java index e36d6f3e0..dec0ff424 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackGetLastCreatedStateModBuff extends ABStateModBuffCallback { @Override - public StateModBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + public StateModBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (StateModBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDSMB); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java index 3b454cd07..7c5b7ebbf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackGetStoredStateModBuffByKey extends ABStateModBuffCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredStateModBuffByKey extends ABStateModBuffCallback private ABBooleanCallback instanceValue; @Override - public StateModBuff callback(CUnit caster, LocalDataStore localStore, final int castId) { + public StateModBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (StateModBuff) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java index 4ccb535b6..6b0825e84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackInlineConditionStateModBuff extends ABStateModBuffCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionStateModBuff extends ABStateModBuffCallbac private ABStateModBuffCallback fail; @Override - public StateModBuff callback(CUnit caster, LocalDataStore localStore, int castId) { + public StateModBuff callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java index af6082e74..6fc151918 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackReuseStateModBuff extends ABStateModBuffCallback { @@ -15,9 +15,9 @@ public class ABCallbackReuseStateModBuff extends ABStateModBuffCallback { private ABStringCallback name; @Override - public StateModBuff callback(final CUnit caster, final LocalDataStore localStore, + public StateModBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java index ca11c4207..f7b3b5cba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackReuseStateModBuffWithArguments extends ABStateModBuffCallback { @@ -18,9 +18,9 @@ public class ABCallbackReuseStateModBuffWithArguments extends ABStateModBuffCall private Map arguments; @Override - public StateModBuff callback(final CUnit caster, final LocalDataStore localStore, + public StateModBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABStateModBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABStateModBuffCallback.java index fb79f663b..54b4cf6c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABStateModBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABStateModBuffCallback.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public abstract class ABStateModBuffCallback implements ABCallback { - abstract public StateModBuff callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public StateModBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java index dfc9b116f..dcf4d0843 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentString extends ABStringCallback { private ABStringCallback name; @Override - public String callback(final CUnit caster, final LocalDataStore localStore, + public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java index 2fc36fc1c..39ec8815d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackBooleanToString extends ABStringCallback { private ABBooleanCallback value; @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return "" + value.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackCatStrings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackCatStrings.java index acc7f61dd..3efe1481f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackCatStrings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackCatStrings.java @@ -3,14 +3,14 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCatStrings extends ABStringCallback { private List stringList; @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { String output = ""; for (ABStringCallback callB : stringList) { output += callB.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackFloatToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackFloatToString.java index c5207682e..8131dccb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackFloatToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackFloatToString.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackFloatToString extends ABStringCallback { private ABFloatCallback value; @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return "" + value.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java index f939eecf3..14fd56555 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java @@ -4,18 +4,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsString extends ABStringCallback { - private DataFieldLetter dataField; + private ABDataFieldLetter dataField; @SuppressWarnings("unchecked") @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { - List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); return levelData.get(level-1).getData().get(dataField.getIndex()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java index be5532184..d3f1beabf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityHandleAsString extends ABStringCallback { private ABAbilityCallback ability; @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return "" + ability.callback(caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java index 4f3f7bd8d..39c1eda95 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueString extends ABStringCallback { @@ -14,7 +14,7 @@ public class ABCallbackGetAbilityUniqueValueString extends ABStringCallback { private ABBooleanCallback allowNull; @Override - public String callback(final CUnit caster, final LocalDataStore localStore, + public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = key.callback(caster, localStore, castId); final CAbility theAbility = ability.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java index a4e959f76..6cf758d48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAliasAsString extends ABStringCallback { @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((War3ID) localStore.get(ABLocalStoreKeys.ALIAS)).asStringValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAllowStackingKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAllowStackingKey.java index 219692caf..652e9d5c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAllowStackingKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAllowStackingKey.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackGetAllowStackingKey extends ABStringCallback { @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return NonStackingStatBuff.ALLOW_STACKING_KEY; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java index 08818b198..f862681cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffHandleAsString extends ABStringCallback { private ABBuffCallback buff; @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return "" + buff.callback(caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java index e2e38fca8..2a2df559b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueString extends ABStringCallback { @@ -14,7 +14,7 @@ public class ABCallbackGetBuffUniqueValueString extends ABStringCallback { private ABBooleanCallback allowNull; @Override - public String callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = key.callback(caster, localStore, castId); final CBuff theBuff = buff.callback(caster, localStore, castId); String theVal = theBuff.getUniqueValue(keyS, String.class); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java index 1c49e4745..f772f3f17 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetCodeAsString extends ABStringCallback { @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((War3ID) localStore.get(ABLocalStoreKeys.CODE)).asStringValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java index f96573da2..e8d31faaf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredStringByKey extends ABStringCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredStringByKey extends ABStringCallback { private ABBooleanCallback instanceValue; @Override - public String callback(final CUnit caster, final LocalDataStore localStore, + public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (String) localStore.get(ABLocalStoreKeys diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java index fe949f5a7..5da6b63fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitHandleAsString extends ABStringCallback { private ABUnitCallback unit; @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return "" + unit.callback(caster, localStore, castId).getHandleId(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIdToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIdToString.java index be4ba2515..1b2f789bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIdToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIdToString.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIdToString extends ABStringCallback { private ABIDCallback value; @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value.callback(caster, localStore, castId).asStringValue(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java index 5a50f6246..859449424 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionString extends ABStringCallback { @@ -11,7 +11,7 @@ public class ABCallbackInlineConditionString extends ABStringCallback { private ABStringCallback fail; @Override - public String callback(CUnit caster, LocalDataStore localStore, int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIntegerToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIntegerToString.java index b2803afed..c7c55ea88 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIntegerToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIntegerToString.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIntegerToString extends ABStringCallback { private ABIntegerCallback value; @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return "" + value.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackLongToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackLongToString.java index 81f029219..2952b26ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackLongToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackLongToString.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.ABLongCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackLongToString extends ABStringCallback { private ABLongCallback value; @Override - public String callback(CUnit caster, LocalDataStore localStore, final int castId) { + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return "" + value.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackRawString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackRawString.java index 97efbd81a..d8026e2f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackRawString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackRawString.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackRawString extends ABStringCallback { private String value; @Override - public String callback(final CUnit caster, final LocalDataStore localStore, + public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return this.value; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java index 9abfe7413..ab236121a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java @@ -2,19 +2,19 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseString extends ABStringCallback { private ABStringCallback name; @Override - public String callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java index f4a6f42ba..0136a6c77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java @@ -4,11 +4,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseStringWithArguments extends ABStringCallback { @@ -16,9 +16,9 @@ public class ABCallbackReuseStringWithArguments extends ABStringCallback { private Map arguments; @Override - public String callback(final CUnit caster, final LocalDataStore localStore, + public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABStringCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABStringCallback.java index 4fd52a700..14f768ee8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABStringCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABStringCallback.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABStringCallback implements ABCallback { - abstract public String callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java index 36c0f827f..41701a70f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentTarget extends ABTargetCallback { private ABStringCallback name; @Override - public AbilityTarget callback(final CUnit caster, final LocalDataStore localStore, + public AbilityTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java index be7b2cead..d74315630 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityTarget extends ABTargetCallback { @Override - public AbilityTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityPointTarget target = (AbilityPointTarget) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+castId); if (target != null) { return target; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java index 4c3358e7b..a5b08d346 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredTargetByKey extends ABTargetCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; @Override - public AbilityTarget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public AbilityTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (AbilityTarget) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java index c71d2f0f1..2e494386a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionTarget extends ABTargetCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionTarget extends ABTargetCallback { private ABTargetCallback fail; @Override - public AbilityTarget callback(CUnit caster, LocalDataStore localStore, int castId) { + public AbilityTarget callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java index 265f1df01..909de27a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java @@ -3,20 +3,20 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseTarget extends ABTargetCallback { private ABStringCallback name; @Override - public AbilityTarget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public AbilityTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java index 123bda990..908282b74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseTargetWithArguments extends ABTargetCallback { @@ -18,8 +18,8 @@ public class ABCallbackReuseTargetWithArguments extends ABTargetCallback { private Map arguments; @Override - public AbilityTarget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public AbilityTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABTargetCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABTargetCallback.java index b4501a2af..402ca448d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABTargetCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABTargetCallback.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABTargetCallback implements ABCallback { - abstract public AbilityTarget callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public AbilityTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java index 41e43c132..5fa7f3fc9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackArgumentTimer extends ABTimerCallback { @@ -13,7 +13,7 @@ public class ABCallbackArgumentTimer extends ABTimerCallback { private ABStringCallback name; @Override - public CTimer callback(final CUnit caster, final LocalDataStore localStore, + public CTimer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java index 2cfe69ec3..504a6db66 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetFiringTimer extends ABTimerCallback { @Override - public CTimer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CTimer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CTimer) localStore.get(ABLocalStoreKeys.FIRINGTIMER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java index 0d752bd92..a3d3df871 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetLastCreatedTimer extends ABTimerCallback { @Override - public CTimer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CTimer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CTimer) localStore.get(ABLocalStoreKeys.LASTCREATEDTIMER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java index ba6e4352e..d64b466b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetLastStartedTimer extends ABTimerCallback { @Override - public CTimer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CTimer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CTimer) localStore.get(ABLocalStoreKeys.LASTSTARTEDTIMER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java index 284e9e86c..157e5bfd5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetStoredTimerByKey extends ABTimerCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredTimerByKey extends ABTimerCallback { private ABBooleanCallback instanceValue; @Override - public CTimer callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CTimer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (CTimer) localStore.get( ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java index 66e530e21..6cc95cd47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackInlineConditionTimer extends ABTimerCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionTimer extends ABTimerCallback { private ABTimerCallback fail; @Override - public CTimer callback(CUnit caster, LocalDataStore localStore, int castId) { + public CTimer callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java index e2c7fa224..3ef280de9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackReuseTimer extends ABTimerCallback { @@ -15,9 +15,9 @@ public class ABCallbackReuseTimer extends ABTimerCallback { private ABStringCallback name; @Override - public CTimer callback(final CUnit caster, final LocalDataStore localStore, + public CTimer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java index d0d39251a..8c48deaab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackReuseTimerWithArguments extends ABTimerCallback { @@ -18,9 +18,9 @@ public class ABCallbackReuseTimerWithArguments extends ABTimerCallback { private Map arguments; @Override - public CTimer callback(final CUnit caster, final LocalDataStore localStore, + public CTimer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABTimerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABTimerCallback.java index abb10f0ff..71e0e84e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABTimerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABTimerCallback.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public abstract class ABTimerCallback implements ABCallback { - abstract public CTimer callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CTimer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java index 7d3ea3170..0cd326941 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentUnit extends ABUnitCallback { private ABStringCallback name; @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java index a0b15ab77..9434b716d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityPairedUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ABILITYPAIREDUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java index 314fb8222..dcd436ac0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityTargetedUnit extends ABUnitCallback { @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java index 3c5bfd0d4..65d53be05 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAttackedUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); return tar.visit(AbilityTargetVisitor.UNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java index 90ebf7e42..33b86874f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAttackingUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ATTACKINGUNIT+castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java index ce1c270d0..25a9323e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffCastingUnit extends ABUnitCallback { @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.BUFFCASTINGUNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffedUnit.java index d6a7a7775..6a1e8ee53 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffedUnit.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffedUnit extends ABUnitCallback { @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return caster; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCastingUnit.java index c8f22bac6..34147e8a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCastingUnit.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetCastingUnit extends ABUnitCallback { @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return caster; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java index dd9b490be..9e5d58646 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetChainUnit extends ABUnitCallback { @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.CHAINUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java index 7552293d9..c8729a3a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetCompUnit1 extends ABUnitCallback { @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.COMPUNIT1); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java index cf21dfe49..f9123ec20 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetCompUnit2 extends ABUnitCallback { @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.COMPUNIT2); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java index d051dbd97..d0cb2525a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetDamagedUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGEDUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java index 388387cfb..b5ddc0076 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetDamagingUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGINGUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java index aabf776f4..22c520812 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetDyingUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.DYINGUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java index 49592ab2f..46e2ff254 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetEnumUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.ENUMUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java index f36987903..050bc1129 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetKillingUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.KILLINGUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java index 24c52c30d..b37d8a3e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetLastCreatedUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.LASTCREATEDUNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetListenerUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetListenerUnit.java index 496267019..ecc5c4b98 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetListenerUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetListenerUnit.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetListenerUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return caster; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java index a142b246d..91aac18f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetMatchingUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.MATCHINGUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java index f43c8ad6a..a41d47835 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; public class ABCallbackGetNearestCorpseInRangeOfUnit extends ABUnitCallback { private static final Rectangle recycleRect = new Rectangle(); @@ -19,11 +19,11 @@ public class ABCallbackGetNearestCorpseInRangeOfUnit extends ABUnitCallback { private List conditions; @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(caster, localStore, castId); Float rangeVal = range.callback(caster, localStore, castId); - final UnitAndRange ur = new UnitAndRange(); + final ABUnitAndRangeComparator ur = new ABUnitAndRangeComparator(); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java index 514d60a25..d9958ab15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; public class ABCallbackGetNearestUnitInRangeOfUnit extends ABUnitCallback { private static final Rectangle recycleRect = new Rectangle(); @@ -19,11 +19,11 @@ public class ABCallbackGetNearestUnitInRangeOfUnit extends ABUnitCallback { private List conditions; @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(caster, localStore, castId); Float rangeVal = range.callback(caster, localStore, castId); - final UnitAndRange ur = new UnitAndRange(); + final ABUnitAndRangeComparator ur = new ABUnitAndRangeComparator(); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java index b74aaae65..d3d8868f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetParentCastingUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.PARENTCASTER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java index b2e13abcf..f7c8bb04a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetProjectileHitUnit extends ABUnitCallback { @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java index b2ee012d2..77806b1fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetProjectileSourceUnit extends ABUnitCallback { @@ -10,7 +10,7 @@ public class ABCallbackGetProjectileSourceUnit extends ABUnitCallback { private ABProjectileCallback proj; @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CProjectile p = proj.callback(caster, localStore, castId); return p.getSource(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java index 4502e4a28..44ab97564 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetReactionAbilityCastingUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CUnit) localStore.get(ABLocalStoreKeys.REACTIONABILITYCASTER + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java index 35c2b7029..d5f84caf3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetReactionAbilityTargetUnit extends ABUnitCallback { @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.REACTIONABILITYCASTER+castId); return tar.visit(AbilityTargetVisitor.UNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java index 70cefd2c6..65ef4f908 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredUnitByKey extends ABUnitCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredUnitByKey extends ABUnitCallback { private ABBooleanCallback instanceValue; @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (CUnit) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java index 5654d81bd..6ead2610b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionUnit extends ABUnitCallback { @@ -11,7 +11,7 @@ public class ABCallbackInlineConditionUnit extends ABUnitCallback { private ABUnitCallback fail; @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackPollUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackPollUnitQueue.java index 5404ef1d6..fb6a28f1e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackPollUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackPollUnitQueue.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackPollUnitQueue extends ABUnitCallback { private ABUnitQueueCallback queue; @Override - public CUnit callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return queue.callback(caster, localStore, castId).poll(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java index 614192911..0eb49f737 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java @@ -2,21 +2,21 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnit extends ABUnitCallback { private ABStringCallback name; @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java index 6545c18ff..ccec83338 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitWithArguments extends ABUnitCallback { @@ -17,9 +17,9 @@ public class ABCallbackReuseUnitWithArguments extends ABUnitCallback { private Map arguments; @Override - public CUnit callback(final CUnit caster, final LocalDataStore localStore, + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABUnitCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABUnitCallback.java index b01ef33ff..98959c99c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABUnitCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABUnitCallback.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABUnitCallback implements ABCallback { @Override - abstract public CUnit callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java index 67cfd28d4..d0ab24c89 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java @@ -7,14 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentUnitGroup extends ABUnitGroupCallback { private ABStringCallback name; @Override - public Set callback(final CUnit caster, final LocalDataStore localStore, + public Set callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java index 489998ab9..d2e9bb9a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetLastCreatedUnitGroup extends ABUnitGroupCallback { @SuppressWarnings("unchecked") @Override - public Set callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Set callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (Set) localStore.get(ABLocalStoreKeys.LASTCREATEDUNITGROUP); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java index 338c5b6a4..faedbce8a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredUnitGroupByKey extends ABUnitGroupCallback { @@ -16,7 +16,7 @@ public class ABCallbackGetStoredUnitGroupByKey extends ABUnitGroupCallback { @SuppressWarnings("unchecked") @Override - public Set callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Set callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Set) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java index 85f4ec096..8728f98c8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java @@ -3,7 +3,7 @@ import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitGroupByName extends ABUnitGroupCallback { @@ -11,7 +11,7 @@ public class ABCallbackGetUnitGroupByName extends ABUnitGroupCallback { @SuppressWarnings("unchecked") @Override - public Set callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Set callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (Set) localStore.get("_unitgroup_" + name); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java index b749a2fff..373c17908 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionUnitGroup extends ABUnitGroupCallback { @@ -13,7 +13,7 @@ public class ABCallbackInlineConditionUnitGroup extends ABUnitGroupCallback { private ABUnitGroupCallback fail; @Override - public Set callback(CUnit caster, LocalDataStore localStore, int castId) { + public Set callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java index f00433bf0..e2624fd38 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java @@ -4,21 +4,21 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitGroup extends ABUnitGroupCallback { private ABStringCallback name; @Override - public Set callback(final CUnit caster, final LocalDataStore localStore, + public Set callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java index bf5583254..c1bc7e8f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitGroupWithArguments extends ABUnitGroupCallback { @@ -18,9 +18,9 @@ public class ABCallbackReuseUnitGroupWithArguments extends ABUnitGroupCallback { private Map arguments; @Override - public Set callback(final CUnit caster, final LocalDataStore localStore, + public Set callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABUnitGroupCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABUnitGroupCallback.java index 36c100a81..c9f8c0a9b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABUnitGroupCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABUnitGroupCallback.java @@ -4,9 +4,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABUnitGroupCallback implements ABCallback { - abstract public Set callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public Set callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java index 6a18e12ef..351eb97c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java @@ -7,14 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentUnitQueue extends ABUnitQueueCallback { private ABStringCallback name; @Override - public Queue callback(final CUnit caster, final LocalDataStore localStore, + public Queue callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java index f14d27106..d03d68f92 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetLastCreatedUnitQueue extends ABUnitQueueCallback { @SuppressWarnings("unchecked") @Override - public Queue callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Queue callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (Queue) localStore.get(ABLocalStoreKeys.LASTCREATEDUNITQUEUE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java index a332af01b..6a3e78391 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredUnitQueueByKey extends ABUnitQueueCallback { @@ -16,7 +16,7 @@ public class ABCallbackGetStoredUnitQueueByKey extends ABUnitQueueCallback { @SuppressWarnings("unchecked") @Override - public Queue callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Queue callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (Queue) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java index 63fced9f3..f4eb12085 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java @@ -3,7 +3,7 @@ import java.util.Queue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetUnitQueueByName extends ABUnitQueueCallback { @@ -11,7 +11,7 @@ public class ABCallbackGetUnitQueueByName extends ABUnitQueueCallback { @SuppressWarnings("unchecked") @Override - public Queue callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Queue callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (Queue) localStore.get("_unitqueue_" + name); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java index a2ce99210..af3a537a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionUnitQueue extends ABUnitQueueCallback { @@ -13,7 +13,7 @@ public class ABCallbackInlineConditionUnitQueue extends ABUnitQueueCallback { private ABUnitQueueCallback fail; @Override - public Queue callback(CUnit caster, LocalDataStore localStore, int castId) { + public Queue callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java index 50a5b80d8..fc92231d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java @@ -4,21 +4,21 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitQueue extends ABUnitQueueCallback { private ABStringCallback name; @Override - public Queue callback(final CUnit caster, final LocalDataStore localStore, + public Queue callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java index 020349b3f..9729a69dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitQueueWithArguments extends ABUnitQueueCallback { @@ -18,8 +18,8 @@ public class ABCallbackReuseUnitQueueWithArguments extends ABUnitQueueCallback { private Map arguments; @Override - public Queue callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public Queue callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java index 04bbc8dea..093e9f9ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java @@ -4,9 +4,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABUnitQueueCallback implements ABCallback { - abstract public Queue callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public Queue callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java index 92b45a728..8d07ce959 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackArgumentVisionModifier extends ABVisionModifierCallback { @@ -13,7 +13,7 @@ public class ABCallbackArgumentVisionModifier extends ABVisionModifierCallback { private ABStringCallback name; @Override - public CFogModifier callback(final CUnit caster, final LocalDataStore localStore, + public CFogModifier callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java index 658563491..5c1322142 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java @@ -2,13 +2,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackGetLastCreatedVisionModifier extends ABVisionModifierCallback { @Override - public CFogModifier callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CFogModifier callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (CFogModifier) localStore.get(ABLocalStoreKeys.LASTCREATEDVISIONMODIFIER); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java index 10b36308e..3b592abb8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackGetStoredVisionModifierByKey extends ABVisionModifierCallback { @@ -12,7 +12,7 @@ public class ABCallbackGetStoredVisionModifierByKey extends ABVisionModifierCall private ABBooleanCallback instanceValue; @Override - public CFogModifier callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CFogModifier callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { return (CFogModifier) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java index a9a95b814..745f260e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackInlineConditionVisionModifier extends ABVisionModifierCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionVisionModifier extends ABVisionModifierCal private ABVisionModifierCallback fail; @Override - public CFogModifier callback(CUnit caster, LocalDataStore localStore, int castId) { + public CFogModifier callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java index 881fa5ca0..a2cb560cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackReuseVisionModifier extends ABVisionModifierCallback { @@ -15,8 +15,8 @@ public class ABCallbackReuseVisionModifier extends ABVisionModifierCallback { private ABStringCallback name; @Override - public CFogModifier callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public CFogModifier callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java index 893aa0c60..a453d6375 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackReuseVisionModifierWithArguments extends ABVisionModifierCallback { @@ -18,8 +18,8 @@ public class ABCallbackReuseVisionModifierWithArguments extends ABVisionModifier private Map arguments; @Override - public CFogModifier callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public CFogModifier callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java index 951bbe4d3..1da3f9d6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public abstract class ABVisionModifierCallback implements ABCallback { - abstract public CFogModifier callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CFogModifier callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java index d50aafce8..965a71289 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentWidget extends ABWidgetCallback { private ABStringCallback name; @Override - public CWidget callback(final CUnit caster, final LocalDataStore localStore, + public CWidget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java index d807bf277..a6e4d49b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackDestructableToWidget extends ABWidgetCallback { private ABDestructableCallback destructable; @Override - public CWidget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CWidget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return destructable.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java index 02c889533..f4a3098a6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetProjectileHitWidget extends ABWidgetCallback { @Override - public CWidget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CWidget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final CWidget unit = (CWidget) localStore.get(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); final CWidget dest = (CWidget) localStore.get(ABLocalStoreKeys.PROJECTILEHITDEST + castId); if (unit != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java index 5e4f9dff7..220ef8868 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetStoredWidgetByKey extends ABWidgetCallback { @@ -14,7 +14,7 @@ public class ABCallbackGetStoredWidgetByKey extends ABWidgetCallback { private ABBooleanCallback instanceValue; @Override - public CWidget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public CWidget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { return (CWidget) localStore.get(ABLocalStoreKeys .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java index 59b04d30d..dd4db9172 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionWidget extends ABWidgetCallback { @@ -12,7 +12,7 @@ public class ABCallbackInlineConditionWidget extends ABWidgetCallback { private ABWidgetCallback fail; @Override - public CWidget callback(CUnit caster, LocalDataStore localStore, int castId) { + public CWidget callback(CUnit caster, ABLocalDataStore localStore, int castId) { if (condition != null && condition.callback(caster, localStore, castId)) { return pass.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java index 7a75c6a2e..9e5e8ccaf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackItemToWidget extends ABWidgetCallback { private ABItemCallback item; @Override - public CWidget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CWidget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return item.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java index e691a6e34..c53521204 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java @@ -3,20 +3,20 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseWidget extends ABWidgetCallback { private ABStringCallback name; @Override - public CWidget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public CWidget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java index 744cc978f..ad1ca5b8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseWidgetWithArguments extends ABWidgetCallback { @@ -18,8 +18,8 @@ public class ABCallbackReuseWidgetWithArguments extends ABWidgetCallback { private Map arguments; @Override - public CWidget callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public CWidget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java index 6a251dce8..178d8bfa4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackUnitToWidget extends ABWidgetCallback { private ABUnitCallback unit; @Override - public CWidget callback(CUnit caster, LocalDataStore localStore, final int castId) { + public CWidget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return unit.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java index c429e0743..216cd6aae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABWidgetCallback implements ABCallback { - abstract public CWidget callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public CWidget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java index ebb1ad54e..3d406b014 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java @@ -7,14 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackArgumentBoolean extends ABCondition { private ABStringCallback name; @Override - public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); if (cbck != null && cbck instanceof ABBooleanCallback) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java index 2d70001e8..24a795439 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java @@ -2,22 +2,22 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBoolean extends ABCondition { private ABStringCallback name; @Override - public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java index 4d0548127..86fec1e65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBooleanWithArguments extends ABCondition { @@ -19,8 +19,8 @@ public class ABCallbackReuseBooleanWithArguments extends ABCondition { private Map arguments; @Override - public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { - final AbilityBuilderConfiguration config = ((AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java index dff57c026..6fb6d9c73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeysEnum; public class ABConditionSetCantUseReasonOnFailure extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionSetCantUseReasonOnFailure extends ABCondition { private CommandStringErrorKeysEnum reason; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { boolean result = condition.callback(caster, localStore, castId); if (!result) { localStore.put(ABLocalStoreKeys.CANTUSEREASON, reason.getKey()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java index d7cc21dff..ea13bf604 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsAutoCastCurrentlyActive extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.ISAUTOCASTON); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java index 3b880e356..c216b60c8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsDisabled extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.isDisabled(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java index 1747c3b04..5192f6b63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsFlexAbilityNonPointTarget extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { - CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return !ability.isPointTarget(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java index 76968c84d..bc60d795e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsFlexAbilityNonTargeted extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { - CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return !ability.isTargetedSpell(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java index 18de5f2fe..d9b4ccee3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsFlexAbilityPointTarget extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { - CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); return ability.isPointTarget(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java index 165841e8d..56b5abe93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.CAbilityAbilityBuilderActiveFlexTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsFlexAbilityTargeted extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { - CAbilityAbilityBuilderActiveFlexTarget ability = (CAbilityAbilityBuilderActiveFlexTarget) localStore + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore .get(ABLocalStoreKeys.ISFLEXABILITY); return ability.isTargetedSpell(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java index 7029b3f8e..8621fa58a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsOnCooldown extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.getCooldownRemainingTicks(localStore.game, caster) > 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java index 1c1f6f780..d4e54f333 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java @@ -3,16 +3,16 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsToggleAbilityActive extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { - AbilityBuilderActiveAbility ability = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderActiveAbility ability = (ABAbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.isActive(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java index e9a19393e..84818fafb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsTransformingToAlternate extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.TRANSFORMINGTOALT + castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java index 1be4f09f6..98ff82a3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionWasAutoCast extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java index 194d28ee4..eae1a40b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionWasAutoCastPreviouslyActive extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.WASAUTOCASTON); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java index 0bda0791d..2777c5817 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionWasCastingInterrupted extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (Boolean) localStore.get(ABLocalStoreKeys.INTERRUPTED); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java index b62dbf0ac..0524b99e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java @@ -3,13 +3,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABConditionIsAttackProjectile extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isProjectile(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java index 1ee2d01fc..6da10eb93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java @@ -3,13 +3,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABConditionIsAttackRanged extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isRanged(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java index 7396f74cb..fd79527bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsBuffAlly extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsBuffAlly extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(caster, localStore, castId); return localStore.game.getPlayer(caster.getPlayerIndex()).hasAlliance(theBuff.getSourceUnit().getPlayerIndex(), CAllianceType.SHARED_SPELLS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java index d156a6018..dea294fdb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsBuffEnemy extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsBuffEnemy extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(caster, localStore, castId); return !localStore.game.getPlayer(caster.getPlayerIndex()).hasAlliance(theBuff.getSourceUnit().getPlayerIndex(), CAllianceType.PASSIVE); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java index 45a2c9c38..3374518d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsBuffMagic extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(caster, localStore, castId); return theBuff.isMagic(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java index 27b1cf309..691e165fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsBuffNegative extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(caster, localStore, castId); return !theBuff.isPositive(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java index e44c370d0..d4a8b43c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsBuffPositive extends ABCondition { ABBuffCallback buff; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(caster, localStore, castId); return theBuff.isPositive(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java index f61b29405..870a26ccf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public class ABConditionIsAttackTypeEqual extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsAttackTypeEqual extends ABCondition { private ABAttackTypeCallback attackType2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CAttackType lA = attackType1.callback(caster, localStore, castId); CAttackType rA = attackType2.callback(caster, localStore, castId); if (lA == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java index 9ce17a460..0410b2e11 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABConditionIsDamageTypeEqual extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsDamageTypeEqual extends ABCondition { private ABDamageTypeCallback damageType2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CDamageType lD = damageType1.callback(caster, localStore, castId); CDamageType rD = damageType2.callback(caster, localStore, castId); if (lD == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java index b37d0b53e..b8264c8ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDefenseTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABConditionIsDefenseTypeEqual extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsDefenseTypeEqual extends ABCondition { private ABDefenseTypeCallback defenseType2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CDefenseType lD = defenseType1.callback(caster, localStore, castId); CDefenseType rD = defenseType2.callback(caster, localStore, castId); if (lD == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java index 842851d19..7253f77a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDefenseTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABConditionIsDefenseTypeInList extends ABCondition { @@ -14,7 +14,7 @@ public class ABConditionIsDefenseTypeInList extends ABCondition { private List list; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, int castId) { CDefenseType theType = defenseType.callback(caster, localStore, castId); for (ABDefenseTypeCallback lType : list) { if (theType == lType.callback(caster, localStore, castId)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java index ad56d3faa..500b519e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsIdEqual extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsIdEqual extends ABCondition { private ABIDCallback id2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { War3ID lA = id1.callback(caster, localStore, castId); War3ID rA = id2.callback(caster, localStore, castId); if (lA == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java index 56f13b1f0..5fd70d65d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABMovementTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsMovementTypeEqual extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsMovementTypeEqual extends ABCondition { private ABMovementTypeCallback movementType2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { MovementType lD = movementType1.callback(caster, localStore, castId); MovementType rD = movementType2.callback(caster, localStore, castId); if (lD == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java index 6048bcba1..e791f5376 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitEqual extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionIsUnitEqual extends ABCondition { private ABUnitCallback unit2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit lUnit = unit1.callback(caster, localStore, castId); CUnit rUnit = unit2.callback(caster, localStore, castId); if (lUnit == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java index 64ce8beac..1d8e716b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABConditionIsWeaponTypeEqual extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsWeaponTypeEqual extends ABCondition { private ABWeaponTypeCallback weaponType2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CWeaponType lD = weaponType1.callback(caster, localStore, castId); CWeaponType rD = weaponType2.callback(caster, localStore, castId); if (lD == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java index 19bd1c444..216e6c753 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABConditionSuccessfullyChargeResources extends ABCondition { @@ -19,7 +19,7 @@ public class ABConditionSuccessfullyChargeResources extends ABCondition { private ABIntegerCallback food; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java index 99d992e3b..4dc67274f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionDoesDestructableHaveBuff extends ABCondition { @@ -14,7 +14,7 @@ public class ABConditionDoesDestructableHaveBuff extends ABCondition { private ABIDCallback id; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CDestructable theDestructable = dest.callback(caster, localStore, castId); if (theDestructable != null) { for (CDestructableBuff ability : theDestructable.getBuffs()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java index 269478cbb..e35f02e8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionDoesDestructableHaveBuffMatchingCondition extends ABCondition { @@ -15,7 +15,7 @@ public class ABConditionDoesDestructableHaveBuffMatchingCondition extends ABCond private ABBooleanCallback condition; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CDestructable theDestructable = dest.callback(caster, localStore, castId); if (theDestructable != null) { for (CDestructableBuff ability : theDestructable.getBuffs()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java index 2248d8bf6..fc2057ebf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABConditionIsTree extends ABCondition { @@ -14,7 +14,7 @@ public class ABConditionIsTree extends ABCondition { private ABDestructableCallback dest; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CDestructable theDestructable = dest.callback(caster, localStore, castId); if (theDestructable != null) { return theDestructable.canBeTargetedBy(localStore.game, caster, EnumSet.of(CTargetType.TREE)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java index 81ea9612d..f4e6f3d44 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsDestructableBuffMagic extends ABCondition { ABDestructableBuffCallback buff; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CDestructableBuff theBuff = buff.callback(caster, localStore, castId); return theBuff.isMagic(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java index 9d76cddca..2801ddc54 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionGameplayConstantCanDisableDivineShield extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getGameplayConstants().isCanDisableDivineShield(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java index 4bf76e374..b5d8ddc7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionGameplayConstantIsDefendCanDeflect extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getGameplayConstants().isDefendDeflection(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java index e817f9145..b5373b763 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionGameplayConstantIsRelativeUpgradeCosts extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getGameplayConstants().isRelativeUpgradeCosts(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java index e6e78674b..e0e6e1bb0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionGameplayConstantSmartAbolishMagic extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return localStore.game.getGameplayConstants().isAbolishMagicSmartDispel(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java index 327694061..122c459aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsTimeOfDayInRange extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionIsTimeOfDayInRange extends ABCondition { private ABFloatCallback endTime; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { float st = 0; float et = Float.MAX_VALUE; if (startTime != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java index 70fc52927..9ab457c2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java @@ -1,16 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsItemAbility extends ABCondition { @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.getItem() != null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java index 08ac0aafa..28279430b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionItemHasCharges extends ABCondition { private ABItemCallback item; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (item == null) { - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.getItem().getCharges() > 0; } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java index 25683e485..82afd9e61 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java @@ -1,20 +1,20 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionItemIsCharged extends ABCondition { private ABItemCallback item; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (item == null) { - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); return ability.getItem().getItemType().getNumberOfCharges() > 0; } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java index 559de3d0f..0a84114db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsLocationDeepWater extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(caster, localStore, castId); return localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && !localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java index 2be3ce56d..59d673e99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsLocationFlyingOnly extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(caster, localStore, castId); return localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.FLYABLE) && !localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java index 35fd22782..6fc0ad832 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsLocationPathableForUnitType extends ABCondition { @@ -14,7 +14,7 @@ public class ABConditionIsLocationPathableForUnitType extends ABCondition { ABIDCallback unitType; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, int castId) { War3ID uType = unitType.callback(caster, localStore, castId); AbilityPointTarget loc = location.callback(caster, localStore, castId); return localStore.game.getPathingGrid().isPathable(loc.x, loc.y, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java index 2f9978b3e..1864d026b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsLocationShallowWater extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(caster, localStore, castId); return localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java index b55483e46..3c14bde58 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsLocationWalkable extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(caster, localStore, castId); return localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java index 6b7a1ce6c..3c954de87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsLocationWalkableNonWater extends ABCondition { private ABLocationCallback location; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { AbilityPointTarget loc = location.callback(caster, localStore, castId); return !localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.SWIMMABLE) && localStore.game.getPathingGrid().isPathable(loc.x, loc.y, PathingType.WALKABLE); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java index 69d32d5b0..51d6c844c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionAnd extends ABCondition { private List conditions; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { boolean result = true; if (conditions != null) { for (ABCondition cond : conditions) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java index 05905b329..a8bd4628b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionBool extends ABCondition { private ABBooleanCallback bool; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return bool.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java index ea9f08f16..6fcaeefab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsNull extends ABCondition { private ABCallback value; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value.callback(caster, localStore, castId) == null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java index b20978398..1c08f1afd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionNot extends ABCondition { private ABCondition condition; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return !condition.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java index 20d8a5155..738734125 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionNotNull extends ABCondition { private ABCallback value; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return value.callback(caster, localStore, castId) != null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java index 9f049e397..afad217b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionOr extends ABCondition { private List conditions; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { boolean result = false; if (conditions != null) { for (ABCondition cond : conditions) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java index 3afb471fe..1da036ffb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitInGroup extends ABCondition { @@ -14,7 +14,7 @@ public class ABConditionIsUnitInGroup extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Set groupSet = group.callback(caster, localStore, castId); CUnit rUnit = unit.callback(caster, localStore, castId); return groupSet.contains(rUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java index 23a0208f4..afc1106fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitInRangeOfUnit extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionIsUnitInRangeOfUnit extends ABCondition { private ABFloatCallback range; @Override - public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { return caster.callback(casterUnit, localStore, castId).canReach( target.callback(casterUnit, localStore, castId), range.callback(casterUnit, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java index 65806fecb..3a9cc1e84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java @@ -9,8 +9,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; public class ABConditionMatchingCorpseExistsInRangeOfUnit extends ABCondition { private static final Rectangle recycleRect = new Rectangle(); @@ -20,11 +20,11 @@ public class ABConditionMatchingCorpseExistsInRangeOfUnit extends ABCondition { private List conditions; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(caster, localStore, castId); Float rangeVal = range.callback(caster, localStore, castId); - final UnitAndRange ur = new UnitAndRange(); + final ABUnitAndRangeComparator ur = new ABUnitAndRangeComparator(); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java index 24b2da253..8e58977ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.UnitAndRange; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; public class ABConditionMatchingUnitExistsInRangeOfUnit extends ABCondition { private static final Rectangle recycleRect = new Rectangle(); @@ -18,11 +18,11 @@ public class ABConditionMatchingUnitExistsInRangeOfUnit extends ABCondition { private ABCondition condition; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(caster, localStore, castId); Float rangeVal = range.callback(caster, localStore, castId); - final UnitAndRange ur = new UnitAndRange(); + final ABUnitAndRangeComparator ur = new ABUnitAndRangeComparator(); recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java index 6e8bddead..7e8e96453 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionFloatEq0 extends ABCondition { private ABFloatCallback value; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Float v = value.callback(caster, localStore, castId); return v==0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java index 73c4ca579..2280e1910 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionFloatEqual extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionFloatEqual extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Float v1 = value1.callback(caster, localStore, castId); Float v2 = value2.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java index 9346d3fb4..447d22a4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionFloatGt extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionFloatGt extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Float v1 = value1.callback(caster, localStore, castId); Float v2 = value2.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java index ec957f815..2de3b11f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionFloatGt0 extends ABCondition { private ABFloatCallback value; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Float v = value.callback(caster, localStore, castId); return v > 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java index 1660da0d9..d1e01de3a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionFloatGte extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionFloatGte extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Float v1 = value1.callback(caster, localStore, castId); Float v2 = value2.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java index faa3e8b4c..068e06309 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionFloatLt extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionFloatLt extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Float v1 = value1.callback(caster, localStore, castId); Float v2 = value2.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java index e46618e98..1c501c0c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionFloatLte extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionFloatLte extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Float v1 = value1.callback(caster, localStore, castId); Float v2 = value2.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java index 7e597a6a7..d33054c25 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionFloatNe extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionFloatNe extends ABCondition { private ABFloatCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Float v1 = value1.callback(caster, localStore, castId); Float v2 = value2.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java index 1eec9c172..2f720b0a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionFloatNe0 extends ABCondition { private ABFloatCallback value; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Float v = value.callback(caster, localStore, castId); return v!=0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java index 8b43646fb..d1303fe27 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIntegerEq extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionIntegerEq extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v1 = value1.callback(caster, localStore, castId); Integer v2 = value2.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java index d3a6b6670..a75ce1b6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIntegerEq0 extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v1 = value.callback(caster, localStore, castId); return v1 == 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java index 55cda1200..759c8cb61 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIntegerGt extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionIntegerGt extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v1 = value1.callback(caster, localStore, castId); Integer v2 = value2.callback(caster, localStore, castId); return v1 > v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java index b558924c2..675c82901 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIntegerGt0 extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v1 = value.callback(caster, localStore, castId); return v1 > 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java index 523bfc422..821efa618 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIntegerGte extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionIntegerGte extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v1 = value1.callback(caster, localStore, castId); Integer v2 = value2.callback(caster, localStore, castId); return v1 >= v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java index 3c3fa1e6c..e23102e90 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIntegerIsEven extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v1 = value.callback(caster, localStore, castId); return (v1 % 2) == 0; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java index 556f7e978..8c4189418 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIntegerIsOdd extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v1 = value.callback(caster, localStore, castId); return (v1 % 2) == 1; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java index aa1714102..7088d43dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIntegerLt extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIntegerLt extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v1 = value1.callback(caster, localStore, castId); Integer v2 = value2.callback(caster, localStore, castId); return v1 < v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java index 6ea6a2ec0..994af6607 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIntegerLte extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionIntegerLte extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v1 = value1.callback(caster, localStore, castId); Integer v2 = value2.callback(caster, localStore, castId); return v1 <= v2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java index 633747929..ff2fb68cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIntegerNe extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionIntegerNe extends ABCondition { private ABIntegerCallback value2; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v1 = value1.callback(caster, localStore, castId); Integer v2 = value2.callback(caster, localStore, castId); return !v1.equals(v2); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java index e7f4b5f91..f6a9cad20 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIntegerNe0 extends ABCondition { private ABIntegerCallback value; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { Integer v1 = value.callback(caster, localStore, castId); return v1 != 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java index 75ebb1462..ed75b4769 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABConditionIsProjectileReflected extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsProjectileReflected extends ABCondition { private ABProjectileCallback projectile; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final CProjectile proj = this.projectile.callback(caster, localStore, castId); return proj.isReflected(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java index 230e13f94..3170ddb8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java @@ -4,14 +4,14 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABConditionIsDestructableValidTarget extends ABCondition { @@ -21,15 +21,15 @@ public class ABConditionIsDestructableValidTarget extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - if (ability != null && ability instanceof AbilityBuilderActiveAbility) { - targetsAllowed = ((AbilityBuilderActiveAbility)ability).getTargetsAllowed(); + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null && ability instanceof ABAbilityBuilderActiveAbility) { + targetsAllowed = ((ABAbilityBuilderActiveAbility)ability).getTargetsAllowed(); } else { - List levelData = (List) localStore + List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL))-1) .getTargetsAllowed(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java index fa492838e..083048030 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; public class ABConditionIsPassAllAbilityTargetChecks extends ABCondition { @@ -16,14 +16,14 @@ public class ABConditionIsPassAllAbilityTargetChecks extends ABCondition { private ABWidgetCallback target; @Override - public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; if (caster != null) { theCaster = caster.callback(casterUnit, localStore, castId); } - AbilityBuilderActiveAbility abil = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderActiveAbility abil = (ABAbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java index b7d235ac8..4f73212a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; public class ABConditionIsUnitPassAllAbilityTargetChecks extends ABCondition { @@ -15,7 +15,7 @@ public class ABConditionIsUnitPassAllAbilityTargetChecks extends ABCondition { private ABUnitCallback target; @Override - public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; CUnit theTarget = target.callback(casterUnit, localStore, castId); if (theTarget == null) { @@ -25,7 +25,7 @@ public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int c theCaster = caster.callback(casterUnit, localStore, castId); } - AbilityBuilderActiveAbility abil = (AbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderActiveAbility abil = (ABAbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java index bcc50ce80..3fabf508b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; @@ -25,15 +25,15 @@ public class ABConditionIsUnitValidTarget extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - if (ability != null && ability instanceof AbilityBuilderActiveAbility) { - targetsAllowed = ((AbilityBuilderActiveAbility) ability).getTargetsAllowed(); + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null && ability instanceof ABAbilityBuilderActiveAbility) { + targetsAllowed = ((ABAbilityBuilderActiveAbility) ability).getTargetsAllowed(); } else { - List levelData = (List) localStore + List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1) .getTargetsAllowed(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java index 51f03a7cb..8a1955a8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java @@ -6,14 +6,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABConditionIsValidTarget extends ABCondition { @@ -23,15 +23,15 @@ public class ABConditionIsValidTarget extends ABCondition { @SuppressWarnings("unchecked") @Override - public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; - AbilityBuilderAbility ability = (AbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - if (ability != null && ability instanceof AbilityBuilderActiveAbility) { - targetsAllowed = ((AbilityBuilderActiveAbility) ability).getTargetsAllowed(); + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + if (ability != null && ability instanceof ABAbilityBuilderActiveAbility) { + targetsAllowed = ((ABAbilityBuilderActiveAbility) ability).getTargetsAllowed(); } else { - List levelData = (List) localStore + List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1) .getTargetsAllowed(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java index b902f514b..16a28263e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsTimerActive extends ABCondition { private ABTimerCallback timer; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return timer.callback(caster, localStore, castId).isRunning(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java index 4fb74fa3c..348f410b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionDoesAbilityHaveUniqueFlag extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionDoesAbilityHaveUniqueFlag extends ABCondition { ABStringCallback flag; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CAbility theAbility = ability.callback(caster, localStore, castId); return theAbility.hasUniqueFlag(flag.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java index 9bb9469bc..bc2f08192 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionDoesBuffHaveUniqueFlag extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionDoesBuffHaveUniqueFlag extends ABCondition { ABStringCallback flag; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CBuff theBuff = buff.callback(caster, localStore, castId); return theBuff.hasUniqueFlag(flag.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java index 29a5945dd..75c44fe35 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitType extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsUnitType extends ABCondition { private ABIDCallback unitType; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java index 07c1612bb..93f6a9c7d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionDoesUnitHaveAbilityMatchingCondition extends ABCondition { @@ -15,7 +15,7 @@ public class ABConditionDoesUnitHaveAbilityMatchingCondition extends ABCondition private ABBooleanCallback condition; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java index 81449e7d4..7ef9f94ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsUnitEnemy extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionIsUnitEnemy extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (this.self != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java index d371edf04..60aad0def 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsUnitFriend extends ABCondition { @@ -13,7 +13,7 @@ public class ABConditionIsUnitFriend extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (this.self != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java index 8bddeb61a..28301f19b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsUnitShareSpells extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsUnitShareSpells extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (caster != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java index b9102eb86..a8499bfa3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; @@ -15,7 +15,7 @@ public class ABConditionIsCurrentBehaviorCategoryInList extends ABCondition { private List list; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java index 2e4478e9a..ed3f5a444 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionDoesUnitHaveBuff extends ABCondition { @@ -14,7 +14,7 @@ public class ABConditionDoesUnitHaveBuff extends ABCondition { private ABIDCallback id; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java index 8e4bd4395..bb81b6867 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionDoesUnitHaveBuffMatchingCondition extends ABCondition { @@ -15,7 +15,7 @@ public class ABConditionDoesUnitHaveBuffMatchingCondition extends ABCondition { private ABBooleanCallback condition; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java index 6ac6538d8..bfe02f2a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitBuilding extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java index 0cfea8442..f2ce21a6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitHero extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java index 1f586d308..fe5258bbf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitHeroDuration extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionIsUnitHeroDuration extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(caster, localStore, castId); if (theUnit != null && (theUnit.isHero() || theUnit.isUnitType(CUnitTypeJass.RESISTANT))) { return true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java index 3ceecaaaf..bbcff8278 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitHidden extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java index f1fdbae24..e2ab55538 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitMagicImmune extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java index efca600cc..160583361 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitMorphImmune extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java index 93a73a9b6..310a25346 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitSummoned extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionIsUnitSummoned extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java index e9b52dedd..78696234a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitAlive extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java index 065937413..cec7703f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitDead extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java index 74a3173e5..79c19ccc1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitMaxHp extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java index cd3293675..38adee565 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java @@ -4,14 +4,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitMaxMp extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java index 8831212e1..bbc4686c9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitPolymorphed extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionIsUnitPolymorphed extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java index e1cc3e541..26b38b18a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitSleeping extends ABCondition { @@ -11,7 +11,7 @@ public class ABConditionIsUnitSleeping extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java index 3a5054086..5975e96d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitUpgrading extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java index 436c95e01..b23ab2dbe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitVisible extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionIsUnitVisible extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit casterUnit, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { CUnit theUnit = unit.callback(casterUnit, localStore, castId); CUnit theCaster = casterUnit; if (this.caster != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java index d4b0c181b..2fd7df89a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitConstructing extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java index 127178f82..160d3e227 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitConstructingOrUpgrading extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java index b3ba6342b..61c36abbf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java @@ -3,14 +3,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionIsUnitTraining extends ABCondition { private ABUnitCallback unit; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java index 9566b0d78..7aca48a99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionUnitHasResearch extends ABCondition { @@ -12,7 +12,7 @@ public class ABConditionUnitHasResearch extends ABCondition { private ABIDCallback researchId; @Override - public Boolean callback(CUnit caster, LocalDataStore localStore, final int castId) { + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (unit != null) { theUnit = unit.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java index 1f80a0196..6095a09af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java @@ -14,7 +14,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractCBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; @@ -32,13 +32,13 @@ public abstract class ABBuff extends AbstractCBuff { protected int flags = DISPELLABLE; - protected LocalDataStore localStore; + protected ABLocalDataStore localStore; protected List uniqueFlags = null; private String visibilityGroup = null; private CAbility sourceAbil; protected CUnit sourceUnit; - public ABBuff(int handleId, War3ID code, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABBuff(int handleId, War3ID code, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit) { super(handleId, code, alias); this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java index f1eaad5e9..df6b68dae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABDestructableBuff implements CDestructableBuff { @@ -26,7 +26,7 @@ public class ABDestructableBuff implements CDestructableBuff { private War3ID alias; private int level; - protected LocalDataStore localStore; + protected ABLocalDataStore localStore; protected int castId = 0; private CUnit caster; @@ -34,7 +34,7 @@ public class ABDestructableBuff implements CDestructableBuff { private List onRemoveActions; private List onDeathActions; - public ABDestructableBuff(int handleId, War3ID alias, int level, LocalDataStore localStore, + public ABDestructableBuff(int handleId, War3ID alias, int level, ABLocalDataStore localStore, List onAddActions, List onRemoveActions, List onDeathActions, final int castId, CUnit caster, boolean dispellable) { this.handleId = handleId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java index 323d0d69f..f38645a20 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -13,7 +13,7 @@ public class ABGenericArtBuff extends ABBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABGenericArtBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABGenericArtBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit) { super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setIconShowing(false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java index 304562e25..fe6264ee6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; @@ -16,7 +16,7 @@ public class ABGenericAuraBuff extends ABBuff { private CUnit caster; - public ABGenericAuraBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABGenericAuraBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit caster, boolean leveled, boolean positive) { super(handleId, alias, alias, localStore, sourceAbility, caster); this.caster = caster; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java index f861f1b5b..a4d0cb054 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java @@ -4,11 +4,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABGenericPermanentBuff extends ABBuff { - public ABGenericPermanentBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABGenericPermanentBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, boolean showIcon, boolean leveled, boolean positive) { super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setIconShowing(showIcon); @@ -16,7 +16,7 @@ public ABGenericPermanentBuff(int handleId, War3ID alias, LocalDataStore localSt this.setPositive(positive); } - public ABGenericPermanentBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABGenericPermanentBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, boolean leveled, boolean positive) { super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setLeveled(leveled); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java index b11ee6d36..cfa850602 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABGenericTimedBuff extends ABBuff { private final float duration; private int currentTick = 0; private int expireTick; - public ABGenericTimedBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABGenericTimedBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, boolean leveled, boolean positive, boolean dispellable) { super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java index e813171a3..4743f060f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -28,7 +28,7 @@ public class ABPermanentPassiveBuff extends ABGenericPermanentBuff { protected int castId = 0; public ABPermanentPassiveBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, - LocalDataStore localStore, List onAddActions, List onRemoveActions, boolean showIcon, + ABLocalDataStore localStore, List onAddActions, List onRemoveActions, boolean showIcon, final int castId, boolean leveled, boolean positive) { this(handleId, alias, sourceAbility, sourceUnit, localStore, onAddActions, onRemoveActions, castId, leveled, positive); @@ -36,7 +36,7 @@ public ABPermanentPassiveBuff(int handleId, War3ID alias, CAbility sourceAbility } public ABPermanentPassiveBuff(int handleId, War3ID alias, CAbility sourceAbility, CUnit sourceUnit, - LocalDataStore localStore, List onAddActions, List onRemoveActions, final int castId, + ABLocalDataStore localStore, List onAddActions, List onRemoveActions, final int castId, boolean leveled, boolean positive) { super(handleId, alias, localStore, sourceAbility, sourceUnit, leveled, positive); this.onAddActions = onAddActions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java index a104923b0..8b6473caf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABTargetingBuff extends ABBuff { - public ABTargetingBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTargetingBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit) { super(handleId, alias, alias, localStore, sourceAbility, sourceUnit); this.setIconShowing(false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java index bf2d70ff9..cd0f7aa75 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -15,14 +15,14 @@ public class ABTimedArtBuff extends ABGenericTimedBuff { private SimulationRenderComponent lsfx; private CEffectType artType = CEffectType.TARGET; - public ABTimedArtBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedArtBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showIcon, boolean leveled, boolean positive, boolean dispellable) { this(handleId, alias, localStore, sourceAbility, sourceUnit, duration, leveled, positive, dispellable); this.setIconShowing(showIcon); } - public ABTimedArtBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedArtBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean leveled, boolean positive, boolean dispellable) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, positive, dispellable); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java index ccd0c3185..4d94f1f47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; @@ -30,7 +30,7 @@ public class ABTimedBuff extends ABGenericTimedBuff { private List stateMods = null; private List statBuffs = null; - public ABTimedBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { @@ -39,7 +39,7 @@ public ABTimedBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbili this.setIconShowing(showIcon); } - public ABTimedBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java index 4c8088ddc..a64847901 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java @@ -5,17 +5,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderPassiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.DelayInstantTransformationTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderPassiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABDelayInstantTransformationTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABTimedInstantTransformationBuff extends ABGenericTimedBuff { private OnTransformationActions actions; - private AbilityBuilderPassiveAbility abil; + private ABAbilityBuilderPassiveAbility abil; private CUnitType targetType; private boolean keepRatios; private boolean addAlternateTagAfter; @@ -23,9 +23,9 @@ public class ABTimedInstantTransformationBuff extends ABGenericTimedBuff { private float dur; private float transTime; - public ABTimedInstantTransformationBuff(int handleId, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedInstantTransformationBuff(int handleId, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, OnTransformationActions actions, War3ID alias, float duration, - AbilityBuilderPassiveAbility ability, CUnitType newType, final boolean keepRatios, + ABAbilityBuilderPassiveAbility ability, CUnitType newType, final boolean keepRatios, boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, true, false, true, false); this.setIconShowing(false); @@ -49,7 +49,7 @@ protected void onBuffRemove(CSimulation game, CUnit unit) { @Override public void onDeath(CSimulation game, CUnit unit) { if (unit.isHero()) { - TransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, + ABTransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); unit.remove(game, this); } @@ -58,11 +58,11 @@ public void onDeath(CSimulation game, CUnit unit) { @Override protected void onBuffExpire(CSimulation game, CUnit unit) { if (dur > 0) { - TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); - new DelayInstantTransformationTimer(sourceUnit, localStore, unit, actions, addAlternateTagAfter, + ABTransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); + new ABDelayInstantTransformationTimer(sourceUnit, localStore, unit, actions, addAlternateTagAfter, transTime, null, targetType, keepRatios, abil, null, transTime, 0).start(game); } else { - TransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, + ABTransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); } unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.abil, null); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java index d43c4b976..eff05b2f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java @@ -5,11 +5,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABTimedPausedExpirationBuff extends ABTimedBuff implements CPausedTickingBuff { - public ABTimedPausedExpirationBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedPausedExpirationBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { @@ -17,7 +17,7 @@ public ABTimedPausedExpirationBuff(int handleId, War3ID alias, LocalDataStore lo onRemoveActions, onExpireActions, showIcon, castId, leveled, positive, dispellable); } - public ABTimedPausedExpirationBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedPausedExpirationBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java index cea200725..5fc44a1c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABTimedTargetingBuff extends ABGenericTimedBuff { - public ABTimedTargetingBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedTargetingBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, false, true, false); this.setIconShowing(false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java index e0f55d2b6..b3ae749ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java @@ -8,13 +8,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABTimedTickingBuff extends ABTimedBuff { private List onTickActions; - public ABTimedTickingBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedTickingBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, @@ -24,7 +24,7 @@ public ABTimedTickingBuff(int handleId, War3ID alias, LocalDataStore localStore, this.setIconShowing(showIcon); } - public ABTimedTickingBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedTickingBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java index 30c9aee3d..1f3bb7bbb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java @@ -8,13 +8,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABTimedTickingPausedBuff extends ABTimedBuff implements CPausedTickingBuff { private List onTickActions; - public ABTimedTickingPausedBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedTickingPausedBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, @@ -24,7 +24,7 @@ public ABTimedTickingPausedBuff(int handleId, War3ID alias, LocalDataStore local this.setIconShowing(showIcon); } - public ABTimedTickingPausedBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedTickingPausedBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java index 474a26ce0..a786b2803 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java @@ -7,11 +7,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABTimedTickingPostDeathBuff extends ABTimedTickingBuff { - public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, boolean showIcon, final int castId, final boolean leveled, final boolean positive, @@ -21,7 +21,7 @@ public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, LocalDataStore lo this.setIconShowing(showIcon); } - public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABTimedTickingPostDeathBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, float duration, boolean showTimedLifeBar, List onAddActions, List onRemoveActions, List onExpireActions, List onTickActions, final int castId, final boolean leveled, final boolean positive, final boolean dispellable) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java index 4928e3559..d200afbff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java @@ -5,21 +5,21 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorFinishTransformation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.COrderStartTransformation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorFinishTransformation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABOrderStartTransformation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.DelayInstantTransformationTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABDelayInstantTransformationTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABTimedTransformationBuff extends ABGenericTimedBuff { private OnTransformationActions actions; - private AbilityBuilderAbility abil; + private ABAbilityBuilderAbility abil; private CUnitType targetType; private boolean keepRatios; private boolean addAlternateTagAfter; @@ -33,8 +33,8 @@ public class ABTimedTransformationBuff extends ABGenericTimedBuff { private boolean imTakeOff; private boolean instantTransformation; - public ABTimedTransformationBuff(int handleId, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, - OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderAbility ability, + public ABTimedTransformationBuff(int handleId, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, + OnTransformationActions actions, War3ID alias, float duration, ABAbilityBuilderAbility ability, CUnitType newType, final boolean keepRatios, boolean addAlternateTagAfter, boolean permanent, float transformationDuration, float transformationTime, float landingDelay, float altitudeAdjustmentDelay, float altitudeAdjustmentDuration, boolean immediateLanding, boolean immediateTakeoff) { @@ -56,8 +56,8 @@ public ABTimedTransformationBuff(int handleId, LocalDataStore localStore, CAbili this.instantTransformation = false; } - public ABTimedTransformationBuff(int handleId, LocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, - OnTransformationActions actions, War3ID alias, float duration, AbilityBuilderAbility ability, + public ABTimedTransformationBuff(int handleId, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, + OnTransformationActions actions, War3ID alias, float duration, ABAbilityBuilderAbility ability, CUnitType newType, boolean addAlternateTagAfter, boolean permanent, float transformationDuration) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, true, false, true, false); this.setIconShowing(false); @@ -81,7 +81,7 @@ protected void onBuffRemove(CSimulation game, CUnit unit) { @Override public void onDeath(CSimulation game, CUnit unit) { if (unit.isHero()) { - TransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, + ABTransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); unit.remove(game, this); } @@ -91,8 +91,8 @@ public void onDeath(CSimulation game, CUnit unit) { protected void onBuffExpire(CSimulation game, CUnit unit) { int visibleOrderId = -1; int transformId = -1; - if (abil instanceof AbilityBuilderActiveAbility) { - AbilityBuilderActiveAbility actabil = (AbilityBuilderActiveAbility) abil; + if (abil instanceof ABAbilityBuilderActiveAbility) { + ABAbilityBuilderActiveAbility actabil = (ABAbilityBuilderActiveAbility) abil; if (actabil.isToggleOn()) { actabil.deactivate(game, unit); } @@ -104,19 +104,19 @@ protected void onBuffExpire(CSimulation game, CUnit unit) { unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this.abil, null); if (instantTransformation) { if (dur > 0) { - TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); - new DelayInstantTransformationTimer(sourceUnit, localStore, unit, actions, addAlternateTagAfter, + ABTransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); + new ABDelayInstantTransformationTimer(sourceUnit, localStore, unit, actions, addAlternateTagAfter, transTime, null, targetType, keepRatios, abil, null, transTime, 0).start(game); } else { - TransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, + ABTransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, true); } unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.abil, null); unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.abil, null); } else { this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, unit.getCurrentBehavior()); - unit.order(game, new COrderStartTransformation( - new CBehaviorFinishTransformation(sourceUnit, localStore, unit, abil, targetType, keepRatios, + unit.order(game, new ABOrderStartTransformation( + new ABBehaviorFinishTransformation(sourceUnit, localStore, unit, abil, targetType, keepRatios, actions, addAlternateTagAfter, visibleOrderId, perm, dur, transTime, landTime, atlAdDelay, altAdTime, imLand, imTakeOff, this.getAlias(), targetType, instantTransformation), transformId), false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffSlow.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffSlow.java index 6c61e2231..8b6baec94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffSlow.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffSlow.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericTimedBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; @@ -23,7 +23,7 @@ public class ABBuffSlow extends ABGenericTimedBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias, LocalDataStore localStore, + public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, final float duration, boolean leveled) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, false, false); if (STANDARD_ATTACK_DEBUFF == null) { @@ -38,7 +38,7 @@ public ABBuffSlow(final CSimulation game, final int handleId, final War3ID alias this.moveSpeedDebuff = STANDARD_MOVE_DEBUFF; } - public ABBuffSlow(final int handleId, final War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABBuffSlow(final int handleId, final War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, final float duration, final float attackSpeedReductionPercent, final float moveSpeedReductionPercent, boolean leveled) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, false, false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffStun.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffStun.java index f43ef9407..d511c34b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffStun.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffStun.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericTimedBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -19,7 +19,7 @@ public class ABBuffStun extends ABGenericTimedBuff { private SimulationRenderComponent sfx; private SimulationRenderComponent lsfx; - public ABBuffStun(final int handleId, final War3ID alias, LocalDataStore localStore, CAbility sourceAbility, + public ABBuffStun(final int handleId, final War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, CUnit sourceUnit, final float duration, final boolean leveled) { super(handleId, alias, localStore, sourceAbility, sourceUnit, duration, false, leveled, false, false); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAbilityBuilderGsonBuilder.java similarity index 99% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAbilityBuilderGsonBuilder.java index 28cd6d1f8..4aad8d17e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/AbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAbilityBuilderGsonBuilder.java @@ -129,7 +129,7 @@ import com.google.gson.typeadapters.RuntimeTypeAdapterFactory; @SuppressWarnings({ "unchecked", "rawtypes" }) -public abstract class AbilityBuilderGsonBuilder { +public abstract class ABAbilityBuilderGsonBuilder { private static void registerAbilityCallbacks(RuntimeTypeAdapterFactory callbackTypeFactory) { callbackTypeFactory.registerSubtype(ABCallbackGetStoredAbilityByKey.class, "getStoredAbilityByKey") diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java index 6bd44dd69..b7d2e7b38 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public interface ABAction extends JassTextGeneratorStmt { - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java index 88305a44d..3a0ab44c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorExpr; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public interface ABCallback extends JassTextGeneratorExpr { - public Object callback(final CUnit caster, final LocalDataStore localStore, final int castId); + public Object callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java index 94acd3a06..2c9f966cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorExpr; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public abstract class ABCondition extends ABBooleanCallback implements JassTextGeneratorExpr { - abstract public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId); + abstract public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/DataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABDataStore.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/DataStore.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABDataStore.java index 34dd25a9c..b8b4273c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/DataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABDataStore.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.Set; -public interface DataStore { +public interface ABDataStore { public boolean containsKey(String key); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/GlobalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABGlobalDataStore.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/GlobalDataStore.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABGlobalDataStore.java index dcaf6e125..ac2ef445d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/GlobalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABGlobalDataStore.java @@ -5,12 +5,12 @@ import java.util.Map; import java.util.Set; -public class GlobalDataStore implements DataStore { - public static GlobalDataStore INSTANCE = new GlobalDataStore(); +public class ABGlobalDataStore implements ABDataStore { + public static ABGlobalDataStore INSTANCE = new ABGlobalDataStore(); private Map store; - private GlobalDataStore() { + private ABGlobalDataStore() { this.store = new HashMap<>(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/LocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalDataStore.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/LocalDataStore.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalDataStore.java index 2d8b5d430..fab061772 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/LocalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalDataStore.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -public abstract class LocalDataStore implements DataStore { +public abstract class ABLocalDataStore implements ABDataStore { public CSimulation game = null; // public CUnit originUnit = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/MapLocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABMapLocalDataStore.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/MapLocalDataStore.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABMapLocalDataStore.java index 25aa77e88..248dd6078 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/MapLocalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABMapLocalDataStore.java @@ -7,14 +7,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -public class MapLocalDataStore extends LocalDataStore { +public class ABMapLocalDataStore extends ABLocalDataStore { private Map store; - public MapLocalDataStore() { + public ABMapLocalDataStore() { this.store = new HashMap<>(); } - public MapLocalDataStore(CSimulation game) { + public ABMapLocalDataStore(CSimulation game) { this.store = new HashMap<>(); this.game = game; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java index 5720375d5..748581351 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java @@ -10,19 +10,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABGlobalWidgetEvent extends CGlobalWidgetEvent { private CUnit caster; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private int castId; private ABCondition condition; private List actions; - public ABGlobalWidgetEvent(CUnit caster, LocalDataStore localStore, int castId, CWidget widget, + public ABGlobalWidgetEvent(CUnit caster, ABLocalDataStore localStore, int castId, CWidget widget, JassGameEventsWar3 eventType, ABCondition condition, List actions) { super(localStore.game, localStore.game.getGlobalScope(), null, eventType, null); this.caster = caster; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java index c7b06d51d..e6e662edd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerJass; @@ -17,13 +17,13 @@ public class ABPlayerEvent extends CPlayerEvent { private CUnit caster; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private int castId; private ABCondition condition; private List actions; - public ABPlayerEvent(CUnit caster, LocalDataStore localStore, int castId, CPlayerJass player, + public ABPlayerEvent(CUnit caster, ABLocalDataStore localStore, int castId, CPlayerJass player, JassGameEventsWar3 eventType, ABCondition condition, List actions) { super(localStore.game.getGlobalScope(), player, null, eventType, null); this.caster = caster; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java index 320bac5c1..702b23710 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java @@ -7,13 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation.TimeOfDayEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABTimeOfDayEvent implements TimeOfDayEvent { private CSimulation game; private CUnit caster; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private int castId; private List actions; @@ -22,7 +22,7 @@ public class ABTimeOfDayEvent implements TimeOfDayEvent { private String equalityId; - public ABTimeOfDayEvent(CUnit caster, LocalDataStore localStore, int castId, List actions, + public ABTimeOfDayEvent(CUnit caster, ABLocalDataStore localStore, int castId, List actions, float startTime, float endTime, String equalityId) { super(); this.game = localStore.game; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java index a1a85c8c1..928d9cb28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java @@ -9,20 +9,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CWidgetEvent; public class ABWidgetEvent extends CWidgetEvent { private CUnit caster; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private int castId; private ABCondition condition; private List actions; - public ABWidgetEvent(CUnit caster, LocalDataStore localStore, int castId, CWidget widget, + public ABWidgetEvent(CUnit caster, ABLocalDataStore localStore, int castId, CWidget widget, JassGameEventsWar3 eventType, ABCondition condition, List actions) { super(localStore.game.getGlobalScope(), widget, null, eventType, null); this.caster = caster; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/RandomTypeHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABRandomTypeHandler.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/RandomTypeHandler.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABRandomTypeHandler.java index 0cdd3acd7..3459a9772 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/RandomTypeHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABRandomTypeHandler.java @@ -10,7 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.data.CUnitRace; -public class RandomTypeHandler { +public class ABRandomTypeHandler { private static List landCritters = null; private static List airCritters = null; private static List seaCritters = null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABTransformationHandler.java similarity index 78% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABTransformationHandler.java index c1aeb02de..9df6dfb27 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/TransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABTransformationHandler.java @@ -10,28 +10,28 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTransformationBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.AltitudeAdjustmentTimer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.DelayTimerTimer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.TransformationMorphAnimationTimer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.GetInstantTransformationBuffVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABAltitudeAdjustmentTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABDelayTimerTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTransformationMorphAnimationTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetInstantTransformationBuffVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; -public class TransformationHandler { +public class ABTransformationHandler { - public static void setUnitID(final LocalDataStore localStore, final CUnit unit, final CUnitType newType, + public static void setUnitID(final ABLocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final boolean addAlternateTagAfter, final OnTransformationActions actions, final CAbility ability) { setUnitID(localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability, false); } - public static void setUnitID(final LocalDataStore localStore, final CUnit unit, final CUnitType newType, + public static void setUnitID(final ABLocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final boolean addAlternateTagAfter, final OnTransformationActions actions, final CAbility ability, final boolean updateArt) { final CPlayer pl = localStore.game.getPlayer(unit.getPlayerIndex()); @@ -98,7 +98,7 @@ public static void setTags(final CUnit unit, final boolean addAlternateTagAfter) addAlternateTagAfter ? EnumSet.of(SecondaryTag.ALTERNATE) : SequenceUtils.EMPTY, 1.0f, true); } - public static void beginTakingOff(final LocalDataStore localStore, final CUnit unit, final CUnitType newType, + public static void beginTakingOff(final ABLocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final CAbility ability, final boolean addAlternateTagAfter, final boolean immediateTakeoff, final float altitudeAdjustmentDelay, final float altitudeAdjustmentDuration) { @@ -106,30 +106,30 @@ public static void beginTakingOff(final LocalDataStore localStore, final CUnit u if (timer != null) { localStore.game.unregisterTimer(timer); } - timer = (new DelayTimerTimer( - new AltitudeAdjustmentTimer(unit, newType.getDefaultFlyingHeight(), altitudeAdjustmentDuration), + timer = (new ABDelayTimerTimer( + new ABAltitudeAdjustmentTimer(unit, newType.getDefaultFlyingHeight(), altitudeAdjustmentDuration), localStore, altitudeAdjustmentDelay)); timer.start(localStore.game); localStore.put(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT, timer); - TransformationHandler.setUnitID(localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability); + ABTransformationHandler.setUnitID(localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability); if (immediateTakeoff) { - TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); + ABTransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); } else { - final CTimer t2 = new TransformationMorphAnimationTimer(unit, addAlternateTagAfter, + final CTimer t2 = new ABTransformationMorphAnimationTimer(unit, addAlternateTagAfter, altitudeAdjustmentDelay); t2.start(localStore.game); localStore.put(ABLocalStoreKeys.WAITING_ANIMATION, t2); } } - public static void beginLanding(final LocalDataStore localStore, final CUnit unit, final CUnitType newType, + public static void beginLanding(final ABLocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean addAlternateTagAfter, final boolean immediateLanding, final float landingDelay, final float altitudeAdjustmentDuration) { unit.setFacing(225); if (immediateLanding) { - TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); + ABTransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); } else { - final CTimer timer = new TransformationMorphAnimationTimer(unit, addAlternateTagAfter, landingDelay); + final CTimer timer = new ABTransformationMorphAnimationTimer(unit, addAlternateTagAfter, landingDelay); timer.start(localStore.game); localStore.put(ABLocalStoreKeys.WAITING_ANIMATION, timer); } @@ -137,12 +137,12 @@ public static void beginLanding(final LocalDataStore localStore, final CUnit uni if (timer != null) { localStore.game.unregisterTimer(timer); } - timer = new AltitudeAdjustmentTimer(unit, newType.getDefaultFlyingHeight(), altitudeAdjustmentDuration); + timer = new ABAltitudeAdjustmentTimer(unit, newType.getDefaultFlyingHeight(), altitudeAdjustmentDuration); timer.start(localStore.game); localStore.put(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT, timer); } - public static void startSlowTransformation(final LocalDataStore localStore, final CUnit unit, + public static void startSlowTransformation(final ABLocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, final CAbility ability, final boolean addAlternateTagAfter, final boolean takingOff, final boolean landing, final boolean immediateTakeoff, final boolean immediateLanding, final float altitudeAdjustmentDelay, @@ -156,25 +156,25 @@ public static void startSlowTransformation(final LocalDataStore localStore, fina if (takingOff || landing) { if (takingOff) { - TransformationHandler.beginTakingOff(localStore, unit, newType, keepRatios, actions, ability, + ABTransformationHandler.beginTakingOff(localStore, unit, newType, keepRatios, actions, ability, addAlternateTagAfter, immediateTakeoff, altitudeAdjustmentDelay, altitudeAdjustmentDuration); } if (landing) { - TransformationHandler.beginLanding(localStore, unit, newType, addAlternateTagAfter, immediateLanding, + ABTransformationHandler.beginLanding(localStore, unit, newType, addAlternateTagAfter, immediateLanding, landingDelay, altitudeAdjustmentDuration); } } else { - TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); + ABTransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); } } - public static void finishSlowTransformation(final LocalDataStore localStore, final CUnit unit, + public static void finishSlowTransformation(final ABLocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, - final AbilityBuilderAbility ability, final boolean addAlternateTagAfter, final boolean permanent, + final ABAbilityBuilderAbility ability, final boolean addAlternateTagAfter, final boolean permanent, final boolean takingOff) { if (!takingOff) { - TransformationHandler.setUnitID(localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, + ABTransformationHandler.setUnitID(localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability); } if (permanent) { @@ -182,24 +182,24 @@ public static void finishSlowTransformation(final LocalDataStore localStore, fin } } - public static void instantTransformation(final LocalDataStore localStore, final CUnit unit, final CUnitType newType, - final boolean keepRatios, final OnTransformationActions actions, final AbilityBuilderAbility ability, + public static void instantTransformation(final ABLocalDataStore localStore, final CUnit unit, final CUnitType newType, + final boolean keepRatios, final OnTransformationActions actions, final ABAbilityBuilderAbility ability, final boolean addAlternateTagAfter, final boolean permanent, final boolean playMorph) { if (newType.getTypeId().equals(unit.getTypeId())) { return; } setUnitID(localStore, unit, newType, keepRatios, addAlternateTagAfter, actions, ability, false); if (playMorph) { - TransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); + ABTransformationHandler.playMorphAnimation(unit, addAlternateTagAfter); } if (permanent) { unit.remove(localStore.game, ability); } } - public static void createSlowTransformBackBuff(CUnit sourceUnit, final LocalDataStore localStore, final CUnit unit, + public static void createSlowTransformBackBuff(CUnit sourceUnit, final ABLocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, - final AbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, + final ABAbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, final float transformationTime, final float duration, final boolean permanent, final boolean takingOff, final boolean landing, final boolean immediateTakeoff, final boolean immediateLanding, final float altitudeAdjustmentDelay, final float landingDelay, final float altitudeAdjustmentDuration) { @@ -213,12 +213,12 @@ public static void createSlowTransformBackBuff(CUnit sourceUnit, final LocalData } } - public static void createInstantTransformBackBuff(CUnit sourceUnit, final LocalDataStore localStore, + public static void createInstantTransformBackBuff(CUnit sourceUnit, final ABLocalDataStore localStore, final CUnit unit, final CUnitType newType, final boolean keepRatios, final OnTransformationActions actions, - final AbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, + final ABAbilityBuilderAbility ability, final War3ID buffId, final boolean addAlternateTagAfter, final float transformationTime, final float duration, final boolean permanent) { if (addAlternateTagAfter && (duration > 0)) { - final ABBuff thebuff = ability.visit(GetInstantTransformationBuffVisitor.getInstance().reset( + final ABBuff thebuff = ability.visit(ABGetInstantTransformationBuffVisitor.getInstance().reset( localStore.game, sourceUnit, localStore, newType, keepRatios, actions, buffId, addAlternateTagAfter, transformationTime, duration, permanent)); if (thebuff != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/UnitAndRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitAndRangeComparator.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/UnitAndRange.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitAndRangeComparator.java index fdef0c325..1ceac51d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/UnitAndRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitAndRangeComparator.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -public class UnitAndRange { +public class ABUnitAndRangeComparator { private CUnit unit; private double range; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java index 750ed5772..5aedbf6ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java @@ -5,16 +5,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABUnitComparator implements Comparator { private CUnit caster; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private int castId; private ABIntegerCallback comparison; - public ABUnitComparator(final CUnit caster, final LocalDataStore localStore, final int castId, + public ABUnitComparator(final CUnit caster, final ABLocalDataStore localStore, final int castId, ABIntegerCallback comparison) { this.caster = caster; this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java index 1dfa6b724..51b4582e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java @@ -11,7 +11,7 @@ import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionJass implements ABAction { private final CodeJassValue jassFunction; @@ -21,7 +21,7 @@ public ABActionJass(final CodeJassValue jassFunction) { } @Override - public void runAction(final CUnit caster, final LocalDataStore localStore, final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final GlobalScope globalScope = localStore.game.getGlobalScope(); final JassThread thread = globalScope.createThread(this.jassFunction, CommonTriggerExecutionScope.abilityBuilder(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java index bd6c09202..2d8202562 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABConditionJass extends ABCondition { private final TriggerBooleanExpression boolExpr; @@ -18,7 +18,7 @@ public ABConditionJass(final TriggerBooleanExpression boolExpr) { } @Override - public Boolean callback(final CUnit caster, final LocalDataStore localStore, final int castId) { + public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { return this.boolExpr.evaluate(localStore.game.getGlobalScope(), CommonTriggerExecutionScope.abilityBuilder(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java index 879d97f0f..2e355b54f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java @@ -8,17 +8,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.listeners.CUnitAbilityEffectReactionListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABAbilityEffectReactionListener implements CUnitAbilityEffectReactionListener { - private LocalDataStore localStore; + private ABLocalDataStore localStore; private List actions; private int triggerId = 0; private boolean useCastId; - public ABAbilityEffectReactionListener(LocalDataStore localStore, List actions, int castId, boolean useCastId) { + public ABAbilityEffectReactionListener(ABLocalDataStore localStore, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java index b3d419f7b..6a160ef5a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java @@ -6,19 +6,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.listeners.CUnitAbilityProjReactionListener; public class ABAbilityProjReactionListener implements CUnitAbilityProjReactionListener { - private LocalDataStore localStore; + private ABLocalDataStore localStore; private List actions; private int triggerId = 0; private boolean useCastId; - public ABAbilityProjReactionListener(LocalDataStore localStore, List actions, int castId, boolean useCastId) { + public ABAbilityProjReactionListener(ABLocalDataStore localStore, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java index eb988c9e5..bf016c1e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java @@ -6,19 +6,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackEvasionListener; public class ABAttackEvasionListener implements CUnitAttackEvasionListener { - private LocalDataStore localStore; + private ABLocalDataStore localStore; private List conditions; private int triggerId = 0; private boolean useCastId; - public ABAttackEvasionListener(LocalDataStore localStore, List conditions, int castId, boolean useCastId) { + public ABAttackEvasionListener(ABLocalDataStore localStore, List conditions, int castId, boolean useCastId) { this.localStore = localStore; this.conditions = conditions; this.useCastId = useCastId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java index 65575121c..06c5faa33 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; @@ -22,11 +22,11 @@ public class ABAttackModifier implements CUnitAttackModifier { private ABCondition condition; private List modification; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private int castId = Integer.MAX_VALUE; private boolean useCastId; - public ABAttackModifier(LocalDataStore localStore, int castId, ABIntegerCallback priority, + public ABAttackModifier(ABLocalDataStore localStore, int castId, ABIntegerCallback priority, ABCondition preLaunchCondition, List preLaunchModification, ABCondition condition, List modification, boolean useCastId) { this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java index ef575fcb9..8b3354549 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java @@ -8,21 +8,21 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPostDamageListener; public class ABAttackPostDamageListener implements CUnitAttackPostDamageListener { - private LocalDataStore localStore; + private ABLocalDataStore localStore; private ABIntegerCallback priority; private List actions; private int triggerId = 0; private boolean useCastId; - public ABAttackPostDamageListener(LocalDataStore localStore, ABIntegerCallback priority, List actions, int castId, boolean useCastId) { + public ABAttackPostDamageListener(ABLocalDataStore localStore, ABIntegerCallback priority, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.priority = priority; this.actions = actions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java index bed044193..e23a653e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListener; @@ -15,13 +15,13 @@ public class ABAttackPreDamageListener implements CUnitAttackPreDamageListener { - private LocalDataStore localStore; + private ABLocalDataStore localStore; private List actions; private int triggerId = 0; private boolean useCastId; - public ABAttackPreDamageListener(LocalDataStore localStore, List actions, int castId, + public ABAttackPreDamageListener(ABLocalDataStore localStore, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.actions = actions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java index 2fb0f7a45..1209984b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java @@ -6,19 +6,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.listeners.CUnitAttackProjReactionListener; public class ABAttackProjReactionListener implements CUnitAttackProjReactionListener { - private LocalDataStore localStore; + private ABLocalDataStore localStore; private List actions; private int triggerId = 0; private boolean useCastId; - public ABAttackProjReactionListener(LocalDataStore localStore, List actions, int castId, + public ABAttackProjReactionListener(ABLocalDataStore localStore, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.actions = actions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java index 6c093f7d0..6eb16c501 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java @@ -6,19 +6,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitBehaviorChangeListener; public class ABBehaviorChangeListener implements CUnitBehaviorChangeListener { - private LocalDataStore localStore; + private ABLocalDataStore localStore; private List actions; private int triggerId = 0; private boolean useCastId; - public ABBehaviorChangeListener(LocalDataStore localStore, List actions, int castId, boolean useCastId) { + public ABBehaviorChangeListener(ABLocalDataStore localStore, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java index 506f32244..47eeb42cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java @@ -7,20 +7,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenListener; public class ABDamageTakenListener implements CUnitAttackDamageTakenListener { - private LocalDataStore localStore; + private ABLocalDataStore localStore; private ABIntegerCallback priority; private List actions; private int triggerId = 0; private boolean useCastId; - public ABDamageTakenListener(LocalDataStore localStore, ABIntegerCallback priority, List actions, + public ABDamageTakenListener(ABLocalDataStore localStore, ABIntegerCallback priority, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.priority = priority; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java index aa0b13d3c..d11978ab2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java @@ -7,20 +7,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListener; public class ABDamageTakenModificationListener implements CUnitAttackDamageTakenModificationListener { - private LocalDataStore localStore; + private ABLocalDataStore localStore; private ABIntegerCallback priority; private List actions; private int triggerId = 0; private boolean useCastId; - public ABDamageTakenModificationListener(LocalDataStore localStore, ABIntegerCallback priority, + public ABDamageTakenModificationListener(ABLocalDataStore localStore, ABIntegerCallback priority, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.priority = priority; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java index cd0593758..2f0e95723 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java @@ -6,20 +6,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; public class ABDeathReplacementEffect implements CUnitDeathReplacementEffect { - private LocalDataStore localStore; + private ABLocalDataStore localStore; private List actions; private int triggerId = 0; private boolean useCastId; - public ABDeathReplacementEffect(LocalDataStore localStore, List actions, int castId, boolean useCastId) { + public ABDeathReplacementEffect(ABLocalDataStore localStore, List actions, int castId, boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java index 43311859c..40a287b9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java @@ -5,11 +5,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitStateListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABUnitStateListener implements CUnitStateListener { private CUnit caster; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private int castId; private List onLifeChanged = null; @@ -25,7 +25,7 @@ public class ABUnitStateListener implements CUnitStateListener { private List onUpgradesChanged = null; private List onHideStateChanged = null; - public ABUnitStateListener(CUnit caster, LocalDataStore localStore, int castId, List onLifeChanged, + public ABUnitStateListener(CUnit caster, ABLocalDataStore localStore, int castId, List onLifeChanged, List onManaChanged, List onOrdersChanged, List onQueueChanged, List onRallyPointChanged, List onWaypointsChanged, List onHeroStatsChanged, List onInventoryChanged, List onAttacksChanged, List onAbilitiesChanged, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderConfiguration.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderConfiguration.java index aad342011..d01426d73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderConfiguration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderConfiguration.java @@ -8,12 +8,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderOverrideFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderSpecialConfigFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderSpecialDisplayFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.definitions.impl.CAbilityTypeDefinitionAbilityBuilder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderOverrideFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderSpecialConfigFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderSpecialDisplayFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.definitions.impl.ABAbilityBuilderTypeDefinition; -public class AbilityBuilderConfiguration { +public class ABAbilityBuilderConfiguration { private String id; private String castId; @@ -22,10 +22,10 @@ public class AbilityBuilderConfiguration { private String autoCastOffId; private AutocastType autoCastType; - private AbilityBuilderType type; - private AbilityBuilderSpecialDisplayFields displayFields; - private AbilityBuilderSpecialConfigFields specialFields; - private AbilityBuilderOverrideFields overrideFields; + private ABAbilityBuilderType type; + private ABAbilityBuilderSpecialDisplayFields displayFields; + private ABAbilityBuilderSpecialConfigFields specialFields; + private ABAbilityBuilderOverrideFields overrideFields; private List extraTargetConditions; private List extraAutoTargetConditions; @@ -56,7 +56,7 @@ public class AbilityBuilderConfiguration { private List initialUniqueFlags; - public AbilityBuilderConfiguration(AbilityBuilderParser parser, AbilityBuilderDupe dupe) { + public ABAbilityBuilderConfiguration(ABAbilityBuilderParser parser, ABAbilityBuilderDupe dupe) { this.id = dupe.getId(); this.castId = dupe.getCastId(); this.uncastId = dupe.getUncastId(); @@ -97,8 +97,8 @@ public AbilityBuilderConfiguration(AbilityBuilderParser parser, AbilityBuilderDu this.setInitialUniqueFlags(parser.getInitialUniqueFlags()); } - public CAbilityTypeDefinitionAbilityBuilder createDefinition() { - return new CAbilityTypeDefinitionAbilityBuilder(this); + public ABAbilityBuilderTypeDefinition createDefinition() { + return new ABAbilityBuilderTypeDefinition(this); } public String getId() { @@ -155,35 +155,35 @@ public void setAutoCastType(AutocastType autoCastType) { this.autoCastType = autoCastType; } - public AbilityBuilderType getType() { + public ABAbilityBuilderType getType() { return type; } - public void setType(AbilityBuilderType type) { + public void setType(ABAbilityBuilderType type) { this.type = type; } - public AbilityBuilderSpecialDisplayFields getDisplayFields() { + public ABAbilityBuilderSpecialDisplayFields getDisplayFields() { return displayFields; } - public void setDisplayFields(AbilityBuilderSpecialDisplayFields displayFields) { + public void setDisplayFields(ABAbilityBuilderSpecialDisplayFields displayFields) { this.displayFields = displayFields; } - public AbilityBuilderSpecialConfigFields getSpecialFields() { + public ABAbilityBuilderSpecialConfigFields getSpecialFields() { return specialFields; } - public void setSpecialFields(AbilityBuilderSpecialConfigFields specialFields) { + public void setSpecialFields(ABAbilityBuilderSpecialConfigFields specialFields) { this.specialFields = specialFields; } - public AbilityBuilderOverrideFields getOverrideFields() { + public ABAbilityBuilderOverrideFields getOverrideFields() { return overrideFields; } - public void setOverrideFields(AbilityBuilderOverrideFields overrideFields) { + public void setOverrideFields(ABAbilityBuilderOverrideFields overrideFields) { this.overrideFields = overrideFields; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderDupe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderDupe.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderDupe.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderDupe.java index 0113a8381..805793af8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderDupe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderDupe.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; -public class AbilityBuilderDupe { +public class ABAbilityBuilderDupe { private String id; private String castId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderFile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderFile.java new file mode 100644 index 000000000..2fd3b41cc --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderFile.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; + +import java.util.List; + +public class ABAbilityBuilderFile { + List abilityList; + + public List getAbilityList() { + return abilityList; + } + + public void setAbilityList(List abilityList) { + this.abilityList = abilityList; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParser.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParser.java index 7d302eb10..a18891fb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParser.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParser.java @@ -9,22 +9,22 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderOverrideFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderParserTemplateFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderSpecialConfigFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.AbilityBuilderSpecialDisplayFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.MeleeRangeTargetOverride; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.StatBuffFromDataField; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderOverrideFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderParserTemplateFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderSpecialConfigFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderSpecialDisplayFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABMeleeRangeTargetOverride; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABStatBuffFromDataField; -public class AbilityBuilderParser { +public class ABAbilityBuilderParser { - private List ids; + private List ids; private String parentId; - private AbilityBuilderType type; - private AbilityBuilderSpecialDisplayFields displayFields; - private AbilityBuilderSpecialConfigFields specialFields; - private AbilityBuilderOverrideFields overrideFields; + private ABAbilityBuilderType type; + private ABAbilityBuilderSpecialDisplayFields displayFields; + private ABAbilityBuilderSpecialConfigFields specialFields; + private ABAbilityBuilderOverrideFields overrideFields; private List extraTargetConditions; private List extraAutoTargetConditions; @@ -55,33 +55,33 @@ public class AbilityBuilderParser { private List initialUniqueFlags; //Template only - private AbilityBuilderParserTemplateFields templateFields; + private ABAbilityBuilderParserTemplateFields templateFields; - public void updateFromParent(AbilityBuilderParser parent) { + public void updateFromParent(ABAbilityBuilderParser parent) { this.type = parent.type; if (parent.displayFields != null) { if (this.displayFields == null) { - this.displayFields = new AbilityBuilderSpecialDisplayFields(); + this.displayFields = new ABAbilityBuilderSpecialDisplayFields(); } this.displayFields.updateFromParent(parent.displayFields); } if (parent.specialFields != null) { if (this.specialFields == null) { - this.specialFields = new AbilityBuilderSpecialConfigFields(); + this.specialFields = new ABAbilityBuilderSpecialConfigFields(); } this.specialFields.updateFromParent(parent.specialFields); } if (parent.overrideFields != null) { if (this.overrideFields == null) { - this.overrideFields = new AbilityBuilderOverrideFields(); + this.overrideFields = new ABAbilityBuilderOverrideFields(); } this.overrideFields.updateFromParent(parent.overrideFields); } if (parent.templateFields != null) { if (this.templateFields == null) { - this.templateFields = new AbilityBuilderParserTemplateFields(); + this.templateFields = new ABAbilityBuilderParserTemplateFields(); } this.templateFields.updateFromParent(parent.templateFields); } @@ -150,11 +150,11 @@ public void updateFromParent(AbilityBuilderParser parent) { this.initialUniqueFlags = parent.initialUniqueFlags; } - public List getIds() { + public List getIds() { return ids; } - public void setIds(List ids) { + public void setIds(List ids) { this.ids = ids; } @@ -166,35 +166,35 @@ public void setParentId(String parentId) { this.parentId = parentId; } - public AbilityBuilderType getType() { + public ABAbilityBuilderType getType() { return type; } - public void setType(AbilityBuilderType type) { + public void setType(ABAbilityBuilderType type) { this.type = type; } - public AbilityBuilderSpecialDisplayFields getDisplayFields() { + public ABAbilityBuilderSpecialDisplayFields getDisplayFields() { return displayFields; } - public void setDisplayFields(AbilityBuilderSpecialDisplayFields displayFields) { + public void setDisplayFields(ABAbilityBuilderSpecialDisplayFields displayFields) { this.displayFields = displayFields; } - public AbilityBuilderSpecialConfigFields getSpecialFields() { + public ABAbilityBuilderSpecialConfigFields getSpecialFields() { return specialFields; } - public void setSpecialFields(AbilityBuilderSpecialConfigFields specialFields) { + public void setSpecialFields(ABAbilityBuilderSpecialConfigFields specialFields) { this.specialFields = specialFields; } - public AbilityBuilderOverrideFields getOverrideFields() { + public ABAbilityBuilderOverrideFields getOverrideFields() { return overrideFields; } - public void setOverrideFields(AbilityBuilderOverrideFields overrideFields) { + public void setOverrideFields(ABAbilityBuilderOverrideFields overrideFields) { this.overrideFields = overrideFields; } @@ -384,11 +384,11 @@ public void setReuseCallbacks(Map reuseCallbacks) { this.reuseCallbacks = reuseCallbacks; } - public AbilityBuilderTemplateType getTemplateType() { + public ABAbilityBuilderTemplateType getTemplateType() { return templateFields.getTemplateType(); } - public void setTemplateType(AbilityBuilderTemplateType templateType) { + public void setTemplateType(ABAbilityBuilderTemplateType templateType) { this.templateFields.setTemplateType(templateType); } @@ -432,19 +432,19 @@ public void setLevellingAbilityIdsToAdd(List levellingAbilityIdsToAdd) { this.templateFields.setLevellingAbilityIdsToAdd(levellingAbilityIdsToAdd); } - public List getStatBuffsFromDataFields() { + public List getStatBuffsFromDataFields() { return templateFields.getStatBuffsFromDataFields(); } - public void setStatBuffsFromDataFields(List statBuffsFromDataFields) { + public void setStatBuffsFromDataFields(List statBuffsFromDataFields) { this.templateFields.setStatBuffsFromDataFields(statBuffsFromDataFields); } - public MeleeRangeTargetOverride getMeleeRangeTargetOverride() { + public ABMeleeRangeTargetOverride getMeleeRangeTargetOverride() { return templateFields.getMeleeRangeTargetOverride(); } - public void setMeleeRangeTargetOverride(MeleeRangeTargetOverride meleeRangeTargetOverride) { + public void setMeleeRangeTargetOverride(ABMeleeRangeTargetOverride meleeRangeTargetOverride) { this.templateFields.setMeleeRangeTargetOverride(meleeRangeTargetOverride); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserUtil.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParserUtil.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserUtil.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParserUtil.java index 9acfca137..ca84b1938 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderParserUtil.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParserUtil.java @@ -4,16 +4,16 @@ import java.io.FileNotFoundException; import java.io.FileReader; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.AbilityBuilderGsonBuilder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAbilityBuilderGsonBuilder; import com.google.gson.Gson; import com.google.gson.JsonParseException; -public class AbilityBuilderParserUtil { +public class ABAbilityBuilderParserUtil { public static void loadAbilityBuilderFiles(final AbilityBuilderFileListener listener) { loadAbilityBuilderFiles(listener, "abilityBehaviors"); } public static void loadAbilityBuilderFiles(final AbilityBuilderFileListener listener, String folder) { - final Gson gson = AbilityBuilderGsonBuilder.create(); + final Gson gson = ABAbilityBuilderGsonBuilder.create(); try { final File abilityBehaviorsDir = new File(folder); final File[] abilityBehaviorFiles = abilityBehaviorsDir.listFiles(); @@ -39,9 +39,9 @@ public static void loadAbilityBuilderFile(final Gson gson, final File abilityBeh } } try { - final AbilityBuilderFile behaviors = gson.fromJson(new FileReader(abilityBehaviorFile), - AbilityBuilderFile.class); - for (final AbilityBuilderParser behavior : behaviors.getAbilityList()) { + final ABAbilityBuilderFile behaviors = gson.fromJson(new FileReader(abilityBehaviorFile), + ABAbilityBuilderFile.class); + for (final ABAbilityBuilderParser behavior : behaviors.getAbilityList()) { listener.callback(behavior); } } @@ -59,6 +59,6 @@ public static void loadAbilityBuilderFile(final Gson gson, final File abilityBeh } public static interface AbilityBuilderFileListener { - void callback(AbilityBuilderParser behavior); + void callback(ABAbilityBuilderParser behavior); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderTemplateType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderTemplateType.java similarity index 76% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderTemplateType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderTemplateType.java index 72f516608..6f3fc0dc9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderTemplateType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderTemplateType.java @@ -1,6 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; -public enum AbilityBuilderTemplateType { +public enum ABAbilityBuilderTemplateType { AURA, AURA_SIMPLE, AURA_STATS, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderType.java similarity index 75% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderType.java index 916b34559..4c704d5dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderType.java @@ -2,7 +2,7 @@ import com.etheller.interpreter.ast.util.CHandle; -public enum AbilityBuilderType implements CHandle { +public enum ABAbilityBuilderType implements CHandle { NORMAL_AUTOTARGET, NORMAL_PAIRING, NORMAL_FLEXTARGET, @@ -19,5 +19,5 @@ public int getHandleId() { return ordinal(); } - public static final AbilityBuilderType[] VALUES = values(); + public static final ABAbilityBuilderType[] VALUES = values(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderFile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderFile.java deleted file mode 100644 index 887c18d6b..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/AbilityBuilderFile.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; - -import java.util.List; - -public class AbilityBuilderFile { - List abilityList; - - public List getAbilityList() { - return abilityList; - } - - public void setAbilityList(List abilityList) { - this.abilityList = abilityList; - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderOverrideFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderOverrideFields.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderOverrideFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderOverrideFields.java index 1574b9251..b4b09e78f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderOverrideFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderOverrideFields.java @@ -9,7 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -public class AbilityBuilderOverrideFields { +public class ABAbilityBuilderOverrideFields { private ABFloatCallback areaOverride; private ABFloatCallback rangeOverride; @@ -32,7 +32,7 @@ public class AbilityBuilderOverrideFields { List extraTargetsAllowed; List excludedTargetsAllowed; - public void updateFromParent(AbilityBuilderOverrideFields parent) { + public void updateFromParent(ABAbilityBuilderOverrideFields parent) { if (this.areaOverride == null) this.areaOverride = parent.areaOverride; if (this.rangeOverride == null) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderParserTemplateFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderParserTemplateFields.java similarity index 76% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderParserTemplateFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderParserTemplateFields.java index c0f3d024a..3568bdaf9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderParserTemplateFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderParserTemplateFields.java @@ -5,13 +5,13 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderTemplateType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.MeleeRangeTargetOverride; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.StatBuffFromDataField; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderTemplateType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABMeleeRangeTargetOverride; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABStatBuffFromDataField; -public class AbilityBuilderParserTemplateFields { +public class ABAbilityBuilderParserTemplateFields { //Template only - private AbilityBuilderTemplateType templateType; + private ABAbilityBuilderTemplateType templateType; //Aura template private List addToAuraActions; private List updateAuraLevelActions; @@ -20,10 +20,10 @@ public class AbilityBuilderParserTemplateFields { private Map> abilityIdsToAddPerLevel; private List levellingAbilityIdsToAdd; //StatList - private List statBuffsFromDataFields; - private MeleeRangeTargetOverride meleeRangeTargetOverride; + private List statBuffsFromDataFields; + private ABMeleeRangeTargetOverride meleeRangeTargetOverride; - public void updateFromParent(AbilityBuilderParserTemplateFields parent) { + public void updateFromParent(ABAbilityBuilderParserTemplateFields parent) { if (this.templateType == null) this.templateType = parent.templateType; @@ -45,11 +45,11 @@ public void updateFromParent(AbilityBuilderParserTemplateFields parent) { this.meleeRangeTargetOverride = parent.meleeRangeTargetOverride; } - public AbilityBuilderTemplateType getTemplateType() { + public ABAbilityBuilderTemplateType getTemplateType() { return templateType; } - public void setTemplateType(AbilityBuilderTemplateType templateType) { + public void setTemplateType(ABAbilityBuilderTemplateType templateType) { this.templateType = templateType; } @@ -93,19 +93,19 @@ public void setLevellingAbilityIdsToAdd(List levellingAbilityIdsToAdd) { this.levellingAbilityIdsToAdd = levellingAbilityIdsToAdd; } - public List getStatBuffsFromDataFields() { + public List getStatBuffsFromDataFields() { return statBuffsFromDataFields; } - public void setStatBuffsFromDataFields(List statBuffsFromDataFields) { + public void setStatBuffsFromDataFields(List statBuffsFromDataFields) { this.statBuffsFromDataFields = statBuffsFromDataFields; } - public MeleeRangeTargetOverride getMeleeRangeTargetOverride() { + public ABMeleeRangeTargetOverride getMeleeRangeTargetOverride() { return meleeRangeTargetOverride; } - public void setMeleeRangeTargetOverride(MeleeRangeTargetOverride meleeRangeTargetOverride) { + public void setMeleeRangeTargetOverride(ABMeleeRangeTargetOverride meleeRangeTargetOverride) { this.meleeRangeTargetOverride = meleeRangeTargetOverride; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialConfigFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialConfigFields.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialConfigFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialConfigFields.java index e096a502e..39bc2b8f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialConfigFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialConfigFields.java @@ -12,7 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeysEnum; -public class AbilityBuilderSpecialConfigFields { +public class ABAbilityBuilderSpecialConfigFields { private ABIntegerCallback bufferManaRequired; private ABIntegerCallback manaDrainedPerSecond; @@ -38,7 +38,7 @@ public class AbilityBuilderSpecialConfigFields { private CBehaviorCategory behaviorCategory; - public void updateFromParent(AbilityBuilderSpecialConfigFields parent) { + public void updateFromParent(ABAbilityBuilderSpecialConfigFields parent) { if (this.bufferManaRequired == null) this.bufferManaRequired = parent.bufferManaRequired; if (this.manaDrainedPerSecond == null) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialDisplayFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialDisplayFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java index e1d6a6786..3259f9705 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/AbilityBuilderSpecialDisplayFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -public class AbilityBuilderSpecialDisplayFields { +public class ABAbilityBuilderSpecialDisplayFields { private ABBooleanCallback showOnAndOffIcons; @@ -26,7 +26,7 @@ public class AbilityBuilderSpecialDisplayFields { private ABBooleanCallback isMenu; private ABIntegerCallback menuId; - public void updateFromParent(AbilityBuilderSpecialDisplayFields parent) { + public void updateFromParent(ABAbilityBuilderSpecialDisplayFields parent) { if (this.showOnAndOffIcons == null) this.showOnAndOffIcons = parent.showOnAndOffIcons; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/DataFieldLetter.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABDataFieldLetter.java similarity index 72% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/DataFieldLetter.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABDataFieldLetter.java index 571426d00..2e10fc04b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/DataFieldLetter.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABDataFieldLetter.java @@ -2,7 +2,7 @@ import com.etheller.interpreter.ast.util.CHandle; -public enum DataFieldLetter implements CHandle { +public enum ABDataFieldLetter implements CHandle { A(0), B(1), C(2), @@ -16,7 +16,7 @@ public enum DataFieldLetter implements CHandle { private int index; - DataFieldLetter(int index) { + ABDataFieldLetter(int index) { this.index = index; } @@ -29,5 +29,5 @@ public int getHandleId() { return ordinal(); } - public static final DataFieldLetter[] VALUES = values(); + public static final ABDataFieldLetter[] VALUES = values(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/MeleeRangeTargetOverride.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABMeleeRangeTargetOverride.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/MeleeRangeTargetOverride.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABMeleeRangeTargetOverride.java index a7f076005..ba5551893 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/MeleeRangeTargetOverride.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABMeleeRangeTargetOverride.java @@ -1,6 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template; -public class MeleeRangeTargetOverride { +public class ABMeleeRangeTargetOverride { private boolean targetMelee; private boolean targetRange; public boolean isTargetMelee() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/StatBuffFromDataField.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffFromDataField.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/StatBuffFromDataField.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffFromDataField.java index 09e6261a5..87eca90c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/StatBuffFromDataField.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffFromDataField.java @@ -1,22 +1,22 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; -public class StatBuffFromDataField { - private StatBuffType type; - private DataFieldLetter percentageBooleanField; - private DataFieldLetter flatBooleanField; - private DataFieldLetter dataField; +public class ABStatBuffFromDataField { + private ABStatBuffType type; + private ABDataFieldLetter percentageBooleanField; + private ABDataFieldLetter flatBooleanField; + private ABDataFieldLetter dataField; private Boolean percentageOverride; - private DataFieldLetter targetMeleeField; - private DataFieldLetter targetRangeField; + private ABDataFieldLetter targetMeleeField; + private ABDataFieldLetter targetRangeField; private transient NonStackingStatBuff buff; private transient NonStackingStatBuff secondAtkBuff; - public StatBuffFromDataField(StatBuffFromDataField statBuff) { + public ABStatBuffFromDataField(ABStatBuffFromDataField statBuff) { this.type = statBuff.getType(); this.percentageBooleanField = statBuff.getPercentageBooleanField(); this.flatBooleanField = statBuff.getFlatBooleanField(); @@ -25,28 +25,28 @@ public StatBuffFromDataField(StatBuffFromDataField statBuff) { this.targetMeleeField = statBuff.getTargetMeleeField(); this.targetRangeField = statBuff.getTargetRangeField(); } - public StatBuffType getType() { + public ABStatBuffType getType() { return type; } - public void setType(StatBuffType type) { + public void setType(ABStatBuffType type) { this.type = type; } - public DataFieldLetter getPercentageBooleanField() { + public ABDataFieldLetter getPercentageBooleanField() { return percentageBooleanField; } - public void setPercentageBooleanField(DataFieldLetter percentageBooleanField) { + public void setPercentageBooleanField(ABDataFieldLetter percentageBooleanField) { this.percentageBooleanField = percentageBooleanField; } - public DataFieldLetter getFlatBooleanField() { + public ABDataFieldLetter getFlatBooleanField() { return flatBooleanField; } - public void setFlatBooleanField(DataFieldLetter flatBooleanField) { + public void setFlatBooleanField(ABDataFieldLetter flatBooleanField) { this.flatBooleanField = flatBooleanField; } - public DataFieldLetter getDataField() { + public ABDataFieldLetter getDataField() { return dataField; } - public void setDataField(DataFieldLetter dataField) { + public void setDataField(ABDataFieldLetter dataField) { this.dataField = dataField; } public Boolean isPercentageOverride() { @@ -55,16 +55,16 @@ public Boolean isPercentageOverride() { public void setPercentageOverride(Boolean percentageOverride) { this.percentageOverride = percentageOverride; } - public DataFieldLetter getTargetMeleeField() { + public ABDataFieldLetter getTargetMeleeField() { return targetMeleeField; } - public void setTargetMeleeField(DataFieldLetter targetMeleeField) { + public void setTargetMeleeField(ABDataFieldLetter targetMeleeField) { this.targetMeleeField = targetMeleeField; } - public DataFieldLetter getTargetRangeField() { + public ABDataFieldLetter getTargetRangeField() { return targetRangeField; } - public void setTargetRangeField(DataFieldLetter targetRangeField) { + public void setTargetRangeField(ABDataFieldLetter targetRangeField) { this.targetRangeField = targetRangeField; } public NonStackingStatBuff getBuff() { @@ -80,7 +80,7 @@ public void setSecondAtkBuff(NonStackingStatBuff secondAtkBuff) { this.secondAtkBuff = secondAtkBuff; } - public NonStackingStatBuffType convertToNonStackingType(CAbilityTypeAbilityBuilderLevelData abilityData) { + public NonStackingStatBuffType convertToNonStackingType(ABAbilityBuilderAbilityTypeLevelData abilityData) { boolean percentage = false; if (this.isPercentageOverride() != null) { percentage = this.isPercentageOverride(); @@ -101,7 +101,7 @@ public NonStackingStatBuffType convertToNonStackingType(CAbilityTypeAbilityBuild } } } - if (this.getType() == StatBuffType.ATK) { + if (this.getType() == ABStatBuffType.ATK) { boolean targetMelee = false; boolean targetRange = false; if (this.getTargetMeleeField() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/StatBuffType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffType.java similarity index 99% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/StatBuffType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffType.java index 4b15107b7..0cc6da2a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/StatBuffType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffType.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; -public enum StatBuffType { +public enum ABStatBuffType { ATK, ATKSPD, DEF, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java index 293abcc7a..94172f259 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java @@ -12,7 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -24,11 +24,11 @@ public class ABCollisionProjectileListener implements CAbilityCollisionProjectil private List onHit; private CUnit caster; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private int castId; public ABCollisionProjectileListener(List onLaunch, List onPreHits, - List canHitTarget, List onHit, CUnit caster, LocalDataStore localStore, int castId) { + List canHitTarget, List onHit, CUnit caster, ABLocalDataStore localStore, int castId) { super(); this.onLaunch = onLaunch; this.onPreHits = onPreHits; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java index 5ca83724d..da3960c91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java @@ -10,7 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -20,10 +20,10 @@ public class ABProjectileListener implements CAbilityProjectileListener { private List onHit; private CUnit caster; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private int castId; - public ABProjectileListener(List onLaunch, List onHit, CUnit caster, LocalDataStore localStore, + public ABProjectileListener(List onLaunch, List onHit, CUnit caster, ABLocalDataStore localStore, int castId) { super(); this.onLaunch = onLaunch; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/AltitudeAdjustmentTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABAltitudeAdjustmentTimer.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/AltitudeAdjustmentTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABAltitudeAdjustmentTimer.java index 36a773d18..12629a8f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/AltitudeAdjustmentTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABAltitudeAdjustmentTimer.java @@ -5,13 +5,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; -public class AltitudeAdjustmentTimer extends CTimer { +public class ABAltitudeAdjustmentTimer extends CTimer { private CUnit unit; private float heightInc; private int durTicks; private int endTick = 0; - public AltitudeAdjustmentTimer(CUnit unit, float targetHeight, float duration) { + public ABAltitudeAdjustmentTimer(CUnit unit, float targetHeight, float duration) { super(); this.unit = unit; durTicks = Math.round(duration / WarsmashConstants.SIMULATION_STEP_TIME); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayInstantTransformationTimer.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayInstantTransformationTimer.java index 5a8ee778f..54575e7e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayInstantTransformationTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayInstantTransformationTimer.java @@ -4,30 +4,30 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; -public class DelayInstantTransformationTimer extends CTimer { +public class ABDelayInstantTransformationTimer extends CTimer { private CUnit sourceUnit; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private OnTransformationActions actions; private CUnit unit; private boolean addAlternateTagAfter; private CUnitType baseType; private CUnitType targetType; private boolean keepRatios; - private AbilityBuilderAbility abil; + private ABAbilityBuilderAbility abil; private boolean perm; private War3ID theBuffId; private float transTime; private float dur; - public DelayInstantTransformationTimer(CUnit sourceUnit, LocalDataStore localStore, CUnit unit, + public ABDelayInstantTransformationTimer(CUnit sourceUnit, ABLocalDataStore localStore, CUnit unit, OnTransformationActions actions, boolean addAlternateTagAfter, float delay, CUnitType baseType, - CUnitType targetType, final boolean keepRatios, AbilityBuilderAbility ability, War3ID buffId, + CUnitType targetType, final boolean keepRatios, ABAbilityBuilderAbility ability, War3ID buffId, float transformationTime, float duration) { super(); this.sourceUnit = sourceUnit; @@ -47,10 +47,10 @@ public DelayInstantTransformationTimer(CUnit sourceUnit, LocalDataStore localSto } public void onFire(CSimulation game) { - TransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, + ABTransformationHandler.instantTransformation(localStore, unit, targetType, keepRatios, actions, abil, addAlternateTagAfter, perm, false); if (dur > 0) { - TransformationHandler.createInstantTransformBackBuff(sourceUnit, localStore, unit, baseType, keepRatios, + ABTransformationHandler.createInstantTransformBackBuff(sourceUnit, localStore, unit, baseType, keepRatios, actions.createUntransformActions(), abil, theBuffId, addAlternateTagAfter, transTime, dur, perm); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayTimerTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayTimerTimer.java similarity index 77% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayTimerTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayTimerTimer.java index 6eef39e76..0df738f27 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/DelayTimerTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayTimerTimer.java @@ -2,15 +2,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; -public class DelayTimerTimer extends CTimer { +public class ABDelayTimerTimer extends CTimer { private CTimer timer; - LocalDataStore localStore; + ABLocalDataStore localStore; - public DelayTimerTimer(CTimer timer, LocalDataStore localStore, float delay) { + public ABDelayTimerTimer(CTimer timer, ABLocalDataStore localStore, float delay) { super(); this.timer = timer; this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ManaDepletedCheckTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABManaDepletedCheckTimer.java similarity index 72% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ManaDepletedCheckTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABManaDepletedCheckTimer.java index 866147444..58dd09ea1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ManaDepletedCheckTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABManaDepletedCheckTimer.java @@ -2,14 +2,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; -public class ManaDepletedCheckTimer extends CTimer { +public class ABManaDepletedCheckTimer extends CTimer { private CUnit caster; - private AbilityBuilderActiveAbility ability; + private ABAbilityBuilderActiveAbility ability; - public ManaDepletedCheckTimer(CUnit caster, AbilityBuilderActiveAbility ability) { + public ABManaDepletedCheckTimer(CUnit caster, ABAbilityBuilderActiveAbility ability) { super(); this.caster = caster; this.ability = ability; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java index 7b69bb375..3be37218c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java @@ -6,18 +6,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABTimer extends CTimer { private CUnit caster; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private List actions; private int castId = 0; private boolean alive = true; - public ABTimer(CUnit caster, LocalDataStore localStore, List actions, final int castId) { + public ABTimer(CUnit caster, ABLocalDataStore localStore, List actions, final int castId) { super(); this.caster = caster; this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/TransformationMorphAnimationTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTransformationMorphAnimationTimer.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/TransformationMorphAnimationTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTransformationMorphAnimationTimer.java index 10535652f..3c8aa306d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/TransformationMorphAnimationTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTransformationMorphAnimationTimer.java @@ -9,11 +9,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; -public class TransformationMorphAnimationTimer extends CTimer { +public class ABTransformationMorphAnimationTimer extends CTimer { private final CUnit unit; private final boolean addAlternateTagAfter; - public TransformationMorphAnimationTimer(final CUnit unit, final boolean addAlternateTagAfter, final float delay) { + public ABTransformationMorphAnimationTimer(final CUnit unit, final boolean addAlternateTagAfter, final float delay) { super(); this.unit = unit; this.addAlternateTagAfter = addAlternateTagAfter; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/CAbilityTypeDefinitionAbilityTemplateBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTemplateTypeDefinition.java similarity index 79% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/CAbilityTypeDefinitionAbilityTemplateBuilder.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTemplateTypeDefinition.java index d0ac8f69f..ef2562be3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/CAbilityTypeDefinitionAbilityTemplateBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTemplateTypeDefinition.java @@ -10,18 +10,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.CAbilityTypeDefinition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbstractCAbilityTypeDefinition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParser; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityTemplateBuilder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderTemplateType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.data.CUnitData; -public class CAbilityTypeDefinitionAbilityTemplateBuilder - extends AbstractCAbilityTypeDefinition implements CAbilityTypeDefinition { +public class ABAbilityBuilderTemplateTypeDefinition + extends AbstractCAbilityTypeDefinition implements CAbilityTypeDefinition { - private AbilityBuilderParser parser; + private ABAbilityBuilderParser parser; - public CAbilityTypeDefinitionAbilityTemplateBuilder(AbilityBuilderParser abilityBuilderParser) { + public ABAbilityBuilderTemplateTypeDefinition(ABAbilityBuilderParser abilityBuilderParser) { super(); this.parser = abilityBuilderParser; } @@ -30,7 +30,7 @@ public CAbilityTypeDefinitionAbilityTemplateBuilder(AbilityBuilderParser ability public CAbilityType createAbilityType(final War3ID alias, final GameObject abilityEditorData) { if (abilityEditorData != null) { final int levels = abilityEditorData.getFieldAsInteger(LEVELS, 0); - final List levelData = new ArrayList<>(); + final List levelData = new ArrayList<>(); for (int level = 1; level <= levels; level++) { levelData.add(createLevelData(abilityEditorData, level)); } @@ -41,7 +41,7 @@ public CAbilityType createAbilityType(final War3ID alias, final GameObject ab } @Override - protected CAbilityTypeAbilityBuilderLevelData createLevelData(final GameObject abilityEditorData, + protected ABAbilityBuilderAbilityTypeLevelData createLevelData(final GameObject abilityEditorData, final int level) { final String targetsAllowedAtLevelString = abilityEditorData.readSLKTag(TARGETS_ALLOWED+level); final float area = abilityEditorData.readSLKTagFloat(AREA+level); @@ -87,17 +87,17 @@ protected CAbilityTypeAbilityBuilderLevelData createLevelData(final GameObject a requirementsLevelsString); } - return new CAbilityTypeAbilityBuilderLevelData(targetsAllowedAtLevel, area, castRange, castTime, cooldown, + return new ABAbilityBuilderAbilityTypeLevelData(targetsAllowedAtLevel, area, castRange, castTime, cooldown, durationHero, durationNormal, buffs, effects, manaCost, data, unitId, requirements); } @Override protected CAbilityType innerCreateAbilityType(final War3ID alias, final GameObject abilityEditorData, - final List levelData) { + final List levelData) { if (abilityEditorData != null) { - return new CAbilityTypeAbilityTemplateBuilder(alias, abilityEditorData.getFieldAsWar3ID(CODE, -1), abilityEditorData, levelData, parser); + return new ABAbilityBuilderTemplateType(alias, abilityEditorData.getFieldAsWar3ID(CODE, -1), abilityEditorData, levelData, parser); } else { - return new CAbilityTypeAbilityTemplateBuilder(alias, alias, null, null, parser); + return new ABAbilityBuilderTemplateType(alias, alias, null, null, parser); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/CAbilityTypeDefinitionAbilityBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTypeDefinition.java similarity index 79% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/CAbilityTypeDefinitionAbilityBuilder.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTypeDefinition.java index c70585255..c72116cbd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/CAbilityTypeDefinitionAbilityBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTypeDefinition.java @@ -10,18 +10,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.CAbilityTypeDefinition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbstractCAbilityTypeDefinition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilder; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.CAbilityTypeAbilityBuilderLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.data.CUnitData; -public class CAbilityTypeDefinitionAbilityBuilder - extends AbstractCAbilityTypeDefinition implements CAbilityTypeDefinition { +public class ABAbilityBuilderTypeDefinition + extends AbstractCAbilityTypeDefinition implements CAbilityTypeDefinition { - private AbilityBuilderConfiguration parser; + private ABAbilityBuilderConfiguration parser; - public CAbilityTypeDefinitionAbilityBuilder(AbilityBuilderConfiguration abilityBuilderParser) { + public ABAbilityBuilderTypeDefinition(ABAbilityBuilderConfiguration abilityBuilderParser) { super(); this.parser = abilityBuilderParser; } @@ -30,7 +30,7 @@ public CAbilityTypeDefinitionAbilityBuilder(AbilityBuilderConfiguration abilityB public CAbilityType createAbilityType(final War3ID alias, final GameObject abilityEditorData) { if (abilityEditorData != null) { final int levels = abilityEditorData.getFieldAsInteger(LEVELS, 0); - final List levelData = new ArrayList<>(); + final List levelData = new ArrayList<>(); for (int level = 1; level <= levels; level++) { levelData.add(createLevelData(abilityEditorData, level)); } @@ -41,7 +41,7 @@ public CAbilityType createAbilityType(final War3ID alias, final GameObject ab } @Override - protected CAbilityTypeAbilityBuilderLevelData createLevelData(final GameObject abilityEditorData, + protected ABAbilityBuilderAbilityTypeLevelData createLevelData(final GameObject abilityEditorData, final int level) { final String targetsAllowedAtLevelString = abilityEditorData.readSLKTag(TARGETS_ALLOWED+level); final float area = abilityEditorData.readSLKTagFloat(AREA+level); @@ -87,17 +87,17 @@ protected CAbilityTypeAbilityBuilderLevelData createLevelData(final GameObject a requirementsLevelsString); } - return new CAbilityTypeAbilityBuilderLevelData(targetsAllowedAtLevel, area, castRange, castTime, cooldown, + return new ABAbilityBuilderAbilityTypeLevelData(targetsAllowedAtLevel, area, castRange, castTime, cooldown, durationHero, durationNormal, buffs, effects, manaCost, data, unitId, requirements); } @Override protected CAbilityType innerCreateAbilityType(final War3ID alias, final GameObject abilityEditorData, - final List levelData) { + final List levelData) { if (abilityEditorData != null) { - return new CAbilityTypeAbilityBuilder(alias, abilityEditorData.getFieldAsWar3ID(CODE, -1), abilityEditorData, levelData, parser); + return new ABAbilityBuilderAbilityType(alias, abilityEditorData.getFieldAsWar3ID(CODE, -1), abilityEditorData, levelData, parser); } else { - return new CAbilityTypeAbilityBuilder(alias, alias, null, null, parser); + return new ABAbilityBuilderAbilityType(alias, alias, null, null, parser); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityType.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilder.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityType.java index 6fda8b9da..1ae848812 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityType.java @@ -12,16 +12,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.MapLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABMapLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -public class CAbilityTypeAbilityBuilder extends CAbilityType { +public class ABAbilityBuilderAbilityType extends CAbilityType { - private AbilityBuilderConfiguration parser; + private ABAbilityBuilderConfiguration parser; private GameObject abilityEditorData; - public CAbilityTypeAbilityBuilder(War3ID alias, War3ID code, GameObject abilityEditorData, List levelData, AbilityBuilderConfiguration parser) { + public ABAbilityBuilderAbilityType(War3ID alias, War3ID code, GameObject abilityEditorData, List levelData, ABAbilityBuilderConfiguration parser) { super(alias, code, levelData); this.parser = parser; this.abilityEditorData = abilityEditorData; @@ -29,7 +29,7 @@ public CAbilityTypeAbilityBuilder(War3ID alias, War3ID code, GameObject abilityE @Override public CAbility createAbility(int handleId) { - LocalDataStore localStore = new MapLocalDataStore(); + ABLocalDataStore localStore = new ABMapLocalDataStore(); localStore.put(ABLocalStoreKeys.ABILITYEDITORDATA, this.abilityEditorData); localStore.put(ABLocalStoreKeys.LEVELDATA, getLevelData()); localStore.put(ABLocalStoreKeys.CURRENTLEVEL, 1); @@ -38,22 +38,22 @@ public CAbility createAbility(int handleId) { switch (parser.getType()) { case PASSIVE: - return new CAbilityAbilityBuilderPassive(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); + return new ABAbilityBuilderPassive(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); case HIDDEN: - return new CAbilityAbilityBuilderNoIcon(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); + return new ABAbilityBuilderNoIcon(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); case NORMAL_FLEXTARGET: - return new CAbilityAbilityBuilderActiveFlexTarget(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); + return new ABAbilityBuilderActiveFlexTarget(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); case NORMAL_PAIRING: - return new CAbilityAbilityBuilderActivePairing(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); + return new ABAbilityBuilderActivePairing(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); case NORMAL_AUTOTARGET: - return new CAbilityAbilityBuilderActiveAutoTarget(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); + return new ABAbilityBuilderActiveAutoTarget(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); case NORMAL_NOTARGET: - return new CAbilityAbilityBuilderActiveNoTarget(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); + return new ABAbilityBuilderActiveNoTarget(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); case NORMAL_POINTTARGET: - return new CAbilityAbilityBuilderActivePointTarget(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); + return new ABAbilityBuilderActivePointTarget(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); case NORMAL_UNITTARGET: default: - return new CAbilityAbilityBuilderActiveUnitTarget(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); + return new ABAbilityBuilderActiveUnitTarget(handleId, getCode(), getAlias(), getLevelData(), parser, localStore); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilderLevelData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityTypeLevelData.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilderLevelData.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityTypeLevelData.java index 00b42137e..e6656db59 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityBuilderLevelData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityTypeLevelData.java @@ -8,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; -public class CAbilityTypeAbilityBuilderLevelData extends CAbilityTypeLevelData { +public class ABAbilityBuilderAbilityTypeLevelData extends CAbilityTypeLevelData { private final float area; private final float castRange; private final float castTime; @@ -22,7 +22,7 @@ public class CAbilityTypeAbilityBuilderLevelData extends CAbilityTypeLevelData { private final War3ID unitId; private List requirements; - public CAbilityTypeAbilityBuilderLevelData(EnumSet targetsAllowed, float area, float castRange, + public ABAbilityBuilderAbilityTypeLevelData(EnumSet targetsAllowed, float area, float castRange, float castTime, float cooldown, float durationHero, float durationNormal, List buffs, List effects, int manaCost, List data, War3ID unitId, List requirements) { super(targetsAllowed); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityTemplateBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderTemplateType.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityTemplateBuilder.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderTemplateType.java index 22e6413e5..772e8d260 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/CAbilityTypeAbilityTemplateBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderTemplateType.java @@ -9,21 +9,21 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.CAbilityAbilityBuilderAuraTemplate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.CAbilityAbilityBuilderSimpleAuraTemplate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.CAbilityAbilityBuilderStatAuraTemplate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.CAbilityAbilityBuilderStatPassiveTemplate; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.ABAbilityBuilderAuraTemplate; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.ABAbilityBuilderSimpleAuraTemplate; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.ABAbilityBuilderStatAuraTemplate; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.ABAbilityBuilderStatPassiveTemplate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.MapLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABMapLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; -public class CAbilityTypeAbilityTemplateBuilder extends CAbilityType { +public class ABAbilityBuilderTemplateType extends CAbilityType { - private AbilityBuilderParser parser; + private ABAbilityBuilderParser parser; private GameObject abilityEditorData; - public CAbilityTypeAbilityTemplateBuilder(War3ID alias, War3ID code, GameObject abilityEditorData, List levelData, AbilityBuilderParser parser) { + public ABAbilityBuilderTemplateType(War3ID alias, War3ID code, GameObject abilityEditorData, List levelData, ABAbilityBuilderParser parser) { super(alias, code, levelData); this.parser = parser; this.abilityEditorData = abilityEditorData; @@ -31,7 +31,7 @@ public CAbilityTypeAbilityTemplateBuilder(War3ID alias, War3ID code, GameObject @Override public CAbility createAbility(int handleId) { - LocalDataStore localStore = new MapLocalDataStore(); + ABLocalDataStore localStore = new ABMapLocalDataStore(); localStore.put(ABLocalStoreKeys.ABILITYEDITORDATA, this.abilityEditorData); localStore.put(ABLocalStoreKeys.LEVELDATA, getLevelData()); localStore.put(ABLocalStoreKeys.CURRENTLEVEL, 1); @@ -39,14 +39,14 @@ public CAbility createAbility(int handleId) { switch (parser.getTemplateType()) { case PASSIVE_STATS: - return new CAbilityAbilityBuilderStatPassiveTemplate(handleId, getCode(), getAlias(), getLevelData(), localStore, parser.getStatBuffsFromDataFields()); + return new ABAbilityBuilderStatPassiveTemplate(handleId, getCode(), getAlias(), getLevelData(), localStore, parser.getStatBuffsFromDataFields()); case AURA_STATS: - return new CAbilityAbilityBuilderStatAuraTemplate(handleId, getCode(), getAlias(), getLevelData(), localStore, parser.getStatBuffsFromDataFields(), parser.getMeleeRangeTargetOverride()); + return new ABAbilityBuilderStatAuraTemplate(handleId, getCode(), getAlias(), getLevelData(), localStore, parser.getStatBuffsFromDataFields(), parser.getMeleeRangeTargetOverride()); case AURA_SIMPLE: - return new CAbilityAbilityBuilderSimpleAuraTemplate(handleId, getCode(), getAlias(), getLevelData(), localStore, parser.getAbilityIdsToAddPerLevel(), parser.getLevellingAbilityIdsToAdd()); + return new ABAbilityBuilderSimpleAuraTemplate(handleId, getCode(), getAlias(), getLevelData(), localStore, parser.getAbilityIdsToAddPerLevel(), parser.getLevellingAbilityIdsToAdd()); case AURA: default: - return new CAbilityAbilityBuilderAuraTemplate(handleId, getCode(), getAlias(), getLevelData(), localStore, parser.getAddToAuraActions(), parser.getUpdateAuraLevelActions(), parser.getRemoveFromAuraActions()); + return new ABAbilityBuilderAuraTemplate(handleId, getCode(), getAlias(), getLevelData(), localStore, parser.getAddToAuraActions(), parser.getUpdateAuraLevelActions(), parser.getRemoveFromAuraActions()); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABAbilityTargetStillTargetableVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABAbilityTargetStillTargetableVisitor.java index 12168b6ca..c24312aeb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABAbilityTargetStillTargetableVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABAbilityTargetStillTargetableVisitor.java @@ -3,19 +3,19 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; public final class ABAbilityTargetStillTargetableVisitor implements AbilityTargetVisitor { private CSimulation simulation; private CUnit unit; - private AbilityBuilderActiveAbility ability; + private ABAbilityBuilderActiveAbility ability; private boolean autoOrder; private boolean channeling; private int orderId; public ABAbilityTargetStillTargetableVisitor reset(final CSimulation simulation, final CUnit unit, - final AbilityBuilderActiveAbility ability, boolean autoOrder, boolean channeling) { + final ABAbilityBuilderActiveAbility ability, boolean autoOrder, boolean channeling) { this.simulation = simulation; this.unit = unit; this.ability = ability; @@ -26,7 +26,7 @@ public ABAbilityTargetStillTargetableVisitor reset(final CSimulation simulation, } public ABAbilityTargetStillTargetableVisitor reset(final CSimulation simulation, final CUnit unit, - final AbilityBuilderActiveAbility ability, boolean autoOrder, boolean channeling, int orderId) { + final ABAbilityBuilderActiveAbility ability, boolean autoOrder, boolean channeling, int orderId) { this.simulation = simulation; this.unit = unit; this.ability = ability; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetABAbilityByRawcodeVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetABAbilityByRawcodeVisitor.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetABAbilityByRawcodeVisitor.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetABAbilityByRawcodeVisitor.java index e0590af37..78d8e5d94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetABAbilityByRawcodeVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetABAbilityByRawcodeVisitor.java @@ -24,159 +24,159 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -public class GetABAbilityByRawcodeVisitor implements CAbilityVisitor { - private static final GetABAbilityByRawcodeVisitor INSTANCE = new GetABAbilityByRawcodeVisitor(); +public class ABGetABAbilityByRawcodeVisitor implements CAbilityVisitor { + private static final ABGetABAbilityByRawcodeVisitor INSTANCE = new ABGetABAbilityByRawcodeVisitor(); - public static GetABAbilityByRawcodeVisitor getInstance() { + public static ABGetABAbilityByRawcodeVisitor getInstance() { return INSTANCE; } private War3ID rawcode; - public GetABAbilityByRawcodeVisitor reset(final War3ID rawcode) { + public ABGetABAbilityByRawcodeVisitor reset(final War3ID rawcode) { this.rawcode = rawcode; return this; } @Override - public AbilityBuilderAbility accept(final AbilityBuilderActiveAbility ability) { + public ABAbilityBuilderAbility accept(final ABAbilityBuilderActiveAbility ability) { if (this.rawcode.equals(ability.getAlias())) { - return (AbilityBuilderAbility) ability; + return (ABAbilityBuilderAbility) ability; } return null; } @Override - public AbilityBuilderAbility accept(final GenericSingleIconActiveAbility ability) { + public ABAbilityBuilderAbility accept(final GenericSingleIconActiveAbility ability) { return null; } @Override - public AbilityBuilderAbility accept(GenericSingleIconPassiveAbility ability) { - if (ability instanceof AbilityBuilderAbility && this.rawcode.equals(ability.getAlias())) { - return (AbilityBuilderAbility) ability; + public ABAbilityBuilderAbility accept(GenericSingleIconPassiveAbility ability) { + if (ability instanceof ABAbilityBuilderAbility && this.rawcode.equals(ability.getAlias())) { + return (ABAbilityBuilderAbility) ability; } return null; } @Override - public AbilityBuilderAbility accept(final GenericNoIconAbility ability) { - if (ability instanceof AbilityBuilderAbility && this.rawcode.equals(ability.getAlias())) { - return (AbilityBuilderAbility) ability; + public ABAbilityBuilderAbility accept(final GenericNoIconAbility ability) { + if (ability instanceof ABAbilityBuilderAbility && this.rawcode.equals(ability.getAlias())) { + return (ABAbilityBuilderAbility) ability; } return null; } @Override - public AbilityBuilderAbility accept(final CAbilityAttack ability) { + public ABAbilityBuilderAbility accept(final CAbilityAttack ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityMove ability) { + public ABAbilityBuilderAbility accept(final CAbilityMove ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityOrcBuild ability) { + public ABAbilityBuilderAbility accept(final CAbilityOrcBuild ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityHumanBuild ability) { + public ABAbilityBuilderAbility accept(final CAbilityHumanBuild ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityUndeadBuild ability) { + public ABAbilityBuilderAbility accept(final CAbilityUndeadBuild ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityNightElfBuild ability) { + public ABAbilityBuilderAbility accept(final CAbilityNightElfBuild ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityGenericDoNothing ability) { + public ABAbilityBuilderAbility accept(final CAbilityGenericDoNothing ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityColdArrows ability) { + public ABAbilityBuilderAbility accept(final CAbilityColdArrows ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityNagaBuild ability) { + public ABAbilityBuilderAbility accept(final CAbilityNagaBuild ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityNeutralBuild ability) { + public ABAbilityBuilderAbility accept(final CAbilityNeutralBuild ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityBuildInProgress ability) { + public ABAbilityBuilderAbility accept(final CAbilityBuildInProgress ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityQueue ability) { + public ABAbilityBuilderAbility accept(final CAbilityQueue ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilitySellItems ability) { + public ABAbilityBuilderAbility accept(final CAbilitySellItems ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityUpgrade ability) { + public ABAbilityBuilderAbility accept(final CAbilityUpgrade ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityReviveHero ability) { + public ABAbilityBuilderAbility accept(final CAbilityReviveHero ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityRoot ability) { + public ABAbilityBuilderAbility accept(final CAbilityRoot ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityRally ability) { + public ABAbilityBuilderAbility accept(final CAbilityRally ability) { return null; } @Override - public AbilityBuilderAbility accept(final CBuff ability) { + public ABAbilityBuilderAbility accept(final CBuff ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityReturnResources ability) { + public ABAbilityBuilderAbility accept(final CAbilityReturnResources ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityHero ability) { + public ABAbilityBuilderAbility accept(final CAbilityHero ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityJass ability) { + public ABAbilityBuilderAbility accept(final CAbilityJass ability) { return null; } @Override - public AbilityBuilderAbility accept(final CAbilityNeutralBuilding ability) { + public ABAbilityBuilderAbility accept(final CAbilityNeutralBuilding ability) { return null; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetInstantTransformationBuffVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetInstantTransformationBuffVisitor.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetInstantTransformationBuffVisitor.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetInstantTransformationBuffVisitor.java index 8653a141a..0185f36aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/GetInstantTransformationBuffVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetInstantTransformationBuffVisitor.java @@ -30,24 +30,24 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderPassiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedInstantTransformationBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTransformationBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.LocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.TransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; -public class GetInstantTransformationBuffVisitor implements CAbilityVisitor { - private static final GetInstantTransformationBuffVisitor INSTANCE = new GetInstantTransformationBuffVisitor(); +public class ABGetInstantTransformationBuffVisitor implements CAbilityVisitor { + private static final ABGetInstantTransformationBuffVisitor INSTANCE = new ABGetInstantTransformationBuffVisitor(); - public static GetInstantTransformationBuffVisitor getInstance() { + public static ABGetInstantTransformationBuffVisitor getInstance() { return INSTANCE; } private CSimulation game; private CUnit caster; - private LocalDataStore localStore; + private ABLocalDataStore localStore; private CUnitType newType; private boolean keepRatios; private OnTransformationActions actions; @@ -57,7 +57,7 @@ public static GetInstantTransformationBuffVisitor getInstance() { private float duration; private boolean permanent; - public GetInstantTransformationBuffVisitor reset(CSimulation game, CUnit caster, LocalDataStore localStore, + public ABGetInstantTransformationBuffVisitor reset(CSimulation game, CUnit caster, ABLocalDataStore localStore, CUnitType newType, final boolean keepRatios, OnTransformationActions actions, War3ID buffId, boolean addAlternateTagAfter, float transformationTime, float duration, boolean permanent) { this.game = game; @@ -75,7 +75,7 @@ public GetInstantTransformationBuffVisitor reset(CSimulation game, CUnit caster, } @Override - public ABBuff accept(final AbilityBuilderActiveAbility ability) { + public ABBuff accept(final ABAbilityBuilderActiveAbility ability) { return new ABTimedTransformationBuff(game.getHandleIdAllocator().createId(), localStore, ability, caster, actions, buffId == null ? ability.getAlias() : buffId, duration, ability, newType, !addAlternateTagAfter, permanent, transformationTime); @@ -88,10 +88,10 @@ public ABBuff accept(final GenericSingleIconActiveAbility ability) { @Override public ABBuff accept(GenericSingleIconPassiveAbility ability) { - if (ability instanceof AbilityBuilderPassiveAbility) { + if (ability instanceof ABAbilityBuilderPassiveAbility) { return new ABTimedInstantTransformationBuff(game.getHandleIdAllocator().createId(), localStore, ability, caster, actions, buffId == null ? ability.getAlias() : buffId, duration, - (AbilityBuilderPassiveAbility) ability, newType, keepRatios, !addAlternateTagAfter, permanent, + (ABAbilityBuilderPassiveAbility) ability, newType, keepRatios, !addAlternateTagAfter, permanent, transformationTime); } return null; @@ -99,10 +99,10 @@ public ABBuff accept(GenericSingleIconPassiveAbility ability) { @Override public ABBuff accept(final GenericNoIconAbility ability) { - if (ability instanceof AbilityBuilderPassiveAbility) { + if (ability instanceof ABAbilityBuilderPassiveAbility) { return new ABTimedInstantTransformationBuff(game.getHandleIdAllocator().createId(), localStore, ability, caster, actions, buffId == null ? ability.getAlias() : buffId, duration, - (AbilityBuilderPassiveAbility) ability, newType, keepRatios, !addAlternateTagAfter, permanent, + (ABAbilityBuilderPassiveAbility) ability, newType, keepRatios, !addAlternateTagAfter, permanent, transformationTime); } return null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java index c7dc68619..b0a1c6cda 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; public class BehaviorAbilityVisitor implements CBehaviorVisitor { public static final BehaviorAbilityVisitor INSTANCE = new BehaviorAbilityVisitor(); @@ -18,12 +18,12 @@ public CAbility accept(CRangedBehavior target) { } @Override - public CAbility accept(CBehaviorAbilityBuilderBase target) { + public CAbility accept(ABBehaviorAbilityBuilderBase target) { return target.getAbility(); } @Override - public CAbility accept(CBehaviorAbilityBuilderNoTarget target) { + public CAbility accept(ABBehaviorAbilityBuilderNoTarget target) { return target.getAbility(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java index 9ac7d7b3b..503e19c50 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; public class BehaviorNextBehaviorVisitor implements CBehaviorVisitor { public static final BehaviorNextBehaviorVisitor INSTANCE = new BehaviorNextBehaviorVisitor(); @@ -22,12 +22,12 @@ public CRangedBehavior accept(CRangedBehavior target) { } @Override - public CRangedBehavior accept(CBehaviorAbilityBuilderBase target) { + public CRangedBehavior accept(ABBehaviorAbilityBuilderBase target) { return null; } @Override - public CRangedBehavior accept(CBehaviorAbilityBuilderNoTarget target) { + public CRangedBehavior accept(ABBehaviorAbilityBuilderNoTarget target) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java index cc9bd8cd3..6b9cff89c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; public class BehaviorTargetUnitVisitor implements CBehaviorVisitor { public static final BehaviorTargetUnitVisitor INSTANCE = new BehaviorTargetUnitVisitor(); @@ -22,7 +22,7 @@ public CUnit accept(CRangedBehavior target) { } @Override - public CUnit accept(CBehaviorAbilityBuilderBase target) { + public CUnit accept(ABBehaviorAbilityBuilderBase target) { if (target.getTarget() != null) { return target.getTarget().visit(AbilityTargetVisitor.UNIT); } @@ -30,7 +30,7 @@ public CUnit accept(CBehaviorAbilityBuilderBase target) { } @Override - public CUnit accept(CBehaviorAbilityBuilderNoTarget target) { + public CUnit accept(ABBehaviorAbilityBuilderNoTarget target) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java index 4bfc163cd..3a1523bb0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; public class BehaviorTargetVisitor implements CBehaviorVisitor { public static final BehaviorTargetVisitor INSTANCE = new BehaviorTargetVisitor(); @@ -18,12 +18,12 @@ public AbilityTarget accept(CRangedBehavior target) { } @Override - public AbilityTarget accept(CBehaviorAbilityBuilderBase target) { + public AbilityTarget accept(ABBehaviorAbilityBuilderBase target) { return target.getTarget(); } @Override - public AbilityTarget accept(CBehaviorAbilityBuilderNoTarget target) { + public AbilityTarget accept(ABBehaviorAbilityBuilderNoTarget target) { return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java index 5be8f9192..41a210279 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java @@ -1,15 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.CBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; public interface CBehaviorVisitor { T accept(CBehavior target); T accept(CRangedBehavior target); - T accept(CBehaviorAbilityBuilderBase target); - T accept(CBehaviorAbilityBuilderNoTarget target); + T accept(ABBehaviorAbilityBuilderBase target); + T accept(ABBehaviorAbilityBuilderNoTarget target); T accept(CBehaviorMove target); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUnderConstructionVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUnderConstructionVisitor.java index 48cc9352d..9adf85dbc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUnderConstructionVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUnderConstructionVisitor.java @@ -27,7 +27,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; public class AbilityDisableWhileUnderConstructionVisitor implements CAbilityVisitor { public static final AbilityDisableWhileUnderConstructionVisitor INSTANCE = new AbilityDisableWhileUnderConstructionVisitor(); @@ -138,7 +138,7 @@ public Void accept(final CAbilityReviveHero ability) { } @Override - public Void accept(final AbilityBuilderActiveAbility ability) { + public Void accept(final ABAbilityBuilderActiveAbility ability) { ability.setDisabled(true, CAbilityDisableType.CONSTRUCTION); ability.setIconShowing(false); return null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUpgradingVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUpgradingVisitor.java index 333cfbfa6..7a49dc4e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUpgradingVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUpgradingVisitor.java @@ -27,7 +27,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; public class AbilityDisableWhileUpgradingVisitor implements CAbilityVisitor { public static final AbilityDisableWhileUpgradingVisitor INSTANCE = new AbilityDisableWhileUpgradingVisitor(); @@ -138,7 +138,7 @@ public Void accept(final CAbilityReviveHero ability) { } @Override - public Void accept(final AbilityBuilderActiveAbility ability) { + public Void accept(final ABAbilityBuilderActiveAbility ability) { ability.setDisabled(true, CAbilityDisableType.CONSTRUCTION); ability.setIconShowing(false); return null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java index db0b7f4f6..2fb9ab928 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java @@ -87,12 +87,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.CAbilityTypeDefinitionStandDown; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.CAbilityTypeDefinitionWispHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.jass.CAbilityTypeJassDefinition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderDupe; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParser; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParserUtil; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.definitions.impl.CAbilityTypeDefinitionAbilityTemplateBuilder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderDupe; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.definitions.impl.ABAbilityBuilderTemplateTypeDefinition; public class CAbilityData { @@ -285,22 +285,22 @@ private void registerCodes() { try { - final List inheritingAbilities = new ArrayList<>(); - final Map previousAbilityParsers = new HashMap<>(); + final List inheritingAbilities = new ArrayList<>(); + final Map previousAbilityParsers = new HashMap<>(); - AbilityBuilderParserUtil.loadAbilityBuilderFiles(behavior -> { - if (behavior.getType().equals(AbilityBuilderType.INHERIT)) { + ABAbilityBuilderParserUtil.loadAbilityBuilderFiles(behavior -> { + if (behavior.getType().equals(ABAbilityBuilderType.INHERIT)) { inheritingAbilities.add(behavior); - } else if (behavior.getType().equals(AbilityBuilderType.TEMPLATE)) { - for (AbilityBuilderDupe dupe : behavior.getIds()) { + } else if (behavior.getType().equals(ABAbilityBuilderType.TEMPLATE)) { + for (ABAbilityBuilderDupe dupe : behavior.getIds()) { previousAbilityParsers.put(dupe.getId(), behavior); this.codeToAbilityTypeDefinition.put(War3ID.fromString(dupe.getId()), - new CAbilityTypeDefinitionAbilityTemplateBuilder(behavior)); + new ABAbilityBuilderTemplateTypeDefinition(behavior)); } } else { - for (AbilityBuilderDupe dupe : behavior.getIds()) { + for (ABAbilityBuilderDupe dupe : behavior.getIds()) { previousAbilityParsers.put(dupe.getId(), behavior); - AbilityBuilderConfiguration config = new AbilityBuilderConfiguration(behavior, dupe); + ABAbilityBuilderConfiguration config = new ABAbilityBuilderConfiguration(behavior, dupe); this.codeToAbilityTypeDefinition.put(War3ID.fromString(config.getId()), config.createDefinition()); } @@ -309,30 +309,30 @@ private void registerCodes() { int prevIter = 1; - List loopInheritingAbilities = inheritingAbilities; + List loopInheritingAbilities = inheritingAbilities; while (loopInheritingAbilities.size() > 0) { - List iter = loopInheritingAbilities; + List iter = loopInheritingAbilities; loopInheritingAbilities = new ArrayList<>(); if (prevIter == 0) { - for (AbilityBuilderParser parser : iter) { + for (ABAbilityBuilderParser parser : iter) { System.err.println("Couldn't parse INHERIT ability due to no parent ability definition: " + parser.getIds().get(0).getId()); } break; } prevIter = 0; - for (AbilityBuilderParser parser : iter) { + for (ABAbilityBuilderParser parser : iter) { if (parser.getParentId() == null) { System.err.println("Couldn't parse INHERIT ability due to missing parent ID: " + parser.getIds().get(0).getId()); continue; } - AbilityBuilderParser parent = previousAbilityParsers.get(parser.getParentId()); + ABAbilityBuilderParser parent = previousAbilityParsers.get(parser.getParentId()); if (parent != null) { parser.updateFromParent(parent); - for (AbilityBuilderDupe dupe : parser.getIds()) { + for (ABAbilityBuilderDupe dupe : parser.getIds()) { previousAbilityParsers.put(dupe.getId(), parser); - AbilityBuilderConfiguration config = new AbilityBuilderConfiguration(parser, dupe); + ABAbilityBuilderConfiguration config = new ABAbilityBuilderConfiguration(parser, dupe); this.codeToAbilityTypeDefinition.put(War3ID.fromString(config.getId()), config.createDefinition()); prevIter++; @@ -344,25 +344,25 @@ private void registerCodes() { } if (WarsmashConstants.ABILITY_COMPATIBILITY != null && WarsmashConstants.ABILITY_COMPATIBILITY.size() > 0) { - final List inheritingCompatAbilities = new ArrayList<>(); + final List inheritingCompatAbilities = new ArrayList<>(); boolean all = WarsmashConstants.ABILITY_COMPATIBILITY.contains("all"); - AbilityBuilderParserUtil.loadAbilityBuilderFiles(behavior -> { - if (behavior.getType().equals(AbilityBuilderType.INHERIT)) { + ABAbilityBuilderParserUtil.loadAbilityBuilderFiles(behavior -> { + if (behavior.getType().equals(ABAbilityBuilderType.INHERIT)) { inheritingCompatAbilities.add(behavior); - } else if (behavior.getType().equals(AbilityBuilderType.TEMPLATE)) { - for (AbilityBuilderDupe dupe : behavior.getIds()) { + } else if (behavior.getType().equals(ABAbilityBuilderType.TEMPLATE)) { + for (ABAbilityBuilderDupe dupe : behavior.getIds()) { if (all || WarsmashConstants.ABILITY_COMPATIBILITY.contains(dupe.getId())) { previousAbilityParsers.put(dupe.getId(), behavior); this.codeToAbilityTypeDefinition.put(War3ID.fromString(dupe.getId()), - new CAbilityTypeDefinitionAbilityTemplateBuilder(behavior)); + new ABAbilityBuilderTemplateTypeDefinition(behavior)); } } } else { - for (AbilityBuilderDupe dupe : behavior.getIds()) { + for (ABAbilityBuilderDupe dupe : behavior.getIds()) { if (all || WarsmashConstants.ABILITY_COMPATIBILITY.contains(dupe.getId())) { previousAbilityParsers.put(dupe.getId(), behavior); - AbilityBuilderConfiguration config = new AbilityBuilderConfiguration(behavior, dupe); + ABAbilityBuilderConfiguration config = new ABAbilityBuilderConfiguration(behavior, dupe); this.codeToAbilityTypeDefinition.put(War3ID.fromString(config.getId()), config.createDefinition()); } @@ -371,31 +371,31 @@ private void registerCodes() { }, "abilityBehaviors_compatibility"); prevIter = 1; - List loopInheritingCompatAbilities = inheritingCompatAbilities; + List loopInheritingCompatAbilities = inheritingCompatAbilities; while (loopInheritingCompatAbilities.size() > 0) { - List iter = loopInheritingCompatAbilities; + List iter = loopInheritingCompatAbilities; loopInheritingCompatAbilities = new ArrayList<>(); if (prevIter == 0) { - for (AbilityBuilderParser parser : iter) { + for (ABAbilityBuilderParser parser : iter) { System.err.println("Couldn't parse INHERIT ability due to no parent ability definition: " + parser.getIds().get(0).getId()); } break; } prevIter = 0; - for (AbilityBuilderParser parser : iter) { + for (ABAbilityBuilderParser parser : iter) { if (parser.getParentId() == null) { System.err.println("Couldn't parse INHERIT ability due to missing parent ID: " + parser.getIds().get(0).getId()); continue; } - AbilityBuilderParser parent = previousAbilityParsers.get(parser.getParentId()); + ABAbilityBuilderParser parent = previousAbilityParsers.get(parser.getParentId()); if (parent != null) { parser.updateFromParent(parent); - for (AbilityBuilderDupe dupe : parser.getIds()) { + for (ABAbilityBuilderDupe dupe : parser.getIds()) { if (all || WarsmashConstants.ABILITY_COMPATIBILITY.contains(dupe.getId())) { previousAbilityParsers.put(dupe.getId(), parser); - AbilityBuilderConfiguration config = new AbilityBuilderConfiguration(parser, dupe); + ABAbilityBuilderConfiguration config = new ABAbilityBuilderConfiguration(parser, dupe); this.codeToAbilityTypeDefinition.put(War3ID.fromString(config.getId()), config.createDefinition()); prevIter++; @@ -421,7 +421,7 @@ public void registerJassType(final War3ID war3id, final CAbilityTypeJassDefiniti this.codeToAbilityTypeDefinition.put(war3id, whichAbilityType); } - public void registerAbilityBuilderType(final War3ID war3id, final AbilityBuilderConfiguration configuration) { + public void registerAbilityBuilderType(final War3ID war3id, final ABAbilityBuilderConfiguration configuration) { this.codeToAbilityTypeDefinition.put(war3id, configuration.createDefinition()); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java index 934ce2394..18350e03e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java @@ -163,7 +163,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.AbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CUpgradeClass; @@ -2258,7 +2258,7 @@ public Void accept(final CAbilityReviveHero ability) { } @Override - public Void accept(final AbilityBuilderActiveAbility ability) { + public Void accept(final ABAbilityBuilderActiveAbility ability) { final float uiAreaOfEffect = ability.getUIAreaOfEffect(); if (Float.isNaN(uiAreaOfEffect)) { handleTargetCursor(ability); diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java index 6abd8338a..cd6b92a03 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java @@ -11,7 +11,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class AbilityBuilderConfigTree extends JTree { private DefaultMutableTreeNode root; @@ -59,10 +59,10 @@ private DefaultMutableTreeNode createActionsNode(String name) { return conditionTreeNode; } - public void setConfig(AbilityBuilderConfiguration config) { + public void setConfig(ABAbilityBuilderConfiguration config) { root = new DefaultMutableTreeNode(config.getId() + " \"" + config.getCastId() + "\""); - Method[] declaredMethods = AbilityBuilderConfiguration.class.getDeclaredMethods(); + Method[] declaredMethods = ABAbilityBuilderConfiguration.class.getDeclaredMethods(); for (Method declaredMethod : declaredMethods) { String name = declaredMethod.getName(); if (name.startsWith("getOn")) { diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderDupeCellRenderer.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderDupeCellRenderer.java index cc09ca857..c8a65f8e3 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderDupeCellRenderer.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderDupeCellRenderer.java @@ -5,14 +5,14 @@ import javax.swing.DefaultListCellRenderer; import javax.swing.JList; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class AbilityBuilderDupeCellRenderer extends DefaultListCellRenderer { @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - if (value instanceof AbilityBuilderConfiguration) { - AbilityBuilderConfiguration config = (AbilityBuilderConfiguration) value; + if (value instanceof ABAbilityBuilderConfiguration) { + ABAbilityBuilderConfiguration config = (ABAbilityBuilderConfiguration) value; value = config.getId() + " \"" + config.getCastId() + "\""; } return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderJassBrainstorm.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderJassBrainstorm.java index 5699ad18a..d3a137db0 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderJassBrainstorm.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderJassBrainstorm.java @@ -10,38 +10,38 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorImpl1; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.AbilityBuilderGsonBuilder; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderDupe; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParser; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParserUtil; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParserUtil.AbilityBuilderFileListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAbilityBuilderGsonBuilder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderDupe; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil.AbilityBuilderFileListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; import com.google.gson.Gson; public class AbilityBuilderJassBrainstorm { public static void main(final String[] args) { - final Gson gson = AbilityBuilderGsonBuilder.create(); - AbilityBuilderParserUtil.loadAbilityBuilderFiles(new AbilityBuilderFileListener() { + final Gson gson = ABAbilityBuilderGsonBuilder.create(); + ABAbilityBuilderParserUtil.loadAbilityBuilderFiles(new AbilityBuilderFileListener() { @Override - public void callback(final AbilityBuilderParser behavior) { + public void callback(final ABAbilityBuilderParser behavior) { System.out.println(behavior); convertTheThing(behavior); } }); } - private static void convertTheThing(final AbilityBuilderParser behavior) { - if (behavior.getType() == AbilityBuilderType.TEMPLATE) { - for (final AbilityBuilderDupe dupe : behavior.getIds()) { + private static void convertTheThing(final ABAbilityBuilderParser behavior) { + if (behavior.getType() == ABAbilityBuilderType.TEMPLATE) { + for (final ABAbilityBuilderDupe dupe : behavior.getIds()) { System.out.println("//template: " + dupe.getId()); // idsListModel.addElement(new AbilityBuilderConfiguration(behavior, dupe)); } } else { - for (final AbilityBuilderDupe dupe : behavior.getIds()) { - final AbilityBuilderConfiguration abilityBuilderConfiguration = new AbilityBuilderConfiguration( + for (final ABAbilityBuilderDupe dupe : behavior.getIds()) { + final ABAbilityBuilderConfiguration abilityBuilderConfiguration = new ABAbilityBuilderConfiguration( behavior, dupe); try { generateJassForConf(dupe, abilityBuilderConfiguration); @@ -66,8 +66,8 @@ private static void generateFunctions(final JassTextGenerator out, final StringB } } - private static void generateJassForConf(final AbilityBuilderDupe dupe, - final AbilityBuilderConfiguration abilityBuilderConfiguration) { + private static void generateJassForConf(final ABAbilityBuilderDupe dupe, + final ABAbilityBuilderConfiguration abilityBuilderConfiguration) { String abilityName = null; final StringBuilder initCode = new StringBuilder(); @@ -112,7 +112,7 @@ private static void generateJassForConf(final AbilityBuilderDupe dupe, if (autoCastType != null) { initCode.append(" call SetABConfAutoCastType(abc, AUTOCAST_TYPE_" + autoCastType.name() + ")\n"); } - final AbilityBuilderType type = abilityBuilderConfiguration.getType(); + final ABAbilityBuilderType type = abilityBuilderConfiguration.getType(); if (type != null) { initCode.append(" call SetABConfType(abc, AB_CONF_TYPE_" + type.name() + ")\n"); } diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java index d796a023e..72a51ae2c 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java @@ -10,38 +10,38 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorImpl1; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.AbilityBuilderGsonBuilder; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderDupe; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParser; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParserUtil; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParserUtil.AbilityBuilderFileListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAbilityBuilderGsonBuilder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderDupe; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil.AbilityBuilderFileListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; import com.google.gson.Gson; public class AbilityBuilderSmashJassBrainstorm { public static void main(final String[] args) { - final Gson gson = AbilityBuilderGsonBuilder.create(); - AbilityBuilderParserUtil.loadAbilityBuilderFiles(new AbilityBuilderFileListener() { + final Gson gson = ABAbilityBuilderGsonBuilder.create(); + ABAbilityBuilderParserUtil.loadAbilityBuilderFiles(new AbilityBuilderFileListener() { @Override - public void callback(final AbilityBuilderParser behavior) { + public void callback(final ABAbilityBuilderParser behavior) { System.out.println(behavior); convertTheThing(behavior); } }); } - private static void convertTheThing(final AbilityBuilderParser behavior) { - if (behavior.getType() == AbilityBuilderType.TEMPLATE) { - for (final AbilityBuilderDupe dupe : behavior.getIds()) { + private static void convertTheThing(final ABAbilityBuilderParser behavior) { + if (behavior.getType() == ABAbilityBuilderType.TEMPLATE) { + for (final ABAbilityBuilderDupe dupe : behavior.getIds()) { System.out.println("//template: " + dupe.getId()); // idsListModel.addElement(new AbilityBuilderConfiguration(behavior, dupe)); } } else { - for (final AbilityBuilderDupe dupe : behavior.getIds()) { - final AbilityBuilderConfiguration abilityBuilderConfiguration = new AbilityBuilderConfiguration( + for (final ABAbilityBuilderDupe dupe : behavior.getIds()) { + final ABAbilityBuilderConfiguration abilityBuilderConfiguration = new ABAbilityBuilderConfiguration( behavior, dupe); try { generateJassForConf(dupe, abilityBuilderConfiguration); @@ -66,8 +66,8 @@ private static void generateFunctions(final JassTextGenerator out, final StringB } } - private static void generateJassForConf(final AbilityBuilderDupe dupe, - final AbilityBuilderConfiguration abilityBuilderConfiguration) { + private static void generateJassForConf(final ABAbilityBuilderDupe dupe, + final ABAbilityBuilderConfiguration abilityBuilderConfiguration) { String abilityName = null; final StringBuilder structCode = new StringBuilder(); @@ -113,7 +113,7 @@ private static void generateJassForConf(final AbilityBuilderDupe dupe, if (autoCastType != null) { initCode.append(" call SetABConfAutoCastType(abc, AUTOCAST_TYPE_" + autoCastType.name() + ")\n"); } - final AbilityBuilderType type = abilityBuilderConfiguration.getType(); + final ABAbilityBuilderType type = abilityBuilderConfiguration.getType(); if (type != null) { initCode.append(" call SetABConfType(abc, AB_CONF_TYPE_" + type.name() + ")\n"); switch (type) { diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderUIPanel.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderUIPanel.java index cc74e9b4a..678b0a35b 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderUIPanel.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderUIPanel.java @@ -20,18 +20,18 @@ import javax.swing.event.ListSelectionListener; import javax.swing.filechooser.FileNameExtensionFilter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.AbilityBuilderGsonBuilder; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderDupe; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderParserUtil; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAbilityBuilderGsonBuilder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderDupe; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; import com.google.gson.Gson; public class AbilityBuilderUIPanel extends JPanel { private final JFileChooser jsonFileChooser = new JFileChooser(new File("abilityBehaviors")); - private final Gson gson = AbilityBuilderGsonBuilder.create(); - private DefaultListModel idsListModel; - private JList idsList; + private final Gson gson = ABAbilityBuilderGsonBuilder.create(); + private DefaultListModel idsListModel; + private JList idsList; private AbilityBuilderConfigTree abilityBuilderConfigTree; public AbilityBuilderUIPanel() { @@ -40,8 +40,8 @@ public AbilityBuilderUIPanel() { jsonFileChooser.addChoosableFileFilter(jsonFilenameFilter); jsonFileChooser.setFileFilter(jsonFilenameFilter); - idsListModel = new DefaultListModel(); - idsList = new JList(idsListModel); + idsListModel = new DefaultListModel(); + idsList = new JList(idsListModel); idsList.setPreferredSize(new Dimension(200, 1)); idsList.setCellRenderer(new AbilityBuilderDupeCellRenderer()); @@ -52,7 +52,7 @@ public AbilityBuilderUIPanel() { @Override public void valueChanged(ListSelectionEvent e) { if (!e.getValueIsAdjusting()) { - AbilityBuilderConfiguration selectedValue = idsList.getSelectedValue(); + ABAbilityBuilderConfiguration selectedValue = idsList.getSelectedValue(); if (selectedValue != null) { abilityBuilderConfigTree.setConfig(selectedValue); } @@ -89,16 +89,16 @@ public void fileOpenClicked() { try { idsListModel.clear(); abilityBuilderConfigTree.clearConfig(); - AbilityBuilderParserUtil.loadAbilityBuilderFile(gson, selectedFile, behavior -> { - if (behavior.getType() == AbilityBuilderType.TEMPLATE) { - for (AbilityBuilderDupe dupe : behavior.getIds()) { + ABAbilityBuilderParserUtil.loadAbilityBuilderFile(gson, selectedFile, behavior -> { + if (behavior.getType() == ABAbilityBuilderType.TEMPLATE) { + for (ABAbilityBuilderDupe dupe : behavior.getIds()) { System.out.println("template: " + dupe.getId()); - idsListModel.addElement(new AbilityBuilderConfiguration(behavior, dupe)); + idsListModel.addElement(new ABAbilityBuilderConfiguration(behavior, dupe)); } } else { - for (AbilityBuilderDupe dupe : behavior.getIds()) { + for (ABAbilityBuilderDupe dupe : behavior.getIds()) { System.out.println("non-template: " + dupe.getId()); - idsListModel.addElement(new AbilityBuilderConfiguration(behavior, dupe)); + idsListModel.addElement(new ABAbilityBuilderConfiguration(behavior, dupe)); } } }); diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java index a3bc23e1d..9fe95f6d5 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.AbilityBuilderType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.DataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; @@ -38,7 +38,7 @@ public static void main(final String[] args) { System.out.println(String.format(" constant statemodtype STATE_MOD_TYPE_%-34s= ConvertStateModType(%d)", type.name(), type.ordinal())); } - for (final DataFieldLetter type : DataFieldLetter.values()) { + for (final ABDataFieldLetter type : ABDataFieldLetter.values()) { System.out.println( String.format(" constant datafieldletter DATA_FIELD_LETTER_%-34s= ConvertDataFieldLetter(%d)", type.name(), type.ordinal())); @@ -47,7 +47,7 @@ public static void main(final String[] args) { System.out.println(String.format(" constant autocasttype AUTOCAST_TYPE_%-34s= ConvertAutocastType(%d)", type.name(), type.ordinal())); } - for (final AbilityBuilderType type : AbilityBuilderType.values()) { + for (final ABAbilityBuilderType type : ABAbilityBuilderType.values()) { System.out.println(String.format(" constant abconftype AB_CONF_TYPE_%-34s= ConvertABConfType(%d)", type.name(), type.ordinal())); } From d6d123ceddca2edf0f5a34667044ede04fb34d46 Mon Sep 17 00:00:00 2001 From: Glasir Date: Sat, 13 Dec 2025 01:45:42 -0500 Subject: [PATCH 37/44] Major AB Refactor: Part 5 - ABBooleanCallback and ABCondition Unification * Removed ABCondition and had ABBooleanCallback take over its place * Kept the Condition folders, as there's enough items to justify the separation --- .../ABAbilityBuilderActiveFlexTarget.java | 6 ++--- .../ABAbilityBuilderGenericActive.java | 12 ++++----- .../ABActionAbilitySetShowIcon.java | 2 +- .../ABActionCreateAttackModifier.java | 7 +++-- .../ABActionFireModifiedAttack.java | 2 +- .../ABActionStartModifiedAttack.java | 2 +- ...ActionAttackModifierApplyAllArtFields.java | 2 +- .../ABActionAttackModifierApplyArt.java | 2 +- ...BActionAttackModifierApplyArtAndSpeed.java | 2 +- ...ABActionAttackModifierSetAttackHoming.java | 2 +- ...ctionAttemptToReOrderPreviousBehavior.java | 2 +- ...ActionAttemptToResumePreviousBehavior.java | 2 +- .../action/buff/ABActionAddSlowBuff.java | 2 +- .../action/buff/ABActionAddStunBuff.java | 2 +- .../buff/ABActionCreatePassiveBuff.java | 2 +- .../buff/ABActionCreateTimedArtBuff.java | 2 +- .../action/buff/ABActionCreateTimedBuff.java | 2 +- .../buff/ABActionCreateTimedLifeBuff.java | 2 +- ...ActionCreateTimedPausedExpirationBuff.java | 2 +- .../ABActionCreateTimedTargetingBuff.java | 2 +- .../buff/ABActionCreateTimedTickingBuff.java | 2 +- .../ABActionCreateTimedTickingPausedBuff.java | 2 +- ...ActionCreateTimedTickingPostDeathBuff.java | 2 +- .../action/buff/ABActionDispelBuffs.java | 4 +-- .../action/damage/ABActionDamageArea.java | 2 +- .../damage/ABActionDamageAttackSplash.java | 2 +- .../action/damage/ABActionDamageBurst.java | 2 +- .../action/damage/ABActionDamageSplash.java | 2 +- .../action/damage/ABActionDamageTarget.java | 2 +- .../behavior/action/damage/ABActionHeal.java | 2 +- .../datastore/ABActionStoreValueLocally.java | 2 +- .../ABActionCreateDestructable.java | 2 +- .../ABActionDamageDestructable.java | 2 +- .../ABActionCreateDestructableBuff.java | 2 +- .../ABActionDispelDestructableBuffs.java | 4 +-- .../widget/ABActionCreateWidgetEvent.java | 4 +-- ...ABActionCreateTerrainRippleAtLocation.java | 2 +- .../action/item/ABActionChargeItem.java | 2 +- ...itsInRangeOfLocationMatchingCondition.java | 4 +-- ...geOfLocationMatchingConditionWithSort.java | 4 +-- ...teUnitsInRangeOfUnitMatchingCondition.java | 4 +-- ...nRangeOfUnitMatchingConditionWithSort.java | 4 +-- .../ABActionSetAbilityEnabledForPlayer.java | 2 +- ...teLocationTargetedCollisionProjectile.java | 5 ++-- ...ctionCreateLocationTargetedProjectile.java | 2 +- ...reateLocationTargetedPseudoProjectile.java | 5 ++-- ...nCreateUnitTargetedBouncingProjectile.java | 5 ++-- ...CreateUnitTargetedCollisionProjectile.java | 5 ++-- .../ABActionCreateUnitTargetedProjectile.java | 2 +- ...ionCreateUnitTargetedPseudoProjectile.java | 5 ++-- .../projectile/ABActionSetProjectileDone.java | 2 +- .../ABActionSetProjectileReflected.java | 2 +- .../action/stats/ABActionAddDefenseBonus.java | 2 +- .../stats/ABActionRemoveDefenseBonus.java | 2 +- .../structural/ABActionChainEffect.java | 5 ++-- .../structural/ABActionCreateSubroutine.java | 2 +- .../action/structural/ABActionIf.java | 4 +-- .../structural/ABActionPeriodicExecute.java | 2 +- .../structural/ABActionRunSubroutine.java | 2 +- .../action/structural/ABActionWhile.java | 4 +-- .../action/timer/ABActionCreateTimer.java | 2 +- .../action/unit/ABActionCreateUnit.java | 2 +- .../unit/ABActionSetExplodesOnDeath.java | 2 +- .../unit/animation/ABActionPlayAnimation.java | 2 +- .../animation/ABActionQueueAnimation.java | 2 +- ...BActionSetUnitMovementTypeNoCollision.java | 2 +- .../action/unit/stats/ABActionAddMp.java | 2 +- .../action/unit/stats/ABActionSetHp.java | 2 +- .../action/unit/stats/ABActionSetMp.java | 2 +- .../action/unit/stats/ABActionSubtractMp.java | 2 +- .../transformation/ABActionMergeUnits.java | 2 +- .../transformation/ABActionTransformUnit.java | 2 +- .../ABActionTransformUnitInstant.java | 2 +- .../ABActionTransformedUnitAbilityAdd.java | 2 +- .../ABActionTransformedUnitAbilityRemove.java | 2 +- ...BActionCreateAttackPostDamageListener.java | 2 +- ...ABActionCreateAttackPreDamageListener.java | 2 +- ...ActionPreDamageListenerAddBonusDamage.java | 2 +- .../ABActionPreDamageListenerSetMiss.java | 2 +- .../ABActionSetPreDamageStacking.java | 2 +- .../ABConditionIsAttackArtillery.java | 4 +-- .../ABConditionIsAttackHoming.java | 4 +-- ...onditionIsUnitValidSplashDamageTarget.java | 5 ++-- .../ABActionCreateBehaviorChangeListener.java | 2 +- ...BConditionIsNewBehaviorCategoryInList.java | 4 +-- .../ABActionCreateDamageTakenListener.java | 2 +- ...CreateDamageTakenModificationListener.java | 2 +- ...ABConditionIsTriggeringDamageAnAttack.java | 4 +-- .../ABConditionIsTriggeringDamageRanged.java | 4 +-- .../ABActionCreateDeathReplacementEffect.java | 2 +- .../ABActionCreateEvasionListener.java | 5 ++-- ...onCreateAbilityEffectReactionListener.java | 2 +- ...tionCreateAbilityProjReactionListener.java | 2 +- ...ctionCreateAttackProjReactionListener.java | 2 +- .../ABActionCreateUnitVisionModifier.java | 2 +- .../ABCallbackGetStoredAbilityByKey.java | 2 +- .../ABCallbackInlineConditionAbility.java | 4 +-- ...BCallbackGetStoredAttackModifierByKey.java | 2 +- ...BCallbackGetStoredAttackSettingsByKey.java | 2 +- .../callback/booleans/ABBooleanCallback.java | 10 ------- .../buff/ABCallbackGetStoredBuffByKey.java | 2 +- .../buff/ABCallbackInlineConditionBuff.java | 4 +-- .../ABCallbackGetStoredDestructableByKey.java | 2 +- ...ABCallbackInlineConditionDestructable.java | 4 +-- ...allbackGetStoredDestructableBuffByKey.java | 2 +- ...llbackInlineConditionDestructableBuff.java | 4 +-- .../ABCallbackConditionalAutocastType.java | 4 +-- .../ABCallbackGetStoredAttackTypeByKey.java | 2 +- .../ABCallbackGetStoredDamageTypeByKey.java | 2 +- .../ABCallbackGetStoredDefenseTypeByKey.java | 2 +- .../ABCallbackGetStoredMovementTypeByKey.java | 2 +- .../ABCallbackGetStoredTargetTypeByKey.java | 2 +- .../ABCallbackGetStoredWeaponTypeByKey.java | 2 +- ...BCallbackGetStoredTimeOfDayEventByKey.java | 2 +- ...CallbackInlineConditionTimeOfDayEvent.java | 4 +-- .../ABCallbackGetStoredWidgetEventByKey.java | 2 +- .../ABCallbackInlineConditionWidgetEvent.java | 4 +-- .../ABCallbackGetAbilityUniqueValueFloat.java | 2 +- .../ABCallbackGetBuffUniqueValueFloat.java | 2 +- .../floats/ABCallbackGetStoredFloatByKey.java | 2 +- .../ABCallbackInlineConditionFloat.java | 4 +-- .../fx/ABCallbackGetStoredFXByKey.java | 2 +- .../fx/ABCallbackGetStoredLightningByKey.java | 2 +- .../fx/ABCallbackInlineConditionFX.java | 4 +-- .../id/ABCallbackGetAbilityUniqueValueId.java | 2 +- .../callback/id/ABCallbackGetParentAlias.java | 1 - .../id/ABCallbackGetStoredIDByKey.java | 2 +- .../id/ABCallbackInlineConditionID.java | 4 +-- .../callback/id/ABCallbackNullIfFalse.java | 4 +-- .../callback/id/ABCallbackRandomItemId.java | 2 +- ...backCountBuffsOnUnitMatchingCondition.java | 4 +-- ...BCallbackGetAbilityUniqueValueInteger.java | 2 +- .../ABCallbackGetBuffUniqueValueInteger.java | 2 +- .../ABCallbackGetStoredIntegerByKey.java | 2 +- .../ABCallbackInlineConditionInteger.java | 4 +-- .../integers/ABCallbackIntegerIf.java | 4 +-- .../ABCallbackIntegerZeroIfFalse.java | 2 +- .../item/ABCallbackGetStoredItemByKey.java | 2 +- .../item/ABCallbackInlineConditionItem.java | 4 +-- .../list/ABCallbackGetStoredListByKey.java | 2 +- .../ABCallbackGetStoredSortableListByKey.java | 2 +- .../list/ABCallbackInlineConditionList.java | 4 +-- ...ABCallbackInlineConditionSortableList.java | 4 +-- .../integer/ABCallbackIntegerListOfRange.java | 2 +- ...redAbilityEffectReactionListenerByKey.java | 2 +- ...toredAbilityProjReactionListenerByKey.java | 2 +- ...etStoredAttackPostDamageListenerByKey.java | 2 +- ...GetStoredAttackPreDamageListenerByKey.java | 2 +- ...StoredAttackProjReactionListenerByKey.java | 2 +- ...kGetStoredBehaviorChangeListenerByKey.java | 2 +- ...backGetStoredDamageTakenListenerByKey.java | 2 +- ...dDamageTakenModificationListenerByKey.java | 2 +- ...allbackGetStoredDeathReplacementByKey.java | 2 +- ...CallbackGetStoredEvasionListenerByKey.java | 2 +- ...llbackGetStoredUnitStateListenerByKey.java | 2 +- .../ABCallbackCreateLocationFromOffset.java | 2 +- .../ABCallbackGetStoredLocationByKey.java | 2 +- .../ABCallbackInlineConditionLocation.java | 4 +-- .../ABCallbackModifyLocationWithOffset.java | 2 +- .../ABCallbackGetAbilityUniqueValueLong.java | 2 +- .../ABCallbackGetBuffUniqueValueLong.java | 2 +- .../longs/ABCallbackGetStoredLongByKey.java | 2 +- .../longs/ABCallbackInlineConditionLong.java | 4 +-- .../ABCallbackGetStoredOrderIdByKey.java | 2 +- .../ABCallbackInlineConditionOrderId.java | 4 +-- .../ABCallbackGetStoredPlayerByKey.java | 2 +- .../ABCallbackInlineConditionPlayer.java | 4 +-- .../ABCallbackGetStoredProjectileByKey.java | 2 +- .../ABCallbackInlineConditionProjectile.java | 4 +-- ...backGetStoredNonStackingStatBuffByKey.java | 2 +- ...ackInlineConditionNonStackingStatBuff.java | 4 +-- .../ABCallbackGetStoredStateModBuffByKey.java | 2 +- ...ABCallbackInlineConditionStateModBuff.java | 4 +-- .../strings/ABCallbackBooleanToString.java | 2 +- ...ABCallbackGetAbilityUniqueValueString.java | 2 +- .../ABCallbackGetBuffUniqueValueString.java | 2 +- .../ABCallbackGetStoredStringByKey.java | 2 +- .../ABCallbackInlineConditionString.java | 4 +-- .../ABCallbackGetStoredTargetByKey.java | 2 +- .../ABCallbackInlineConditionTarget.java | 4 +-- .../timer/ABCallbackGetStoredTimerByKey.java | 2 +- .../timer/ABCallbackInlineConditionTimer.java | 4 +-- ...CallbackGetNearestCorpseInRangeOfUnit.java | 6 ++--- ...ABCallbackGetNearestUnitInRangeOfUnit.java | 6 ++--- .../unit/ABCallbackGetStoredUnitByKey.java | 2 +- .../unit/ABCallbackInlineConditionUnit.java | 4 +-- .../ABCallbackGetStoredUnitGroupByKey.java | 2 +- .../ABCallbackInlineConditionUnitGroup.java | 4 +-- .../ABCallbackGetStoredUnitQueueByKey.java | 2 +- .../ABCallbackInlineConditionUnitQueue.java | 4 +-- ...BCallbackGetStoredVisionModifierByKey.java | 2 +- ...CallbackInlineConditionVisionModifier.java | 4 +-- .../ABCallbackGetStoredWidgetByKey.java | 2 +- .../ABCallbackInlineConditionWidget.java | 4 +-- .../condition/ABBooleanCallback.java} | 6 ++--- .../condition/ABCallbackArgumentBoolean.java | 4 +-- .../condition/ABCallbackReuseBoolean.java | 4 +-- .../ABCallbackReuseBooleanWithArguments.java | 4 +-- .../ABConditionSetCantUseReasonOnFailure.java | 5 ++-- .../ABConditionIsAutoCastCurrentlyActive.java | 4 +-- .../ability/ABConditionIsDisabled.java | 4 +-- ...BConditionIsFlexAbilityNonPointTarget.java | 4 +-- .../ABConditionIsFlexAbilityNonTargeted.java | 4 +-- .../ABConditionIsFlexAbilityPointTarget.java | 4 +-- .../ABConditionIsFlexAbilityTargeted.java | 4 +-- .../ability/ABConditionIsOnCooldown.java | 4 +-- .../ABConditionIsToggleAbilityActive.java | 4 +-- .../ABConditionIsTransformingToAlternate.java | 4 +-- .../ability/ABConditionWasAutoCast.java | 4 +-- ...BConditionWasAutoCastPreviouslyActive.java | 4 +-- .../ABConditionWasCastingInterrupted.java | 4 +-- .../attack/ABConditionIsAttackProjectile.java | 4 +-- .../attack/ABConditionIsAttackRanged.java | 4 +-- .../ABCallbackGetAbilityDataAsBoolean.java | 6 ++--- ...BCallbackGetAbilityUniqueValueBoolean.java | 3 ++- .../ABCallbackGetBuffUniqueValueBoolean.java | 3 ++- ...CallbackGetParentAbilityDataAsBoolean.java | 6 ++--- .../ABCallbackGetStoredBooleanByKey.java | 6 ++--- .../ABCallbackInlineConditionBoolean.java | 6 ++--- .../booleans/ABCallbackIntegerToBoolean.java | 6 ++--- .../booleans/ABCallbackRawBoolean.java | 6 ++--- .../condition/buff/ABConditionIsBuffAlly.java | 4 +-- .../buff/ABConditionIsBuffEnemy.java | 4 +-- .../buff/ABConditionIsBuffMagic.java | 4 +-- .../buff/ABConditionIsBuffNegative.java | 4 +-- .../buff/ABConditionIsBuffPositive.java | 4 +-- .../ABConditionIsAttackTypeEqual.java | 4 +-- .../ABConditionIsDamageTypeEqual.java | 4 +-- .../ABConditionIsDefenseTypeEqual.java | 4 +-- .../ABConditionIsDefenseTypeInList.java | 4 +-- .../comparison/ABConditionIsIdEqual.java | 4 +-- .../ABConditionIsMovementTypeEqual.java | 4 +-- .../comparison/ABConditionIsUnitEqual.java | 4 +-- .../ABConditionIsWeaponTypeEqual.java | 4 +-- ...BConditionSuccessfullyChargeResources.java | 4 +-- .../ABConditionDoesDestructableHaveBuff.java | 4 +-- ...DestructableHaveBuffMatchingCondition.java | 5 ++-- .../destructable/ABConditionIsTree.java | 4 +-- .../ABConditionIsDestructableBuffMagic.java | 4 +-- ...ameplayConstantCanDisableDivineShield.java | 4 +-- ...ionGameplayConstantIsDefendCanDeflect.java | 4 +-- ...ameplayConstantIsRelativeUpgradeCosts.java | 4 +-- ...tionGameplayConstantSmartAbolishMagic.java | 4 +-- .../game/ABConditionIsTimeOfDayInRange.java | 4 +-- .../item/ABConditionIsItemAbility.java | 4 +-- .../item/ABConditionItemHasCharges.java | 4 +-- .../item/ABConditionItemIsCharged.java | 4 +-- .../ABConditionIsLocationDeepWater.java | 4 +-- .../ABConditionIsLocationFlyingOnly.java | 4 +-- ...onditionIsLocationPathableForUnitType.java | 4 +-- .../ABConditionIsLocationShallowWater.java | 4 +-- .../ABConditionIsLocationWalkable.java | 4 +-- ...ABConditionIsLocationWalkableNonWater.java | 4 +-- .../condition/logical/ABConditionAnd.java | 8 +++--- .../condition/logical/ABConditionBool.java | 5 ++-- .../condition/logical/ABConditionIsNull.java | 4 +-- .../condition/logical/ABConditionNot.java | 6 ++--- .../condition/logical/ABConditionNotNull.java | 4 +-- .../condition/logical/ABConditionOr.java | 8 +++--- .../membership/ABConditionIsUnitInGroup.java | 4 +-- .../ABConditionIsUnitInRangeOfUnit.java | 4 +-- ...tionMatchingCorpseExistsInRangeOfUnit.java | 8 +++--- ...ditionMatchingUnitExistsInRangeOfUnit.java | 6 ++--- .../numeric/ABConditionFloatEq0.java | 4 +-- .../numeric/ABConditionFloatEqual.java | 4 +-- .../condition/numeric/ABConditionFloatGt.java | 4 +-- .../numeric/ABConditionFloatGt0.java | 4 +-- .../numeric/ABConditionFloatGte.java | 4 +-- .../condition/numeric/ABConditionFloatLt.java | 4 +-- .../numeric/ABConditionFloatLte.java | 4 +-- .../condition/numeric/ABConditionFloatNe.java | 4 +-- .../numeric/ABConditionFloatNe0.java | 4 +-- .../numeric/ABConditionIntegerEq.java | 4 +-- .../numeric/ABConditionIntegerEq0.java | 4 +-- .../numeric/ABConditionIntegerGt.java | 4 +-- .../numeric/ABConditionIntegerGt0.java | 4 +-- .../numeric/ABConditionIntegerGte.java | 4 +-- .../numeric/ABConditionIntegerIsEven.java | 4 +-- .../numeric/ABConditionIntegerIsOdd.java | 4 +-- .../numeric/ABConditionIntegerLt.java | 4 +-- .../numeric/ABConditionIntegerLte.java | 4 +-- .../numeric/ABConditionIntegerNe.java | 4 +-- .../numeric/ABConditionIntegerNe0.java | 4 +-- .../ABConditionIsProjectileReflected.java | 4 +-- .../ABConditionIsDestructableValidTarget.java | 4 +-- ...ConditionIsPassAllAbilityTargetChecks.java | 4 +-- ...itionIsUnitPassAllAbilityTargetChecks.java | 4 +-- .../ABConditionIsUnitValidTarget.java | 5 ++-- .../targeting/ABConditionIsValidTarget.java | 4 +-- .../timer/ABConditionIsTimerActive.java | 4 +-- .../ABConditionDoesAbilityHaveUniqueFlag.java | 4 +-- .../ABConditionDoesBuffHaveUniqueFlag.java | 4 +-- .../condition/unit/ABConditionIsUnitType.java | 4 +-- ...nDoesUnitHaveAbilityMatchingCondition.java | 5 ++-- .../unit/alliance/ABConditionIsUnitEnemy.java | 4 +-- .../alliance/ABConditionIsUnitFriend.java | 4 +-- .../ABConditionIsUnitShareSpells.java | 4 +-- ...ditionIsCurrentBehaviorCategoryInList.java | 4 +-- .../buff/ABConditionDoesUnitHaveBuff.java | 4 +-- ...tionDoesUnitHaveBuffMatchingCondition.java | 5 ++-- .../ABConditionIsUnitBuilding.java | 4 +-- .../classification/ABConditionIsUnitHero.java | 4 +-- .../ABConditionIsUnitHeroDuration.java | 4 +-- .../ABConditionIsUnitHidden.java | 4 +-- .../ABConditionIsUnitMagicImmune.java | 4 +-- .../ABConditionIsUnitMorphImmune.java | 4 +-- .../ABConditionIsUnitSummoned.java | 4 +-- .../unit/state/ABConditionIsUnitAlive.java | 4 +-- .../unit/state/ABConditionIsUnitDead.java | 4 +-- .../unit/state/ABConditionIsUnitMaxHp.java | 4 +-- .../unit/state/ABConditionIsUnitMaxMp.java | 4 +-- .../state/ABConditionIsUnitPolymorphed.java | 4 +-- .../unit/state/ABConditionIsUnitSleeping.java | 4 +-- .../state/ABConditionIsUnitUpgrading.java | 4 +-- .../unit/state/ABConditionIsUnitVisible.java | 4 +-- .../tech/ABConditionIsUnitConstructing.java | 4 +-- ...onditionIsUnitConstructingOrUpgrading.java | 4 +-- .../unit/tech/ABConditionIsUnitTraining.java | 4 +-- .../unit/tech/ABConditionUnitHasResearch.java | 4 +-- .../core/ABAbilityBuilderGsonBuilder.java | 6 ++--- .../event/ABGlobalWidgetEvent.java | 6 ++--- .../abilitybuilder/event/ABPlayerEvent.java | 6 ++--- .../abilitybuilder/event/ABWidgetEvent.java | 6 ++--- .../abilitybuilder/jass/ABConditionJass.java | 6 ++--- .../listener/ABAttackEvasionListener.java | 8 +++--- .../listener/ABAttackModifier.java | 8 +++--- .../parser/ABAbilityBuilderConfiguration.java | 26 +++++++++---------- .../parser/ABAbilityBuilderParser.java | 26 +++++++++---------- .../ABAbilityBuilderOverrideFields.java | 2 +- .../ABAbilityBuilderSpecialConfigFields.java | 15 +++++------ .../ABAbilityBuilderSpecialDisplayFields.java | 2 +- .../ABCollisionProjectileListener.java | 8 +++--- .../AbilityBuilderConfigTree.java | 10 +++---- 333 files changed, 588 insertions(+), 619 deletions(-) delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABBooleanCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/{core/ABCondition.java => behavior/condition/ABBooleanCallback.java} (73%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{callback => condition}/booleans/ABCallbackGetAbilityDataAsBoolean.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{callback => condition}/booleans/ABCallbackGetAbilityUniqueValueBoolean.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{callback => condition}/booleans/ABCallbackGetBuffUniqueValueBoolean.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{callback => condition}/booleans/ABCallbackGetParentAbilityDataAsBoolean.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{callback => condition}/booleans/ABCallbackGetStoredBooleanByKey.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{callback => condition}/booleans/ABCallbackInlineConditionBoolean.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{callback => condition}/booleans/ABCallbackIntegerToBoolean.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/{callback => condition}/booleans/ABCallbackRawBoolean.java (81%) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java index a1addbd4d..95eee29ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java @@ -12,7 +12,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; @@ -37,7 +37,7 @@ public ABAbilityBuilderActiveFlexTarget(int handleId, War3ID alias, War3ID code, private void setTargeted(CSimulation game, CUnit unit) { if (config.getSpecialFields() != null && config.getSpecialFields().getTargetedSpell() != null) { boolean result = true; - for (ABCondition condition : config.getSpecialFields().getTargetedSpell()) { + for (ABBooleanCallback condition : config.getSpecialFields().getTargetedSpell()) { result = result && condition.callback(unit, localStore, castId); } this.targetedSpell = result; @@ -46,7 +46,7 @@ private void setTargeted(CSimulation game, CUnit unit) { private void setPointTarget(CSimulation game, CUnit unit) { if (config.getSpecialFields() != null && config.getSpecialFields().getPointTargeted() != null) { boolean result = true; - for (ABCondition condition : config.getSpecialFields().getPointTargeted()) { + for (ABBooleanCallback condition : config.getSpecialFields().getPointTargeted()) { result = result && condition.callback(unit, localStore, castId); } this.pointTarget = result; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java index b2d6aaf57..41bb4d11b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java @@ -32,8 +32,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABTargetTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; @@ -714,7 +714,7 @@ protected void innerCheckExtraCastConditions(CSimulation game, CUnit unit, int o if (innerCheckCanUseSpell(game, unit, orderId, receiver)) { if (config.getExtraCastConditions() != null) { boolean result = true; - for (ABCondition condition : config.getExtraCastConditions()) { + for (ABBooleanCallback condition : config.getExtraCastConditions()) { result = result && condition.callback(unit, localStore, -1); } if (result) { @@ -939,7 +939,7 @@ protected boolean innerCheckTargetInRange(CUnit unit, AbilityTarget target) { protected String innerCheckExtraTargetConditions(CSimulation game, CUnit unit, int orderId) { if (config.getExtraTargetConditions() != null) { boolean result = true; - for (ABCondition condition : config.getExtraTargetConditions()) { + for (ABBooleanCallback condition : config.getExtraTargetConditions()) { result = result && condition.callback(unit, localStore, -1); } if (result) { @@ -961,12 +961,12 @@ protected String innerCheckExtraAutoTargetConditions(CSimulation game, CUnit uni if (config.getExtraTargetConditions() != null || config.getExtraAutoTargetConditions() != null) { boolean result = true; if (config.getExtraTargetConditions() != null) { - for (ABCondition condition : config.getExtraTargetConditions()) { + for (ABBooleanCallback condition : config.getExtraTargetConditions()) { result = result && condition.callback(unit, localStore, -1); } } if (config.getExtraAutoTargetConditions() != null) { - for (ABCondition condition : config.getExtraAutoTargetConditions()) { + for (ABBooleanCallback condition : config.getExtraAutoTargetConditions()) { result = result && condition.callback(unit, localStore, -1); } } @@ -990,7 +990,7 @@ protected String innerCheckExtraAutoNoTargetConditions(CSimulation game, CUnit u if (config.getExtraAutoNoTargetConditions() != null) { boolean result = true; if (config.getExtraAutoNoTargetConditions() != null) { - for (ABCondition condition : config.getExtraAutoNoTargetConditions()) { + for (ABBooleanCallback condition : config.getExtraAutoNoTargetConditions()) { result = result && condition.callback(unit, localStore, -1); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java index c29c28242..52735b5d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java @@ -5,7 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java index 403cf361a..d6f4f7e8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java @@ -4,10 +4,9 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; @@ -15,9 +14,9 @@ public class ABActionCreateAttackModifier implements ABAction { private ABIntegerCallback priority; - private ABCondition preLaunchCondition; + private ABBooleanCallback preLaunchCondition; private List preLaunchModification; - private ABCondition condition; + private ABBooleanCallback condition; private List modification; private ABBooleanCallback useCastId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java index dd218e41e..ad7c1f0a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java index e2cab0672..3265ec87d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorAttackListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java index ce4886157..96db6994e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java index 33439a1b5..9f22fea0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java index f0a4a8e5e..41bf93442 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java index d6ef4fd02..b45cded0a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java @@ -2,7 +2,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java index b3d76c703..b3ffc2d87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java index df7ad5764..50646ed9b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java index 931aab912..983d82221 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs.ABBuffSlow; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java index 8244622cb..5be46299b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs.ABBuffStun; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java index 4731fd765..31d21ab4e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java index 1144bd0ca..1929af261 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -6,10 +6,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedArtBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java index f5ff2272d..fdce102ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java index 948d79601..7fb171d77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.util.CBuffTimedLife; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java index 57ab56edf..0f9326ce5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedPausedExpirationBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java index 76a2af217..597fb28f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java @@ -6,10 +6,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTargetingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java index b71757373..ea12f8d32 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java index 639cf93f8..466e86442 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPausedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java index 466755878..982fcdfc0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java @@ -7,12 +7,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPostDeathBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java index f48dad7f7..bcbfead2b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; @@ -17,7 +17,7 @@ public class ABActionDispelBuffs implements ABAction { private ABUnitCallback source; private ABUnitCallback unit; - private ABCondition filter; + private ABBooleanCallback filter; @Override public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java index 73689f251..7bac0af5a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java index e06de873b..c05ca67f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java index 1f0c936d3..f624ab97b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java index a22fa52cd..232deb360 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java index 67897c5b9..b76eb07bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java index 0a3c25f21..7945c00bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java index db163bba3..17169d208 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java index bcd751927..e46c615dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java @@ -5,11 +5,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java index 017b8da7e..13f2f759b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java index 2ae098785..7d6446809 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java index 35e464f39..9f529cd4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; @@ -17,7 +17,7 @@ public class ABActionDispelDestructableBuffs implements ABAction { private ABUnitCallback source; private ABDestructableCallback dest; - private ABCondition filter; + private ABBooleanCallback filter; @Override public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java index 1210d95bf..eb6b067b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; @@ -14,7 +14,7 @@ public class ABActionCreateWidgetEvent implements ABAction { private ABWidgetCallback widget; - private ABCondition condition; + private ABBooleanCallback condition; private List actions; private JassGameEventsWar3 eventType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java index 1ea27f6cb..d39468c10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java index 3e89776de..cbc05517c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java index 880ac5752..5b8ad6de9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java @@ -12,8 +12,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; @@ -24,7 +24,7 @@ public class ABActionIterateUnitsInRangeOfLocationMatchingCondition implements A private ABLocationCallback location; private ABFloatCallback range; private List iterationActions; - private ABCondition condition; + private ABBooleanCallback condition; @Override public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java index ac1c01efe..327adc763 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; @@ -26,7 +26,7 @@ public class ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort impl private ABLocationCallback location; private ABFloatCallback range; private List iterationActions; - private ABCondition condition; + private ABBooleanCallback condition; private ABIntegerCallback sort; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java index de0b4fb0c..49eba50e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java @@ -11,8 +11,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; @@ -20,7 +20,7 @@ public class ABActionIterateUnitsInRangeOfUnitMatchingCondition implements ABAct private static final Rectangle recycleRect = new Rectangle(); private List iterationActions; - private ABCondition condition; + private ABBooleanCallback condition; private ABUnitCallback originUnit; private ABFloatCallback range; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java index aca508e0a..1ff88111e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java @@ -12,8 +12,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; @@ -22,7 +22,7 @@ public class ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort implemen private static final Rectangle recycleRect = new Rectangle(); private List iterationActions; - private ABCondition condition; + private ABBooleanCallback condition; private ABIntegerCallback sort; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java index cdb827577..ebe81b5ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java index 60840e017..48ae46094 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java @@ -6,14 +6,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; @@ -31,7 +30,7 @@ public class ABActionCreateLocationTargetedCollisionProjectile implements ABSing private List onLaunch; private List onPreHits; - private List canHitTarget; + private List canHitTarget; private List onHit; private ABIntegerCallback maxHits; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java index 8858215ab..fb8af202b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java @@ -6,11 +6,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java index 522914e9a..1bdff5509 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java @@ -8,14 +8,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; @@ -36,7 +35,7 @@ public class ABActionCreateLocationTargetedPseudoProjectile implements ABSingleA private List onLaunch; private List onPreHits; - private List canHitTarget; + private List canHitTarget; private List onHit; private ABIntegerCallback maxHits; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java index 2c0dd2398..55e8c837e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java @@ -14,14 +14,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.ABAttackSettingsCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABNearestUnitComparator; @@ -46,7 +45,7 @@ public class ABActionCreateUnitTargetedBouncingProjectile implements ABAction { private List onLaunch; private List onHit; - private ABCondition condition; + private ABBooleanCallback condition; private ABIntegerCallback sort; private ABFloatCallback range; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java index 161bd82b9..f2adf1029 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java @@ -5,14 +5,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; @@ -30,7 +29,7 @@ public class ABActionCreateUnitTargetedCollisionProjectile implements ABSingleAc private List onLaunch; private List onPreHits; - private List canHitTarget; + private List canHitTarget; private List onHit; private ABIntegerCallback maxHits; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java index ac65fd508..5e9ba4db5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java @@ -6,11 +6,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.ABAttackSettingsCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java index 50cae283b..a78828fe3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java @@ -7,14 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; @@ -35,7 +34,7 @@ public class ABActionCreateUnitTargetedPseudoProjectile implements ABSingleActio private List onLaunch; private List onPreHits; - private List canHitTarget; + private List canHitTarget; private List onHit; private ABIntegerCallback maxHits; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java index 6d0182883..d1f098438 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java index 026371d46..ef2044b7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java index 4cbe0b2c6..cff660e61 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java index 4444e93fe..ab2b25f10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java index 0d38890b6..165ead03f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java @@ -9,13 +9,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABNearestUnitComparator; @@ -26,7 +25,7 @@ public class ABActionChainEffect implements ABAction { private static final Rectangle recycleRect = new Rectangle(); private List actions; - private ABCondition condition; + private ABBooleanCallback condition; private ABIntegerCallback sort; private ABUnitCallback target; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java index 92029103b..7f86f0860 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java index 9b69954c1..29bedc3b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java @@ -4,13 +4,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionIf implements ABAction { - private ABCondition condition; + private ABBooleanCallback condition; private List thenActions; private List elseActions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java index 3bfb6d0d1..531872d8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java index 8cd55a394..3d87e3a06 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java index ba7f4d05c..6b6b39d93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABActionWhile implements ABAction { - private ABCondition condition; + private ABBooleanCallback condition; private List loopActions; @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java index a7d866034..99da7b2df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java index 570f8e1b1..153eaeeaf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java @@ -5,11 +5,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitClassification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java index e10ce0c45..48e40ac59 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java index 299afa163..0580a477f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java index 1de9c3c06..1dbf53fc5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java index 8d09ffa93..7c3f469e3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java index 1ddcaf98b..987597f15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java index 9aae2d07a..da37dd418 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java index c3a147323..339b05a67 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java index 116c6e5a1..cd36862bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java index 374e83b83..85a2df851 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java @@ -3,12 +3,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java index 827fc4c40..e92d9d8cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java @@ -8,10 +8,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorFinishTransformation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java index 88d9b1128..ce3bb3b81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java @@ -6,10 +6,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java index a6faf759a..0d4524f51 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java @@ -7,10 +7,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java index c6793e8c0..a6f8000a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java index 5021eead4..b926a8a5f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java @@ -4,8 +4,8 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java index 501d8733f..c1a6a8e92 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java @@ -4,7 +4,7 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java index 87e54dc1f..eb9a5e04d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java @@ -2,10 +2,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java index 74f846389..cdb386ab0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java @@ -2,7 +2,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java index 3086db0e6..cae00f2d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java @@ -2,7 +2,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java index 6eab86c53..41e8c9744 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileLine; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; -public class ABConditionIsAttackArtillery extends ABCondition { +public class ABConditionIsAttackArtillery extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java index 9fd8f3b82..fc6f670cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; -public class ABConditionIsAttackHoming extends ABCondition { +public class ABConditionIsAttackHoming extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java index 770bfc39e..27745a00e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java @@ -4,9 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; @@ -14,7 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; -public class ABConditionIsUnitValidSplashDamageTarget extends ABCondition { +public class ABConditionIsUnitValidSplashDamageTarget extends ABBooleanCallback { private ABUnitCallback caster; private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java index 3853e7a14..808e95252 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java @@ -4,7 +4,7 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java index 16838cde1..dda53224a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java @@ -3,13 +3,13 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; -public class ABConditionIsNewBehaviorCategoryInList extends ABCondition { +public class ABConditionIsNewBehaviorCategoryInList extends ABBooleanCallback { private List list; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java index 08e735a71..c2225afc6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java @@ -4,8 +4,8 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java index 7729f7821..407ad47c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java @@ -4,8 +4,8 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java index 876a902fa..bb2ec8b2f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalcondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; -public class ABConditionIsTriggeringDamageAnAttack extends ABCondition { +public class ABConditionIsTriggeringDamageAnAttack extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java index 40326fb8b..1bd4cdb80 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalcondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; -public class ABConditionIsTriggeringDamageRanged extends ABCondition { +public class ABConditionIsTriggeringDamageRanged extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java index fcff5cd2d..86a62468a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java @@ -4,7 +4,7 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java index 95e4b8fd3..0271d1dca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java @@ -4,16 +4,15 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public class ABActionCreateEvasionListener implements ABAction { - private List conditions; + private List conditions; private ABBooleanCallback useCastId; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java index 7c0c096a9..eaa46d346 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java @@ -4,7 +4,7 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java index 259ea055a..7a6259f25 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java @@ -4,7 +4,7 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java index 633d4d474..8b567b240 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java @@ -4,7 +4,7 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java index 44813d8d8..6b3d0d07e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java @@ -1,9 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java index 6ce7f3e83..b678ffaed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java index fd83ce1d1..dae421cbb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionAbility extends ABAbilityCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABAbilityCallback pass; private ABAbilityCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java index 7ec3123db..717f9aa2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java index 77fcda15c..eb3e42a4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABBooleanCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABBooleanCallback.java deleted file mode 100644 index ccd9bcf60..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABBooleanCallback.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABBooleanCallback implements ABCallback { - - abstract public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java index fd354dd6a..9e0519146 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java index 130cf3154..44e26b4fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionBuff extends ABBuffCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABBuffCallback pass; private ABBuffCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java index d9c037586..96a3bea60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java index 315d629e8..ba7e9b4e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionDestructable extends ABDestructableCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABDestructableCallback pass; private ABDestructableCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java index bd431cc19..f5c3bb4d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java index 60973224f..0dcb1e031 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionDestructableBuff extends ABDestructableBuffCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABDestructableBuffCallback pass; private ABDestructableBuffCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java index 7012306f9..b3912d65e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackConditionalAutocastType extends ABAutocastTypeCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABAutocastTypeCallback value1; private ABAutocastTypeCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java index 7aae82c9e..7242f7d15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java index d58aa3db4..2bc75d559 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java index fa1f9b0d7..e9cda1599 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java index 40f22b72e..4cf751cd0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java index 40cb34b97..360d304fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java index a3782a89d..2c37921d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java index 88e677096..6c4f04719 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java index a19f8518c..1ad7506c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackInlineConditionTimeOfDayEvent extends ABTimeOfDayEventCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABTimeOfDayEventCallback pass; private ABTimeOfDayEventCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java index 7b4861c45..ba9dbb96e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java index 515175638..ca7b772bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackInlineConditionWidgetEvent extends ABWidgetEventCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABWidgetEventCallback pass; private ABWidgetEventCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java index bf8b35271..58fc1233d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java index fcafcd7a6..bd2f68355 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java index 74e1d1410..10b0928f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java index 15d8a8a4d..fec8aa4bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionFloat extends ABFloatCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABFloatCallback pass; private ABFloatCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java index 8be18a599..480cbdd72 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java index f108fcc70..496ab9500 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java index 7b6bf1e7f..62db9b83e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackInlineConditionFX extends ABFXCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABFXCallback pass; private ABFXCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java index 907d1f9cf..6b801911d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java index b8e3e0df4..0b39e3116 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java @@ -7,7 +7,6 @@ public class ABCallbackGetParentAlias extends ABIDCallback { - @SuppressWarnings("unchecked") @Override public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return (War3ID) ((ABLocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java index b75aea7a3..6ec76d80c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java index 4c8891299..d867545cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionID extends ABIDCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABIDCallback pass; private ABIDCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java index 129f31aeb..fb1de3b96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackNullIfFalse extends ABIDCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABIDCallback value; @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java index 8495e0dac..f5868a843 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItemType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABRandomTypeHandler; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java index ad1f1972d..b135754f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java @@ -5,14 +5,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCountBuffsOnUnitMatchingCondition extends ABIntegerCallback { private ABUnitCallback unit; - private ABCondition condition; + private ABBooleanCallback condition; @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java index 729699947..dd1da6a2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java index 078eba764..baccae853 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java index f9a6bf61a..f47864c15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java index 4aa79fe8f..cfb9e3ed0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionInteger extends ABIntegerCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABIntegerCallback pass; private ABIntegerCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java index 1067fec62..ff578ecec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java @@ -1,14 +1,14 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIntegerIf extends ABIntegerCallback { private ABIntegerCallback value1; private ABIntegerCallback value2; - private ABCondition condition; + private ABBooleanCallback condition; @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java index bfa3860fd..0f4363e4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIntegerZeroIfFalse extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java index 9b171cb09..5bc7b044c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java index 985fd8f0f..a60d7dca3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionItem extends ABItemCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABItemCallback pass; private ABItemCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java index eba929ec7..5e2510c56 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java @@ -3,8 +3,8 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java index 9dfaa44ba..b78af9d08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java @@ -3,8 +3,8 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java index 0fb50946d..658beb08c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java @@ -3,12 +3,12 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionList extends ABListCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABListCallback pass; private ABListCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java index 3f0486cc2..d66ffc304 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java @@ -3,12 +3,12 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionSortableList> extends ABSortableListCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABListCallback pass; private ABListCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java index f316d8dde..a68bf4ca7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java @@ -5,8 +5,8 @@ import java.util.stream.IntStream; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackIntegerListOfRange extends ABIntegerListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java index 8bf7f180e..904f5c7a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java index 5feb9226c..4bab6a43a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java index d070b12f6..bae981b3a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java index 43e631960..59a8b0960 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java index f91201010..ee03e0165 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java index f0d1e3966..41ed9ea52 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java index dc7f107e7..0fa22fb63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java index ef688d27f..cb2c8dac4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java index ac15133d8..1ec2a6b20 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java index fefc18a05..8efb133f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java index c0ac3c8fc..eadf0e54d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java index cf04931c8..e6a1bac02 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackCreateLocationFromOffset extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java index 123b11725..ad0486033 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java index 1915a8ff3..92773fa0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionLocation extends ABLocationCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABLocationCallback pass; private ABLocationCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java index 9ad20bf39..6309f80b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackModifyLocationWithOffset extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java index 0f90f930a..a6ede1b58 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java index b745360e7..45c69ae70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java @@ -2,9 +2,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java index a3a39cb17..aa08638ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java index af914f4c2..fb558a1d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionLong extends ABLongCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABLongCallback pass; private ABLongCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java index 55c8bbecd..a529d1526 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java index b54daaf0d..c8b96c07b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionOrderId extends ABOrderIdCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABOrderIdCallback pass; private ABOrderIdCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java index f889f49b0..68cdce801 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java index 187a8e79b..b3857b1f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackInlineConditionPlayer extends ABPlayerCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABPlayerCallback pass; private ABPlayerCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java index a987f16f7..843aeb5a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java index 83563a400..94bda6884 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackInlineConditionProjectile extends ABProjectileCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABProjectileCallback pass; private ABProjectileCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java index 53c246c3d..ea09da8ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java index 36e5d23ec..552752bbd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackInlineConditionNonStackingStatBuff extends ABNonStackingStatBuffCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABNonStackingStatBuffCallback pass; private ABNonStackingStatBuffCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java index 7c5b7ebbf..5a8135dae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java index 6b0825e84..a0e950444 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackInlineConditionStateModBuff extends ABStateModBuffCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABStateModBuffCallback pass; private ABStateModBuffCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java index 39ec8815d..7100b64ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackBooleanToString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java index 39c1eda95..1bcdc176c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java @@ -3,7 +3,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java index 2a2df559b..27322e20d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java index e8d31faaf..9f17e9da0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java @@ -2,7 +2,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java index 859449424..57e76a9a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionString extends ABStringCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABStringCallback pass; private ABStringCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java index a5b08d346..7b80c89cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java index 2e494386a..79bb6bce7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionTarget extends ABTargetCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABTargetCallback pass; private ABTargetCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java index 157e5bfd5..a0fe5282a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java index 6cc95cd47..bdee51e7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackInlineConditionTimer extends ABTimerCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABTimerCallback pass; private ABTimerCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java index a41d47835..204faba2b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; @@ -16,7 +16,7 @@ public class ABCallbackGetNearestCorpseInRangeOfUnit extends ABUnitCallback { private ABUnitCallback originUnit; private ABFloatCallback range; - private List conditions; + private List conditions; @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { @@ -36,7 +36,7 @@ public boolean call(final CUnit enumUnit) { if (conditions != null) { boolean result = true; localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); - for (ABCondition condition : conditions) { + for (ABBooleanCallback condition : conditions) { result = result && condition.callback(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java index d9958ab15..7425efcf7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; @@ -16,7 +16,7 @@ public class ABCallbackGetNearestUnitInRangeOfUnit extends ABUnitCallback { private ABUnitCallback originUnit; private ABFloatCallback range; - private List conditions; + private List conditions; @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { @@ -36,7 +36,7 @@ public boolean call(final CUnit enumUnit) { if (conditions != null) { boolean result = true; localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); - for (ABCondition condition : conditions) { + for (ABBooleanCallback condition : conditions) { result = result && condition.callback(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java index 65ef4f908..69a414b3f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java index 6ead2610b..5fa393288 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionUnit extends ABUnitCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABUnitCallback pass; private ABUnitCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java index faedbce8a..7f77eb26a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java index 373c17908..ad1899a37 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java @@ -3,12 +3,12 @@ import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionUnitGroup extends ABUnitGroupCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABUnitGroupCallback pass; private ABUnitGroupCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java index 6a3e78391..2a58332ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java index af3a537a2..f60d99ea3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java @@ -3,12 +3,12 @@ import java.util.Queue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionUnitQueue extends ABUnitQueueCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABUnitQueueCallback pass; private ABUnitQueueCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java index 3b592abb8..251155e2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java index 745f260e8..fb4fdab90 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java @@ -1,13 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackInlineConditionVisionModifier extends ABVisionModifierCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABVisionModifierCallback pass; private ABVisionModifierCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java index 220ef8868..438b8cb3a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java index dd4db9172..1e1a29935 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionWidget extends ABWidgetCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABWidgetCallback pass; private ABWidgetCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABBooleanCallback.java similarity index 73% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABBooleanCallback.java index 2c9f966cc..9167c2e6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABBooleanCallback.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; import com.etheller.warsmash.parsers.jass.JassTextGeneratorExpr; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public abstract class ABCondition extends ABBooleanCallback implements JassTextGeneratorExpr { +public abstract class ABBooleanCallback implements ABCallback, JassTextGeneratorExpr { abstract public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java index 3d406b014..9089f9f0b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java @@ -2,14 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABCallbackArgumentBoolean extends ABCondition { +public class ABCallbackArgumentBoolean extends ABBooleanCallback { private ABStringCallback name; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java index 24a795439..009e2a628 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java @@ -3,15 +3,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -public class ABCallbackReuseBoolean extends ABCondition { +public class ABCallbackReuseBoolean extends ABBooleanCallback { private ABStringCallback name; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java index 86fec1e65..5e7831cb6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java @@ -5,15 +5,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -public class ABCallbackReuseBooleanWithArguments extends ABCondition { +public class ABCallbackReuseBooleanWithArguments extends ABBooleanCallback { private ABStringCallback name; private Map arguments; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java index 6fb6d9c73..d935c20c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java @@ -1,14 +1,13 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeysEnum; -public class ABConditionSetCantUseReasonOnFailure extends ABCondition { +public class ABConditionSetCantUseReasonOnFailure extends ABBooleanCallback { - private ABCondition condition; + private ABBooleanCallback condition; private CommandStringErrorKeysEnum reason; @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java index ea13bf604..12e9187e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsAutoCastCurrentlyActive extends ABCondition { +public class ABConditionIsAutoCastCurrentlyActive extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java index c216b60c8..534bd1f81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsDisabled extends ABCondition { +public class ABConditionIsDisabled extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java index 5192f6b63..af8fb9523 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsFlexAbilityNonPointTarget extends ABCondition { +public class ABConditionIsFlexAbilityNonPointTarget extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java index bc60d795e..748e29e0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsFlexAbilityNonTargeted extends ABCondition { +public class ABConditionIsFlexAbilityNonTargeted extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java index d9b4ccee3..3b45d3405 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsFlexAbilityPointTarget extends ABCondition { +public class ABConditionIsFlexAbilityPointTarget extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java index 56b5abe93..e6b500fcb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsFlexAbilityTargeted extends ABCondition { +public class ABConditionIsFlexAbilityTargeted extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java index 8621fa58a..bb269e0e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsOnCooldown extends ABCondition { +public class ABConditionIsOnCooldown extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java index d4e54f333..752d40181 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java @@ -4,11 +4,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsToggleAbilityActive extends ABCondition { +public class ABConditionIsToggleAbilityActive extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java index 84818fafb..9b655278c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java @@ -1,11 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsTransformingToAlternate extends ABCondition { +public class ABConditionIsTransformingToAlternate extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java index 98ff82a3b..8345cc64b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionWasAutoCast extends ABCondition { +public class ABConditionWasAutoCast extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java index eae1a40b1..5cb6414d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionWasAutoCastPreviouslyActive extends ABCondition { +public class ABConditionWasAutoCastPreviouslyActive extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java index 2777c5817..86f237a1f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionWasCastingInterrupted extends ABCondition { +public class ABConditionWasCastingInterrupted extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java index 0524b99e9..76f19786b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; -public class ABConditionIsAttackProjectile extends ABCondition { +public class ABConditionIsAttackProjectile extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java index 6da10eb93..95567815a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java @@ -1,12 +1,12 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; -public class ABConditionIsAttackRanged extends ABCondition { +public class ABConditionIsAttackRanged extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityDataAsBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java index bd588ad9a..7708fb6e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; -public class ABCallbackGetAbilityDataAsBoolean extends ABCondition { +public class ABCallbackGetAbilityDataAsBoolean extends ABBooleanCallback { private ABDataFieldLetter dataField; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityUniqueValueBoolean.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityUniqueValueBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityUniqueValueBoolean.java index 29871445d..8d86eae0d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetAbilityUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityUniqueValueBoolean.java @@ -1,9 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetBuffUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetBuffUniqueValueBoolean.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetBuffUniqueValueBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetBuffUniqueValueBoolean.java index 3353d569d..e06ba984b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetBuffUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetBuffUniqueValueBoolean.java @@ -1,9 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetParentAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetParentAbilityDataAsBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java index 557eacd0c..a4c771c1b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetParentAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; -public class ABCallbackGetParentAbilityDataAsBoolean extends ABCondition { +public class ABCallbackGetParentAbilityDataAsBoolean extends ABBooleanCallback { private ABIntegerCallback dataField; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetStoredBooleanByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetStoredBooleanByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java index a9da1e42f..99cf1dcb1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackGetStoredBooleanByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABCallbackGetStoredBooleanByKey extends ABCondition { +public class ABCallbackGetStoredBooleanByKey extends ABBooleanCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackInlineConditionBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackInlineConditionBoolean.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackInlineConditionBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackInlineConditionBoolean.java index 0657ff9d1..61e0f17ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackInlineConditionBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackInlineConditionBoolean.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABCallbackInlineConditionBoolean extends ABBooleanCallback { - private ABCondition condition; + private ABBooleanCallback condition; private ABBooleanCallback pass; private ABBooleanCallback fail; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackIntegerToBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackIntegerToBoolean.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackIntegerToBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackIntegerToBoolean.java index e6c3b06db..93ccb53e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackIntegerToBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackIntegerToBoolean.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABCallbackIntegerToBoolean extends ABCondition { +public class ABCallbackIntegerToBoolean extends ABBooleanCallback { private ABIntegerCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackRawBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackRawBoolean.java similarity index 81% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackRawBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackRawBoolean.java index bc6829543..c06890176 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/booleans/ABCallbackRawBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackRawBoolean.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABCallbackRawBoolean extends ABCondition { +public class ABCallbackRawBoolean extends ABBooleanCallback { private Boolean value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java index fd79527bf..bd9d07685 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; -public class ABConditionIsBuffAlly extends ABCondition { +public class ABConditionIsBuffAlly extends ABBooleanCallback { ABBuffCallback buff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java index dea294fdb..8cb19a265 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; -public class ABConditionIsBuffEnemy extends ABCondition { +public class ABConditionIsBuffEnemy extends ABBooleanCallback { ABBuffCallback buff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java index 3374518d9..aad92094e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsBuffMagic extends ABCondition { +public class ABConditionIsBuffMagic extends ABBooleanCallback { ABBuffCallback buff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java index 691e165fb..4d9959bce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsBuffNegative extends ABCondition { +public class ABConditionIsBuffNegative extends ABBooleanCallback { ABBuffCallback buff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java index d4a8b43c1..fd9ecb02d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsBuffPositive extends ABCondition { +public class ABConditionIsBuffPositive extends ABBooleanCallback { ABBuffCallback buff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java index 870a26ccf..b035c3337 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; -public class ABConditionIsAttackTypeEqual extends ABCondition { +public class ABConditionIsAttackTypeEqual extends ABBooleanCallback { private ABAttackTypeCallback attackType1; private ABAttackTypeCallback attackType2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java index 0410b2e11..c3612684a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; -public class ABConditionIsDamageTypeEqual extends ABCondition { +public class ABConditionIsDamageTypeEqual extends ABBooleanCallback { private ABDamageTypeCallback damageType1; private ABDamageTypeCallback damageType2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java index b8264c8ee..9c7ad01cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDefenseTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; -public class ABConditionIsDefenseTypeEqual extends ABCondition { +public class ABConditionIsDefenseTypeEqual extends ABBooleanCallback { private ABDefenseTypeCallback defenseType1; private ABDefenseTypeCallback defenseType2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java index 7253f77a5..76c7f5bf0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java @@ -4,11 +4,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDefenseTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; -public class ABConditionIsDefenseTypeInList extends ABCondition { +public class ABConditionIsDefenseTypeInList extends ABBooleanCallback { private ABDefenseTypeCallback defenseType; private List list; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java index 500b519e0..b101b3c74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsIdEqual extends ABCondition { +public class ABConditionIsIdEqual extends ABBooleanCallback { private ABIDCallback id1; private ABIDCallback id2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java index 5fd70d65d..0f2a13b4e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABMovementTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsMovementTypeEqual extends ABCondition { +public class ABConditionIsMovementTypeEqual extends ABBooleanCallback { private ABMovementTypeCallback movementType1; private ABMovementTypeCallback movementType2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java index e791f5376..eeae5e1ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitEqual extends ABCondition { +public class ABConditionIsUnitEqual extends ABBooleanCallback { private ABUnitCallback unit1; private ABUnitCallback unit2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java index 1d8e716b6..5a02a4f31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; -public class ABConditionIsWeaponTypeEqual extends ABCondition { +public class ABConditionIsWeaponTypeEqual extends ABBooleanCallback { private ABWeaponTypeCallback weaponType1; private ABWeaponTypeCallback weaponType2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java index 216e6c753..1648b990c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java @@ -4,11 +4,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; -public class ABConditionSuccessfullyChargeResources extends ABCondition { +public class ABConditionSuccessfullyChargeResources extends ABBooleanCallback { private ABUnitCallback unit; private ABPlayerCallback player; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java index 4dc67274f..a59647e6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java @@ -5,10 +5,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionDoesDestructableHaveBuff extends ABCondition { +public class ABConditionDoesDestructableHaveBuff extends ABBooleanCallback { private ABDestructableCallback dest; private ABIDCallback id; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java index e35f02e8d..19c0e3f0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java @@ -3,13 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionDoesDestructableHaveBuffMatchingCondition extends ABCondition { +public class ABConditionDoesDestructableHaveBuffMatchingCondition extends ABBooleanCallback { private ABDestructableCallback dest; private ABBooleanCallback condition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java index fc2057ebf..730da209c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java @@ -5,11 +5,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; -public class ABConditionIsTree extends ABCondition { +public class ABConditionIsTree extends ABBooleanCallback { private ABDestructableCallback dest; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java index f4e6f3d44..57d06578c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsDestructableBuffMagic extends ABCondition { +public class ABConditionIsDestructableBuffMagic extends ABBooleanCallback { ABDestructableBuffCallback buff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java index 2801ddc54..c911d54a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionGameplayConstantCanDisableDivineShield extends ABCondition { +public class ABConditionGameplayConstantCanDisableDivineShield extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java index b5d8ddc7a..578dd4716 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionGameplayConstantIsDefendCanDeflect extends ABCondition { +public class ABConditionGameplayConstantIsDefendCanDeflect extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java index b5373b763..7cd959a57 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionGameplayConstantIsRelativeUpgradeCosts extends ABCondition { +public class ABConditionGameplayConstantIsRelativeUpgradeCosts extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java index e0e6e1bb0..bef984380 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java @@ -1,10 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionGameplayConstantSmartAbolishMagic extends ABCondition { +public class ABConditionGameplayConstantSmartAbolishMagic extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java index 122c459aa..b12aa9cfe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsTimeOfDayInRange extends ABCondition { +public class ABConditionIsTimeOfDayInRange extends ABBooleanCallback { private ABFloatCallback startTime; private ABFloatCallback endTime; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java index 9ab457c2a..20e155691 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsItemAbility extends ABCondition { +public class ABConditionIsItemAbility extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java index 28279430b..e64f2424e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionItemHasCharges extends ABCondition { +public class ABConditionItemHasCharges extends ABBooleanCallback { private ABItemCallback item; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java index 82afd9e61..fec6a8d66 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionItemIsCharged extends ABCondition { +public class ABConditionItemIsCharged extends ABBooleanCallback { private ABItemCallback item; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java index 0a84114db..0be80d578 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsLocationDeepWater extends ABCondition { +public class ABConditionIsLocationDeepWater extends ABBooleanCallback { private ABLocationCallback location; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java index 59d673e99..561a6ae2b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsLocationFlyingOnly extends ABCondition { +public class ABConditionIsLocationFlyingOnly extends ABBooleanCallback { private ABLocationCallback location; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java index 6fc0ad832..9acc0f045 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java @@ -5,10 +5,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsLocationPathableForUnitType extends ABCondition { +public class ABConditionIsLocationPathableForUnitType extends ABBooleanCallback { ABLocationCallback location; ABIDCallback unitType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java index 1864d026b..1100c6fe6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsLocationShallowWater extends ABCondition { +public class ABConditionIsLocationShallowWater extends ABBooleanCallback { private ABLocationCallback location; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java index 3c14bde58..fa925ef68 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsLocationWalkable extends ABCondition { +public class ABConditionIsLocationWalkable extends ABBooleanCallback { private ABLocationCallback location; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java index 3c954de87..4e45bc9ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsLocationWalkableNonWater extends ABCondition { +public class ABConditionIsLocationWalkableNonWater extends ABBooleanCallback { private ABLocationCallback location; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java index 51d6c844c..7b125fbe2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java @@ -4,18 +4,18 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionAnd extends ABCondition { +public class ABConditionAnd extends ABBooleanCallback { - private List conditions; + private List conditions; @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { boolean result = true; if (conditions != null) { - for (ABCondition cond : conditions) { + for (ABBooleanCallback cond : conditions) { if (result) { result = result && cond.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java index a8bd4628b..64f3e243a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java @@ -1,11 +1,10 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionBool extends ABCondition { +public class ABConditionBool extends ABBooleanCallback { private ABBooleanCallback bool; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java index 6fcaeefab..9ace00f2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java @@ -1,11 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsNull extends ABCondition { +public class ABConditionIsNull extends ABBooleanCallback { private ABCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java index 1c08f1afd..f5b4094af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java @@ -2,12 +2,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionNot extends ABCondition { +public class ABConditionNot extends ABBooleanCallback { - private ABCondition condition; + private ABBooleanCallback condition; @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java index 738734125..ee4eebe5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java @@ -1,11 +1,11 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionNotNull extends ABCondition { +public class ABConditionNotNull extends ABBooleanCallback { private ABCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java index afad217b1..f4e656507 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java @@ -3,18 +3,18 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionOr extends ABCondition { +public class ABConditionOr extends ABBooleanCallback { - private List conditions; + private List conditions; @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { boolean result = false; if (conditions != null) { - for (ABCondition cond : conditions) { + for (ABBooleanCallback cond : conditions) { if (!result) { result = result || cond.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java index 1da036ffb..de56a0039 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java @@ -5,10 +5,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitInGroup extends ABCondition { +public class ABConditionIsUnitInGroup extends ABBooleanCallback { private ABUnitGroupCallback group; private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java index afc1106fe..d4f78e46f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitInRangeOfUnit extends ABCondition { +public class ABConditionIsUnitInRangeOfUnit extends ABBooleanCallback { private ABUnitCallback caster; private ABUnitCallback target; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java index 3a9cc1e84..204677686 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java @@ -7,17 +7,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; -public class ABConditionMatchingCorpseExistsInRangeOfUnit extends ABCondition { +public class ABConditionMatchingCorpseExistsInRangeOfUnit extends ABBooleanCallback { private static final Rectangle recycleRect = new Rectangle(); private ABUnitCallback originUnit; private ABFloatCallback range; - private List conditions; + private List conditions; @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { @@ -36,7 +36,7 @@ public boolean call(final CUnit enumUnit) { if (conditions != null) { boolean result = true; localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); - for (ABCondition condition : conditions) { + for (ABBooleanCallback condition : conditions) { result = result && condition.callback(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java index 8e58977ab..8f4bdb8a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java @@ -5,17 +5,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; -public class ABConditionMatchingUnitExistsInRangeOfUnit extends ABCondition { +public class ABConditionMatchingUnitExistsInRangeOfUnit extends ABBooleanCallback { private static final Rectangle recycleRect = new Rectangle(); private ABUnitCallback originUnit; private ABFloatCallback range; - private ABCondition condition; + private ABBooleanCallback condition; @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java index 7e8e96453..c6e6624c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionFloatEq0 extends ABCondition { +public class ABConditionFloatEq0 extends ABBooleanCallback { private ABFloatCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java index 2280e1910..b689280fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionFloatEqual extends ABCondition { +public class ABConditionFloatEqual extends ABBooleanCallback { private ABFloatCallback value1; private ABFloatCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java index 447d22a4d..9d13ae54b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionFloatGt extends ABCondition { +public class ABConditionFloatGt extends ABBooleanCallback { private ABFloatCallback value1; private ABFloatCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java index 2de3b11f9..6a6e1d649 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionFloatGt0 extends ABCondition { +public class ABConditionFloatGt0 extends ABBooleanCallback { private ABFloatCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java index d1e01de3a..5bf0b69d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionFloatGte extends ABCondition { +public class ABConditionFloatGte extends ABBooleanCallback { private ABFloatCallback value1; private ABFloatCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java index 068e06309..29e007c31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionFloatLt extends ABCondition { +public class ABConditionFloatLt extends ABBooleanCallback { private ABFloatCallback value1; private ABFloatCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java index 1c501c0c2..0cd0bbb68 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionFloatLte extends ABCondition { +public class ABConditionFloatLte extends ABBooleanCallback { private ABFloatCallback value1; private ABFloatCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java index d33054c25..316756fdb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionFloatNe extends ABCondition { +public class ABConditionFloatNe extends ABBooleanCallback { private ABFloatCallback value1; private ABFloatCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java index 2f720b0a1..d57a16803 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionFloatNe0 extends ABCondition { +public class ABConditionFloatNe0 extends ABBooleanCallback { private ABFloatCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java index d1303fe27..5a7d451be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIntegerEq extends ABCondition { +public class ABConditionIntegerEq extends ABBooleanCallback { private ABIntegerCallback value1; private ABIntegerCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java index a75ce1b6a..247d1d4c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIntegerEq0 extends ABCondition { +public class ABConditionIntegerEq0 extends ABBooleanCallback { private ABIntegerCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java index 759c8cb61..a67f49e60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIntegerGt extends ABCondition { +public class ABConditionIntegerGt extends ABBooleanCallback { private ABIntegerCallback value1; private ABIntegerCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java index 675c82901..21e31b705 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIntegerGt0 extends ABCondition { +public class ABConditionIntegerGt0 extends ABBooleanCallback { private ABIntegerCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java index 821efa618..d521c24ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIntegerGte extends ABCondition { +public class ABConditionIntegerGte extends ABBooleanCallback { private ABIntegerCallback value1; private ABIntegerCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java index e23102e90..0cce98915 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIntegerIsEven extends ABCondition { +public class ABConditionIntegerIsEven extends ABBooleanCallback { private ABIntegerCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java index 8c4189418..99d11066d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIntegerIsOdd extends ABCondition { +public class ABConditionIntegerIsOdd extends ABBooleanCallback { private ABIntegerCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java index 7088d43dc..99b2282f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIntegerLt extends ABCondition { +public class ABConditionIntegerLt extends ABBooleanCallback { private ABIntegerCallback value1; private ABIntegerCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java index 994af6607..c8b69bc51 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIntegerLte extends ABCondition { +public class ABConditionIntegerLte extends ABBooleanCallback { private ABIntegerCallback value1; private ABIntegerCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java index ff2fb68cd..cc42736ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIntegerNe extends ABCondition { +public class ABConditionIntegerNe extends ABBooleanCallback { private ABIntegerCallback value1; private ABIntegerCallback value2; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java index f6a9cad20..d87e09810 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIntegerNe0 extends ABCondition { +public class ABConditionIntegerNe0 extends ABBooleanCallback { private ABIntegerCallback value; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java index ed75b4769..ba26d8ab9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; -public class ABConditionIsProjectileReflected extends ABCondition { +public class ABConditionIsProjectileReflected extends ABBooleanCallback { private ABProjectileCallback projectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java index 3170ddb8f..56b3e8b99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java @@ -8,13 +8,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; -public class ABConditionIsDestructableValidTarget extends ABCondition { +public class ABConditionIsDestructableValidTarget extends ABBooleanCallback { private ABUnitCallback caster; private ABDestructableCallback target; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java index 083048030..119a8064a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java @@ -5,12 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; -public class ABConditionIsPassAllAbilityTargetChecks extends ABCondition { +public class ABConditionIsPassAllAbilityTargetChecks extends ABBooleanCallback { private ABUnitCallback caster; private ABWidgetCallback target; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java index 4f73212a8..5589d7fcc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; -public class ABConditionIsUnitPassAllAbilityTargetChecks extends ABCondition { +public class ABConditionIsUnitPassAllAbilityTargetChecks extends ABBooleanCallback { private ABUnitCallback caster; private ABUnitCallback target; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java index 3fabf508b..e84672f3c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java @@ -8,16 +8,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; -public class ABConditionIsUnitValidTarget extends ABCondition { +public class ABConditionIsUnitValidTarget extends ABBooleanCallback { private ABUnitCallback caster; private ABUnitCallback target; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java index 8a1955a8e..297739abe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java @@ -10,13 +10,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; -public class ABConditionIsValidTarget extends ABCondition { +public class ABConditionIsValidTarget extends ABBooleanCallback { private ABUnitCallback caster; private ABWidgetCallback target; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java index 16a28263e..02b62352c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsTimerActive extends ABCondition { +public class ABConditionIsTimerActive extends ABBooleanCallback { private ABTimerCallback timer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java index 348f410b4..3141d9239 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionDoesAbilityHaveUniqueFlag extends ABCondition { +public class ABConditionDoesAbilityHaveUniqueFlag extends ABBooleanCallback { ABAbilityCallback ability; ABStringCallback flag; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java index bc2f08192..a36c96fe7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java @@ -4,10 +4,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionDoesBuffHaveUniqueFlag extends ABCondition { +public class ABConditionDoesBuffHaveUniqueFlag extends ABBooleanCallback { ABBuffCallback buff; ABStringCallback flag; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java index 75c44fe35..8ec82a65d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitType extends ABCondition { +public class ABConditionIsUnitType extends ABBooleanCallback { private ABUnitCallback unit; private ABIDCallback unitType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java index 93f6a9c7d..823d7b30f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java @@ -3,13 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionDoesUnitHaveAbilityMatchingCondition extends ABCondition { +public class ABConditionDoesUnitHaveAbilityMatchingCondition extends ABBooleanCallback { private ABUnitCallback unit; private ABBooleanCallback condition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java index 7ef9f94ff..8ff247097 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; -public class ABConditionIsUnitEnemy extends ABCondition { +public class ABConditionIsUnitEnemy extends ABBooleanCallback { private ABUnitCallback self; private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java index 60aad0def..5ed2e7f3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java @@ -3,11 +3,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; -public class ABConditionIsUnitFriend extends ABCondition { +public class ABConditionIsUnitFriend extends ABBooleanCallback { private ABUnitCallback self; private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java index 28301f19b..6bc3a6784 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; -public class ABConditionIsUnitShareSpells extends ABCondition { +public class ABConditionIsUnitShareSpells extends ABBooleanCallback { private ABUnitCallback caster; private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java index a8499bfa3..78179942d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java @@ -4,12 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; -public class ABConditionIsCurrentBehaviorCategoryInList extends ABCondition { +public class ABConditionIsCurrentBehaviorCategoryInList extends ABBooleanCallback { private ABUnitCallback unit; private List list; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java index ed3f5a444..bf29712d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java @@ -5,10 +5,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionDoesUnitHaveBuff extends ABCondition { +public class ABConditionDoesUnitHaveBuff extends ABBooleanCallback { private ABUnitCallback unit; private ABIDCallback id; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java index bb81b6867..1cac23650 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java @@ -3,13 +3,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionDoesUnitHaveBuffMatchingCondition extends ABCondition { +public class ABConditionDoesUnitHaveBuffMatchingCondition extends ABBooleanCallback { private ABUnitCallback unit; private ABBooleanCallback condition; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java index bfe02f2a9..96121a496 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitBuilding extends ABCondition { +public class ABConditionIsUnitBuilding extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java index f2ce21a6b..a72f885a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitHero extends ABCondition { +public class ABConditionIsUnitHero extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java index fe5258bbf..bdca0c7e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; -public class ABConditionIsUnitHeroDuration extends ABCondition { +public class ABConditionIsUnitHeroDuration extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java index bbcff8278..309fe20ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitHidden extends ABCondition { +public class ABConditionIsUnitHidden extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java index e2ab55538..a997f57e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitMagicImmune extends ABCondition { +public class ABConditionIsUnitMagicImmune extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java index 160583361..d56ea5fee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitMorphImmune extends ABCondition { +public class ABConditionIsUnitMorphImmune extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java index 310a25346..953edfa05 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; -public class ABConditionIsUnitSummoned extends ABCondition { +public class ABConditionIsUnitSummoned extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java index 78696234a..9dba35c47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitAlive extends ABCondition { +public class ABConditionIsUnitAlive extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java index cec7703f1..3cb9302ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitDead extends ABCondition { +public class ABConditionIsUnitDead extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java index 79c19ccc1..e663778c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitMaxHp extends ABCondition { +public class ABConditionIsUnitMaxHp extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java index 38adee565..e1273de6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitMaxMp extends ABCondition { +public class ABConditionIsUnitMaxMp extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java index bbc4686c9..1ec91ce0c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; -public class ABConditionIsUnitPolymorphed extends ABCondition { +public class ABConditionIsUnitPolymorphed extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java index 26b38b18a..24fe453f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java @@ -2,11 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; -public class ABConditionIsUnitSleeping extends ABCondition { +public class ABConditionIsUnitSleeping extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java index 5975e96d9..3f73bde92 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitUpgrading extends ABCondition { +public class ABConditionIsUnitUpgrading extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java index b23ab2dbe..fe40c286f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitVisible extends ABCondition { +public class ABConditionIsUnitVisible extends ABBooleanCallback { private ABUnitCallback caster; private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java index 2fd7df89a..47efeed73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitConstructing extends ABCondition { +public class ABConditionIsUnitConstructing extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java index 160d3e227..7cfde7121 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitConstructingOrUpgrading extends ABCondition { +public class ABConditionIsUnitConstructingOrUpgrading extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java index 61c36abbf..5812529cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java @@ -2,10 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionIsUnitTraining extends ABCondition { +public class ABConditionIsUnitTraining extends ABBooleanCallback { private ABUnitCallback unit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java index 7aca48a99..a7e442b2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java @@ -3,10 +3,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionUnitHasResearch extends ABCondition { +public class ABConditionUnitHasResearch extends ABBooleanCallback { private ABUnitCallback unit; private ABIDCallback researchId; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAbilityBuilderGsonBuilder.java index 4aad8d17e..391d1269f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAbilityBuilderGsonBuilder.java @@ -67,7 +67,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.*; @@ -101,6 +100,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.cost.*; @@ -1605,8 +1605,8 @@ public static Gson create() { registerWidgetEventCallbacks(widgetEventCallbackTypeFactory); gsonBuilder.registerTypeAdapterFactory(widgetEventCallbackTypeFactory); - final RuntimeTypeAdapterFactory conditionTypeFactory = RuntimeTypeAdapterFactory - .of(ABCondition.class, "type"); + final RuntimeTypeAdapterFactory conditionTypeFactory = RuntimeTypeAdapterFactory + .of(ABBooleanCallback.class, "type"); registerConditions(conditionTypeFactory); registerBooleanCallbacks(conditionTypeFactory); gsonBuilder.registerTypeAdapterFactory(conditionTypeFactory); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java index 748581351..02745c1c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CGlobalWidgetEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; @@ -19,11 +19,11 @@ public class ABGlobalWidgetEvent extends CGlobalWidgetEvent { private ABLocalDataStore localStore; private int castId; - private ABCondition condition; + private ABBooleanCallback condition; private List actions; public ABGlobalWidgetEvent(CUnit caster, ABLocalDataStore localStore, int castId, CWidget widget, - JassGameEventsWar3 eventType, ABCondition condition, List actions) { + JassGameEventsWar3 eventType, ABBooleanCallback condition, List actions) { super(localStore.game, localStore.game.getGlobalScope(), null, eventType, null); this.caster = caster; this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java index e6e662edd..2af050e28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java @@ -5,8 +5,8 @@ import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; @@ -20,11 +20,11 @@ public class ABPlayerEvent extends CPlayerEvent { private ABLocalDataStore localStore; private int castId; - private ABCondition condition; + private ABBooleanCallback condition; private List actions; public ABPlayerEvent(CUnit caster, ABLocalDataStore localStore, int castId, CPlayerJass player, - JassGameEventsWar3 eventType, ABCondition condition, List actions) { + JassGameEventsWar3 eventType, ABBooleanCallback condition, List actions) { super(localStore.game.getGlobalScope(), player, null, eventType, null); this.caster = caster; this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java index 928d9cb28..0f0c6fa68 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; @@ -19,11 +19,11 @@ public class ABWidgetEvent extends CWidgetEvent { private ABLocalDataStore localStore; private int castId; - private ABCondition condition; + private ABBooleanCallback condition; private List actions; public ABWidgetEvent(CUnit caster, ABLocalDataStore localStore, int castId, CWidget widget, - JassGameEventsWar3 eventType, ABCondition condition, List actions) { + JassGameEventsWar3 eventType, ABBooleanCallback condition, List actions) { super(localStore.game.getGlobalScope(), widget, null, eventType, null); this.caster = caster; this.localStore = localStore; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java index 2d8202562..db88f74f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java @@ -7,10 +7,10 @@ import com.etheller.interpreter.ast.scope.trigger.TriggerBooleanExpression; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -public class ABConditionJass extends ABCondition { +public class ABConditionJass extends ABBooleanCallback { private final TriggerBooleanExpression boolExpr; public ABConditionJass(final TriggerBooleanExpression boolExpr) { @@ -23,7 +23,7 @@ public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, f CommonTriggerExecutionScope.abilityBuilder(caster, localStore, castId)); } - public static List wrap(final TriggerBooleanExpression jassFunction) { + public static List wrap(final TriggerBooleanExpression jassFunction) { if (jassFunction == null) { return Collections.emptyList(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java index bf016c1e7..af1d1d075 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java @@ -4,7 +4,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; @@ -13,12 +13,12 @@ public class ABAttackEvasionListener implements CUnitAttackEvasionListener { private ABLocalDataStore localStore; - private List conditions; + private List conditions; private int triggerId = 0; private boolean useCastId; - public ABAttackEvasionListener(ABLocalDataStore localStore, List conditions, int castId, boolean useCastId) { + public ABAttackEvasionListener(ABLocalDataStore localStore, List conditions, int castId, boolean useCastId) { this.localStore = localStore; this.conditions = conditions; this.useCastId = useCastId; @@ -34,7 +34,7 @@ public boolean onAttack(CSimulation simulation, CUnit target, CDamageCalculation localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, damage.getSource()); localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); localStore.put(ABLocalStoreKeys.DAMAGECALC+triggerId, damage); - for (ABCondition condition : conditions) { + for (ABBooleanCallback condition : conditions) { evade = evade || condition.callback(target, localStore, triggerId); } localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java index 06c5faa33..05f871042 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; @@ -17,9 +17,9 @@ public class ABAttackModifier implements CUnitAttackModifier { private ABIntegerCallback priority; - private ABCondition preLaunchCondition; + private ABBooleanCallback preLaunchCondition; private List preLaunchModification; - private ABCondition condition; + private ABBooleanCallback condition; private List modification; private ABLocalDataStore localStore; @@ -27,7 +27,7 @@ public class ABAttackModifier implements CUnitAttackModifier { private boolean useCastId; public ABAttackModifier(ABLocalDataStore localStore, int castId, ABIntegerCallback priority, - ABCondition preLaunchCondition, List preLaunchModification, ABCondition condition, + ABBooleanCallback preLaunchCondition, List preLaunchModification, ABBooleanCallback condition, List modification, boolean useCastId) { this.localStore = localStore; this.priority = priority; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderConfiguration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderConfiguration.java index d01426d73..9354fce19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderConfiguration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderConfiguration.java @@ -5,9 +5,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderOverrideFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderSpecialConfigFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderSpecialDisplayFields; @@ -27,10 +27,10 @@ public class ABAbilityBuilderConfiguration { private ABAbilityBuilderSpecialConfigFields specialFields; private ABAbilityBuilderOverrideFields overrideFields; - private List extraTargetConditions; - private List extraAutoTargetConditions; - private List extraAutoNoTargetConditions; - private List extraCastConditions; + private List extraTargetConditions; + private List extraAutoTargetConditions; + private List extraAutoNoTargetConditions; + private List extraCastConditions; private List onAddAbility; private List onAddDisabledAbility; @@ -187,41 +187,41 @@ public void setOverrideFields(ABAbilityBuilderOverrideFields overrideFields) { this.overrideFields = overrideFields; } - public List getExtraTargetConditions() { + public List getExtraTargetConditions() { return extraTargetConditions; } - public void setExtraTargetConditions(List extraTargetConditions) { + public void setExtraTargetConditions(List extraTargetConditions) { this.extraTargetConditions = extraTargetConditions; } /** * @return the extraAutoTargetConditions */ - public List getExtraAutoTargetConditions() { + public List getExtraAutoTargetConditions() { return extraAutoTargetConditions; } /** * @param extraAutoTargetConditions the extraAutoTargetConditions to set */ - public void setExtraAutoTargetConditions(List extraAutoTargetConditions) { + public void setExtraAutoTargetConditions(List extraAutoTargetConditions) { this.extraAutoTargetConditions = extraAutoTargetConditions; } - public List getExtraAutoNoTargetConditions() { + public List getExtraAutoNoTargetConditions() { return extraAutoNoTargetConditions; } - public void setExtraAutoNoTargetConditions(List extraAutoNoTargetConditions) { + public void setExtraAutoNoTargetConditions(List extraAutoNoTargetConditions) { this.extraAutoNoTargetConditions = extraAutoNoTargetConditions; } - public List getExtraCastConditions() { + public List getExtraCastConditions() { return extraCastConditions; } - public void setExtraCastConditions(List extraCastConditions) { + public void setExtraCastConditions(List extraCastConditions) { this.extraCastConditions = extraCastConditions; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParser.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParser.java index a18891fb9..9b74d51e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParser.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParser.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderOverrideFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderParserTemplateFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderSpecialConfigFields; @@ -26,10 +26,10 @@ public class ABAbilityBuilderParser { private ABAbilityBuilderSpecialConfigFields specialFields; private ABAbilityBuilderOverrideFields overrideFields; - private List extraTargetConditions; - private List extraAutoTargetConditions; - private List extraAutoNoTargetConditions; - private List extraCastConditions; + private List extraTargetConditions; + private List extraAutoTargetConditions; + private List extraAutoNoTargetConditions; + private List extraCastConditions; private List onAddAbility; private List onAddDisabledAbility; @@ -198,41 +198,41 @@ public void setOverrideFields(ABAbilityBuilderOverrideFields overrideFields) { this.overrideFields = overrideFields; } - public List getExtraTargetConditions() { + public List getExtraTargetConditions() { return extraTargetConditions; } - public void setExtraTargetConditions(List extraTargetConditions) { + public void setExtraTargetConditions(List extraTargetConditions) { this.extraTargetConditions = extraTargetConditions; } /** * @return the extraAutoTargetConditions */ - public List getExtraAutoTargetConditions() { + public List getExtraAutoTargetConditions() { return extraAutoTargetConditions; } /** * @param extraAutoTargetConditions the extraAutoTargetConditions to set */ - public void setExtraAutoTargetConditions(List extraAutoTargetConditions) { + public void setExtraAutoTargetConditions(List extraAutoTargetConditions) { this.extraAutoTargetConditions = extraAutoTargetConditions; } - public List getExtraAutoNoTargetConditions() { + public List getExtraAutoNoTargetConditions() { return extraAutoNoTargetConditions; } - public void setExtraAutoNoTargetConditions(List extraAutoNoTargetConditions) { + public void setExtraAutoNoTargetConditions(List extraAutoNoTargetConditions) { this.extraAutoNoTargetConditions = extraAutoNoTargetConditions; } - public List getExtraCastConditions() { + public List getExtraCastConditions() { return extraCastConditions; } - public void setExtraCastConditions(List extraCastConditions) { + public void setExtraCastConditions(List extraCastConditions) { this.extraCastConditions = extraCastConditions; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderOverrideFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderOverrideFields.java index b4b09e78f..3f405248d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderOverrideFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderOverrideFields.java @@ -2,12 +2,12 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAutocastTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABTargetTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; public class ABAbilityBuilderOverrideFields { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialConfigFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialConfigFields.java index 39bc2b8f1..192b31e5b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialConfigFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialConfigFields.java @@ -2,13 +2,12 @@ import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid.ABOrderIdCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeysEnum; @@ -16,8 +15,8 @@ public class ABAbilityBuilderSpecialConfigFields { private ABIntegerCallback bufferManaRequired; private ABIntegerCallback manaDrainedPerSecond; - private List pointTargeted; - private List targetedSpell; + private List pointTargeted; + private List targetedSpell; private List autoAquireTarget; @@ -101,19 +100,19 @@ public void setManaDrainedPerSecond(ABIntegerCallback manaDrainedPerSecond) { this.manaDrainedPerSecond = manaDrainedPerSecond; } - public List getPointTargeted() { + public List getPointTargeted() { return pointTargeted; } - public void setPointTargeted(List pointTargeted) { + public void setPointTargeted(List pointTargeted) { this.pointTargeted = pointTargeted; } - public List getTargetedSpell() { + public List getTargetedSpell() { return targetedSpell; } - public void setTargetedSpell(List targetedSpell) { + public void setTargetedSpell(List targetedSpell) { this.targetedSpell = targetedSpell; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java index 3259f9705..2a1e8fef7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java @@ -1,9 +1,9 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.booleans.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; public class ABAbilityBuilderSpecialDisplayFields { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java index 94172f259..b71ddfa73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java @@ -9,8 +9,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityCollisionProjectileListener; @@ -20,7 +20,7 @@ public class ABCollisionProjectileListener implements CAbilityCollisionProjectil private List onLaunch; private List onPreHits; - private List canHitTarget; + private List canHitTarget; private List onHit; private CUnit caster; @@ -28,7 +28,7 @@ public class ABCollisionProjectileListener implements CAbilityCollisionProjectil private int castId; public ABCollisionProjectileListener(List onLaunch, List onPreHits, - List canHitTarget, List onHit, CUnit caster, ABLocalDataStore localStore, int castId) { + List canHitTarget, List onHit, CUnit caster, ABLocalDataStore localStore, int castId) { super(); this.onLaunch = onLaunch; this.onPreHits = onPreHits; @@ -69,7 +69,7 @@ public boolean canHitTarget(CSimulation game, CWidget target) { CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT + castId, targetUnit); localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST + castId, targetDest); - for (ABCondition condition : canHitTarget) { + for (ABBooleanCallback condition : canHitTarget) { result = result && condition.callback(caster, localStore, castId); } localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java index cd6b92a03..910ddee6f 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java @@ -9,8 +9,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class AbilityBuilderConfigTree extends JTree { @@ -84,10 +84,10 @@ public void setConfig(ABAbilityBuilderConfiguration config) { String fixedName = fixConditionsName(name); DefaultMutableTreeNode conditionsNode = createConditionsNode(fixedName); try { - List conditions = (List) declaredMethod.invoke(config, new Object[0]); + List conditions = (List) declaredMethod.invoke(config, new Object[0]); if (conditions != null) { root.add(conditionsNode); - for (ABCondition condition : conditions) { + for (ABBooleanCallback condition : conditions) { generateInto(conditionsNode, condition); } } @@ -129,7 +129,7 @@ public void generateInto(DefaultMutableTreeNode actionsNode, Object action) { } } if (ABAction.class.isAssignableFrom(field.getType()) - || ABCondition.class.isAssignableFrom(field.getType())) { + || ABBooleanCallback.class.isAssignableFrom(field.getType())) { try { DefaultMutableTreeNode nodeForField = new DefaultMutableTreeNode(field.getName()); nodeForAction.add(nodeForField); @@ -176,7 +176,7 @@ private Object describe(Object action) { boolean first = true; for (Field field : fields) { if (!ABAction.class.isAssignableFrom(field.getType()) - && !ABCondition.class.isAssignableFrom(field.getType())) { + && !ABBooleanCallback.class.isAssignableFrom(field.getType())) { String fieldName = field.getName(); if ("recycleRect".equals(fieldName)) { continue; From c40e94bf9dd3b96f1aefbccafca74cf7409aced1 Mon Sep 17 00:00:00 2001 From: Glasir Date: Sat, 13 Dec 2025 01:59:27 -0500 Subject: [PATCH 38/44] Minor Refactor: Moved ABLocalStoreKeys --- .../parsers/jass/scope/CommonTriggerExecutionScope.java | 2 +- .../ability/ABAbilityBuilderActiveAutoTarget.java | 2 +- .../ability/ABAbilityBuilderActiveFlexTarget.java | 2 +- .../abilitybuilder/ability/ABAbilityBuilderActiveNoTarget.java | 2 +- .../abilitybuilder/ability/ABAbilityBuilderActivePairing.java | 2 +- .../ability/ABAbilityBuilderActivePointTarget.java | 2 +- .../ability/ABAbilityBuilderActiveUnitTarget.java | 2 +- .../abilitybuilder/ability/ABAbilityBuilderGenericActive.java | 2 +- .../abilitybuilder/ability/ABAbilityBuilderNoIcon.java | 2 +- .../abilitybuilder/ability/ABAbilityBuilderPassive.java | 2 +- .../ability/template/ABAbilityBuilderAuraTemplate.java | 2 +- .../ability/template/ABAbilityBuilderSimpleAuraTemplate.java | 2 +- .../ability/template/ABAbilityBuilderStatAuraTemplate.java | 2 +- .../ability/template/ABAbilityBuilderStatPassiveTemplate.java | 2 +- .../abilitybuilder/behavior/ABBehaviorAbilityBuilderBase.java | 2 +- .../behavior/ABBehaviorAbilityBuilderNoTarget.java | 2 +- .../abilitybuilder/behavior/ABBehaviorFinishTransformation.java | 2 +- .../action/ability/ABActionAbilityAttemptToApplyEffect.java | 2 +- .../behavior/action/ability/ABActionActivateToggledAbility.java | 2 +- .../behavior/action/ability/ABActionAddAbility.java | 2 +- .../behavior/action/ability/ABActionAddNewAbility.java | 2 +- .../behavior/action/ability/ABActionBeginChanneling.java | 2 +- .../behavior/action/ability/ABActionClickDisableAbility.java | 2 +- .../behavior/action/ability/ABActionClickEnableAbility.java | 2 +- .../behavior/action/ability/ABActionCreateAbilityFromId.java | 2 +- .../action/ability/ABActionDeactivateToggledAbility.java | 2 +- .../behavior/action/ability/ABActionFinishChanneling.java | 2 +- .../behavior/action/ability/ABActionResetCooldown.java | 2 +- .../behavior/action/ability/ABActionSendStartCastingEvents.java | 2 +- .../behavior/action/ability/ABActionStartCooldown.java | 2 +- .../behavior/action/abilitydata/ABActionAbilitySetShowIcon.java | 2 +- .../behavior/action/abilitydata/ABActionAddTargetAllowed.java | 2 +- .../behavior/action/abilitydata/ABActionDisableAbility.java | 2 +- .../behavior/action/abilitydata/ABActionDisableAbilityById.java | 2 +- .../behavior/action/abilitydata/ABActionEnableAbility.java | 2 +- .../behavior/action/abilitydata/ABActionEnableAbilityById.java | 2 +- .../action/abilitydata/ABActionRemoveTargetAllowed.java | 2 +- .../action/abilitydata/ABActionSetAbilityCastRange.java | 2 +- .../action/abilitydata/ABActionSetAutoTargetDestructable.java | 2 +- .../behavior/action/abilitydata/ABActionSetAutoTargetUnit.java | 2 +- .../action/abilitydata/ABActionSetPreventEndEvents.java | 2 +- .../action/attackmodifier/ABActionCreateAttackModifier.java | 2 +- .../internal/ABActionAttackModifierAddAnimationTag.java | 2 +- .../internal/ABActionAttackModifierAddPostDamageListener.java | 2 +- .../internal/ABActionAttackModifierAddPreDamageListener.java | 2 +- .../internal/ABActionAttackModifierApplyAllArtFields.java | 2 +- .../attackmodifier/internal/ABActionAttackModifierApplyArt.java | 2 +- .../internal/ABActionAttackModifierApplyArtAndSpeed.java | 2 +- .../internal/ABActionAttackModifierApplyDefaultSpeed.java | 2 +- .../ABActionAttackModifierPreventOtherModifications.java | 2 +- ...tionAttackModifierPreventOtherSamePriorityModifications.java | 2 +- .../internal/ABActionAttackModifierRemoveAnimationTag.java | 2 +- .../ABActionAttackModifierRemovePostDamageListener.java | 2 +- .../internal/ABActionAttackModifierRemovePreDamageListener.java | 2 +- .../internal/ABActionAttackModifierSetAttackArc.java | 2 +- .../internal/ABActionAttackModifierSetAttackDeathTime.java | 2 +- .../internal/ABActionAttackModifierSetAttackHoming.java | 2 +- .../internal/ABActionAttackModifierSetAttackImpactZ.java | 2 +- .../internal/ABActionAttackModifierSetAttackStartZ.java | 2 +- .../internal/ABActionAttackModifierSetSplashFields.java | 2 +- .../internal/ABCallbackGetModifiedAttackAttackType.java | 2 +- .../internal/ABCallbackGetModifiedAttackDamageType.java | 2 +- .../internal/ABCallbackGetModifiedAttackWeaponType.java | 2 +- .../behavior/ABActionAttemptToReOrderPreviousBehavior.java | 2 +- .../behavior/ABActionAttemptToResumePreviousBehavior.java | 2 +- .../action/behavior/ABActionForceBeginCreatedBehavior.java | 2 +- .../abilitybuilder/behavior/action/buff/ABActionAddBuff.java | 2 +- .../behavior/action/buff/ABActionAddNonStackingDisplayBuff.java | 2 +- .../behavior/action/buff/ABActionAddSlowBuff.java | 2 +- .../behavior/action/buff/ABActionAddStunBuff.java | 2 +- .../behavior/action/buff/ABActionCreatePassiveBuff.java | 2 +- .../behavior/action/buff/ABActionCreateTargetingBuff.java | 2 +- .../behavior/action/buff/ABActionCreateTimedArtBuff.java | 2 +- .../behavior/action/buff/ABActionCreateTimedBuff.java | 2 +- .../behavior/action/buff/ABActionCreateTimedLifeBuff.java | 2 +- .../action/buff/ABActionCreateTimedPausedExpirationBuff.java | 2 +- .../behavior/action/buff/ABActionCreateTimedTargetingBuff.java | 2 +- .../behavior/action/buff/ABActionCreateTimedTickingBuff.java | 2 +- .../action/buff/ABActionCreateTimedTickingPausedBuff.java | 2 +- .../action/buff/ABActionCreateTimedTickingPostDeathBuff.java | 2 +- .../behavior/action/buff/ABActionDispelBuffs.java | 2 +- .../behavior/action/damage/ABActionDamageArea.java | 2 +- .../behavior/action/damage/ABActionDamageAttackSplash.java | 2 +- .../behavior/action/damage/ABActionDamageBurst.java | 2 +- .../behavior/action/damage/ABActionDamageSplash.java | 2 +- .../behavior/action/datastore/ABActionStoreValueLocally.java | 2 +- .../action/destructable/ABActionCreateDestructable.java | 2 +- .../action/destructablebuff/ABActionCreateDestructableBuff.java | 2 +- .../destructablebuff/ABActionDispelDestructableBuffs.java | 2 +- .../action/events/timeofday/ABActionCreateTimeOfDayEvent.java | 2 +- .../action/events/widget/ABActionCreateWidgetEvent.java | 2 +- .../behavior/action/fx/ABActionCreateSpellEffectAtLocation.java | 2 +- .../behavior/action/fx/ABActionCreateSpellEffectAtPoint.java | 2 +- .../behavior/action/fx/ABActionCreateSpellEffectOnUnit.java | 2 +- .../action/fx/ABActionCreateTemporarySpellEffectAtLocation.java | 2 +- .../action/fx/ABActionCreateTemporarySpellEffectAtPoint.java | 2 +- .../action/fx/ABActionCreateTemporarySpellEffectOnUnit.java | 2 +- .../action/fx/group/ABActionCreateGroupEffectAtLocation.java | 2 +- .../action/fx/lightning/ABActionCreateLightningEffect.java | 2 +- .../fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java | 2 +- .../action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java | 2 +- .../action/fx/sound/ABActionCreateSoundEffectAtLocation.java | 2 +- .../action/fx/sound/ABActionCreateSoundEffectOnUnit.java | 2 +- .../behavior/action/fx/splat/ABActionCreateUberSplat.java | 2 +- .../action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java | 2 +- .../fx/terrain/ABActionCreateTerrainRippleAtLocation.java | 2 +- .../action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java | 2 +- .../abilitybuilder/behavior/action/item/ABActionChargeItem.java | 2 +- .../ABActionIterateDestructablesInRangeOfLocation.java | 2 +- .../action/iterator/unit/ABActionIterateUnitsInGroup.java | 2 +- .../action/iterator/unit/ABActionIterateUnitsInQueue.java | 2 +- .../ABActionIterateUnitsInRangeOfLocationMatchingCondition.java | 2 +- ...nIterateUnitsInRangeOfLocationMatchingConditionWithSort.java | 2 +- .../ABActionIterateUnitsInRangeOfUnitMatchingCondition.java | 2 +- ...ctionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java | 2 +- .../action/iterator/unit/ABActionIterateUnitsInRect.java | 2 +- .../ABActionCreateLocationTargetedCollisionProjectile.java | 2 +- .../projectile/ABActionCreateLocationTargetedProjectile.java | 2 +- .../ABActionCreateLocationTargetedPseudoProjectile.java | 2 +- .../ABActionCreateUnitTargetedBouncingProjectile.java | 2 +- .../ABActionCreateUnitTargetedCollisionProjectile.java | 2 +- .../action/projectile/ABActionCreateUnitTargetedProjectile.java | 2 +- .../projectile/ABActionCreateUnitTargetedPseudoProjectile.java | 2 +- .../action/reaction/ABActionCheckAbilityEffectReaction.java | 2 +- .../action/stats/ABActionCreateNonStackingStatBuff.java | 2 +- .../behavior/action/structural/ABActionBreak.java | 2 +- .../behavior/action/structural/ABActionChainEffect.java | 2 +- .../behavior/action/structural/ABActionCreateSubroutine.java | 2 +- .../abilitybuilder/behavior/action/structural/ABActionFor.java | 2 +- .../behavior/action/structural/ABActionPeriodicExecute.java | 2 +- .../action/structural/ABActionResetPeriodicExecute.java | 2 +- .../behavior/action/structural/ABActionRunReuseAction.java | 2 +- .../action/structural/ABActionRunReuseActionWithArguments.java | 2 +- .../behavior/action/structural/ABActionRunSubroutine.java | 2 +- .../behavior/action/structural/ABActionWhile.java | 2 +- .../behavior/action/timer/ABActionCreateTimer.java | 2 +- .../behavior/action/timer/ABActionStartTimer.java | 2 +- .../action/uniquevalue/ABActionAbilityRemoveUniqueValue.java | 2 +- .../action/uniquevalue/ABActionAbilityStoreUniqueValue.java | 2 +- .../abilitybuilder/behavior/action/unit/ABActionCreateUnit.java | 2 +- .../behavior/action/unit/transformation/ABActionMergeUnits.java | 2 +- .../action/unit/transformation/ABActionTransformUnit.java | 2 +- .../unit/transformation/ABActionTransformUnitInstant.java | 2 +- .../unit/transformation/ABActionTransformedUnitAbilityAdd.java | 2 +- .../transformation/ABActionTransformedUnitAbilityRemove.java | 2 +- .../behavior/action/unitgroup/ABActionAddUnitToGroup.java | 2 +- .../behavior/action/unitgroup/ABActionCreateUnitGroup.java | 2 +- .../behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java | 2 +- .../attack/ABActionCreateAttackPostDamageListener.java | 2 +- .../attack/ABActionCreateAttackPreDamageListener.java | 2 +- .../internalaction/ABActionPreDamageListenerAddBonusDamage.java | 2 +- .../ABActionPreDamageListenerAddDamageMultiplier.java | 2 +- .../ABActionPreDamageListenerLockDamageModifications.java | 2 +- .../attack/internalaction/ABActionPreDamageListenerSetMiss.java | 2 +- .../attack/internalaction/ABActionSetPreDamageStacking.java | 2 +- .../attack/internalcallback/ABCallbackGetAttackBaseDamage.java | 2 +- .../attack/internalcallback/ABCallbackGetAttackDamageType.java | 2 +- .../ABCallbackGetAttackMaximumSplashRadius.java | 2 +- .../attack/internalcallback/ABCallbackGetAttackType.java | 2 +- .../attack/internalcallback/ABCallbackGetAttackWeaponType.java | 2 +- .../attack/internalcondition/ABConditionIsAttackArtillery.java | 2 +- .../attack/internalcondition/ABConditionIsAttackHoming.java | 2 +- .../ABConditionIsUnitValidSplashDamageTarget.java | 2 +- .../behavior/ABActionCreateBehaviorChangeListener.java | 2 +- .../internalcallback/ABCallbackGetNewBehaviorTarget.java | 2 +- .../ABConditionIsNewBehaviorCategoryInList.java | 2 +- .../damagetaken/ABActionCreateDamageTakenListener.java | 2 +- .../ABActionCreateDamageTakenModificationListener.java | 2 +- ...ABActionDamageTakenModificationMultiplyDamageMultiplier.java | 2 +- .../ABActionDamageTakenModificationSetDamageMultiplier.java | 2 +- .../ABConditionIsTriggeringDamageAnAttack.java | 2 +- .../internalcondition/ABConditionIsTriggeringDamageRanged.java | 2 +- .../death/ABActionCreateDeathReplacementEffect.java | 2 +- .../ABActionDeathReplacementSetReincarnating.java | 2 +- .../internalaction/ABActionDeathReplacementSetReviving.java | 2 +- .../unitlisteners/evasion/ABActionCreateEvasionListener.java | 2 +- .../reaction/ABActionCreateAbilityEffectReactionListener.java | 2 +- .../reaction/ABActionCreateAbilityProjReactionListener.java | 2 +- .../reaction/ABActionCreateAttackProjReactionListener.java | 2 +- .../reaction/internalaction/ABActionReactionPreventHit.java | 2 +- .../ABCallbackGetReactionAttackProjectileAttackType.java | 2 +- .../ABCallbackGetReactionAttackProjectileDamage.java | 2 +- .../sharedinternalactions/ABActionSubtractTotalDamageDealt.java | 2 +- .../ABCallbackGetFinalTotalDamageDealt.java | 2 +- .../ABCallbackGetRawTotalDamageDealt.java | 2 +- .../ABCallbackGetTriggeringAttackType.java | 2 +- .../ABCallbackGetTriggeringDamageType.java | 2 +- .../unitlisteners/state/ABActionAddUnitStateListener.java | 2 +- .../unitlisteners/state/ABActionCreateUnitStateListener.java | 2 +- .../behavior/action/unitqueue/ABActionAddUnitToQueue.java | 2 +- .../behavior/action/unitqueue/ABActionCreateUnitQueue.java | 2 +- .../behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java | 2 +- .../behavior/action/unitstate/ABActionCreateStateModBuff.java | 2 +- .../action/vision/ABActionCreateLocationVisionModifier.java | 2 +- .../action/vision/ABActionCreateProjectileVisionModifier.java | 2 +- .../action/vision/ABActionCreateUnitVisionModifier.java | 2 +- .../behavior/callback/ability/ABCallbackArgumentAbility.java | 2 +- .../callback/ability/ABCallbackGetLastCreatedAbility.java | 2 +- .../behavior/callback/ability/ABCallbackGetMatchingAbility.java | 2 +- .../behavior/callback/ability/ABCallbackGetPartnerAbility.java | 2 +- .../behavior/callback/ability/ABCallbackGetReactionAbility.java | 2 +- .../callback/ability/ABCallbackGetStoredAbilityByKey.java | 2 +- .../behavior/callback/ability/ABCallbackGetThisAbility.java | 2 +- .../behavior/callback/ability/ABCallbackReuseAbility.java | 2 +- .../callback/ability/ABCallbackReuseAbilityWithArguments.java | 2 +- .../callback/attack/ABCallbackGetLastCreatedAttackModifier.java | 2 +- .../callback/attack/ABCallbackGetStoredAttackModifierByKey.java | 2 +- .../attacksettings/ABCallbackGetCurrentAttackSettings.java | 2 +- .../attacksettings/ABCallbackGetLastCreatedAttackSettings.java | 2 +- .../attacksettings/ABCallbackGetStoredAttackSettingsByKey.java | 2 +- .../behavior/callback/buff/ABCallbackArgumentBuff.java | 2 +- .../behavior/callback/buff/ABCallbackEnumBuff.java | 2 +- .../behavior/callback/buff/ABCallbackGetLastCreatedBuff.java | 2 +- .../behavior/callback/buff/ABCallbackGetMatchingBuff.java | 2 +- .../behavior/callback/buff/ABCallbackGetStoredBuffByKey.java | 2 +- .../behavior/callback/buff/ABCallbackReuseBuff.java | 2 +- .../callback/buff/ABCallbackReuseBuffWithArguments.java | 2 +- .../behavior/callback/buff/ABCallbackThisBuff.java | 2 +- .../callback/destructable/ABCallbackArgumentDestructable.java | 2 +- .../destructable/ABCallbackGetAbilityTargetedDestructable.java | 2 +- .../destructable/ABCallbackGetAttackedDestructable.java | 2 +- .../callback/destructable/ABCallbackGetEnumDestructable.java | 2 +- .../destructable/ABCallbackGetLastCreatedDestructable.java | 2 +- .../destructable/ABCallbackGetProjectileHitDestructable.java | 2 +- .../destructable/ABCallbackGetStoredDestructableByKey.java | 2 +- .../callback/destructable/ABCallbackReuseDestructable.java | 2 +- .../destructable/ABCallbackReuseDestructableWithArguments.java | 2 +- .../destructablebuff/ABCallbackArgumentDestructableBuff.java | 2 +- .../destructablebuff/ABCallbackEnumDestructableBuff.java | 2 +- .../ABCallbackGetLastCreatedDestructableBuff.java | 2 +- .../ABCallbackGetStoredDestructableBuffByKey.java | 2 +- .../destructablebuff/ABCallbackMatchingDestructableBuff.java | 2 +- .../destructablebuff/ABCallbackReuseDestructableBuff.java | 2 +- .../ABCallbackReuseDestructableBuffWithArguments.java | 2 +- .../callback/enums/ABCallbackGetStoredAttackTypeByKey.java | 2 +- .../callback/enums/ABCallbackGetStoredDamageTypeByKey.java | 2 +- .../callback/enums/ABCallbackGetStoredDefenseTypeByKey.java | 2 +- .../callback/enums/ABCallbackGetStoredMovementTypeByKey.java | 2 +- .../callback/enums/ABCallbackGetStoredTargetTypeByKey.java | 2 +- .../callback/enums/ABCallbackGetStoredWeaponTypeByKey.java | 2 +- .../event/timeevent/ABCallbackArgumentTimeOfDayEvent.java | 2 +- .../event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java | 2 +- .../event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java | 2 +- .../callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java | 2 +- .../timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java | 2 +- .../event/widgetevent/ABCallbackArgumentWidgetEvent.java | 2 +- .../event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java | 2 +- .../event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java | 2 +- .../callback/event/widgetevent/ABCallbackReuseWidgetEvent.java | 2 +- .../widgetevent/ABCallbackReuseWidgetEventWithArguments.java | 2 +- .../behavior/callback/floats/ABCallbackArgumentFloat.java | 2 +- .../behavior/callback/floats/ABCallbackGetAbilityArea.java | 2 +- .../behavior/callback/floats/ABCallbackGetAbilityCastRange.java | 2 +- .../behavior/callback/floats/ABCallbackGetAbilityCastTime.java | 2 +- .../behavior/callback/floats/ABCallbackGetAbilityCooldown.java | 2 +- .../callback/floats/ABCallbackGetAbilityDataAsFloat.java | 2 +- .../behavior/callback/floats/ABCallbackGetAbilityDuration.java | 2 +- .../callback/floats/ABCallbackGetAbilityHeroDuration.java | 2 +- .../callback/floats/ABCallbackGetAbilityProjectileSpeed.java | 2 +- .../callback/floats/ABCallbackGetParentAbilityDataAsFloat.java | 2 +- .../behavior/callback/floats/ABCallbackGetStoredFloatByKey.java | 2 +- .../behavior/callback/floats/ABCallbackReuseFloat.java | 2 +- .../callback/floats/ABCallbackReuseFloatWithArguments.java | 2 +- .../behavior/callback/fx/ABCallbackArgumentFX.java | 2 +- .../behavior/callback/fx/ABCallbackGetLastCreatedFX.java | 2 +- .../callback/fx/ABCallbackGetLastCreatedLightningEffect.java | 2 +- .../behavior/callback/fx/ABCallbackGetStoredFXByKey.java | 2 +- .../behavior/callback/fx/ABCallbackGetStoredLightningByKey.java | 2 +- .../abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java | 2 +- .../behavior/callback/fx/ABCallbackReuseFXWithArguments.java | 2 +- .../behavior/callback/id/ABCallbackArgumentID.java | 2 +- .../behavior/callback/id/ABCallbackGetAbilityDataAsID.java | 2 +- .../callback/id/ABCallbackGetAbilityDataAsIDFromList.java | 2 +- .../callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java | 2 +- .../behavior/callback/id/ABCallbackGetAbilityUnitId.java | 2 +- .../abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java | 2 +- .../behavior/callback/id/ABCallbackGetBuffIdFromCode.java | 2 +- .../abilitybuilder/behavior/callback/id/ABCallbackGetCode.java | 2 +- .../behavior/callback/id/ABCallbackGetFirstBuffId.java | 2 +- .../behavior/callback/id/ABCallbackGetFirstEffectId.java | 2 +- .../behavior/callback/id/ABCallbackGetParentAlias.java | 2 +- .../behavior/callback/id/ABCallbackGetSecondBuffId.java | 2 +- .../behavior/callback/id/ABCallbackGetStoredIDByKey.java | 2 +- .../abilitybuilder/behavior/callback/id/ABCallbackReuseID.java | 2 +- .../behavior/callback/id/ABCallbackReuseIDWithArguments.java | 2 +- .../behavior/callback/integers/ABCallbackArgumentInteger.java | 2 +- .../integers/ABCallbackCountBuffsOnUnitMatchingCondition.java | 2 +- .../integers/ABCallbackGetAbilityCastTimeAsInteger.java | 2 +- .../callback/integers/ABCallbackGetAbilityDataAsInteger.java | 2 +- .../callback/integers/ABCallbackGetAbilityManaCost.java | 2 +- .../integers/ABCallbackGetAbilityTargetAttachmentPoints.java | 2 +- .../behavior/callback/integers/ABCallbackGetItemCharges.java | 2 +- .../behavior/callback/integers/ABCallbackGetItemLevel.java | 2 +- .../behavior/callback/integers/ABCallbackGetItemMaxCharges.java | 2 +- .../behavior/callback/integers/ABCallbackGetItemSlot.java | 2 +- .../integers/ABCallbackGetProjectileDestructableTargets.java | 2 +- .../callback/integers/ABCallbackGetProjectileUnitTargets.java | 2 +- .../behavior/callback/integers/ABCallbackGetSpellLevel.java | 2 +- .../callback/integers/ABCallbackGetStoredIntegerByKey.java | 2 +- .../behavior/callback/integers/ABCallbackIterator.java | 2 +- .../behavior/callback/integers/ABCallbackReuseInteger.java | 2 +- .../callback/integers/ABCallbackReuseIntegerWithArguments.java | 2 +- .../behavior/callback/item/ABCallbackArgumentItem.java | 2 +- .../callback/item/ABCallbackGetAbilityTargetedItem.java | 2 +- .../behavior/callback/item/ABCallbackGetAttackedItem.java | 2 +- .../behavior/callback/item/ABCallbackGetLastCreatedItem.java | 2 +- .../behavior/callback/item/ABCallbackGetStoredItemByKey.java | 2 +- .../behavior/callback/item/ABCallbackReuseItem.java | 2 +- .../callback/item/ABCallbackReuseItemWithArguments.java | 2 +- .../behavior/callback/list/ABCallbackArgumentList.java | 2 +- .../behavior/callback/list/ABCallbackArgumentSortableList.java | 2 +- .../behavior/callback/list/ABCallbackGetStoredListByKey.java | 2 +- .../callback/list/ABCallbackGetStoredSortableListByKey.java | 2 +- .../behavior/callback/list/ABCallbackReuseList.java | 2 +- .../callback/list/ABCallbackReuseListWithArguments.java | 2 +- .../behavior/callback/list/ABCallbackReuseSortableList.java | 2 +- .../callback/list/ABCallbackReuseSortableListWithArguments.java | 2 +- .../ABCallbackGetLastCreatedAbilityEffectReactionListener.java | 2 +- .../ABCallbackGetLastCreatedAbilityProjReactionListener.java | 2 +- .../ABCallbackGetLastCreatedAttackPostDamageListener.java | 2 +- .../ABCallbackGetLastCreatedAttackPreDamageListener.java | 2 +- .../ABCallbackGetLastCreatedAttackProjReactionListener.java | 2 +- .../ABCallbackGetLastCreatedBehaviorChangeListener.java | 2 +- .../listener/ABCallbackGetLastCreatedDamageTakenListener.java | 2 +- ...ABCallbackGetLastCreatedDamageTakenModificationListener.java | 2 +- .../listener/ABCallbackGetLastCreatedDeathReplacement.java | 2 +- .../listener/ABCallbackGetLastCreatedEvasionListener.java | 2 +- .../listener/ABCallbackGetLastCreatedUnitStateListener.java | 2 +- .../ABCallbackGetStoredAbilityEffectReactionListenerByKey.java | 2 +- .../ABCallbackGetStoredAbilityProjReactionListenerByKey.java | 2 +- .../ABCallbackGetStoredAttackPostDamageListenerByKey.java | 2 +- .../ABCallbackGetStoredAttackPreDamageListenerByKey.java | 2 +- .../ABCallbackGetStoredAttackProjReactionListenerByKey.java | 2 +- .../ABCallbackGetStoredBehaviorChangeListenerByKey.java | 2 +- .../listener/ABCallbackGetStoredDamageTakenListenerByKey.java | 2 +- ...ABCallbackGetStoredDamageTakenModificationListenerByKey.java | 2 +- .../listener/ABCallbackGetStoredDeathReplacementByKey.java | 2 +- .../listener/ABCallbackGetStoredEvasionListenerByKey.java | 2 +- .../listener/ABCallbackGetStoredUnitStateListenerByKey.java | 2 +- .../behavior/callback/location/ABCallbackArgumentLocation.java | 2 +- .../callback/location/ABCallbackGetAttackImpactLocation.java | 2 +- .../callback/location/ABCallbackGetAttackTargetLocation.java | 2 +- .../callback/location/ABCallbackGetGroundAttackedLocation.java | 2 +- .../location/ABCallbackGetProjectileCurrentLocation.java | 2 +- .../callback/location/ABCallbackGetStoredLocationByKey.java | 2 +- .../callback/location/ABCallbackGetTargetedLocation.java | 2 +- .../behavior/callback/location/ABCallbackReuseLocation.java | 2 +- .../callback/location/ABCallbackReuseLocationWithArguments.java | 2 +- .../behavior/callback/longs/ABCallbackArgumentLong.java | 2 +- .../behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java | 2 +- .../behavior/callback/longs/ABCallbackGetStoredLongByKey.java | 2 +- .../behavior/callback/longs/ABCallbackReuseLong.java | 2 +- .../callback/longs/ABCallbackReuseLongWithArguments.java | 2 +- .../behavior/callback/orderid/ABCallbackArgumentOrderId.java | 2 +- .../callback/orderid/ABCallbackGetStoredOrderIdByKey.java | 2 +- .../behavior/callback/orderid/ABCallbackReuseOrderId.java | 2 +- .../callback/orderid/ABCallbackReuseOrderIdWithArguments.java | 2 +- .../behavior/callback/player/ABCallbackArgumentPlayer.java | 2 +- .../callback/player/ABCallbackGetStoredPlayerByKey.java | 2 +- .../behavior/callback/player/ABCallbackReusePlayer.java | 2 +- .../callback/player/ABCallbackReusePlayerWithArguments.java | 2 +- .../callback/projectile/ABCallbackArgumentProjectile.java | 2 +- .../callback/projectile/ABCallbackGetLastCreatedProjectile.java | 2 +- .../projectile/ABCallbackGetReactionAbilityProjectile.java | 2 +- .../projectile/ABCallbackGetReactionAttackProjectile.java | 2 +- .../callback/projectile/ABCallbackGetStoredProjectileByKey.java | 2 +- .../callback/projectile/ABCallbackGetThisProjectile.java | 2 +- .../behavior/callback/projectile/ABCallbackReuseProjectile.java | 2 +- .../projectile/ABCallbackReuseProjectileWithArguments.java | 2 +- .../statbuff/ABCallbackArgumentNonStackingStatBuff.java | 2 +- .../statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java | 2 +- .../statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java | 2 +- .../callback/statbuff/ABCallbackReuseNonStackingStatBuff.java | 2 +- .../ABCallbackReuseNonStackingStatBuffWithArguments.java | 2 +- .../callback/statemod/ABCallbackArgumentStateModBuff.java | 2 +- .../callback/statemod/ABCallbackGetLastCreatedStateModBuff.java | 2 +- .../callback/statemod/ABCallbackGetStoredStateModBuffByKey.java | 2 +- .../behavior/callback/statemod/ABCallbackReuseStateModBuff.java | 2 +- .../statemod/ABCallbackReuseStateModBuffWithArguments.java | 2 +- .../behavior/callback/strings/ABCallbackArgumentString.java | 2 +- .../callback/strings/ABCallbackGetAbilityDataAsString.java | 2 +- .../behavior/callback/strings/ABCallbackGetAliasAsString.java | 2 +- .../behavior/callback/strings/ABCallbackGetCodeAsString.java | 2 +- .../callback/strings/ABCallbackGetStoredStringByKey.java | 2 +- .../behavior/callback/strings/ABCallbackReuseString.java | 2 +- .../callback/strings/ABCallbackReuseStringWithArguments.java | 2 +- .../behavior/callback/target/ABCallbackArgumentTarget.java | 2 +- .../behavior/callback/target/ABCallbackGetAbilityTarget.java | 2 +- .../callback/target/ABCallbackGetStoredTargetByKey.java | 2 +- .../behavior/callback/target/ABCallbackReuseTarget.java | 2 +- .../callback/target/ABCallbackReuseTargetWithArguments.java | 2 +- .../behavior/callback/timer/ABCallbackArgumentTimer.java | 2 +- .../behavior/callback/timer/ABCallbackGetFiringTimer.java | 2 +- .../behavior/callback/timer/ABCallbackGetLastCreatedTimer.java | 2 +- .../behavior/callback/timer/ABCallbackGetLastStartedTimer.java | 2 +- .../behavior/callback/timer/ABCallbackGetStoredTimerByKey.java | 2 +- .../behavior/callback/timer/ABCallbackReuseTimer.java | 2 +- .../callback/timer/ABCallbackReuseTimerWithArguments.java | 2 +- .../behavior/callback/unit/ABCallbackArgumentUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java | 2 +- .../callback/unit/ABCallbackGetAbilityTargetedUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetAttackedUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetAttackingUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetBuffCastingUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetChainUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetCompUnit1.java | 2 +- .../behavior/callback/unit/ABCallbackGetCompUnit2.java | 2 +- .../behavior/callback/unit/ABCallbackGetDamagedUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetDamagingUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetDyingUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetEnumUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetKillingUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetLastCreatedUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetMatchingUnit.java | 2 +- .../callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java | 2 +- .../callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetParentCastingUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetProjectileHitUnit.java | 2 +- .../callback/unit/ABCallbackGetReactionAbilityCastingUnit.java | 2 +- .../callback/unit/ABCallbackGetReactionAbilityTargetUnit.java | 2 +- .../behavior/callback/unit/ABCallbackGetStoredUnitByKey.java | 2 +- .../behavior/callback/unit/ABCallbackReuseUnit.java | 2 +- .../callback/unit/ABCallbackReuseUnitWithArguments.java | 2 +- .../callback/unitgroup/ABCallbackArgumentUnitGroup.java | 2 +- .../callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java | 2 +- .../callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java | 2 +- .../behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java | 2 +- .../unitgroup/ABCallbackReuseUnitGroupWithArguments.java | 2 +- .../callback/unitqueue/ABCallbackArgumentUnitQueue.java | 2 +- .../callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java | 2 +- .../callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java | 2 +- .../behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java | 2 +- .../unitqueue/ABCallbackReuseUnitQueueWithArguments.java | 2 +- .../visionmodifier/ABCallbackArgumentVisionModifier.java | 2 +- .../visionmodifier/ABCallbackGetLastCreatedVisionModifier.java | 2 +- .../visionmodifier/ABCallbackGetStoredVisionModifierByKey.java | 2 +- .../callback/visionmodifier/ABCallbackReuseVisionModifier.java | 2 +- .../ABCallbackReuseVisionModifierWithArguments.java | 2 +- .../behavior/callback/widget/ABCallbackArgumentWidget.java | 2 +- .../callback/widget/ABCallbackGetProjectileHitWidget.java | 2 +- .../callback/widget/ABCallbackGetStoredWidgetByKey.java | 2 +- .../behavior/callback/widget/ABCallbackReuseWidget.java | 2 +- .../callback/widget/ABCallbackReuseWidgetWithArguments.java | 2 +- .../behavior/condition/ABCallbackArgumentBoolean.java | 2 +- .../behavior/condition/ABCallbackReuseBoolean.java | 2 +- .../behavior/condition/ABCallbackReuseBooleanWithArguments.java | 2 +- .../condition/ABConditionSetCantUseReasonOnFailure.java | 2 +- .../condition/ability/ABConditionIsAutoCastCurrentlyActive.java | 2 +- .../behavior/condition/ability/ABConditionIsDisabled.java | 2 +- .../ability/ABConditionIsFlexAbilityNonPointTarget.java | 2 +- .../condition/ability/ABConditionIsFlexAbilityNonTargeted.java | 2 +- .../condition/ability/ABConditionIsFlexAbilityPointTarget.java | 2 +- .../condition/ability/ABConditionIsFlexAbilityTargeted.java | 2 +- .../behavior/condition/ability/ABConditionIsOnCooldown.java | 2 +- .../condition/ability/ABConditionIsToggleAbilityActive.java | 2 +- .../condition/ability/ABConditionIsTransformingToAlternate.java | 2 +- .../behavior/condition/ability/ABConditionWasAutoCast.java | 2 +- .../ability/ABConditionWasAutoCastPreviouslyActive.java | 2 +- .../condition/ability/ABConditionWasCastingInterrupted.java | 2 +- .../condition/attack/ABConditionIsAttackProjectile.java | 2 +- .../behavior/condition/attack/ABConditionIsAttackRanged.java | 2 +- .../condition/booleans/ABCallbackGetAbilityDataAsBoolean.java | 2 +- .../booleans/ABCallbackGetParentAbilityDataAsBoolean.java | 2 +- .../condition/booleans/ABCallbackGetStoredBooleanByKey.java | 2 +- .../ABConditionDoesDestructableHaveBuffMatchingCondition.java | 2 +- .../behavior/condition/item/ABConditionIsItemAbility.java | 2 +- .../behavior/condition/item/ABConditionItemHasCharges.java | 2 +- .../behavior/condition/item/ABConditionItemIsCharged.java | 2 +- .../ABConditionMatchingCorpseExistsInRangeOfUnit.java | 2 +- .../membership/ABConditionMatchingUnitExistsInRangeOfUnit.java | 2 +- .../targeting/ABConditionIsDestructableValidTarget.java | 2 +- .../targeting/ABConditionIsPassAllAbilityTargetChecks.java | 2 +- .../targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java | 2 +- .../condition/targeting/ABConditionIsUnitValidTarget.java | 2 +- .../behavior/condition/targeting/ABConditionIsValidTarget.java | 2 +- .../ABConditionDoesUnitHaveAbilityMatchingCondition.java | 2 +- .../unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java | 2 +- .../handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java | 2 +- .../w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java | 2 +- .../w3x/simulation/abilitybuilder/buff/ABTimedBuff.java | 2 +- .../w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java | 2 +- .../abilitybuilder/buff/ABTimedTickingPausedBuff.java | 2 +- .../abilitybuilder/buff/ABTimedTransformationBuff.java | 2 +- .../abilitybuilder/{core => datastore}/ABLocalStoreKeys.java | 2 +- .../simulation/abilitybuilder/event/ABGlobalWidgetEvent.java | 2 +- .../w3x/simulation/abilitybuilder/event/ABPlayerEvent.java | 2 +- .../w3x/simulation/abilitybuilder/event/ABWidgetEvent.java | 2 +- .../abilitybuilder/handler/ABTransformationHandler.java | 2 +- .../simulation/abilitybuilder/iterstructs/ABUnitComparator.java | 2 +- .../listener/ABAbilityEffectReactionListener.java | 2 +- .../abilitybuilder/listener/ABAbilityProjReactionListener.java | 2 +- .../abilitybuilder/listener/ABAttackEvasionListener.java | 2 +- .../simulation/abilitybuilder/listener/ABAttackModifier.java | 2 +- .../abilitybuilder/listener/ABAttackPostDamageListener.java | 2 +- .../abilitybuilder/listener/ABAttackPreDamageListener.java | 2 +- .../abilitybuilder/listener/ABAttackProjReactionListener.java | 2 +- .../abilitybuilder/listener/ABBehaviorChangeListener.java | 2 +- .../abilitybuilder/listener/ABDamageTakenListener.java | 2 +- .../listener/ABDamageTakenModificationListener.java | 2 +- .../abilitybuilder/listener/ABDeathReplacementEffect.java | 2 +- .../projectile/ABCollisionProjectileListener.java | 2 +- .../abilitybuilder/projectile/ABProjectileListener.java | 2 +- .../w3x/simulation/abilitybuilder/timer/ABDelayTimerTimer.java | 2 +- .../handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java | 2 +- .../abilitybuilder/types/impl/ABAbilityBuilderAbilityType.java | 2 +- .../abilitybuilder/types/impl/ABAbilityBuilderTemplateType.java | 2 +- .../desktop/editor/abilitybuilder/JassGeneratorForType.java | 2 +- 507 files changed, 507 insertions(+), 507 deletions(-) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/{core => datastore}/ABLocalStoreKeys.java (99%) diff --git a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java index 7424bfc1d..eecd38e33 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java +++ b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java @@ -12,8 +12,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.COrderButton; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.COrderButton.JassOrderButtonType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerJass; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.region.CRegion; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAutoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAutoTarget.java index 4970399d5..2625197cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAutoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAutoTarget.java @@ -10,8 +10,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java index 95eee29ba..45b45fac9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveNoTarget.java index ac008f305..96b5004ce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveNoTarget.java @@ -9,8 +9,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePairing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePairing.java index 6880d2a07..2ec9aa72d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePairing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePairing.java @@ -18,8 +18,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorSendOrder; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePointTarget.java index 57d20a3e8..0f165f85a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePointTarget.java @@ -10,8 +10,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveUnitTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveUnitTarget.java index 4399cc469..9692de338 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveUnitTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveUnitTarget.java @@ -10,8 +10,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java index 41bb4d11b..ca0949995 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java @@ -34,8 +34,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABManaDepletedCheckTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderNoIcon.java index f78dc32e5..dea39326b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderNoIcon.java @@ -17,8 +17,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassive.java index 79eb824e4..bf4a109ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassive.java @@ -16,8 +16,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderAuraTemplate.java index 6f6a6b13e..ba2d4ce12 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderAuraTemplate.java @@ -15,8 +15,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderSimpleAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderSimpleAuraTemplate.java index 1111949f7..31f9c9316 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderSimpleAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderSimpleAuraTemplate.java @@ -18,8 +18,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatAuraTemplate.java index 76c4c4d9d..31c513535 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatAuraTemplate.java @@ -15,8 +15,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericAuraBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABMeleeRangeTargetOverride; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABStatBuffFromDataField; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatPassiveTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatPassiveTemplate.java index 34276b958..3fdfe1b13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatPassiveTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatPassiveTemplate.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABStatBuffFromDataField; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderBase.java index 509e9a376..ff1972150 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderBase.java @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABAbilityTargetStillTargetableVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CAbstractRangedBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderNoTarget.java index 0af716633..11a653d47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderNoTarget.java @@ -12,8 +12,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorVisitor; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorFinishTransformation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorFinishTransformation.java index a030a66b9..8d2d86a8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorFinishTransformation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorFinishTransformation.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java index 929dd4ae4..c451577be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java index 339e94b95..2d0ebb4b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java @@ -4,9 +4,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionActivateToggledAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java index 8a87d0295..23086580c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java @@ -5,9 +5,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAddAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java index f2c59b8f8..e5effa153 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java @@ -5,9 +5,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAddNewAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java index 51a0c89b4..e391cff78 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionBeginChanneling implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java index 2fb30a8ef..201ec64b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionClickDisableAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java index c79b4bd73..a259f80b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionClickEnableAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java index dbc765923..97ae26f9e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionCreateAbilityFromId implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java index 50e081f4d..f6893dd6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java @@ -4,9 +4,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionDeactivateToggledAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java index 8943f26e9..11cee6c0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionFinishChanneling implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java index 9b0b49d4b..2a90df747 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionResetCooldown implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java index 2ad4ed3eb..c53d12b26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABActionSendStartCastingEvents implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java index 42ed7e523..9e1ba23ed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java @@ -8,9 +8,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionStartCooldown implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java index 52735b5d6..a56a49d67 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAbilitySetShowIcon implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java index e84a9568c..104b03e70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java @@ -8,9 +8,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java index 769ab4e86..a8035fbe4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionDisableAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java index a14c3950b..8334a18cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionDisableAbilityById implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java index 80ef1c8e1..84019e19d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionEnableAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java index c074efa97..50cabffa2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionEnableAbilityById implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java index 92713d356..7b8531ca8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java @@ -8,9 +8,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java index bba259256..34f4a8ab7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java @@ -5,9 +5,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionSetAbilityCastRange implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java index 0b4c5fa9e..1fa4295f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java @@ -4,9 +4,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionSetAutoTargetDestructable implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java index 1777ad8f7..6f753ba09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java @@ -4,9 +4,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionSetAutoTargetUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java index 7d4ec312b..ae2f4c58a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionSetPreventEndEvents implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java index d6f4f7e8d..d39c323ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; public class ABActionCreateAttackModifier implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java index a4be3e012..41241f86e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddAnimationTag implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java index 3c42ad988..344ef75ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddPostDamageListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java index f8f5ab227..75e658521 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddPreDamageListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java index 96db6994e..1858c3db6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyAllArtFields implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java index 9f22fea0f..aef675ddf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyArt implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java index 41bf93442..d24c33562 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyArtAndSpeed implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java index 2e715bb3e..f76430737 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyDefaultSpeed implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java index df67a2a18..198f652e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public class ABActionAttackModifierPreventOtherModifications implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java index 6e7868302..91fd8c17b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public class ABActionAttackModifierPreventOtherSamePriorityModifications implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java index 4b40a18ec..68f0e254f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemoveAnimationTag implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java index 742f07d20..a718fd37b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemovePostDamageListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java index 3d95b7598..66a821c28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemovePreDamageListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java index f56a308f3..0a66b3aaf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackArc implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java index 93d3c7708..48d6fcbc7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackDeathTime implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java index b45cded0a..2b1bc9f7f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackHoming implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java index e3c4ae38c..af4ca8035 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackImpactZ implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java index 8a8704878..2c732a38c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackStartZ implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java index d1f4c2b43..bc43bbb37 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetSplashFields implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java index c5e5a5cf8..0d54a8cce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java index 669b5f8fb..0963830de 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java index efa961c92..61f30c765 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java index b3ffc2d87..1e5d5a6fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java index 50646ed9b..bf9b3fead 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAttemptToResumePreviousBehavior implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java index af533e8ec..ba0943093 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; public class ABActionForceBeginCreatedBehavior implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java index abd003860..da3702a40 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java @@ -5,9 +5,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAddBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java index ec6e33f18..74e9bf5a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAddNonStackingDisplayBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java index 983d82221..c0fbf0d96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java @@ -9,9 +9,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs.ABBuffSlow; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAddSlowBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java index 5be46299b..685794d1c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java @@ -9,9 +9,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs.ABBuffStun; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAddStunBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java index 31d21ab4e..39ea392bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -12,9 +12,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreatePassiveBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java index d0c8abcfb..d700b6755 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java @@ -10,9 +10,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTargetingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionCreateTargetingBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java index 1929af261..fde4b24a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -12,9 +12,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedArtBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTimedArtBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java index fdce102ae..4291791f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java @@ -16,9 +16,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java index 7fb171d77..9fec3911c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionCreateTimedLifeBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java index 0f9326ce5..8b239f2f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java @@ -16,8 +16,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedPausedExpirationBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java index 597fb28f9..c8948d7c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java @@ -12,9 +12,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTargetingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionCreateTimedTargetingBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java index ea12f8d32..e849242dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java @@ -16,9 +16,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java index 466e86442..4152d258c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java @@ -16,9 +16,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPausedBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java index 982fcdfc0..9b4ea0ca3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java @@ -16,9 +16,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPostDeathBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java index bcbfead2b..6f3aa79a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java @@ -10,8 +10,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionDispelBuffs implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java index 7bac0af5a..133355293 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java index c05ca67f5..a44a646ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java index f624ab97b..da0be5c70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java index 232deb360..e3b6d3cb8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java index 17169d208..98f0ddf86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java @@ -8,9 +8,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionStoreValueLocally implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java index e46c615dd..3d30cd82c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java @@ -11,8 +11,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionCreateDestructable implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java index 7d6446809..2f85bf2f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java @@ -9,9 +9,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionCreateDestructableBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java index 9f529cd4c..a4d006622 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java @@ -10,8 +10,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionDispelDestructableBuffs implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java index 05bdebd93..9217708c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABActionCreateTimeOfDayEvent implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java index eb6b067b3..5949ce3bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java index 69b90ad07..f9af680cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java index 2cfe1e63b..c457fab14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java index d166d7ab2..2198a1085 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java index d511299f1..60348cce2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTemporarySpellEffectAtLocation implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java index f067b41c1..246cb09b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java @@ -5,9 +5,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTemporarySpellEffectAtPoint implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java index acf7b7b25..b43dc3fa1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java @@ -5,9 +5,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTemporarySpellEffectOnUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java index a0f562fb9..2fbf61566 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABGroupEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java index 920a930bd..c07b527de 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABActionCreateLightningEffect implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java index b86828fc8..a6d3859f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateLoopingSoundEffectAtLocation implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java index d3fd17185..18bfbde0d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateLoopingSoundEffectOnUnit implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java index ba45a28e4..e13fb43da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateSoundEffectAtLocation implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java index d2b49a746..d094e1d2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateSoundEffectOnUnit implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java index 8915d44b2..2dee1cb26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateUberSplat implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java index d89d42e14..8973af90a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainBowlEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java index d39468c10..43fb27d1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainRippleEffect; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java index 99baa73ff..c2f6f632b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainWaveEffect; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java index cbc05517c..bc5aaf881 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionChargeItem implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java index 9e2e7bf25..7142b1a1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java @@ -14,8 +14,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionIterateDestructablesInRangeOfLocation implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java index af407de5a..dce7d23af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java @@ -11,8 +11,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionIterateUnitsInGroup implements ABAction { private static final boolean ALLOW_BREAK_JASS = true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java index 66e8ea6a3..e572111a6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java @@ -9,8 +9,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionIterateUnitsInQueue implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java index 5b8ad6de9..81852a2cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java @@ -14,8 +14,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionIterateUnitsInRangeOfLocationMatchingCondition implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java index 327adc763..5bb65bcee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java @@ -15,8 +15,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; public class ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java index 49eba50e9..a78a270cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionIterateUnitsInRangeOfUnitMatchingCondition implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java index 1ff88111e..52dcd56b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java @@ -14,8 +14,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; public class ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java index fd51dbc79..c70a08dcd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java @@ -10,8 +10,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionIterateUnitsInRect implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java index 48ae46094..7dc46c574 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java @@ -13,9 +13,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java index fb8af202b..359f7dbff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java @@ -12,9 +12,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java index 1bdff5509..112f87cc4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java @@ -15,9 +15,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java index 55e8c837e..4b01eefc5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java @@ -21,8 +21,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABNearestUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java index f2adf1029..c17324d1e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java @@ -12,9 +12,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java index 5e9ba4db5..4c9891274 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java @@ -12,9 +12,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java index a78828fe3..6ee7e4c2b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java @@ -14,9 +14,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java index 8fbf12396..c97ef2983 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java @@ -8,9 +8,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionCheckAbilityEffectReaction implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java index c5d1e9408..849744d9b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABNonStackingStatBuffTypeCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABActionCreateNonStackingStatBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java index b95660f32..3a9fe8625 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionBreak implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java index 165ead03f..873bdbb23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java @@ -15,8 +15,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABNearestUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java index 7f86f0860..06edfee86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionCreateSubroutine implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java index d62d86954..12c524897 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionFor implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java index 531872d8f..4c678b6ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java @@ -9,8 +9,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionPeriodicExecute implements ABAction { private final static int HARD_LOOP_CAP = 100; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java index 4b754fb5b..97b3e55a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionResetPeriodicExecute implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java index 7c71c7763..4c875557d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABActionRunReuseAction implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java index 209629b7f..9dc4607a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java @@ -9,9 +9,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABActionRunReuseActionWithArguments implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java index 3d87e3a06..308057203 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionRunSubroutine implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java index 6b6b39d93..d6af3c690 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionWhile implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java index 99da7b2df..4c51ddf01 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java index 282f49a09..d514ff918 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java @@ -3,9 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionStartTimer implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java index 165325964..9b72c96dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAbilityRemoveUniqueValue implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java index d2f37ad4b..3508dacb6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAbilityStoreUniqueValue implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java index 153eaeeaf..2936d0d90 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java @@ -10,9 +10,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionCreateUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java index 85a2df851..875c91485 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java @@ -9,9 +9,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionMergeUnits implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java index e92d9d8cd..734c202d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java index ce3bb3b81..b611def2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java @@ -11,8 +11,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABDelayInstantTransformationTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java index 0d4524f51..d941e99d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java @@ -12,8 +12,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java index a6f8000a2..86a0bbd54 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java @@ -10,8 +10,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; public class ABActionTransformedUnitAbilityRemove implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java index bc9e3829d..b61eebc12 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAddUnitToGroup implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java index 201979118..fded360d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java @@ -5,9 +5,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionCreateUnitGroup implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java index 346df2cdb..d2b60c1c2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionRemoveUnitFromGroup implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java index b926a8a5f..2215fa450 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public class ABActionCreateAttackPostDamageListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java index c1a6a8e92..31ce3810c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; public class ABActionCreateAttackPreDamageListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java index eb9a5e04d..e0951292e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java index 73ae34023..b9f319e18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerAddDamageMultiplier implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java index 0de4860f0..3f7b85d81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerLockDamageModifications implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java index cdb386ab0..15f64b038 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerSetMiss implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java index cae00f2d2..8e3f94c28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionSetPreDamageStacking implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java index 69edf1365..60e77cb5f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetAttackBaseDamage extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java index 5a943274f..e12559390 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java index e6d82ac28..b012ac83f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetAttackMaximumSplashRadius extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java index 22be26fa1..fdda4d450 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java index 587cc95ff..ce9e9bafe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java index 41e8c9744..2bf4e7c23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileLine; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java index fc6f670cc..b3881d86d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABConditionIsAttackHoming extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java index 27745a00e..5c9988873 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java index 808e95252..532da49c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; public class ABActionCreateBehaviorChangeListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java index c97eacfbe..37568169b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target.ABTargetCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java index dda53224a..d505efc77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java index c2225afc6..fad452f74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public class ABActionCreateDamageTakenListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java index 407ad47c2..1ac1d1689 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; public class ABActionCreateDamageTakenModificationListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java index 04a709ed1..1061ee0e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionDamageTakenModificationMultiplyDamageMultiplier implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java index 2d6c8e1db..cc9a7c812 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionDamageTakenModificationSetDamageMultiplier implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java index bb2ec8b2f..16e0b4e91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABConditionIsTriggeringDamageAnAttack extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java index 1bd4cdb80..c2d9f6739 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABConditionIsTriggeringDamageRanged extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java index 86a62468a..9e2fa2dba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; public class ABActionCreateDeathReplacementEffect implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java index 131198463..6e2e075e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java index 591b51a1d..8fd1d1630 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java index 0271d1dca..72cefa04f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public class ABActionCreateEvasionListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java index eaa46d346..8022525d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; public class ABActionCreateAbilityEffectReactionListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java index 7a6259f25..ec8d38745 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; public class ABActionCreateAbilityProjReactionListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java index 8b567b240..62f41871c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; public class ABActionCreateAttackProjReactionListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java index 58d32e716..67ea32ddd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionReactionPreventHit implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java index ed4ef7a32..3ca141be9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java index 8486fc850..7b93debb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; public class ABCallbackGetReactionAttackProjectileDamage extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java index de1f535ce..634e6ee31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; /* diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java index 99e28cf52..7a8855358 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; /* diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java index c9d2c9a2c..c815bd872 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; /* diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java index 1bb386fcc..aa532434a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java index 0171bc0d9..9577cc33a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java index 2abd312f8..54b1a5448 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABUnitStateListenerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAddUnitStateListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java index 8c2d7e4b3..5d3cb64e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; public class ABActionCreateUnitStateListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java index 3d2c2828d..eea6d92fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionAddUnitToQueue implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java index d6bf85396..78968f038 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java @@ -5,9 +5,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionCreateUnitQueue implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java index 8dd881cbe..b78a2928d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABActionRemoveUnitFromQueue implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java index 393fdb482..e1dc2d486 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.ABLongCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuffType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java index cc01402d8..d52bae26b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CCircleFogModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CTimedCircleFogModifier; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java index 26a24d1ba..acd31f06f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CProjectileVisionFogModifier; public class ABActionCreateProjectileVisionModifier implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java index 6b3d0d07e..06d735a10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CUnitVisionFogModifier; public class ABActionCreateUnitVisionModifier implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java index 5577e0643..4b6310660 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java index 77574f05c..8ef451761 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java index eaefe9c43..b264bcc28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetMatchingAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java index b3467fff9..b7d6295b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetPartnerAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java index 0852a8976..b2a9a4009 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetReactionAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java index b678ffaed..25ca18eb6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredAbilityByKey extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java index e02a656d1..03a2ebaa3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetThisAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java index 3ca78bab3..ed928ec94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java index b78675b5c..07df8ec03 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseAbilityWithArguments extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java index 23cf21b6a..c41a36c25 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; public class ABCallbackGetLastCreatedAttackModifier extends ABAttackModifierCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java index 717f9aa2c..e91a9d721 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; public class ABCallbackGetStoredAttackModifierByKey extends ABAttackModifierCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java index f41ff6189..539279a83 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetCurrentAttackSettings extends ABAttackSettingsCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java index 7e1463b62..365563e63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetLastCreatedAttackSettings extends ABAttackSettingsCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java index eb3e42a4c..d72642cf7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetStoredAttackSettingsByKey extends ABAttackSettingsCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java index 54fb43f69..5a175d9a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java index 952825424..8684239f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackEnumBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java index 8b9fa9654..7e7fe0b23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java index b1dfd8695..786ad1c4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetMatchingBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java index 9e0519146..40d184854 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredBuffByKey extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java index 2d10ecc10..1ad8c8c4a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java index b2d36e801..fa0b8bc24 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBuffWithArguments extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java index 737413725..3c591cecb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackThisBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java index 3835f0484..d93f1fe6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java index b6fdc338b..486a6f828 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityTargetedDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java index e926b3d0c..9c3c665c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAttackedDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java index ca13bf93d..c5a112367 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetEnumDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java index 533bdce0a..5795a2077 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java index 88409701f..334faab79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileHitDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java index 96a3bea60..acefb0d4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredDestructableByKey extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java index 6c39870a8..e3c517ab3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java index cdcd619fc..d654d5dba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructableWithArguments extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java index 85fb7f7a8..bc95dd7a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentDestructableBuff extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java index 7d6268655..2a78cf2ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackEnumDestructableBuff extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java index 65e92ad46..c29b02b30 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedDestructableBuff extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java index f5c3bb4d0..566eca735 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredDestructableBuffByKey extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java index ec0800be8..b0b3a5858 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackMatchingDestructableBuff extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java index 96e2bacbe..f150eec3d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructableBuff extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java index ba77c8d67..04da7f3fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructableBuffWithArguments extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java index 7242f7d15..676197f9c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public class ABCallbackGetStoredAttackTypeByKey extends ABAttackTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java index 2bc75d559..0f10a8e85 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetStoredDamageTypeByKey extends ABDamageTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java index e9cda1599..1537484ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABCallbackGetStoredDefenseTypeByKey extends ABDefenseTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java index 4cf751cd0..79401c121 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredMovementTypeByKey extends ABMovementTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java index 360d304fe..0cdc7a0f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABCallbackGetStoredTargetTypeByKey extends ABTargetTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java index 2c37921d9..666660e6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABCallbackGetStoredWeaponTypeByKey extends ABWeaponTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java index 03f91f2c4..51479cbf9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackArgumentTimeOfDayEvent extends ABTimeOfDayEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java index fd3ee29ee..e6201511c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackGetLastCreatedTimeOfDayEvent extends ABTimeOfDayEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java index 6c4f04719..74ffa11b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; public class ABCallbackGetStoredTimeOfDayEventByKey extends ABTimeOfDayEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java index 5862a05f9..75dad1b17 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java index c613a4d6e..f00b6238a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java index 739c0cdd6..fdbcdd364 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackArgumentWidgetEvent extends ABWidgetEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java index 67d9b94f6..3c3be28ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackGetLastCreatedWidgetEvent extends ABWidgetEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java index ba9dbb96e..e0c8e2753 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; public class ABCallbackGetStoredWidgetEventByKey extends ABWidgetEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java index e2a0b6b69..03b7b3c22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java index 0b91bb94e..6edf1138f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java index 0b26e0ef4..06b831568 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java index 135197dfa..8e20fb127 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityArea extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java index ee18055a7..b7f2f34a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityCastRange extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java index 6b4f1d61f..b11f20020 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityCastTime extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java index e788739e1..a9835e56e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityCooldown extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java index d99275907..2e8d30b15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java index 6d15f62b2..d20240980 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java index f4f6c9cd8..c00259d59 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java @@ -3,8 +3,8 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityHeroDuration extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java index 5d609cb49..74bb4fc05 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityProjectileSpeed extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java index c5a5c67dd..8bc39b629 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java @@ -3,8 +3,8 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java index 10b0928f9..214f8f697 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredFloatByKey extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java index 65d3ac270..82e0a8a91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java index 2d823626d..06fada4f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseFloatWithArguments extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java index 8bf89c757..6b625352a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackArgumentFX extends ABFXCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java index a392683b4..d944d3785 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackGetLastCreatedFX extends ABFXCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java index 6356ba9ae..4050dbff7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABCallbackGetLastCreatedLightningEffect extends ABLightningCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java index 480cbdd72..eaf239d2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackGetStoredFXByKey extends ABFXCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java index 496ab9500..01319b3d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABCallbackGetStoredLightningByKey extends ABLightningCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java index 5150f65b4..bf0b02ea4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java index d2c171957..79dc9130a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java index 5e6f0c11a..1a5539977 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentID extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java index 671c75df9..8535d40d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java index 156c251fe..dd849fa33 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java index c30ccd0cc..3ba0619ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java index 2a85adc8d..47a918d43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityUnitId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java index 5d3be8854..3aa4ea5ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAlias extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java index 2e0d71983..7731e72ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetBuffIdFromCode extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java index 408201539..9c8d49b85 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetCode extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java index cdfc4759c..befe53a24 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetFirstBuffId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java index d761ebc29..d0558d15e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetFirstEffectId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java index 0b39e3116..36a0d4eaf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetParentAlias extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java index 093757924..67a8db598 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetSecondBuffId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java index 6ec76d80c..0bde8a39e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredIDByKey extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java index 6a9a604a5..37d089515 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseID extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java index dd1cd961f..99a0650dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseIDWithArguments extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java index d39dbd949..210b9592e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java index b135754f3..9128b704b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackCountBuffsOnUnitMatchingCondition extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java index 8c98816da..3c9fe7fec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityCastTimeAsInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java index 1e54e488e..52a5d06e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java index 2ee7c95cc..c0a9405a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityManaCost extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java index 087cc394f..e2d9c50b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityTargetAttachmentPoints extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java index d714e452b..46ad082ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetItemCharges extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java index 0b07815ba..2332a2852 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetItemLevel extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java index f8fb14a6e..5f7d6d892 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetItemMaxCharges extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java index 7bde486f3..7d215b4b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetItemSlot extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java index e76d80e8e..3782dfdf6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileDestructableTargets extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java index 2f00f02d9..7ba60cb30 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileUnitTargets extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java index 092b6f846..4bceca312 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetSpellLevel extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java index f47864c15..1be113d13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredIntegerByKey extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java index 0fdad694b..3af9ee2e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackIterator extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java index 8ae327442..65819d69e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java index 279ede332..36822ad22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseIntegerWithArguments extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java index 2cdedb453..466fa09c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentItem extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java index f4efd106e..199f87339 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityTargetedItem extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java index 72b54b54e..7786dc45d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAttackedItem extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java index ff73ddb5c..ff65fa150 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedItem extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java index 5bc7b044c..d84c9def4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredItemByKey extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java index 58623c32b..d141c3fca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseItem extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java index 4bda2b5f6..c59701c63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseItemWithArguments extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java index 0ae3233f3..80809ba6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentList extends ABListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java index f7cb3073d..6872877ed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentSortableList> extends ABSortableListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java index 5e2510c56..97d867395 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredListByKey extends ABListCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java index b78af9d08..95a147e6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredSortableListByKey> extends ABSortableListCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java index ed1417d06..a5bf405ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseList extends ABListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java index 27c058220..3a745c9d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseListWithArguments extends ABListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java index 155f52d72..8e81930f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseSortableList> extends ABSortableListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java index 43681c73d..abf0bec5a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseSortableListWithArguments> extends ABSortableListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java index a6dcf8165..12474126d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; public class ABCallbackGetLastCreatedAbilityEffectReactionListener extends ABAbilityEffectReactionListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java index 596c6abbf..2f6ce533e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; public class ABCallbackGetLastCreatedAbilityProjReactionListener extends ABAbilityProjReactionListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java index 1449ddd39..1bd6f8510 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public class ABCallbackGetLastCreatedAttackPostDamageListener extends ABAttackPostDamageListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java index f7a836329..29b6b71ed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; public class ABCallbackGetLastCreatedAttackPreDamageListener extends ABAttackPreDamageListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java index d17398eee..9a612fca4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; public class ABCallbackGetLastCreatedAttackProjReactionListener extends ABAttackProjReactionListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java index 8e416072d..a8a721c24 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; public class ABCallbackGetLastCreatedBehaviorChangeListener extends ABBehaviorChangeListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java index 1373601be..5ca3e2947 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public class ABCallbackGetLastCreatedDamageTakenListener extends ABDamageTakenListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java index 4dca60468..750ab55c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; public class ABCallbackGetLastCreatedDamageTakenModificationListener extends ABDamageTakenModificationListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java index 6523e8a97..e7b576d8b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; public class ABCallbackGetLastCreatedDeathReplacement extends ABDeathReplacementCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java index dd82468b7..c0665f381 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public class ABCallbackGetLastCreatedEvasionListener extends ABEvasionListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java index 148c2facb..96654358f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; public class ABCallbackGetLastCreatedUnitStateListener extends ABUnitStateListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java index 904f5c7a9..029dfcc23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; public class ABCallbackGetStoredAbilityEffectReactionListenerByKey extends ABAbilityEffectReactionListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java index 4bab6a43a..33f546c06 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; public class ABCallbackGetStoredAbilityProjReactionListenerByKey extends ABAbilityProjReactionListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java index bae981b3a..c3605f752 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; public class ABCallbackGetStoredAttackPostDamageListenerByKey extends ABAttackPostDamageListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java index 59a8b0960..4acea35aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; public class ABCallbackGetStoredAttackPreDamageListenerByKey extends ABAttackPreDamageListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java index ee03e0165..98b71d156 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; public class ABCallbackGetStoredAttackProjReactionListenerByKey extends ABAttackProjReactionListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java index 41ed9ea52..ce35bb482 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; public class ABCallbackGetStoredBehaviorChangeListenerByKey extends ABBehaviorChangeListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java index 0fa22fb63..460b5d8e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; public class ABCallbackGetStoredDamageTakenListenerByKey extends ABDamageTakenListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java index cb2c8dac4..df5c7c582 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; public class ABCallbackGetStoredDamageTakenModificationListenerByKey extends ABDamageTakenModificationListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java index 1ec2a6b20..6f972779d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; public class ABCallbackGetStoredDeathReplacementByKey extends ABDeathReplacementCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java index 8efb133f4..53ea8cc89 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; public class ABCallbackGetStoredEvasionListenerByKey extends ABEvasionListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java index eadf0e54d..f848d13c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; public class ABCallbackGetStoredUnitStateListenerByKey extends ABUnitStateListenerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java index 61353ac36..c860c08ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java index dcccc827c..118866b6c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAttackImpactLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java index 130e6cb65..16b75ce4f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAttackTargetLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java index 6b0f6d94f..5457cb70e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetGroundAttackedLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java index 7375dc29e..0e3bf5275 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileCurrentLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java index ad0486033..10ac50c7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredLocationByKey extends ABLocationCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java index e620cafed..897e5a67b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetTargetedLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java index de6d59f57..f748a6381 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java index e4eeedaea..32330dc63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLocationWithArguments extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java index fe1411a37..0280b7b39 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java index 36ae39b4b..146c38ef4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java index aa08638ef..ba9ba47cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredLongByKey extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java index 2b51e82a7..e1f0455b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java index 7361c0c8c..019f1d6bd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLongWithArguments extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java index d6a03381d..80890de69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentOrderId extends ABOrderIdCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java index a529d1526..d31f65f50 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredOrderIdByKey extends ABOrderIdCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java index 1c71edcac..6f24ea14e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseOrderId extends ABOrderIdCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java index 1551832fc..9e32ab355 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseOrderIdWithArguments extends ABOrderIdCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java index 11b3acbbc..d9c392ac5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackArgumentPlayer extends ABPlayerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java index 68cdce801..54dcbd424 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetStoredPlayerByKey extends ABPlayerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java index b909d5653..c440c43d7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java index dec18579f..ab753d3aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java index c43851569..1c9831e67 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackArgumentProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java index 5b3633815..2e8733037 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetLastCreatedProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java index b0d546993..d0fd69490 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetReactionAbilityProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java index d52ff35e3..d5a764d70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetReactionAttackProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java index 843aeb5a5..54c9fabcc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetStoredProjectileByKey extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java index 835432439..c78f602b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetThisProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java index 535222ba7..217466c59 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java index 680cd53c0..b29f04379 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java index f158bbf63..dc1baf070 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackArgumentNonStackingStatBuff extends ABNonStackingStatBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java index 59018eb65..43a1d4287 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackGetLastCreatedNonStackingStatBuff extends ABNonStackingStatBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java index ea09da8ee..dbd25c744 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackGetStoredNonStackingStatBuffByKey extends ABNonStackingStatBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java index 7a1b073c4..e3e1e86c3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java index 28f663a7c..d1f5ea2a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java index 1bc3bb4df..d4f8caa81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackArgumentStateModBuff extends ABStateModBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java index dec0ff424..1f59da5b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackGetLastCreatedStateModBuff extends ABStateModBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java index 5a8135dae..db1ff195c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackGetStoredStateModBuffByKey extends ABStateModBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java index 6fc151918..127167e67 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java index f7b3b5cba..7e95754dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java index dcf4d0843..46f7ae329 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java index 14fd56555..7a18b5474 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java @@ -3,8 +3,8 @@ import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java index 6cf758d48..3f4b6959a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAliasAsString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java index f772f3f17..03e07643b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetCodeAsString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java index 9f17e9da0..021d317e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredStringByKey extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java index ab236121a..0086aba48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java index 0136a6c77..08f0778eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseStringWithArguments extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java index 41701a70f..9939da04e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentTarget extends ABTargetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java index d74315630..ed3c9c307 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityTarget extends ABTargetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java index 7b80c89cb..eaf6901d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredTargetByKey extends ABTargetCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java index 909de27a5..753814663 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseTarget extends ABTargetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java index 908282b74..6ec14b3c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseTargetWithArguments extends ABTargetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java index 5fa7f3fc9..6712993b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackArgumentTimer extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java index 504a6db66..bd2cf60aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetFiringTimer extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java index a3d3df871..35a30cf32 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetLastCreatedTimer extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java index d64b466b7..b4e75f8d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetLastStartedTimer extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java index a0fe5282a..87054e532 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetStoredTimerByKey extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java index 3ef280de9..1337783f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java index 8c48deaab..1de1bcf13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java index 0cd326941..2bdc3c1f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java index 9434b716d..e0064269f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityPairedUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java index dcd436ac0..09d101c2b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityTargetedUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java index 65d53be05..f323505aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAttackedUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java index 33b86874f..a86588303 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetAttackingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java index 25a9323e4..65ab0753a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetBuffCastingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java index 9e5d58646..65f742433 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetChainUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java index c8729a3a1..7ce401473 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetCompUnit1 extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java index f9123ec20..9cf0931e0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetCompUnit2 extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java index d0cb2525a..5849704e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetDamagedUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java index b5ddc0076..88bfb0616 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetDamagingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java index 22c520812..a35ed1182 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetDyingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java index 46e2ff254..a0b375cb6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetEnumUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java index 050bc1129..6e5148f4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetKillingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java index b37d8a3e8..d559a5e2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java index 91aac18f0..8c88f2d85 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetMatchingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java index 204faba2b..08d74dbcf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; public class ABCallbackGetNearestCorpseInRangeOfUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java index 7425efcf7..6c857e8a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; public class ABCallbackGetNearestUnitInRangeOfUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java index d3d8868f2..f19973837 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetParentCastingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java index f7c8bb04a..9fa96524c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileHitUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java index 44ab97564..e0a427c60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetReactionAbilityCastingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java index d5f84caf3..ab7329869 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetReactionAbilityTargetUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java index 69a414b3f..370b381d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredUnitByKey extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java index 0eb49f737..d48a3f7ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java index ccec83338..3401db9d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitWithArguments extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java index d0ab24c89..f60ea669d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentUnitGroup extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java index d2e9bb9a4..c6f714342 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java @@ -3,8 +3,8 @@ import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedUnitGroup extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java index 7f77eb26a..abb143718 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredUnitGroupByKey extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java index e2624fd38..52eb23a92 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitGroup extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java index c1bc7e8f6..17e4621cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitGroupWithArguments extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java index 351eb97c2..ff7d018d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentUnitQueue extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java index d03d68f92..4b9ca048c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java @@ -3,8 +3,8 @@ import java.util.Queue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedUnitQueue extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java index 2a58332ab..5e10ff4a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredUnitQueueByKey extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java index fc92231d2..0d66b6029 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitQueue extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java index 9729a69dd..1593c21f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitQueueWithArguments extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java index 8d07ce959..c9a8cc862 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackArgumentVisionModifier extends ABVisionModifierCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java index 5c1322142..5c1bb9915 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackGetLastCreatedVisionModifier extends ABVisionModifierCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java index 251155e2a..a322f33d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackGetStoredVisionModifierByKey extends ABVisionModifierCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java index a2cb560cc..5d79a792b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java index a453d6375..d8ef8ef54 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java index 965a71289..e7fb1642d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentWidget extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java index f4a3098a6..0a8ef5461 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileHitWidget extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java index 438b8cb3a..625c593bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredWidgetByKey extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java index c53521204..408075197 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseWidget extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java index ad1ca5b8c..8145e930d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseWidgetWithArguments extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java index 9089f9f0b..f4ade7ac0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackArgumentBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java index 009e2a628..fead9018d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java index 5e7831cb6..cc214c4cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBooleanWithArguments extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java index d935c20c4..6a3435bb5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeysEnum; public class ABConditionSetCantUseReasonOnFailure extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java index 12e9187e0..78a83728b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionIsAutoCastCurrentlyActive extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java index 534bd1f81..cbf73b580 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionIsDisabled extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java index af8fb9523..a75473cbd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionIsFlexAbilityNonPointTarget extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java index 748e29e0f..76bde6e01 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionIsFlexAbilityNonTargeted extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java index 3b45d3405..537f1736b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionIsFlexAbilityPointTarget extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java index e6b500fcb..ec1ac2979 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionIsFlexAbilityTargeted extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java index bb269e0e8..852dbc1bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionIsOnCooldown extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java index 752d40181..b357c4876 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionIsToggleAbilityActive extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java index 9b655278c..acdad0823 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionIsTransformingToAlternate extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java index 8345cc64b..b954ecd2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionWasAutoCast extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java index 5cb6414d4..c612717f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionWasAutoCastPreviouslyActive extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java index 86f237a1f..e0a09a229 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionWasCastingInterrupted extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java index 76f19786b..557c85dfa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABConditionIsAttackProjectile extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java index 95567815a..6c19be29f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; public class ABConditionIsAttackRanged extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java index 7708fb6e0..a20ab0d41 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java index a4c771c1b..3e40dca2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetParentAbilityDataAsBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java index 99cf1dcb1..f61038208 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredBooleanByKey extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java index 19c0e3f0f..e42cd6a15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionDoesDestructableHaveBuffMatchingCondition extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java index 20e155691..62be627af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java @@ -3,8 +3,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionIsItemAbility extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java index e64f2424e..d570626ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionItemHasCharges extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java index fec6a8d66..fc26f4682 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionItemIsCharged extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java index 204677686..50af59ded 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; public class ABConditionMatchingCorpseExistsInRangeOfUnit extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java index 8f4bdb8a4..6d83f5fee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; public class ABConditionMatchingUnitExistsInRangeOfUnit extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java index 56b3e8b99..a60b6afd6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java @@ -9,8 +9,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java index 119a8064a..ff2e47a46 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; public class ABConditionIsPassAllAbilityTargetChecks extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java index 5589d7fcc..0f41b016f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; public class ABConditionIsUnitPassAllAbilityTargetChecks extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java index e84672f3c..e38ade6fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java @@ -10,8 +10,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java index 297739abe..1f5746fb5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java @@ -11,8 +11,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java index 823d7b30f..7e57a4b3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionDoesUnitHaveAbilityMatchingCondition extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java index 1cac23650..10bcb0178 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABConditionDoesUnitHaveBuffMatchingCondition extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java index 6095a09af..c0d9bbf88 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractCBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java index df6b68dae..fb0bebb4e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABDestructableBuff implements CDestructableBuff { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java index 4d94f1f47..5cea048c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java index b3ae749ff..f362492c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABTimedTickingBuff extends ABTimedBuff { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java index 1f3bb7bbb..378664e87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABTimedTickingPausedBuff extends ABTimedBuff implements CPausedTickingBuff { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java index d200afbff..5309541ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java @@ -9,8 +9,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorFinishTransformation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABOrderStartTransformation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABDelayInstantTransformationTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalStoreKeys.java similarity index 99% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalStoreKeys.java index 3322b3df7..7cca31d01 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalStoreKeys.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore; public class ABLocalStoreKeys { // Core values diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java index 02745c1c0..b1b869b66 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java @@ -9,8 +9,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABGlobalWidgetEvent extends CGlobalWidgetEvent { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java index 2af050e28..8b4ab3ce4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerJass; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java index 0f0c6fa68..085af7b4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CWidgetEvent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABTransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABTransformationHandler.java index 9df6dfb27..1a750be38 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABTransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABTransformationHandler.java @@ -14,8 +14,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTransformationBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABAltitudeAdjustmentTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABDelayTimerTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTransformationMorphAnimationTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java index 5aedbf6ce..62446808f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java @@ -4,8 +4,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABUnitComparator implements Comparator { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java index 2e355b54f..e4c0994bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.listeners.CUnitAbilityEffectReactionListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; public class ABAbilityEffectReactionListener implements CUnitAbilityEffectReactionListener { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java index 6a160ef5a..eb6a2fc13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.listeners.CUnitAbilityProjReactionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java index af1d1d075..20b44d5e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackEvasionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java index 05f871042..315f0ecf9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java @@ -8,8 +8,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java index 8b3354549..696d1d205 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java @@ -7,8 +7,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPostDamageListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java index e23a653e4..bdf1004ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java index 1209984b6..8574e25c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.listeners.CUnitAttackProjReactionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java index 6eb16c501..ff54f0cd0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitBehaviorChangeListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java index 47eeb42cf..50e7b0041 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java index d11978ab2..a9b1a75b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java index 2f0e95723..1c61e9fbd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java index b71ddfa73..c954162a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java @@ -11,8 +11,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java index da3960c91..38b439989 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java @@ -9,8 +9,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayTimerTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayTimerTimer.java index 0df738f27..1739066ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayTimerTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayTimerTimer.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABDelayTimerTimer extends CTimer { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java index 3be37218c..fab2d7282 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java @@ -5,8 +5,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABTimer extends CTimer { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityType.java index 1ae848812..9bf27a75a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityType.java @@ -11,8 +11,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.CAbilitySpell; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABMapLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderTemplateType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderTemplateType.java index 772e8d260..acd016536 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderTemplateType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderTemplateType.java @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.ABAbilityBuilderSimpleAuraTemplate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.ABAbilityBuilderStatAuraTemplate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.ABAbilityBuilderStatPassiveTemplate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABMapLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java index 9fe95f6d5..dca442a7c 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; From 08c935f25a030d8508f7acd775b5e92649057fef Mon Sep 17 00:00:00 2001 From: Glasir Date: Sat, 13 Dec 2025 02:05:35 -0500 Subject: [PATCH 39/44] Major AB Refactor: Part 6 - AB is now AdjustableBehaviors * AbilityBuilder name still used for ability sections * Planning to add UpgradeBuilder for functional researches --- .../etheller/warsmash/parsers/jass/Jass2.java | 54 ++-- .../scope/CommonTriggerExecutionScope.java | 4 +- .../CommandCardPopulatingAbilityVisitor.java | 2 +- .../handlers/w3x/simulation/CUnit.java | 4 +- .../simulation/abilities/CAbilityVisitor.java | 2 +- .../abilities/GetAbilityByRawcodeVisitor.java | 2 +- .../ABAbilityBuilderPassiveAbility.java | 5 - .../ABActionAddAttackModifier.java | 20 -- .../ABActionRemoveAttackModifier.java | 20 -- .../datastore/ABActionDeleteStoredKey.java | 16 -- .../ABActionKillDestructable.java | 17 -- .../ABActionRemoveDestructable.java | 18 -- .../widget/ABActionCreateWidgetEvent.java | 30 --- .../ABActionRemoveLightningEffect.java | 15 -- ...BActionCreateLoopingSoundEffectOnUnit.java | 21 -- .../ABActionCreateSoundEffectOnUnit.java | 21 -- .../action/list/ABActionListRemove.java | 28 -- .../list/ABActionSortableListRemove.java | 28 -- .../ABActionResetPeriodicExecute.java | 23 -- .../ABActionAbilityRemoveUniqueValue.java | 28 -- .../ABActionAbilityStoreUniqueValue.java | 31 --- .../ABActionBuffRemoveUniqueValue.java | 22 -- .../ABActionBuffStoreUniqueValue.java | 24 -- .../action/unit/stats/ABActionSetSpeed.java | 20 -- .../ABActionTransformUnitAppearance.java | 20 -- .../ABActionAddAttackPostDamageListener.java | 21 -- .../ABActionAddAttackPreDamageListener.java | 23 -- ...BActionCreateAttackPostDamageListener.java | 30 --- ...ABActionCreateAttackPreDamageListener.java | 27 -- ...BActionRemoveAttackPostDamageListener.java | 21 -- ...ABActionRemoveAttackPreDamageListener.java | 23 -- ...nPreDamageListenerAddDamageMultiplier.java | 20 -- .../ABActionAddBehaviorChangeListener.java | 21 -- .../ABActionCreateBehaviorChangeListener.java | 27 -- .../ABActionRemoveBehaviorChangeListener.java | 20 -- .../ABActionAddDamageTakenListener.java | 21 -- ...ionAddDamageTakenModificationListener.java | 21 -- .../ABActionCreateDamageTakenListener.java | 29 -- ...CreateDamageTakenModificationListener.java | 30 --- .../ABActionRemoveDamageTakenListener.java | 21 -- ...RemoveDamageTakenModificationListener.java | 21 -- ...eTakenModificationSetDamageMultiplier.java | 21 -- ...ABConditionIsTriggeringDamageAnAttack.java | 17 -- .../ABConditionIsTriggeringDamageRanged.java | 16 -- .../ABActionAddDeathReplacementEffect.java | 23 -- .../ABActionCreateDeathReplacementEffect.java | 27 -- .../ABActionRemoveDeathReplacementEffect.java | 22 -- .../evasion/ABActionAddEvasionListener.java | 21 -- .../ABActionCreateEvasionListener.java | 27 -- .../ABActionRemoveEvasionListener.java | 21 -- ...ctionAddAbilityEffectReactionListener.java | 20 -- ...BActionAddAbilityProjReactionListener.java | 20 -- ...ABActionAddAttackProjReactionListener.java | 21 -- ...onCreateAbilityEffectReactionListener.java | 28 -- ...tionCreateAbilityProjReactionListener.java | 27 -- ...ctionCreateAttackProjReactionListener.java | 27 -- ...onRemoveAbilityEffectReactionListener.java | 21 -- ...tionRemoveAbilityProjReactionListener.java | 20 -- ...ctionRemoveAttackProjReactionListener.java | 20 -- .../ABActionReactionPreventHit.java | 15 -- ...backGetReactionAttackProjectileDamage.java | 16 -- .../state/ABActionAddUnitStateListener.java | 23 -- .../ABActionRemoveUnitStateListener.java | 21 -- .../unitstate/ABActionUpdateStateModBuff.java | 23 -- .../vision/ABActionRemoveVisionModifier.java | 20 -- .../vision/ABActionSetBurrowPlaceholder.java | 15 -- .../attack/ABAttackModifierCallback.java | 12 - ...BCallbackGetLastCreatedAttackModifier.java | 15 -- ...BCallbackGetLastCreatedTimeOfDayEvent.java | 15 -- .../timeevent/ABTimeOfDayEventCallback.java | 13 - .../ABCallbackGetLastCreatedWidgetEvent.java | 15 -- .../widgetevent/ABWidgetEventCallback.java | 12 - .../floats/ABCallbackGetLocationX.java | 16 -- .../floats/ABCallbackGetLocationY.java | 16 -- .../floats/ABCallbackGetUnitLocationX.java | 16 -- .../floats/ABCallbackGetUnitLocationY.java | 16 -- .../callback/floats/ABFloatCallback.java | 10 - .../behavior/callback/id/ABIDCallback.java | 12 - .../integers/ABCallbackGetListSize.java | 16 -- .../integers/ABCallbackGetPlayerId.java | 16 -- .../integers/ABCallbackGetSpellLevel.java | 14 - .../integers/ABCallbackGetUnitGroupSize.java | 16 -- .../integers/ABCallbackGetUnitQueueSize.java | 16 -- .../callback/integers/ABIntegerCallback.java | 10 - .../callback/item/ABItemCallback.java | 11 - .../callback/list/ABListCallback.java | 12 - .../callback/list/ABListSortType.java | 7 - .../callback/list/ABSortableListCallback.java | 12 - .../list/integer/ABIntegerListCallback.java | 13 - ...AbilityEffectReactionListenerCallback.java | 12 - ...ABAbilityProjReactionListenerCallback.java | 12 - .../ABAttackPostDamageListenerCallback.java | 12 - .../ABAttackPreDamageListenerCallback.java | 12 - .../ABAttackProjReactionListenerCallback.java | 12 - .../ABBehaviorChangeListenerCallback.java | 12 - ...tCreatedAbilityEffectReactionListener.java | 16 -- ...astCreatedAbilityProjReactionListener.java | 15 -- ...etLastCreatedAttackPostDamageListener.java | 16 -- ...GetLastCreatedAttackPreDamageListener.java | 16 -- ...LastCreatedAttackProjReactionListener.java | 15 -- ...kGetLastCreatedBehaviorChangeListener.java | 15 -- ...backGetLastCreatedDamageTakenListener.java | 15 -- ...reatedDamageTakenModificationListener.java | 16 -- ...allbackGetLastCreatedDeathReplacement.java | 16 -- ...CallbackGetLastCreatedEvasionListener.java | 15 -- ...llbackGetLastCreatedUnitStateListener.java | 15 -- .../ABDamageTakenListenerCallback.java | 12 - ...mageTakenModificationListenerCallback.java | 12 - .../listener/ABDeathReplacementCallback.java | 12 - .../listener/ABEvasionListenerCallback.java | 12 - .../listener/ABUnitStateListenerCallback.java | 12 - .../callback/longs/ABLongCallback.java | 10 - .../callback/orderid/ABOrderIdCallback.java | 10 - .../strings/ABCallbackBooleanToString.java | 16 -- .../strings/ABCallbackFloatToString.java | 16 -- .../strings/ABCallbackIntegerToString.java | 16 -- .../strings/ABCallbackLongToString.java | 16 -- .../callback/strings/ABStringCallback.java | 10 - .../unit/ABCallbackGetAttackingUnit.java | 14 - .../unit/ABCallbackGetDamagedUnit.java | 14 - .../unit/ABCallbackGetDamagingUnit.java | 14 - .../callback/unit/ABCallbackGetDyingUnit.java | 14 - .../unit/ABCallbackGetKillingUnit.java | 14 - .../unit/ABCallbackGetParentCastingUnit.java | 14 - .../unit/ABCallbackPollUnitQueue.java | 16 -- .../callback/unit/ABUnitCallback.java | 11 - .../unitgroup/ABUnitGroupCallback.java | 12 - .../unitqueue/ABUnitQueueCallback.java | 12 - .../callback/widget/ABWidgetCallback.java | 11 - .../ability/ABConditionIsDisabled.java | 17 -- ...BConditionIsFlexAbilityNonPointTarget.java | 18 -- .../ABConditionIsFlexAbilityNonTargeted.java | 18 -- .../ABConditionIsFlexAbilityPointTarget.java | 18 -- .../ABConditionIsFlexAbilityTargeted.java | 19 -- .../ability/ABConditionIsOnCooldown.java | 18 -- .../ABConditionIsTransformingToAlternate.java | 15 -- .../attack/ABConditionIsAttackProjectile.java | 16 -- .../attack/ABConditionIsAttackRanged.java | 16 -- .../buff/ABConditionIsBuffMagic.java | 19 -- .../buff/ABConditionIsBuffNegative.java | 19 -- .../buff/ABConditionIsBuffPositive.java | 19 -- .../ABConditionIsDestructableBuffMagic.java | 19 -- ...ionGameplayConstantIsDefendCanDeflect.java | 14 - .../item/ABConditionIsItemAbility.java | 18 -- .../item/ABConditionItemHasCharges.java | 25 -- .../item/ABConditionItemIsCharged.java | 25 -- .../condition/logical/ABConditionBool.java | 16 -- .../condition/logical/ABConditionIsNull.java | 17 -- .../condition/logical/ABConditionNotNull.java | 17 -- .../membership/ABConditionIsUnitInGroup.java | 23 -- .../ABConditionIsUnitInRangeOfUnit.java | 22 -- .../numeric/ABConditionFloatEq0.java | 19 -- .../numeric/ABConditionFloatGt0.java | 18 -- .../numeric/ABConditionFloatGte.java | 20 -- .../condition/numeric/ABConditionFloatLt.java | 20 -- .../numeric/ABConditionFloatLte.java | 20 -- .../condition/numeric/ABConditionFloatNe.java | 21 -- .../numeric/ABConditionFloatNe0.java | 19 -- .../numeric/ABConditionIntegerEq.java | 21 -- .../numeric/ABConditionIntegerEq0.java | 18 -- .../numeric/ABConditionIntegerGt.java | 20 -- .../numeric/ABConditionIntegerGt0.java | 18 -- .../numeric/ABConditionIntegerGte.java | 20 -- .../numeric/ABConditionIntegerIsEven.java | 19 -- .../numeric/ABConditionIntegerIsOdd.java | 19 -- .../numeric/ABConditionIntegerLte.java | 20 -- .../numeric/ABConditionIntegerNe.java | 20 -- .../numeric/ABConditionIntegerNe0.java | 18 -- .../timer/ABConditionIsTimerActive.java | 17 -- .../ABConditionDoesAbilityHaveUniqueFlag.java | 21 -- .../ABConditionDoesBuffHaveUniqueFlag.java | 21 -- .../condition/unit/ABConditionIsUnitType.java | 26 -- .../ABConditionIsUnitBuilding.java | 24 -- .../classification/ABConditionIsUnitHero.java | 24 -- .../ABConditionIsUnitHidden.java | 24 -- .../ABConditionIsUnitMagicImmune.java | 24 -- .../ABConditionIsUnitMorphImmune.java | 24 -- .../unit/state/ABConditionIsUnitAlive.java | 24 -- .../unit/state/ABConditionIsUnitDead.java | 24 -- .../unit/tech/ABConditionUnitHasResearch.java | 26 -- .../ability/ABAbilityBuilderAbility.java | 8 +- .../ABAbilityBuilderActiveAbility.java | 8 +- .../ABAbilityBuilderActiveAutoTarget.java | 14 +- .../ABAbilityBuilderActiveFlexTarget.java | 18 +- .../ABAbilityBuilderActiveNoTarget.java | 12 +- .../ABAbilityBuilderActivePairing.java | 16 +- .../ABAbilityBuilderActivePointTarget.java | 12 +- .../ABAbilityBuilderActiveUnitTarget.java | 12 +- .../ABAbilityBuilderGenericActive.java | 26 +- .../ability/ABAbilityBuilderNoIcon.java | 14 +- .../ability/ABAbilityBuilderPassive.java | 14 +- .../ABAbilityBuilderPassiveAbility.java | 5 + .../ABAbilityBuilderAuraTemplate.java | 10 +- .../ABAbilityBuilderSimpleAuraTemplate.java | 8 +- .../ABAbilityBuilderStatAuraTemplate.java | 14 +- .../ABAbilityBuilderStatPassiveTemplate.java | 12 +- .../behavior/ABBehavior.java | 2 +- .../ABBehaviorAbilityBuilderBase.java | 10 +- .../ABBehaviorAbilityBuilderNoTarget.java | 8 +- .../ABBehaviorFinishTransformation.java | 14 +- .../behavior/ABBehaviorSendOrder.java | 2 +- .../behavior/ABOrderStartTransformation.java | 2 +- .../ABActionAbilityAttemptToApplyEffect.java | 14 +- .../ABActionAbilityRunEndCastingActions.java | 18 +- .../ABActionActivateToggledAbility.java | 10 +- .../action/ability/ABActionAddAbility.java | 12 +- .../action/ability/ABActionAddNewAbility.java | 12 +- .../ability/ABActionAddRallyAbility.java | 8 +- .../ability/ABActionBeginChanneling.java | 8 +- .../ability/ABActionCleanUpCastInstance.java | 6 +- .../ability/ABActionClickDisableAbility.java | 12 +- .../ability/ABActionClickEnableAbility.java | 12 +- .../ability/ABActionCreateAbilityFromId.java | 10 +- .../ABActionDeactivateToggledAbility.java | 10 +- .../ability/ABActionFinishChanneling.java | 8 +- .../ABActionPrepUnownedAbilityForUse.java | 10 +- .../action/ability/ABActionRemoveAbility.java | 10 +- .../action/ability/ABActionResetCooldown.java | 16 +- .../ABActionSendStartCastingEvents.java | 12 +- .../action/ability/ABActionStartCooldown.java | 18 +- .../ABActionAbilitySetShowIcon.java | 14 +- .../abilitydata/ABActionAddTargetAllowed.java | 14 +- .../abilitydata/ABActionDisableAbility.java | 12 +- .../ABActionDisableAbilityById.java | 16 +- .../abilitydata/ABActionEnableAbility.java | 12 +- .../ABActionEnableAbilityById.java | 16 +- .../ABActionRemoveTargetAllowed.java | 14 +- .../ABActionSetAbilityCastRange.java | 12 +- .../ABActionSetAutoTargetDestructable.java | 10 +- .../ABActionSetAutoTargetUnit.java | 10 +- .../ABActionSetPreventEndEvents.java | 8 +- .../ABActionAddAttackModifier.java | 20 ++ .../ABActionCreateAttackModifier.java | 14 +- .../ABActionFireModifiedAttack.java | 14 +- .../ABActionRemoveAttackModifier.java | 20 ++ .../ABActionStartModifiedAttack.java | 12 +- ...ABActionAttackModifierAddAnimationTag.java | 10 +- ...onAttackModifierAddPostDamageListener.java | 10 +- ...ionAttackModifierAddPreDamageListener.java | 10 +- ...ActionAttackModifierApplyAllArtFields.java | 12 +- .../ABActionAttackModifierApplyArt.java | 12 +- ...BActionAttackModifierApplyArtAndSpeed.java | 12 +- ...ActionAttackModifierApplyDefaultSpeed.java | 8 +- ...tackModifierPreventOtherModifications.java | 8 +- ...PreventOtherSamePriorityModifications.java | 8 +- ...ctionAttackModifierRemoveAnimationTag.java | 10 +- ...ttackModifierRemovePostDamageListener.java | 10 +- ...AttackModifierRemovePreDamageListener.java | 10 +- .../ABActionAttackModifierSetAttackArc.java | 10 +- ...ctionAttackModifierSetAttackDeathTime.java | 10 +- ...ABActionAttackModifierSetAttackHoming.java | 10 +- ...BActionAttackModifierSetAttackImpactZ.java | 10 +- ...ABActionAttackModifierSetAttackStartZ.java | 10 +- ...ABActionAttackModifierSetSplashFields.java | 12 +- ...ABCallbackGetModifiedAttackAttackType.java | 8 +- ...ABCallbackGetModifiedAttackDamageType.java | 8 +- ...ABCallbackGetModifiedAttackWeaponType.java | 8 +- ...ctionAttemptToReOrderPreviousBehavior.java | 10 +- ...ActionAttemptToResumePreviousBehavior.java | 10 +- .../ABActionChangeAttackActionToMovement.java | 8 +- .../ABActionForceBeginCreatedBehavior.java | 10 +- .../behavior/action/buff/ABActionAddBuff.java | 12 +- .../ABActionAddNonStackingDisplayBuff.java | 14 +- .../action/buff/ABActionAddSlowBuff.java | 18 +- .../action/buff/ABActionAddStunBuff.java | 18 +- .../buff/ABActionCreatePassiveBuff.java | 20 +- .../buff/ABActionCreateTargetingBuff.java | 16 +- .../buff/ABActionCreateTimedArtBuff.java | 20 +- .../action/buff/ABActionCreateTimedBuff.java | 26 +- .../buff/ABActionCreateTimedLifeBuff.java | 14 +- ...ActionCreateTimedPausedExpirationBuff.java | 26 +- .../ABActionCreateTimedTargetingBuff.java | 20 +- .../buff/ABActionCreateTimedTickingBuff.java | 26 +- .../ABActionCreateTimedTickingPausedBuff.java | 26 +- ...ActionCreateTimedTickingPostDeathBuff.java | 26 +- .../action/buff/ABActionDispelBuffs.java | 12 +- .../action/buff/ABActionRemoveBuff.java | 10 +- .../ABActionRemoveNonStackingDisplayBuff.java | 12 +- .../action/damage/ABActionDamageArea.java | 20 +- .../damage/ABActionDamageAttackSplash.java | 20 +- .../action/damage/ABActionDamageBurst.java | 20 +- .../action/damage/ABActionDamageSplash.java | 20 +- .../action/damage/ABActionDamageTarget.java | 16 +- .../behavior/action/damage/ABActionHeal.java | 12 +- .../datastore/ABActionDeleteStoredKey.java | 16 ++ .../datastore/ABActionStoreValueLocally.java | 20 +- .../ABActionCreateDestructable.java | 18 +- .../ABActionDamageDestructable.java | 18 +- .../ABActionKillDestructable.java | 17 ++ .../ABActionRemoveDestructable.java | 18 ++ .../ABActionAddDestructableBuff.java | 10 +- .../ABActionCreateDestructableBuff.java | 16 +- .../ABActionDispelDestructableBuffs.java | 14 +- .../ABActionRemoveDestructableBuff.java | 10 +- .../ABActionCreateTimeOfDayEvent.java | 16 +- .../ABActionRegisterTimeOfDayEvent.java | 8 +- .../ABActionRegisterUniqueTimeOfDayEvent.java | 10 +- .../ABActionUnregisterTimeOfDayEvent.java | 8 +- .../widget/ABActionCreateWidgetEvent.java | 30 +++ .../widget/ABActionRegisterWidgetEvent.java | 10 +- .../widget/ABActionUnregisterWidgetEvent.java | 10 +- .../ABActionCreateFloatingTextOnUnit.java | 10 +- ...ActionCreateNumericFloatingTextOnUnit.java | 10 +- .../ABActionCreateSpellEffectAtLocation.java | 14 +- .../fx/ABActionCreateSpellEffectAtPoint.java | 12 +- .../fx/ABActionCreateSpellEffectOnUnit.java | 14 +- ...nCreateTemporarySpellEffectAtLocation.java | 14 +- ...tionCreateTemporarySpellEffectAtPoint.java | 12 +- ...ctionCreateTemporarySpellEffectOnUnit.java | 12 +- .../action/fx/ABActionRemoveEffect.java | 8 +- .../ABActionCreateGroupEffectAtLocation.java | 16 +- .../ABActionCreateLightningEffect.java | 16 +- .../ABActionRemoveLightningEffect.java | 15 ++ ...ionCreateLoopingSoundEffectAtLocation.java | 12 +- ...BActionCreateLoopingSoundEffectOnUnit.java | 21 ++ .../ABActionCreateSoundEffectAtLocation.java | 12 +- .../ABActionCreateSoundEffectOnUnit.java | 21 ++ .../fx/splat/ABActionCreateUberSplat.java | 12 +- .../ABActionCreateTerrainBowlAtLocation.java | 16 +- ...ABActionCreateTerrainRippleAtLocation.java | 20 +- .../ABActionCreateTerrainWaveAtLocation.java | 18 +- .../terrain/ABActionModifyTerrainVertex.java | 10 +- .../gamestate/ABActionSetFalseTimeOfDay.java | 10 +- .../action/item/ABActionChargeItem.java | 14 +- .../action/item/ABActionTransformItem.java | 10 +- ...IterateDestructablesInRangeOfLocation.java | 12 +- .../unit/ABActionIterateUnitsInGroup.java | 10 +- .../unit/ABActionIterateUnitsInQueue.java | 10 +- ...itsInRangeOfLocationMatchingCondition.java | 14 +- ...geOfLocationMatchingConditionWithSort.java | 18 +- ...teUnitsInRangeOfUnitMatchingCondition.java | 14 +- ...nRangeOfUnitMatchingConditionWithSort.java | 18 +- .../unit/ABActionIterateUnitsInRect.java | 8 +- .../action/list/ABActionListRemove.java | 28 ++ .../action/list/ABActionLocationListAdd.java | 12 +- .../list/ABActionSortableListRemove.java | 28 ++ .../action/order/ABActionIssueStopOrder.java | 8 +- .../player/ABActionGiveResourcesToPlayer.java | 10 +- .../ABActionSetAbilityEnabledForPlayer.java | 12 +- ...teLocationTargetedCollisionProjectile.java | 24 +- ...ctionCreateLocationTargetedProjectile.java | 22 +- ...reateLocationTargetedPseudoProjectile.java | 24 +- ...nCreateUnitTargetedBouncingProjectile.java | 26 +- ...CreateUnitTargetedCollisionProjectile.java | 24 +- .../ABActionCreateUnitTargetedProjectile.java | 24 +- ...ionCreateUnitTargetedPseudoProjectile.java | 24 +- .../ABActionSetAttackProjectileDamage.java | 10 +- .../projectile/ABActionSetProjectileDone.java | 10 +- .../ABActionSetProjectileReflected.java | 10 +- .../ABActionSetProjectileTarget.java | 10 +- .../ABActionCheckAbilityEffectReaction.java | 12 +- .../ABActionCheckAbilityProjReaction.java | 12 +- .../action/stats/ABActionAddDefenseBonus.java | 12 +- .../stats/ABActionAddNonStackingStatBuff.java | 10 +- .../ABActionCreateNonStackingStatBuff.java | 14 +- .../ABActionRecomputeStatBuffsOnUnit.java | 10 +- .../stats/ABActionRemoveDefenseBonus.java | 12 +- .../ABActionRemoveNonStackingStatBuff.java | 10 +- .../ABActionUpdateNonStackingStatBuff.java | 10 +- .../action/structural/ABActionBreak.java | 8 +- .../structural/ABActionChainEffect.java | 22 +- .../structural/ABActionCreateSubroutine.java | 14 +- .../action/structural/ABActionFor.java | 12 +- .../action/structural/ABActionIf.java | 8 +- .../structural/ABActionPeriodicExecute.java | 14 +- .../ABActionResetPeriodicExecute.java | 23 ++ .../structural/ABActionRunReuseAction.java | 16 +- .../ABActionRunReuseActionWithArguments.java | 18 +- .../structural/ABActionRunSubroutine.java | 14 +- .../action/structural/ABActionWhile.java | 10 +- .../action/timer/ABActionCreateTimer.java | 16 +- .../action/timer/ABActionKillTimer.java | 8 +- .../action/timer/ABActionRemoveTimer.java | 8 +- .../action/timer/ABActionStartTimer.java | 10 +- .../timer/ABActionUpdateTimerTimeout.java | 10 +- .../ABActionAbilityAddUniqueFlag.java | 12 +- .../ABActionAbilityRemoveUniqueFlag.java | 12 +- .../uniqueflag/ABActionBuffAddUniqueFlag.java | 12 +- .../ABActionBuffRemoveUniqueFlag.java | 12 +- .../ABActionAbilityRemoveUniqueValue.java | 28 ++ .../ABActionAbilityStoreUniqueValue.java | 31 +++ .../ABActionBuffRemoveUniqueValue.java | 22 ++ .../ABActionBuffStoreUniqueValue.java | 24 ++ .../action/unit/ABActionCreateUnit.java | 18 +- .../action/unit/ABActionHideUnit.java | 8 +- .../action/unit/ABActionKillUnit.java | 8 +- .../action/unit/ABActionRemoveUnit.java | 8 +- .../action/unit/ABActionResurrect.java | 8 +- .../unit/ABActionSetExplodesOnDeath.java | 12 +- .../unit/ABActionStartSacrificingUnit.java | 10 +- .../unit/ABActionStartTrainingUnit.java | 10 +- .../action/unit/ABActionUnhideUnit.java | 8 +- .../ABActionAddSecondaryAnimationTag.java | 10 +- .../unit/animation/ABActionPlayAnimation.java | 14 +- .../animation/ABActionQueueAnimation.java | 12 +- .../ABActionRemoveSecondaryAnimationTag.java | 10 +- .../unit/art/ABActionDivideUnitAlpha.java | 10 +- .../unit/art/ABActionMultiplyUnitAlpha.java | 10 +- .../unit/art/ABActionMultiplyUnitScale.java | 10 +- .../action/unit/art/ABActionSetUnitAlpha.java | 10 +- .../movement/ABActionSetUnitFlyHeight.java | 10 +- ...BActionSetUnitMovementTypeNoCollision.java | 10 +- .../action/unit/stats/ABActionAddMp.java | 12 +- .../action/unit/stats/ABActionSetHp.java | 12 +- .../action/unit/stats/ABActionSetMp.java | 12 +- .../action/unit/stats/ABActionSetSpeed.java | 20 ++ .../action/unit/stats/ABActionSubtractMp.java | 12 +- .../transformation/ABActionMergeUnits.java | 20 +- .../transformation/ABActionTransformUnit.java | 26 +- .../ABActionTransformUnitAppearance.java | 20 ++ .../ABActionTransformUnitInstant.java | 24 +- .../ABActionTransformedUnitAbilityAdd.java | 22 +- .../ABActionTransformedUnitAbilityRemove.java | 18 +- .../ABActionDisableWorkerAbilities.java | 8 +- .../worker/ABActionEnableWorkerAbilities.java | 8 +- .../ABActionInstantReturnResources.java | 8 +- .../worker/ABActionSendUnitBackToWork.java | 10 +- .../unitgroup/ABActionAddUnitToGroup.java | 12 +- .../unitgroup/ABActionCreateUnitGroup.java | 8 +- .../ABActionRemoveUnitFromGroup.java | 12 +- .../ABActionAddAttackPostDamageListener.java | 21 ++ .../ABActionAddAttackPreDamageListener.java | 23 ++ ...BActionCreateAttackPostDamageListener.java | 30 +++ ...ABActionCreateAttackPreDamageListener.java | 27 ++ ...BActionRemoveAttackPostDamageListener.java | 21 ++ ...ABActionRemoveAttackPreDamageListener.java | 23 ++ ...ActionPreDamageListenerAddBonusDamage.java | 16 +- ...nPreDamageListenerAddDamageMultiplier.java | 20 ++ ...DamageListenerLockDamageModifications.java | 8 +- .../ABActionPreDamageListenerSetMiss.java | 10 +- .../ABActionSetPreDamageStacking.java | 10 +- .../ABCallbackGetAttackBaseDamage.java | 8 +- .../ABCallbackGetAttackDamageType.java | 8 +- ...BCallbackGetAttackMaximumSplashRadius.java | 8 +- .../ABCallbackGetAttackType.java | 8 +- .../ABCallbackGetAttackWeaponType.java | 8 +- .../ABConditionIsAttackArtillery.java | 8 +- .../ABConditionIsAttackHoming.java | 8 +- ...onditionIsUnitValidSplashDamageTarget.java | 10 +- .../ABActionAddBehaviorChangeListener.java | 21 ++ .../ABActionCreateBehaviorChangeListener.java | 27 ++ .../ABActionRemoveBehaviorChangeListener.java | 20 ++ .../ABCallbackGetNewBehaviorTarget.java | 8 +- ...BConditionIsNewBehaviorCategoryInList.java | 8 +- .../ABActionAddDamageTakenListener.java | 21 ++ ...ionAddDamageTakenModificationListener.java | 21 ++ .../ABActionCreateDamageTakenListener.java | 29 ++ ...CreateDamageTakenModificationListener.java | 30 +++ .../ABActionRemoveDamageTakenListener.java | 21 ++ ...RemoveDamageTakenModificationListener.java | 21 ++ ...nModificationMultiplyDamageMultiplier.java | 10 +- ...eTakenModificationSetDamageMultiplier.java | 21 ++ ...ABConditionIsTriggeringDamageAnAttack.java | 17 ++ .../ABConditionIsTriggeringDamageRanged.java | 16 ++ .../ABActionAddDeathReplacementEffect.java | 23 ++ .../ABActionCreateDeathReplacementEffect.java | 27 ++ .../ABActionRemoveDeathReplacementEffect.java | 22 ++ ...onDeathReplacementFinishReincarnating.java | 6 +- ...ctionDeathReplacementSetReincarnating.java | 8 +- .../ABActionDeathReplacementSetReviving.java | 8 +- .../evasion/ABActionAddEvasionListener.java | 21 ++ .../ABActionCreateEvasionListener.java | 27 ++ .../ABActionRemoveEvasionListener.java | 21 ++ ...ctionAddAbilityEffectReactionListener.java | 20 ++ ...BActionAddAbilityProjReactionListener.java | 20 ++ ...ABActionAddAttackProjReactionListener.java | 21 ++ ...onCreateAbilityEffectReactionListener.java | 28 ++ ...tionCreateAbilityProjReactionListener.java | 27 ++ ...ctionCreateAttackProjReactionListener.java | 27 ++ ...onRemoveAbilityEffectReactionListener.java | 21 ++ ...tionRemoveAbilityProjReactionListener.java | 20 ++ ...ctionRemoveAttackProjReactionListener.java | 20 ++ .../ABActionReactionPreventHit.java | 15 ++ ...GetReactionAttackProjectileAttackType.java | 8 +- ...backGetReactionAttackProjectileDamage.java | 16 ++ .../ABActionSubtractTotalDamageDealt.java | 10 +- .../ABCallbackGetFinalTotalDamageDealt.java | 8 +- .../ABCallbackGetRawTotalDamageDealt.java | 8 +- .../ABCallbackGetTriggeringAttackType.java | 8 +- .../ABCallbackGetTriggeringDamageType.java | 8 +- .../state/ABActionAddUnitStateListener.java | 23 ++ .../ABActionCreateUnitStateListener.java | 10 +- .../ABActionRemoveUnitStateListener.java | 21 ++ .../unitqueue/ABActionAddUnitToQueue.java | 12 +- .../unitqueue/ABActionClearUnitQueue.java | 8 +- .../unitqueue/ABActionCreateUnitQueue.java | 8 +- .../ABActionRemoveUnitFromQueue.java | 12 +- .../unitstate/ABActionAddStateModBuff.java | 10 +- .../unitstate/ABActionCreateStateModBuff.java | 10 +- .../unitstate/ABActionRemoveStateModBuff.java | 10 +- .../unitstate/ABActionSetUnitFadeTimer.java | 10 +- .../unitstate/ABActionUpdateStateModBuff.java | 23 ++ .../ABActionCreateLocationVisionModifier.java | 14 +- ...BActionCreateProjectileVisionModifier.java | 14 +- .../ABActionCreateUnitVisionModifier.java | 14 +- .../vision/ABActionRemoveVisionModifier.java | 20 ++ .../vision/ABActionSetBurrowPlaceholder.java | 15 ++ .../behavior/callback/ABCallbackNull.java | 6 +- .../callback/ability/ABAbilityCallback.java | 6 +- .../ability/ABCallbackArgumentAbility.java | 10 +- .../ability/ABCallbackGetAbilityById.java | 10 +- .../ABCallbackGetBuffSourceAbility.java | 6 +- .../ABCallbackGetLastCreatedAbility.java | 6 +- .../ability/ABCallbackGetMatchingAbility.java | 6 +- .../ability/ABCallbackGetPartnerAbility.java | 6 +- .../ability/ABCallbackGetReactionAbility.java | 6 +- .../ABCallbackGetStoredAbilityByKey.java | 10 +- .../ability/ABCallbackGetThisAbility.java | 6 +- .../ABCallbackInlineConditionAbility.java | 6 +- .../ability/ABCallbackReuseAbility.java | 14 +- .../ABCallbackReuseAbilityWithArguments.java | 14 +- .../attack/ABAttackModifierCallback.java | 12 + ...BCallbackGetLastCreatedAttackModifier.java | 15 ++ ...BCallbackGetStoredAttackModifierByKey.java | 12 +- .../ABAttackSettingsCallback.java | 6 +- .../ABCallbackGetCurrentAttackSettings.java | 6 +- ...BCallbackGetLastCreatedAttackSettings.java | 6 +- ...BCallbackGetStoredAttackSettingsByKey.java | 10 +- .../callback/buff/ABBuffCallback.java | 6 +- .../callback/buff/ABCallbackArgumentBuff.java | 10 +- .../callback/buff/ABCallbackEnumBuff.java | 6 +- .../callback/buff/ABCallbackGetBuffById.java | 8 +- .../buff/ABCallbackGetLastCreatedBuff.java | 6 +- .../buff/ABCallbackGetMatchingBuff.java | 6 +- .../buff/ABCallbackGetStoredBuffByKey.java | 10 +- .../buff/ABCallbackInlineConditionBuff.java | 6 +- .../callback/buff/ABCallbackReuseBuff.java | 14 +- .../ABCallbackReuseBuffWithArguments.java | 14 +- .../callback/buff/ABCallbackThisBuff.java | 6 +- .../ABCallbackArgumentDestructable.java | 10 +- ...allbackGetAbilityTargetedDestructable.java | 6 +- .../ABCallbackGetAttackedDestructable.java | 6 +- .../ABCallbackGetEnumDestructable.java | 6 +- .../ABCallbackGetLastCreatedDestructable.java | 6 +- ...BCallbackGetProjectileHitDestructable.java | 6 +- .../ABCallbackGetStoredDestructableByKey.java | 10 +- ...ABCallbackInlineConditionDestructable.java | 6 +- .../ABCallbackReuseDestructable.java | 14 +- ...allbackReuseDestructableWithArguments.java | 14 +- .../destructable/ABDestructableCallback.java | 6 +- .../ABCallbackArgumentDestructableBuff.java | 10 +- .../ABCallbackEnumDestructableBuff.java | 6 +- ...allbackGetLastCreatedDestructableBuff.java | 6 +- ...allbackGetStoredDestructableBuffByKey.java | 10 +- ...llbackInlineConditionDestructableBuff.java | 6 +- .../ABCallbackMatchingDestructableBuff.java | 6 +- .../ABCallbackReuseDestructableBuff.java | 14 +- ...ackReuseDestructableBuffWithArguments.java | 14 +- .../ABDestructableBuffCallback.java | 6 +- ...tackPreDamageListenerPriorityCallback.java | 6 +- .../callback/enums/ABAttackTypeCallback.java | 6 +- .../enums/ABAutocastTypeCallback.java | 6 +- .../ABCallbackConditionalAutocastType.java | 6 +- .../ABCallbackGetAttackTypeFromString.java | 6 +- .../ABCallbackGetAutocastTypeFromString.java | 6 +- .../ABCallbackGetDamageTypeFromString.java | 8 +- .../ABCallbackGetDefenseTypeFromString.java | 6 +- .../ABCallbackGetMovementTypeFromString.java | 6 +- ...kGetNonStackingStatBuffTypeFromString.java | 8 +- .../ABCallbackGetStoredAttackTypeByKey.java | 10 +- .../ABCallbackGetStoredDamageTypeByKey.java | 10 +- .../ABCallbackGetStoredDefenseTypeByKey.java | 10 +- .../ABCallbackGetStoredMovementTypeByKey.java | 10 +- .../ABCallbackGetStoredTargetTypeByKey.java | 10 +- .../ABCallbackGetStoredWeaponTypeByKey.java | 10 +- .../ABCallbackGetTargetTypeFromString.java | 6 +- .../enums/ABCallbackGetUnitDefenseType.java | 6 +- .../enums/ABCallbackGetUnitMovementType.java | 6 +- .../ABCallbackGetUnitTypeMovementType.java | 6 +- .../ABCallbackGetWeaponTypeFromString.java | 8 +- .../ABCallbackRawDeathEffectPriority.java | 4 +- ...BCallbackRawPreDamageListenerPriority.java | 4 +- .../enums/ABCallbackRawTargetType.java | 4 +- .../enums/ABCallbackRawWeaponType.java | 4 +- .../callback/enums/ABDamageTypeCallback.java | 6 +- .../ABDeathReplacementPriorityCallback.java | 6 +- .../callback/enums/ABDefenseTypeCallback.java | 6 +- .../enums/ABMovementTypeCallback.java | 6 +- .../ABNonStackingStatBuffTypeCallback.java | 6 +- .../callback/enums/ABTargetTypeCallback.java | 6 +- .../callback/enums/ABWeaponTypeCallback.java | 6 +- .../ABCallbackArgumentTimeOfDayEvent.java | 12 +- ...BCallbackGetLastCreatedTimeOfDayEvent.java | 15 ++ ...BCallbackGetStoredTimeOfDayEventByKey.java | 12 +- ...CallbackInlineConditionTimeOfDayEvent.java | 8 +- .../ABCallbackReuseTimeOfDayEvent.java | 16 +- ...lbackReuseTimeOfDayEventWithArguments.java | 16 +- .../timeevent/ABTimeOfDayEventCallback.java | 13 + .../ABCallbackArgumentWidgetEvent.java | 12 +- .../ABCallbackGetLastCreatedWidgetEvent.java | 15 ++ .../ABCallbackGetStoredWidgetEventByKey.java | 12 +- .../ABCallbackInlineConditionWidgetEvent.java | 8 +- .../ABCallbackReuseWidgetEvent.java | 16 +- ...CallbackReuseWidgetEventWithArguments.java | 16 +- .../widgetevent/ABWidgetEventCallback.java | 12 + .../callback/floats/ABCallbackAddFloat.java | 4 +- .../floats/ABCallbackArgumentFloat.java | 10 +- .../callback/floats/ABCallbackCeilFloat.java | 4 +- .../callback/floats/ABCallbackCos.java | 4 +- .../callback/floats/ABCallbackDegToRad.java | 4 +- .../floats/ABCallbackDivideFloat.java | 4 +- .../callback/floats/ABCallbackFMaxValue.java | 4 +- .../callback/floats/ABCallbackFloorFloat.java | 4 +- .../floats/ABCallbackGetAbilityArea.java | 10 +- .../floats/ABCallbackGetAbilityCastRange.java | 10 +- .../floats/ABCallbackGetAbilityCastTime.java | 10 +- .../floats/ABCallbackGetAbilityCooldown.java | 10 +- .../ABCallbackGetAbilityDataAsFloat.java | 10 +- .../floats/ABCallbackGetAbilityDuration.java | 10 +- .../ABCallbackGetAbilityHeroDuration.java | 8 +- .../ABCallbackGetAbilityProjectileSpeed.java | 6 +- .../ABCallbackGetAbilityUniqueValueFloat.java | 10 +- .../ABCallbackGetAngleBetweenLocations.java | 6 +- .../ABCallbackGetBuffDurationElapsed.java | 6 +- .../ABCallbackGetBuffUniqueValueFloat.java | 10 +- ...ABCallbackGetDistanceBetweenLocations.java | 6 +- .../ABCallbackGetDistanceBetweenUnits.java | 6 +- .../floats/ABCallbackGetLocationX.java | 16 ++ .../floats/ABCallbackGetLocationY.java | 16 ++ ...ABCallbackGetParentAbilityDataAsFloat.java | 10 +- .../floats/ABCallbackGetStoredFloatByKey.java | 10 +- .../ABCallbackGetUnitAcquisitionRange.java | 6 +- .../floats/ABCallbackGetUnitCastPoint.java | 6 +- .../floats/ABCallbackGetUnitCurrentHp.java | 6 +- .../floats/ABCallbackGetUnitCurrentMana.java | 6 +- .../floats/ABCallbackGetUnitFacing.java | 6 +- .../floats/ABCallbackGetUnitInitialMana.java | 6 +- .../floats/ABCallbackGetUnitLocationX.java | 16 ++ .../floats/ABCallbackGetUnitLocationY.java | 16 ++ .../ABCallbackInlineConditionFloat.java | 6 +- .../callback/floats/ABCallbackIntToFloat.java | 6 +- .../callback/floats/ABCallbackMaxFloat.java | 4 +- .../callback/floats/ABCallbackMinFloat.java | 4 +- .../floats/ABCallbackMultiplyFloat.java | 4 +- .../floats/ABCallbackNegativeFloat.java | 4 +- .../floats/ABCallbackOneGameTick.java | 4 +- .../callback/floats/ABCallbackPi.java | 4 +- .../floats/ABCallbackRandomBoundedFloat.java | 4 +- .../floats/ABCallbackRandomFloat.java | 4 +- .../callback/floats/ABCallbackRawFloat.java | 4 +- .../callback/floats/ABCallbackReuseFloat.java | 14 +- .../ABCallbackReuseFloatWithArguments.java | 14 +- .../callback/floats/ABCallbackSin.java | 4 +- .../floats/ABCallbackSubtractFloat.java | 4 +- .../callback/floats/ABCallbackTan.java | 4 +- .../floats/ABCallbackTicksForDuration.java | 4 +- .../callback/floats/ABFloatCallback.java | 10 + .../callback/fx/ABCallbackArgumentFX.java | 10 +- .../fx/ABCallbackGetLastCreatedFX.java | 6 +- ...CallbackGetLastCreatedLightningEffect.java | 6 +- .../fx/ABCallbackGetStoredFXByKey.java | 10 +- .../fx/ABCallbackGetStoredLightningByKey.java | 10 +- .../fx/ABCallbackInlineConditionFX.java | 6 +- .../callback/fx/ABCallbackReuseFX.java | 14 +- .../fx/ABCallbackReuseFXWithArguments.java | 14 +- .../behavior/callback/fx/ABFXCallback.java | 6 +- .../callback/fx/ABLightningCallback.java | 6 +- .../callback/id/ABCallbackArgumentID.java | 10 +- .../id/ABCallbackGetAbilityDataAsID.java | 10 +- .../ABCallbackGetAbilityDataAsIDFromList.java | 12 +- ...lbackGetAbilityDataAsRandomIDFromList.java | 10 +- .../id/ABCallbackGetAbilityUniqueValueId.java | 10 +- .../id/ABCallbackGetAbilityUnitId.java | 8 +- .../callback/id/ABCallbackGetAlias.java | 6 +- .../callback/id/ABCallbackGetBuffAlias.java | 6 +- .../id/ABCallbackGetBuffIdFromCode.java | 6 +- .../callback/id/ABCallbackGetCode.java | 8 +- .../callback/id/ABCallbackGetFirstBuffId.java | 8 +- .../id/ABCallbackGetFirstEffectId.java | 8 +- .../callback/id/ABCallbackGetItemType.java | 6 +- .../ABCallbackGetNonCurrentTransformType.java | 6 +- .../callback/id/ABCallbackGetParentAlias.java | 6 +- .../id/ABCallbackGetSecondBuffId.java | 8 +- .../id/ABCallbackGetStoredIDByKey.java | 10 +- .../callback/id/ABCallbackGetUnitType.java | 6 +- .../id/ABCallbackGetWar3IDFromString.java | 4 +- .../id/ABCallbackInlineConditionID.java | 6 +- .../callback/id/ABCallbackNullIfFalse.java | 6 +- .../callback/id/ABCallbackRandomItemId.java | 10 +- .../ABCallbackRandomMechanicalCritterId.java | 6 +- .../callback/id/ABCallbackReuseID.java | 14 +- .../id/ABCallbackReuseIDWithArguments.java | 14 +- .../behavior/callback/id/ABIDCallback.java | 12 + .../integers/ABCallbackAddInteger.java | 4 +- .../integers/ABCallbackAndInteger.java | 4 +- .../integers/ABCallbackArgumentInteger.java | 10 +- ...backCountBuffsOnUnitMatchingCondition.java | 10 +- ...ABCallbackCountUnitsInRangeOfLocation.java | 8 +- .../ABCallbackCountUnitsInRangeOfUnit.java | 8 +- ...ABCallbackDetectionDropdownConversion.java | 4 +- .../integers/ABCallbackDivideInteger.java | 4 +- ...ABCallbackGetAbilityCastTimeAsInteger.java | 10 +- .../ABCallbackGetAbilityDataAsInteger.java | 10 +- .../ABCallbackGetAbilityHandleAsInteger.java | 6 +- .../ABCallbackGetAbilityManaCost.java | 10 +- ...lbackGetAbilityTargetAttachmentPoints.java | 10 +- ...BCallbackGetAbilityUniqueValueInteger.java | 10 +- .../ABCallbackGetBuffHandleAsInteger.java | 6 +- .../ABCallbackGetBuffUniqueValueInteger.java | 10 +- .../integers/ABCallbackGetCastId.java | 4 +- .../ABCallbackGetIntegerFromList.java | 6 +- .../integers/ABCallbackGetItemCharges.java | 8 +- .../integers/ABCallbackGetItemLevel.java | 8 +- .../integers/ABCallbackGetItemMaxCharges.java | 8 +- .../integers/ABCallbackGetItemSlot.java | 8 +- .../integers/ABCallbackGetListSize.java | 16 ++ .../ABCallbackGetNeutralHostilePlayerId.java | 4 +- .../ABCallbackGetNeutralPassivePlayerId.java | 4 +- .../integers/ABCallbackGetPlayerId.java | 16 ++ ...lbackGetProjectileDestructableTargets.java | 6 +- .../ABCallbackGetProjectileUnitTargets.java | 6 +- .../ABCallbackGetSortableListSize.java | 6 +- .../integers/ABCallbackGetSpellLevel.java | 14 + .../ABCallbackGetStoredIntegerByKey.java | 10 +- .../integers/ABCallbackGetUnitGroupSize.java | 16 ++ .../ABCallbackGetUnitHandleAsInteger.java | 6 +- .../integers/ABCallbackGetUnitMaximumHp.java | 6 +- .../integers/ABCallbackGetUnitMaximumMp.java | 6 +- .../integers/ABCallbackGetUnitQueueSize.java | 16 ++ .../ABCallbackGetUnitTypeFoodCost.java | 6 +- .../ABCallbackGetUnitTypeGoldCost.java | 6 +- .../ABCallbackGetUnitTypeLumberCost.java | 6 +- .../integers/ABCallbackGetUnitTypeSpeed.java | 6 +- .../ABCallbackInlineConditionInteger.java | 6 +- .../integers/ABCallbackIntegerIf.java | 6 +- .../ABCallbackIntegerZeroIfFalse.java | 6 +- .../integers/ABCallbackIntegerZeroIfNull.java | 4 +- .../callback/integers/ABCallbackIterator.java | 8 +- .../integers/ABCallbackMaxInteger.java | 4 +- .../integers/ABCallbackMinInteger.java | 4 +- .../integers/ABCallbackMultiplyInteger.java | 4 +- .../integers/ABCallbackOrInteger.java | 4 +- .../ABCallbackPlayerToStateModValue.java | 6 +- .../integers/ABCallbackRandomInteger.java | 4 +- .../integers/ABCallbackRawInteger.java | 4 +- .../integers/ABCallbackReuseInteger.java | 14 +- .../ABCallbackReuseIntegerWithArguments.java | 14 +- .../integers/ABCallbackSubtractInteger.java | 4 +- .../ABCallbackTruncateFloatToInteger.java | 6 +- .../callback/integers/ABIntegerCallback.java | 10 + .../callback/item/ABCallbackArgumentItem.java | 10 +- .../ABCallbackGetAbilityTargetedItem.java | 6 +- .../item/ABCallbackGetAttackedItem.java | 6 +- .../item/ABCallbackGetLastCreatedItem.java | 6 +- .../item/ABCallbackGetStoredItemByKey.java | 10 +- .../item/ABCallbackInlineConditionItem.java | 6 +- .../callback/item/ABCallbackReuseItem.java | 14 +- .../ABCallbackReuseItemWithArguments.java | 14 +- .../callback/item/ABItemCallback.java | 11 + .../callback/list/ABCallbackArgumentList.java | 10 +- .../list/ABCallbackArgumentSortableList.java | 10 +- .../list/ABCallbackGetStoredListByKey.java | 10 +- .../ABCallbackGetStoredSortableListByKey.java | 10 +- .../list/ABCallbackInlineConditionList.java | 6 +- ...ABCallbackInlineConditionSortableList.java | 6 +- .../callback/list/ABCallbackListSorted.java | 4 +- .../callback/list/ABCallbackReuseList.java | 14 +- .../ABCallbackReuseListWithArguments.java | 14 +- .../list/ABCallbackReuseSortableList.java | 14 +- ...allbackReuseSortableListWithArguments.java | 14 +- .../callback/list/ABListCallback.java | 12 + .../callback/list/ABListSortType.java | 7 + .../callback/list/ABSortableListCallback.java | 12 + .../integer/ABCallbackEmptyIntegerList.java | 4 +- .../integer/ABCallbackIntegerListOfRange.java | 8 +- .../list/integer/ABIntegerListCallback.java | 13 + .../location/ABCallbackEmptyLocationList.java | 4 +- .../list/location/ABLocationListCallback.java | 6 +- ...AbilityEffectReactionListenerCallback.java | 12 + ...ABAbilityProjReactionListenerCallback.java | 12 + .../ABAttackPostDamageListenerCallback.java | 12 + .../ABAttackPreDamageListenerCallback.java | 12 + .../ABAttackProjReactionListenerCallback.java | 12 + .../ABBehaviorChangeListenerCallback.java | 12 + ...tCreatedAbilityEffectReactionListener.java | 16 ++ ...astCreatedAbilityProjReactionListener.java | 15 ++ ...etLastCreatedAttackPostDamageListener.java | 16 ++ ...GetLastCreatedAttackPreDamageListener.java | 16 ++ ...LastCreatedAttackProjReactionListener.java | 15 ++ ...kGetLastCreatedBehaviorChangeListener.java | 15 ++ ...backGetLastCreatedDamageTakenListener.java | 15 ++ ...reatedDamageTakenModificationListener.java | 16 ++ ...allbackGetLastCreatedDeathReplacement.java | 16 ++ ...CallbackGetLastCreatedEvasionListener.java | 15 ++ ...llbackGetLastCreatedUnitStateListener.java | 15 ++ ...redAbilityEffectReactionListenerByKey.java | 12 +- ...toredAbilityProjReactionListenerByKey.java | 12 +- ...etStoredAttackPostDamageListenerByKey.java | 12 +- ...GetStoredAttackPreDamageListenerByKey.java | 12 +- ...StoredAttackProjReactionListenerByKey.java | 12 +- ...kGetStoredBehaviorChangeListenerByKey.java | 12 +- ...backGetStoredDamageTakenListenerByKey.java | 12 +- ...dDamageTakenModificationListenerByKey.java | 12 +- ...allbackGetStoredDeathReplacementByKey.java | 12 +- ...CallbackGetStoredEvasionListenerByKey.java | 12 +- ...llbackGetStoredUnitStateListenerByKey.java | 12 +- .../ABDamageTakenListenerCallback.java | 12 + ...mageTakenModificationListenerCallback.java | 12 + .../listener/ABDeathReplacementCallback.java | 12 + .../listener/ABEvasionListenerCallback.java | 12 + .../listener/ABUnitStateListenerCallback.java | 12 + .../location/ABCallbackArgumentLocation.java | 10 +- .../ABCallbackCreateLocationFromOffset.java | 8 +- .../ABCallbackCreateLocationFromTarget.java | 6 +- .../ABCallbackCreateLocationFromXY.java | 6 +- .../ABCallbackCreateLocationFromXYOffset.java | 6 +- .../ABCallbackGetAttackImpactLocation.java | 6 +- .../ABCallbackGetAttackTargetLocation.java | 6 +- .../ABCallbackGetGroundAttackedLocation.java | 6 +- .../ABCallbackGetLocationFromList.java | 8 +- ...BCallbackGetProjectileCurrentLocation.java | 6 +- .../ABCallbackGetStoredLocationByKey.java | 10 +- .../ABCallbackGetTargetedLocation.java | 6 +- .../location/ABCallbackGetUnitLocation.java | 6 +- .../ABCallbackInlineConditionLocation.java | 6 +- .../ABCallbackModifyLocationWithOffset.java | 8 +- .../ABCallbackModifyLocationWithXYOffset.java | 6 +- .../ABCallbackRandomLocationInRange.java | 6 +- .../location/ABCallbackReuseLocation.java | 14 +- .../ABCallbackReuseLocationWithArguments.java | 14 +- .../callback/location/ABLocationCallback.java | 6 +- .../callback/longs/ABCallbackAddLong.java | 4 +- .../callback/longs/ABCallbackAndLong.java | 4 +- .../longs/ABCallbackArgumentLong.java | 10 +- .../longs/ABCallbackCreateDetectedData.java | 6 +- .../longs/ABCallbackCreateDetectorData.java | 8 +- .../longs/ABCallbackCreateOwnershipData.java | 6 +- .../callback/longs/ABCallbackDivideLong.java | 4 +- .../longs/ABCallbackGetAbilityDataAsLong.java | 10 +- .../ABCallbackGetAbilityUniqueValueLong.java | 10 +- .../ABCallbackGetBuffUniqueValueLong.java | 10 +- .../longs/ABCallbackGetStoredLongByKey.java | 10 +- .../longs/ABCallbackInlineConditionLong.java | 6 +- .../callback/longs/ABCallbackMaxLong.java | 4 +- .../callback/longs/ABCallbackMinLong.java | 4 +- .../longs/ABCallbackMultiplyLong.java | 4 +- .../callback/longs/ABCallbackOrLong.java | 4 +- .../longs/ABCallbackPlayerMaskAllPlayers.java | 4 +- .../ABCallbackPlayerMaskExcludePlayers.java | 6 +- .../ABCallbackPlayerMaskIncludePlayers.java | 6 +- .../callback/longs/ABCallbackRawLong.java | 4 +- .../callback/longs/ABCallbackReuseLong.java | 14 +- .../ABCallbackReuseLongWithArguments.java | 14 +- .../longs/ABCallbackSubtractLong.java | 4 +- .../callback/longs/ABLongCallback.java | 10 + .../orderid/ABCallbackArgumentOrderId.java | 10 +- .../ABCallbackGetStoredOrderIdByKey.java | 10 +- .../callback/orderid/ABCallbackIdString.java | 6 +- .../ABCallbackInlineConditionOrderId.java | 6 +- .../callback/orderid/ABCallbackRawID.java | 4 +- .../orderid/ABCallbackReuseOrderId.java | 14 +- .../ABCallbackReuseOrderIdWithArguments.java | 14 +- .../callback/orderid/ABOrderIdCallback.java | 10 + .../player/ABCallbackArgumentPlayer.java | 10 +- .../player/ABCallbackGetCastingPlayer.java | 4 +- .../player/ABCallbackGetOwnerOfUnit.java | 6 +- .../player/ABCallbackGetPlayerById.java | 6 +- .../ABCallbackGetStoredPlayerByKey.java | 10 +- .../ABCallbackInlineConditionPlayer.java | 6 +- .../player/ABCallbackReusePlayer.java | 14 +- .../ABCallbackReusePlayerWithArguments.java | 14 +- .../callback/player/ABPlayerCallback.java | 6 +- .../ABCallbackArgumentProjectile.java | 10 +- .../ABCallbackGetLastCreatedProjectile.java | 6 +- ...BCallbackGetReactionAbilityProjectile.java | 6 +- ...ABCallbackGetReactionAttackProjectile.java | 6 +- .../ABCallbackGetStoredProjectileByKey.java | 10 +- .../ABCallbackGetThisProjectile.java | 6 +- .../ABCallbackInlineConditionProjectile.java | 6 +- .../projectile/ABCallbackReuseProjectile.java | 14 +- ...BCallbackReuseProjectileWithArguments.java | 14 +- .../projectile/ABProjectileCallback.java | 6 +- ...ABCallbackArgumentNonStackingStatBuff.java | 10 +- ...backGetLastCreatedNonStackingStatBuff.java | 6 +- ...backGetStoredNonStackingStatBuffByKey.java | 10 +- ...ackInlineConditionNonStackingStatBuff.java | 6 +- .../ABCallbackReuseNonStackingStatBuff.java | 14 +- ...ReuseNonStackingStatBuffWithArguments.java | 14 +- .../ABNonStackingStatBuffCallback.java | 6 +- .../ABCallbackArgumentStateModBuff.java | 10 +- .../ABCallbackGetLastCreatedStateModBuff.java | 6 +- .../ABCallbackGetStoredStateModBuffByKey.java | 10 +- ...ABCallbackInlineConditionStateModBuff.java | 6 +- .../statemod/ABCallbackReuseStateModBuff.java | 14 +- ...allbackReuseStateModBuffWithArguments.java | 14 +- .../statemod/ABStateModBuffCallback.java | 6 +- .../strings/ABCallbackArgumentString.java | 8 +- .../strings/ABCallbackBooleanToString.java | 16 ++ .../strings/ABCallbackCatStrings.java | 4 +- .../strings/ABCallbackFloatToString.java | 16 ++ .../ABCallbackGetAbilityDataAsString.java | 10 +- .../ABCallbackGetAbilityHandleAsString.java | 6 +- ...ABCallbackGetAbilityUniqueValueString.java | 8 +- .../strings/ABCallbackGetAliasAsString.java | 6 +- .../ABCallbackGetAllowStackingKey.java | 4 +- .../ABCallbackGetBuffHandleAsString.java | 6 +- .../ABCallbackGetBuffUniqueValueString.java | 8 +- .../strings/ABCallbackGetCodeAsString.java | 6 +- .../ABCallbackGetStoredStringByKey.java | 8 +- .../ABCallbackGetUnitHandleAsString.java | 6 +- .../strings/ABCallbackIdToString.java | 6 +- .../ABCallbackInlineConditionString.java | 6 +- .../strings/ABCallbackIntegerToString.java | 16 ++ .../strings/ABCallbackLongToString.java | 16 ++ .../callback/strings/ABCallbackRawString.java | 4 +- .../strings/ABCallbackReuseString.java | 12 +- .../ABCallbackReuseStringWithArguments.java | 12 +- .../callback/strings/ABStringCallback.java | 10 + .../target/ABCallbackArgumentTarget.java | 10 +- .../target/ABCallbackGetAbilityTarget.java | 6 +- .../ABCallbackGetStoredTargetByKey.java | 10 +- .../ABCallbackInlineConditionTarget.java | 6 +- .../target/ABCallbackReuseTarget.java | 14 +- .../ABCallbackReuseTargetWithArguments.java | 14 +- .../callback/target/ABTargetCallback.java | 6 +- .../timer/ABCallbackArgumentTimer.java | 10 +- .../timer/ABCallbackGetFiringTimer.java | 6 +- .../timer/ABCallbackGetLastCreatedTimer.java | 6 +- .../timer/ABCallbackGetLastStartedTimer.java | 6 +- .../timer/ABCallbackGetStoredTimerByKey.java | 10 +- .../timer/ABCallbackInlineConditionTimer.java | 6 +- .../callback/timer/ABCallbackReuseTimer.java | 14 +- .../ABCallbackReuseTimerWithArguments.java | 14 +- .../callback/timer/ABTimerCallback.java | 6 +- .../callback/unit/ABCallbackArgumentUnit.java | 10 +- .../unit/ABCallbackGetAbilityPairedUnit.java | 6 +- .../ABCallbackGetAbilityTargetedUnit.java | 6 +- .../unit/ABCallbackGetAttackedUnit.java | 6 +- .../unit/ABCallbackGetAttackingUnit.java | 14 + .../unit/ABCallbackGetBuffCastingUnit.java | 6 +- .../unit/ABCallbackGetBuffedUnit.java | 4 +- .../unit/ABCallbackGetCastingUnit.java | 4 +- .../callback/unit/ABCallbackGetChainUnit.java | 6 +- .../callback/unit/ABCallbackGetCompUnit1.java | 6 +- .../callback/unit/ABCallbackGetCompUnit2.java | 6 +- .../unit/ABCallbackGetDamagedUnit.java | 14 + .../unit/ABCallbackGetDamagingUnit.java | 14 + .../callback/unit/ABCallbackGetDyingUnit.java | 14 + .../callback/unit/ABCallbackGetEnumUnit.java | 6 +- .../unit/ABCallbackGetKillingUnit.java | 14 + .../unit/ABCallbackGetLastCreatedUnit.java | 6 +- .../unit/ABCallbackGetListenerUnit.java | 4 +- .../unit/ABCallbackGetMatchingUnit.java | 6 +- ...CallbackGetNearestCorpseInRangeOfUnit.java | 12 +- ...ABCallbackGetNearestUnitInRangeOfUnit.java | 12 +- .../unit/ABCallbackGetParentCastingUnit.java | 14 + .../unit/ABCallbackGetProjectileHitUnit.java | 6 +- .../ABCallbackGetProjectileSourceUnit.java | 6 +- ...CallbackGetReactionAbilityCastingUnit.java | 6 +- ...BCallbackGetReactionAbilityTargetUnit.java | 6 +- .../unit/ABCallbackGetStoredUnitByKey.java | 10 +- .../unit/ABCallbackInlineConditionUnit.java | 6 +- .../unit/ABCallbackPollUnitQueue.java | 16 ++ .../callback/unit/ABCallbackReuseUnit.java | 14 +- .../ABCallbackReuseUnitWithArguments.java | 14 +- .../callback/unit/ABUnitCallback.java | 11 + .../ABCallbackArgumentUnitGroup.java | 10 +- .../ABCallbackGetLastCreatedUnitGroup.java | 6 +- .../ABCallbackGetStoredUnitGroupByKey.java | 10 +- .../ABCallbackGetUnitGroupByName.java | 4 +- .../ABCallbackInlineConditionUnitGroup.java | 6 +- .../unitgroup/ABCallbackReuseUnitGroup.java | 14 +- ...ABCallbackReuseUnitGroupWithArguments.java | 14 +- .../unitgroup/ABUnitGroupCallback.java | 12 + .../ABCallbackArgumentUnitQueue.java | 10 +- .../ABCallbackGetLastCreatedUnitQueue.java | 6 +- .../ABCallbackGetStoredUnitQueueByKey.java | 10 +- .../ABCallbackGetUnitQueueByName.java | 4 +- .../ABCallbackInlineConditionUnitQueue.java | 6 +- .../unitqueue/ABCallbackReuseUnitQueue.java | 14 +- ...ABCallbackReuseUnitQueueWithArguments.java | 14 +- .../unitqueue/ABUnitQueueCallback.java | 12 + .../ABCallbackArgumentVisionModifier.java | 10 +- ...BCallbackGetLastCreatedVisionModifier.java | 6 +- ...BCallbackGetStoredVisionModifierByKey.java | 10 +- ...CallbackInlineConditionVisionModifier.java | 6 +- .../ABCallbackReuseVisionModifier.java | 14 +- ...lbackReuseVisionModifierWithArguments.java | 14 +- .../ABVisionModifierCallback.java | 6 +- .../widget/ABCallbackArgumentWidget.java | 10 +- .../ABCallbackDestructableToWidget.java | 6 +- .../ABCallbackGetProjectileHitWidget.java | 6 +- .../ABCallbackGetStoredWidgetByKey.java | 10 +- .../ABCallbackInlineConditionWidget.java | 6 +- .../widget/ABCallbackItemToWidget.java | 6 +- .../widget/ABCallbackReuseWidget.java | 14 +- .../ABCallbackReuseWidgetWithArguments.java | 14 +- .../widget/ABCallbackUnitToWidget.java | 6 +- .../callback/widget/ABWidgetCallback.java | 11 + .../behavior/condition/ABBooleanCallback.java | 6 +- .../condition/ABCallbackArgumentBoolean.java | 10 +- .../condition/ABCallbackReuseBoolean.java | 14 +- .../ABCallbackReuseBooleanWithArguments.java | 14 +- .../ABConditionSetCantUseReasonOnFailure.java | 6 +- .../ABConditionIsAutoCastCurrentlyActive.java | 8 +- .../ability/ABConditionIsDisabled.java | 17 ++ ...BConditionIsFlexAbilityNonPointTarget.java | 18 ++ .../ABConditionIsFlexAbilityNonTargeted.java | 18 ++ .../ABConditionIsFlexAbilityPointTarget.java | 18 ++ .../ABConditionIsFlexAbilityTargeted.java | 19 ++ .../ability/ABConditionIsOnCooldown.java | 18 ++ .../ABConditionIsToggleAbilityActive.java | 10 +- .../ABConditionIsTransformingToAlternate.java | 15 ++ .../ability/ABConditionWasAutoCast.java | 8 +- ...BConditionWasAutoCastPreviouslyActive.java | 8 +- .../ABConditionWasCastingInterrupted.java | 8 +- .../attack/ABConditionIsAttackProjectile.java | 16 ++ .../attack/ABConditionIsAttackRanged.java | 16 ++ .../ABCallbackGetAbilityDataAsBoolean.java | 12 +- ...BCallbackGetAbilityUniqueValueBoolean.java | 10 +- .../ABCallbackGetBuffUniqueValueBoolean.java | 10 +- ...CallbackGetParentAbilityDataAsBoolean.java | 12 +- .../ABCallbackGetStoredBooleanByKey.java | 10 +- .../ABCallbackInlineConditionBoolean.java | 6 +- .../booleans/ABCallbackIntegerToBoolean.java | 8 +- .../booleans/ABCallbackRawBoolean.java | 6 +- .../condition/buff/ABConditionIsBuffAlly.java | 8 +- .../buff/ABConditionIsBuffEnemy.java | 8 +- .../buff/ABConditionIsBuffMagic.java | 19 ++ .../buff/ABConditionIsBuffNegative.java | 19 ++ .../buff/ABConditionIsBuffPositive.java | 19 ++ .../ABConditionIsAttackTypeEqual.java | 8 +- .../ABConditionIsDamageTypeEqual.java | 8 +- .../ABConditionIsDefenseTypeEqual.java | 8 +- .../ABConditionIsDefenseTypeInList.java | 8 +- .../comparison/ABConditionIsIdEqual.java | 8 +- .../ABConditionIsMovementTypeEqual.java | 8 +- .../comparison/ABConditionIsUnitEqual.java | 8 +- .../ABConditionIsWeaponTypeEqual.java | 8 +- ...BConditionSuccessfullyChargeResources.java | 12 +- .../ABConditionDoesDestructableHaveBuff.java | 10 +- ...DestructableHaveBuffMatchingCondition.java | 10 +- .../destructable/ABConditionIsTree.java | 8 +- .../ABConditionIsDestructableBuffMagic.java | 19 ++ ...ameplayConstantCanDisableDivineShield.java | 6 +- ...ionGameplayConstantIsDefendCanDeflect.java | 14 + ...ameplayConstantIsRelativeUpgradeCosts.java | 6 +- ...tionGameplayConstantSmartAbolishMagic.java | 6 +- .../game/ABConditionIsTimeOfDayInRange.java | 8 +- .../item/ABConditionIsItemAbility.java | 18 ++ .../item/ABConditionItemHasCharges.java | 25 ++ .../item/ABConditionItemIsCharged.java | 25 ++ .../ABConditionIsLocationDeepWater.java | 8 +- .../ABConditionIsLocationFlyingOnly.java | 8 +- ...onditionIsLocationPathableForUnitType.java | 10 +- .../ABConditionIsLocationShallowWater.java | 8 +- .../ABConditionIsLocationWalkable.java | 8 +- ...ABConditionIsLocationWalkableNonWater.java | 8 +- .../condition/logical/ABConditionAnd.java | 6 +- .../condition/logical/ABConditionBool.java | 16 ++ .../condition/logical/ABConditionIsNull.java | 17 ++ .../condition/logical/ABConditionNot.java | 6 +- .../condition/logical/ABConditionNotNull.java | 17 ++ .../condition/logical/ABConditionOr.java | 6 +- .../membership/ABConditionIsUnitInGroup.java | 23 ++ .../ABConditionIsUnitInRangeOfUnit.java | 22 ++ ...tionMatchingCorpseExistsInRangeOfUnit.java | 14 +- ...ditionMatchingUnitExistsInRangeOfUnit.java | 14 +- .../numeric/ABConditionFloatEq0.java | 19 ++ .../numeric/ABConditionFloatEqual.java | 8 +- .../condition/numeric/ABConditionFloatGt.java | 8 +- .../numeric/ABConditionFloatGt0.java | 18 ++ .../numeric/ABConditionFloatGte.java | 20 ++ .../condition/numeric/ABConditionFloatLt.java | 20 ++ .../numeric/ABConditionFloatLte.java | 20 ++ .../condition/numeric/ABConditionFloatNe.java | 21 ++ .../numeric/ABConditionFloatNe0.java | 19 ++ .../numeric/ABConditionIntegerEq.java | 21 ++ .../numeric/ABConditionIntegerEq0.java | 18 ++ .../numeric/ABConditionIntegerGt.java | 20 ++ .../numeric/ABConditionIntegerGt0.java | 18 ++ .../numeric/ABConditionIntegerGte.java | 20 ++ .../numeric/ABConditionIntegerIsEven.java | 19 ++ .../numeric/ABConditionIntegerIsOdd.java | 19 ++ .../numeric/ABConditionIntegerLt.java | 8 +- .../numeric/ABConditionIntegerLte.java | 20 ++ .../numeric/ABConditionIntegerNe.java | 20 ++ .../numeric/ABConditionIntegerNe0.java | 18 ++ .../ABConditionIsProjectileReflected.java | 8 +- .../ABConditionIsDestructableValidTarget.java | 18 +- ...ConditionIsPassAllAbilityTargetChecks.java | 14 +- ...itionIsUnitPassAllAbilityTargetChecks.java | 12 +- .../ABConditionIsUnitValidTarget.java | 16 +- .../targeting/ABConditionIsValidTarget.java | 18 +- .../timer/ABConditionIsTimerActive.java | 17 ++ .../ABConditionDoesAbilityHaveUniqueFlag.java | 21 ++ .../ABConditionDoesBuffHaveUniqueFlag.java | 21 ++ .../condition/unit/ABConditionIsUnitType.java | 26 ++ ...nDoesUnitHaveAbilityMatchingCondition.java | 10 +- .../unit/alliance/ABConditionIsUnitEnemy.java | 8 +- .../alliance/ABConditionIsUnitFriend.java | 8 +- .../ABConditionIsUnitShareSpells.java | 8 +- ...ditionIsCurrentBehaviorCategoryInList.java | 8 +- .../buff/ABConditionDoesUnitHaveBuff.java | 10 +- ...tionDoesUnitHaveBuffMatchingCondition.java | 10 +- .../ABConditionIsUnitBuilding.java | 24 ++ .../classification/ABConditionIsUnitHero.java | 24 ++ .../ABConditionIsUnitHeroDuration.java | 8 +- .../ABConditionIsUnitHidden.java | 24 ++ .../ABConditionIsUnitMagicImmune.java | 24 ++ .../ABConditionIsUnitMorphImmune.java | 24 ++ .../ABConditionIsUnitSummoned.java | 8 +- .../unit/state/ABConditionIsUnitAlive.java | 24 ++ .../unit/state/ABConditionIsUnitDead.java | 24 ++ .../unit/state/ABConditionIsUnitMaxHp.java | 8 +- .../unit/state/ABConditionIsUnitMaxMp.java | 8 +- .../state/ABConditionIsUnitPolymorphed.java | 8 +- .../unit/state/ABConditionIsUnitSleeping.java | 8 +- .../state/ABConditionIsUnitUpgrading.java | 8 +- .../unit/state/ABConditionIsUnitVisible.java | 8 +- .../tech/ABConditionIsUnitConstructing.java | 8 +- ...onditionIsUnitConstructingOrUpgrading.java | 8 +- .../unit/tech/ABConditionIsUnitTraining.java | 8 +- .../unit/tech/ABConditionUnitHasResearch.java | 26 ++ .../buff/ABBuff.java | 6 +- .../buff/ABDestructableBuff.java | 8 +- .../buff/ABGenericArtBuff.java | 4 +- .../buff/ABGenericAuraBuff.java | 4 +- .../buff/ABGenericPermanentBuff.java | 4 +- .../buff/ABGenericTimedBuff.java | 4 +- .../buff/ABPermanentPassiveBuff.java | 6 +- .../buff/ABTargetingBuff.java | 4 +- .../buff/ABTimedArtBuff.java | 4 +- .../buff/ABTimedBuff.java | 8 +- .../ABTimedInstantTransformationBuff.java | 12 +- .../buff/ABTimedPausedExpirationBuff.java | 6 +- .../buff/ABTimedTargetingBuff.java | 4 +- .../buff/ABTimedTickingBuff.java | 8 +- .../buff/ABTimedTickingPausedBuff.java | 8 +- .../buff/ABTimedTickingPostDeathBuff.java | 6 +- .../buff/ABTimedTransformationBuff.java | 20 +- .../buff/CPausedTickingBuff.java | 2 +- .../buff/defaultbuffs/ABBuffSlow.java | 6 +- .../buff/defaultbuffs/ABBuffStun.java | 6 +- .../core/ABAbilityBuilderGsonBuilder.java | 252 +++++++++--------- .../core/ABAction.java | 4 +- .../core/ABCallback.java | 4 +- .../core/ABSingleAction.java | 2 +- .../datastore/ABDataStore.java | 2 +- .../datastore/ABGlobalDataStore.java | 2 +- .../datastore/ABLocalDataStore.java | 2 +- .../datastore/ABLocalStoreKeys.java | 2 +- .../datastore/ABMapLocalDataStore.java | 2 +- .../effects/ABGroupEffect.java | 2 +- .../effects/ABTerrainBowlEffect.java | 2 +- .../effects/ABTerrainEffect.java | 2 +- .../effects/ABTerrainRippleEffect.java | 2 +- .../effects/ABTerrainWaveEffect.java | 2 +- .../event/ABGlobalWidgetEvent.java | 10 +- .../event/ABPlayerEvent.java | 10 +- .../event/ABTimeOfDayEvent.java | 6 +- .../event/ABWidgetEvent.java | 10 +- .../handler/ABRandomTypeHandler.java | 2 +- .../handler/ABTransformationHandler.java | 22 +- .../iterstructs/ABNearestUnitComparator.java | 2 +- .../iterstructs/ABUnitAndRangeComparator.java | 2 +- .../iterstructs/ABUnitComparator.java | 8 +- .../jass/ABActionJass.java | 6 +- .../jass/ABConditionJass.java | 6 +- .../ABAbilityEffectReactionListener.java | 8 +- .../ABAbilityProjReactionListener.java | 8 +- .../listener/ABAttackEvasionListener.java | 8 +- .../listener/ABAttackModifier.java | 12 +- .../listener/ABAttackPostDamageListener.java | 10 +- .../listener/ABAttackPreDamageListener.java | 8 +- .../ABAttackProjReactionListener.java | 8 +- .../listener/ABBehaviorChangeListener.java | 8 +- .../listener/ABDamageTakenListener.java | 10 +- .../ABDamageTakenModificationListener.java | 10 +- .../listener/ABDeathReplacementEffect.java | 8 +- .../listener/ABUnitStateListener.java | 6 +- .../parser/ABAbilityBuilderConfiguration.java | 18 +- .../parser/ABAbilityBuilderDupe.java | 2 +- .../parser/ABAbilityBuilderFile.java | 2 +- .../parser/ABAbilityBuilderParser.java | 22 +- .../parser/ABAbilityBuilderParserUtil.java | 4 +- .../parser/ABAbilityBuilderTemplateType.java | 2 +- .../parser/ABAbilityBuilderType.java | 2 +- .../ABAbilityBuilderOverrideFields.java | 14 +- .../ABAbilityBuilderParserTemplateFields.java | 10 +- .../ABAbilityBuilderSpecialConfigFields.java | 14 +- .../ABAbilityBuilderSpecialDisplayFields.java | 10 +- .../parser/template/ABDataFieldLetter.java | 2 +- .../template/ABMeleeRangeTargetOverride.java | 2 +- .../template/ABStatBuffFromDataField.java | 4 +- .../parser/template/ABStatBuffType.java | 2 +- .../ABCollisionProjectileListener.java | 10 +- .../projectile/ABProjectileListener.java | 8 +- .../timer/ABAltitudeAdjustmentTimer.java | 2 +- .../ABDelayInstantTransformationTimer.java | 10 +- .../timer/ABDelayTimerTimer.java | 6 +- .../timer/ABManaDepletedCheckTimer.java | 4 +- .../timer/ABTimer.java | 8 +- .../ABTransformationMorphAnimationTimer.java | 2 +- ...BAbilityBuilderTemplateTypeDefinition.java | 8 +- .../impl/ABAbilityBuilderTypeDefinition.java | 8 +- .../impl/ABAbilityBuilderAbilityType.java | 12 +- .../ABAbilityBuilderAbilityTypeLevelData.java | 2 +- .../impl/ABAbilityBuilderTemplateType.java | 18 +- ...ABAbilityTargetStillTargetableVisitor.java | 4 +- .../ABGetABAbilityByRawcodeVisitor.java | 6 +- ...ABGetInstantTransformationBuffVisitor.java | 16 +- .../behaviors/BehaviorAbilityVisitor.java | 4 +- .../BehaviorNextBehaviorVisitor.java | 4 +- .../behaviors/BehaviorTargetUnitVisitor.java | 4 +- .../behaviors/BehaviorTargetVisitor.java | 4 +- .../behaviors/CBehaviorVisitor.java | 4 +- ...yDisableWhileUnderConstructionVisitor.java | 2 +- .../AbilityDisableWhileUpgradingVisitor.java | 2 +- .../w3x/simulation/data/CAbilityData.java | 12 +- .../viewer5/handlers/w3x/ui/MeleeUI.java | 2 +- .../AbilityBuilderConfigTree.java | 6 +- .../AbilityBuilderDupeCellRenderer.java | 2 +- .../AbilityBuilderJassBrainstorm.java | 16 +- .../AbilityBuilderSmashJassBrainstorm.java | 16 +- .../abilitybuilder/AbilityBuilderUIPanel.java | 10 +- .../abilitybuilder/JassGeneratorForType.java | 6 +- 1217 files changed, 7308 insertions(+), 7308 deletions(-) delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassiveAbility.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionAddAttackModifier.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionDeleteStoredKey.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetSpeed.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABWidgetEventCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationX.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationY.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationX.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationY.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABFloatCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABIDCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetListSize.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetPlayerId.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitGroupSize.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitQueueSize.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABIntegerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListSortType.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPostDamageListenerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPreDamageListenerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackProjReactionListenerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABBehaviorChangeListenerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenListenerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDeathReplacementCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABEvasionListenerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABUnitStateListenerCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABLongCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackFloatToString.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIntegerToString.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackLongToString.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABStringCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackPollUnitQueue.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABUnitCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABUnitGroupCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/ABAbilityBuilderAbility.java (75%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/ABAbilityBuilderActiveAbility.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/ABAbilityBuilderActiveAutoTarget.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/ABAbilityBuilderActiveFlexTarget.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/ABAbilityBuilderActiveNoTarget.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/ABAbilityBuilderActivePairing.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/ABAbilityBuilderActivePointTarget.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/ABAbilityBuilderActiveUnitTarget.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/ABAbilityBuilderGenericActive.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/ABAbilityBuilderNoIcon.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/ABAbilityBuilderPassive.java (93%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassiveAbility.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/template/ABAbilityBuilderAuraTemplate.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/template/ABAbilityBuilderSimpleAuraTemplate.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/template/ABAbilityBuilderStatAuraTemplate.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/ability/template/ABAbilityBuilderStatPassiveTemplate.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/ABBehavior.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/ABBehaviorAbilityBuilderBase.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/ABBehaviorAbilityBuilderNoTarget.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/ABBehaviorFinishTransformation.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/ABBehaviorSendOrder.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/ABOrderStartTransformation.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java (74%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionAbilityRunEndCastingActions.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionActivateToggledAbility.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionAddAbility.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionAddNewAbility.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionAddRallyAbility.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionBeginChanneling.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionCleanUpCastInstance.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionClickDisableAbility.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionClickEnableAbility.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionCreateAbilityFromId.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionDeactivateToggledAbility.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionFinishChanneling.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionRemoveAbility.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionResetCooldown.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionSendStartCastingEvents.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/ability/ABActionStartCooldown.java (72%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/abilitydata/ABActionAddTargetAllowed.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/abilitydata/ABActionDisableAbility.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/abilitydata/ABActionDisableAbilityById.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/abilitydata/ABActionEnableAbility.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/abilitydata/ABActionEnableAbilityById.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/abilitydata/ABActionSetAbilityCastRange.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/abilitydata/ABActionSetPreventEndEvents.java (60%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionAddAttackModifier.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/ABActionCreateAttackModifier.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/ABActionFireModifiedAttack.java (76%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/ABActionStartModifiedAttack.java (75%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/behavior/ABActionChangeAttackActionToMovement.java (78%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionAddBuff.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionAddSlowBuff.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionAddStunBuff.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionCreatePassiveBuff.java (78%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionCreateTargetingBuff.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionCreateTimedArtBuff.java (77%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionCreateTimedBuff.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionCreateTimedLifeBuff.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java (77%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionCreateTimedTargetingBuff.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionCreateTimedTickingBuff.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionDispelBuffs.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionRemoveBuff.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/damage/ABActionDamageArea.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/damage/ABActionDamageAttackSplash.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/damage/ABActionDamageBurst.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/damage/ABActionDamageSplash.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/damage/ABActionDamageTarget.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/damage/ABActionHeal.java (65%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/datastore/ABActionDeleteStoredKey.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/datastore/ABActionStoreValueLocally.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/destructable/ABActionCreateDestructable.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/destructable/ABActionDamageDestructable.java (74%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionKillDestructable.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionRemoveDestructable.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/destructablebuff/ABActionAddDestructableBuff.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java (58%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/widget/ABActionCreateWidgetEvent.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/events/widget/ABActionRegisterWidgetEvent.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/ABActionRemoveEffect.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/lightning/ABActionCreateLightningEffect.java (60%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java (54%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java (54%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/splat/ABActionCreateUberSplat.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/item/ABActionChargeItem.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/item/ABActionTransformItem.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java (88%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/list/ABActionListRemove.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/list/ABActionLocationListAdd.java (53%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/list/ABActionSortableListRemove.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/order/ABActionIssueStopOrder.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/player/ABActionGiveResourcesToPlayer.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java (77%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java (75%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/projectile/ABActionSetAttackProjectileDamage.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/projectile/ABActionSetProjectileDone.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/projectile/ABActionSetProjectileReflected.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/projectile/ABActionSetProjectileTarget.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/reaction/ABActionCheckAbilityProjReaction.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/stats/ABActionAddDefenseBonus.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/stats/ABActionAddNonStackingStatBuff.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/stats/ABActionCreateNonStackingStatBuff.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/stats/ABActionRemoveDefenseBonus.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/structural/ABActionBreak.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/structural/ABActionChainEffect.java (80%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/structural/ABActionCreateSubroutine.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/structural/ABActionFor.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/structural/ABActionIf.java (80%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/structural/ABActionPeriodicExecute.java (83%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionResetPeriodicExecute.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/structural/ABActionRunReuseAction.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/structural/ABActionRunReuseActionWithArguments.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/structural/ABActionRunSubroutine.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/structural/ABActionWhile.java (81%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/timer/ABActionCreateTimer.java (74%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/timer/ABActionKillTimer.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/timer/ABActionRemoveTimer.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/timer/ABActionStartTimer.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/timer/ABActionUpdateTimerTimeout.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java (54%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/ABActionCreateUnit.java (71%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/ABActionHideUnit.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/ABActionKillUnit.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/ABActionRemoveUnit.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/ABActionResurrect.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/ABActionSetExplodesOnDeath.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/ABActionStartSacrificingUnit.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/ABActionStartTrainingUnit.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/ABActionUnhideUnit.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/animation/ABActionPlayAnimation.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/animation/ABActionQueueAnimation.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/art/ABActionDivideUnitAlpha.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/art/ABActionMultiplyUnitScale.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/art/ABActionSetUnitAlpha.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/stats/ABActionAddMp.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/stats/ABActionSetHp.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/stats/ABActionSetMp.java (66%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSetSpeed.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/stats/ABActionSubtractMp.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/transformation/ABActionMergeUnits.java (74%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/transformation/ABActionTransformUnit.java (82%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/transformation/ABActionTransformUnitInstant.java (78%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java (81%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/worker/ABActionInstantReturnResources.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unit/worker/ABActionSendUnitBackToWork.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitgroup/ABActionAddUnitToGroup.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitgroup/ABActionCreateUnitGroup.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java (58%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java (74%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java (73%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java (60%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java (50%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java (65%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java (54%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java (59%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java (67%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitqueue/ABActionAddUnitToQueue.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitqueue/ABActionClearUnitQueue.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitqueue/ABActionCreateUnitQueue.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitstate/ABActionAddStateModBuff.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitstate/ABActionCreateStateModBuff.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitstate/ABActionRemoveStateModBuff.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/unitstate/ABActionSetUnitFadeTimer.java (50%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionUpdateStateModBuff.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/vision/ABActionCreateLocationVisionModifier.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/vision/ABActionCreateProjectileVisionModifier.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/action/vision/ABActionCreateUnitVisionModifier.java (54%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionRemoveVisionModifier.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionSetBurrowPlaceholder.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ABCallbackNull.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABAbilityCallback.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackArgumentAbility.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackGetAbilityById.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackGetMatchingAbility.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackGetPartnerAbility.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackGetReactionAbility.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java (71%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackGetThisAbility.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackInlineConditionAbility.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackReuseAbility.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java (66%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABAttackModifierCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/attacksettings/ABAttackSettingsCallback.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/buff/ABBuffCallback.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/buff/ABCallbackArgumentBuff.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/buff/ABCallbackEnumBuff.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/buff/ABCallbackGetBuffById.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/buff/ABCallbackGetMatchingBuff.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java (71%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/buff/ABCallbackInlineConditionBuff.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/buff/ABCallbackReuseBuff.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/buff/ABCallbackThisBuff.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructable/ABCallbackArgumentDestructable.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructable/ABCallbackGetEnumDestructable.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructable/ABCallbackReuseDestructable.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructable/ABDestructableCallback.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/destructablebuff/ABDestructableBuffCallback.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABAttackTypeCallback.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABAutocastTypeCallback.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackConditionalAutocastType.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetUnitDefenseType.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetUnitMovementType.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackRawTargetType.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABCallbackRawWeaponType.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABDamageTypeCallback.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABDeathReplacementPriorityCallback.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABDefenseTypeCallback.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABMovementTypeCallback.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABTargetTypeCallback.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/enums/ABWeaponTypeCallback.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java (59%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java (62%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java (58%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java (62%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABWidgetEventCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackAddFloat.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackArgumentFloat.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackCeilFloat.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackCos.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackDegToRad.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackDivideFloat.java (76%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackFMaxValue.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackFloorFloat.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetAbilityArea.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetAbilityCastRange.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetAbilityCastTime.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetAbilityCooldown.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetAbilityDuration.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java (74%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java (57%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetLocationX.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetLocationY.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetUnitCastPoint.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetUnitFacing.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackGetUnitInitialMana.java (51%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitLocationX.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitLocationY.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackInlineConditionFloat.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackIntToFloat.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackMaxFloat.java (77%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackMinFloat.java (77%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackMultiplyFloat.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackNegativeFloat.java (72%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackOneGameTick.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackPi.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackRandomBoundedFloat.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackRandomFloat.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackRawFloat.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackReuseFloat.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackSin.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackSubtractFloat.java (76%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackTan.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/floats/ABCallbackTicksForDuration.java (66%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABFloatCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/fx/ABCallbackArgumentFX.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/fx/ABCallbackGetLastCreatedFX.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/fx/ABCallbackGetStoredFXByKey.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/fx/ABCallbackInlineConditionFX.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/fx/ABCallbackReuseFX.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/fx/ABCallbackReuseFXWithArguments.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/fx/ABFXCallback.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/fx/ABLightningCallback.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackArgumentID.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetAbilityDataAsID.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetAbilityUnitId.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetAlias.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetBuffAlias.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetBuffIdFromCode.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetCode.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetFirstBuffId.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetFirstEffectId.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetItemType.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetParentAlias.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetSecondBuffId.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetStoredIDByKey.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetUnitType.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackGetWar3IDFromString.java (71%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackInlineConditionID.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackNullIfFalse.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackRandomItemId.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackReuseID.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/id/ABCallbackReuseIDWithArguments.java (65%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABIDCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackAddInteger.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackAndInteger.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackArgumentInteger.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java (71%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackDivideInteger.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetAbilityManaCost.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetCastId.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetIntegerFromList.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetItemCharges.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetItemLevel.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetItemMaxCharges.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetItemSlot.java (63%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetListSize.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java (61%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetPlayerId.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetSortableListSize.java (50%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java (70%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitGroupSize.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java (53%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitQueueSize.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackInlineConditionInteger.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackIntegerIf.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackIterator.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackMaxInteger.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackMinInteger.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackMultiplyInteger.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackOrInteger.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackPlayerToStateModValue.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackRandomInteger.java (78%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackRawInteger.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackReuseInteger.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackSubtractInteger.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java (50%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABIntegerCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/item/ABCallbackArgumentItem.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/item/ABCallbackGetAttackedItem.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/item/ABCallbackGetLastCreatedItem.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/item/ABCallbackGetStoredItemByKey.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/item/ABCallbackInlineConditionItem.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/item/ABCallbackReuseItem.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/item/ABCallbackReuseItemWithArguments.java (65%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABItemCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/ABCallbackArgumentList.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/ABCallbackArgumentSortableList.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/ABCallbackGetStoredListByKey.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/ABCallbackInlineConditionList.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/ABCallbackInlineConditionSortableList.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/ABCallbackListSorted.java (77%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/ABCallbackReuseList.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/ABCallbackReuseListWithArguments.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/ABCallbackReuseSortableList.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java (66%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABListCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABListSortType.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABSortableListCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java (65%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/integer/ABIntegerListCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/location/ABCallbackEmptyLocationList.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/list/location/ABLocationListCallback.java (54%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackPostDamageListenerCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackPreDamageListenerCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackProjReactionListenerCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABBehaviorChangeListenerCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java (51%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDamageTakenListenerCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDeathReplacementCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABEvasionListenerCallback.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABUnitStateListenerCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackArgumentLocation.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackCreateLocationFromOffset.java (75%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackCreateLocationFromTarget.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackCreateLocationFromXY.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackGetAttackImpactLocation.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackGetAttackTargetLocation.java (71%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackGetLocationFromList.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackGetStoredLocationByKey.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackGetTargetedLocation.java (73%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackGetUnitLocation.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackInlineConditionLocation.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackModifyLocationWithOffset.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackRandomLocationInRange.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackReuseLocation.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABCallbackReuseLocationWithArguments.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/location/ABLocationCallback.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackAddLong.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackAndLong.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackArgumentLong.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackCreateDetectedData.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackCreateDetectorData.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackCreateOwnershipData.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackDivideLong.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackGetStoredLongByKey.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackInlineConditionLong.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackMaxLong.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackMinLong.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackMultiplyLong.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackOrLong.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackRawLong.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackReuseLong.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackReuseLongWithArguments.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/longs/ABCallbackSubtractLong.java (64%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABLongCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/orderid/ABCallbackArgumentOrderId.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/orderid/ABCallbackIdString.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/orderid/ABCallbackRawID.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/orderid/ABCallbackReuseOrderId.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java (64%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABOrderIdCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/player/ABCallbackArgumentPlayer.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/player/ABCallbackGetCastingPlayer.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/player/ABCallbackGetOwnerOfUnit.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/player/ABCallbackGetPlayerById.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/player/ABCallbackInlineConditionPlayer.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/player/ABCallbackReusePlayer.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/player/ABCallbackReusePlayerWithArguments.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/player/ABPlayerCallback.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/projectile/ABCallbackArgumentProjectile.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/projectile/ABCallbackGetThisProjectile.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/projectile/ABCallbackReuseProjectile.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/projectile/ABProjectileCallback.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java (71%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java (73%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statemod/ABCallbackReuseStateModBuff.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/statemod/ABStateModBuffCallback.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackArgumentString.java (67%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackBooleanToString.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackCatStrings.java (67%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackFloatToString.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackGetAliasAsString.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackGetAllowStackingKey.java (73%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackGetCodeAsString.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackGetStoredStringByKey.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackIdToString.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackInlineConditionString.java (61%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackIntegerToString.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackLongToString.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackRawString.java (71%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackReuseString.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/strings/ABCallbackReuseStringWithArguments.java (68%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABStringCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/target/ABCallbackArgumentTarget.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/target/ABCallbackGetAbilityTarget.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/target/ABCallbackGetStoredTargetByKey.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/target/ABCallbackInlineConditionTarget.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/target/ABCallbackReuseTarget.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/target/ABCallbackReuseTargetWithArguments.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/target/ABTargetCallback.java (52%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/timer/ABCallbackArgumentTimer.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/timer/ABCallbackGetFiringTimer.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/timer/ABCallbackGetLastStartedTimer.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/timer/ABCallbackInlineConditionTimer.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/timer/ABCallbackReuseTimer.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/timer/ABTimerCallback.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackArgumentUnit.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetAttackedUnit.java (64%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetBuffedUnit.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetCastingUnit.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetChainUnit.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetCompUnit1.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetCompUnit2.java (66%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetEnumUnit.java (68%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetListenerUnit.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetMatchingUnit.java (68%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java (72%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java (72%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetParentCastingUnit.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackInlineConditionUnit.java (60%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackPollUnitQueue.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackReuseUnit.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java (64%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABUnitCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java (65%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABUnitGroupCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java (65%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABUnitQueueCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/visionmodifier/ABVisionModifierCallback.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/widget/ABCallbackArgumentWidget.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/widget/ABCallbackDestructableToWidget.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/widget/ABCallbackInlineConditionWidget.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/widget/ABCallbackItemToWidget.java (53%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/widget/ABCallbackReuseWidget.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/callback/widget/ABCallbackUnitToWidget.java (53%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABWidgetCallback.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/ABBooleanCallback.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/ABCallbackArgumentBoolean.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/ABCallbackReuseBoolean.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/ABCallbackReuseBooleanWithArguments.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/ABConditionSetCantUseReasonOnFailure.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java (59%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsDisabled.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsOnCooldown.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/ability/ABConditionIsToggleAbilityActive.java (57%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/ability/ABConditionWasAutoCast.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/ability/ABConditionWasCastingInterrupted.java (58%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/booleans/ABCallbackGetAbilityUniqueValueBoolean.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/booleans/ABCallbackGetBuffUniqueValueBoolean.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/booleans/ABCallbackInlineConditionBoolean.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/booleans/ABCallbackIntegerToBoolean.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/booleans/ABCallbackRawBoolean.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/buff/ABConditionIsBuffAlly.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/buff/ABConditionIsBuffEnemy.java (58%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffMagic.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffNegative.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffPositive.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/comparison/ABConditionIsIdEqual.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/comparison/ABConditionIsUnitEqual.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java (58%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java (71%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/destructable/ABConditionIsTree.java (58%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java (50%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/game/ABConditionIsTimeOfDayInRange.java (61%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionIsItemAbility.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemHasCharges.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemIsCharged.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/location/ABConditionIsLocationDeepWater.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/location/ABConditionIsLocationFlyingOnly.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/location/ABConditionIsLocationShallowWater.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/location/ABConditionIsLocationWalkable.java (57%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/logical/ABConditionAnd.java (72%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionBool.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionIsNull.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/logical/ABConditionNot.java (62%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionNotNull.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/logical/ABConditionOr.java (60%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionIsUnitInGroup.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java (67%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java (65%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatEq0.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/numeric/ABConditionFloatEqual.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/numeric/ABConditionFloatGt.java (61%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatGt0.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatGte.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatLt.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatLte.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatNe.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatNe0.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerEq.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerEq0.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGt.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGt0.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGte.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerIsEven.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerIsOdd.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/numeric/ABConditionIntegerLt.java (61%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerLte.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerNe.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerNe0.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/projectile/ABConditionIsProjectileReflected.java (61%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java (56%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java (65%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/targeting/ABConditionIsUnitValidTarget.java (73%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/targeting/ABConditionIsValidTarget.java (65%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/timer/ABConditionIsTimerActive.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/ABConditionIsUnitType.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java (64%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java (72%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java (72%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java (62%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java (63%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitHero.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java (53%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitHidden.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java (54%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitAlive.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitDead.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java (55%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/state/ABConditionIsUnitSleeping.java (54%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/state/ABConditionIsUnitVisible.java (70%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java (50%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/behavior/condition/unit/tech/ABConditionIsUnitTraining.java (50%) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionUnitHasResearch.java rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABBuff.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABDestructableBuff.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABGenericArtBuff.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABGenericAuraBuff.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABGenericPermanentBuff.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABGenericTimedBuff.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABPermanentPassiveBuff.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABTargetingBuff.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABTimedArtBuff.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABTimedBuff.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABTimedInstantTransformationBuff.java (78%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABTimedPausedExpirationBuff.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABTimedTargetingBuff.java (81%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABTimedTickingBuff.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABTimedTickingPausedBuff.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABTimedTickingPostDeathBuff.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/ABTimedTransformationBuff.java (81%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/CPausedTickingBuff.java (72%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/defaultbuffs/ABBuffSlow.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/buff/defaultbuffs/ABBuffStun.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/core/ABAbilityBuilderGsonBuilder.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/core/ABAction.java (59%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/core/ABCallback.java (60%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/core/ABSingleAction.java (63%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/datastore/ABDataStore.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/datastore/ABGlobalDataStore.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/datastore/ABLocalDataStore.java (78%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/datastore/ABLocalStoreKeys.java (99%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/datastore/ABMapLocalDataStore.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/effects/ABGroupEffect.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/effects/ABTerrainBowlEffect.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/effects/ABTerrainEffect.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/effects/ABTerrainRippleEffect.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/effects/ABTerrainWaveEffect.java (98%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/event/ABGlobalWidgetEvent.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/event/ABPlayerEvent.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/event/ABTimeOfDayEvent.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/event/ABWidgetEvent.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/handler/ABRandomTypeHandler.java (97%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/handler/ABTransformationHandler.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/iterstructs/ABNearestUnitComparator.java (78%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/iterstructs/ABUnitAndRangeComparator.java (79%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/iterstructs/ABUnitComparator.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/jass/ABActionJass.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/jass/ABConditionJass.java (76%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABAbilityEffectReactionListener.java (81%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABAbilityProjReactionListener.java (81%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABAttackEvasionListener.java (79%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABAttackModifier.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABAttackPostDamageListener.java (83%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABAttackPreDamageListener.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABAttackProjReactionListener.java (81%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABBehaviorChangeListener.java (79%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABDamageTakenListener.java (80%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABDamageTakenModificationListener.java (81%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABDeathReplacementEffect.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/listener/ABUnitStateListener.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/ABAbilityBuilderConfiguration.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/ABAbilityBuilderDupe.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/ABAbilityBuilderFile.java (76%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/ABAbilityBuilderParser.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/ABAbilityBuilderParserUtil.java (91%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/ABAbilityBuilderTemplateType.java (51%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/ABAbilityBuilderType.java (81%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/subfields/ABAbilityBuilderOverrideFields.java (84%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/subfields/ABAbilityBuilderParserTemplateFields.java (85%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/subfields/ABAbilityBuilderSpecialConfigFields.java (89%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java (87%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/template/ABDataFieldLetter.java (81%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/template/ABMeleeRangeTargetOverride.java (80%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/template/ABStatBuffFromDataField.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/parser/template/ABStatBuffType.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/projectile/ABCollisionProjectileListener.java (88%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/projectile/ABProjectileListener.java (86%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/timer/ABAltitudeAdjustmentTimer.java (93%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/timer/ABDelayInstantTransformationTimer.java (77%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/timer/ABDelayTimerTimer.java (66%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/timer/ABManaDepletedCheckTimer.java (76%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/timer/ABTimer.java (74%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/timer/ABTransformationMorphAnimationTimer.java (95%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/types/definitions/impl/ABAbilityBuilderTemplateTypeDefinition.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/types/definitions/impl/ABAbilityBuilderTypeDefinition.java (90%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/types/impl/ABAbilityBuilderAbilityType.java (82%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/types/impl/ABAbilityBuilderAbilityTypeLevelData.java (96%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/types/impl/ABAbilityBuilderTemplateType.java (69%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/visitor/ABAbilityTargetStillTargetableVisitor.java (92%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/visitor/ABGetABAbilityByRawcodeVisitor.java (94%) rename core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/{abilitybuilder => adjustablebehaviors}/visitor/ABGetInstantTransformationBuffVisitor.java (89%) diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index ef0b627e9..bb83df710 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -139,33 +139,33 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.jass.CAbilityTypeJassDefinition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.jass.CodeJassValueBehaviorExpr; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTargetingBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedArtBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTargetingBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPausedBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPostDeathBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABMapLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.jass.ABActionJass; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.jass.ABConditionJass; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderDupe; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABProjectileListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTimer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABPermanentPassiveBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTargetingBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedArtBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedTargetingBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedTickingBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedTickingPausedBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedTickingPostDeathBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABMapLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABTimeOfDayEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.jass.ABActionJass; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.jass.ABConditionJass; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderDupe; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.projectile.ABCollisionProjectileListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.projectile.ABProjectileListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer.ABTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor.ABGetABAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.ai.AIDifficulty; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java index eecd38e33..a4f67c91b 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java +++ b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java @@ -12,8 +12,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.COrderButton; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.COrderButton.JassOrderButtonType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerJass; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.region.CRegion; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java index 94aa3c82a..59320fd75 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/commandbuttons/CommandCardPopulatingAbilityVisitor.java @@ -48,7 +48,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java index e5dfa008f..d5bb41bc7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CUnit.java @@ -54,8 +54,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericTimedBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.CPausedTickingBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABGenericTimedBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.CPausedTickingBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetUnitVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityVisitor.java index f5d8993d3..928565052 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityVisitor.java @@ -22,7 +22,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; /** * A visitor for the lowest level inherent types of an ability. It's a bit of a diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java index ec2cd24ba..5acf67e73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java @@ -20,7 +20,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; public class GetAbilityByRawcodeVisitor implements CAbilityVisitor { private static final GetAbilityByRawcodeVisitor INSTANCE = new GetAbilityByRawcodeVisitor(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassiveAbility.java deleted file mode 100644 index 8f37f8440..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassiveAbility.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; - -public interface ABAbilityBuilderPassiveAbility extends ABAbilityBuilderAbility { - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionAddAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionAddAttackModifier.java deleted file mode 100644 index 18f93ec0c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionAddAttackModifier.java +++ /dev/null @@ -1,20 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionAddAttackModifier implements ABAction { - - private ABUnitCallback unit; - private ABAttackModifierCallback modifier; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnit target = unit.callback(caster, localStore, castId); - - target.addAttackModifier(modifier.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java deleted file mode 100644 index a2e084edc..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java +++ /dev/null @@ -1,20 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveAttackModifier implements ABAction { - - private ABUnitCallback unit; - private ABAttackModifierCallback modifier; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnit target = unit.callback(caster, localStore, castId); - - target.removeAttackModifier(modifier.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionDeleteStoredKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionDeleteStoredKey.java deleted file mode 100644 index a2f534e8f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionDeleteStoredKey.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.datastore; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionDeleteStoredKey implements ABAction { - - private ABStringCallback key; - - @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - localStore.remove(key.callback(caster, localStore, castId)); - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java deleted file mode 100644 index 025a4221c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionKillDestructable.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionKillDestructable implements ABAction { - - private ABDestructableCallback dest; - - @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - dest.callback(caster, localStore, castId).setLife(localStore.game, 0); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java deleted file mode 100644 index 2442ce005..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionRemoveDestructable.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveDestructable implements ABAction { - - private ABDestructableCallback dest; - - @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - localStore.game.removeDestructable(dest.callback(caster, localStore, castId)); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java deleted file mode 100644 index 5949ce3bc..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionCreateWidgetEvent.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; - -public class ABActionCreateWidgetEvent implements ABAction { - - private ABWidgetCallback widget; - private ABBooleanCallback condition; - private List actions; - - private JassGameEventsWar3 eventType; - - @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - - final ABWidgetEvent event = new ABWidgetEvent(caster, localStore, castId, - this.widget.callback(caster, localStore, castId), this.eventType, this.condition, this.actions); - - localStore.put(ABLocalStoreKeys.LASTCREATEDWIDEVENT, event); - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java deleted file mode 100644 index 7e9fb98e8..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.lightning; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx.ABLightningCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveLightningEffect implements ABAction { - - private ABLightningCallback effect; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - effect.callback(caster, localStore, castId).remove(); - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java deleted file mode 100644 index 18bfbde0d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.sound; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; - -public class ABActionCreateLoopingSoundEffectOnUnit implements ABAction { - - private ABUnitCallback unit; - private ABIDCallback id; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - SimulationRenderComponent ret = localStore.game.unitLoopSoundEffectEvent( - (unit.callback(caster, localStore, castId)), this.id.callback(caster, localStore, castId)); - localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java deleted file mode 100644 index d094e1d2e..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.sound; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; - -public class ABActionCreateSoundEffectOnUnit implements ABAction { - - private ABUnitCallback unit; - private ABIDCallback id; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - SimulationRenderComponent ret = localStore.game.unitSoundEffectEvent( - (unit.callback(caster, localStore, castId)), this.id.callback(caster, localStore, castId)); - localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java deleted file mode 100644 index 659dc779d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionListRemove.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionListRemove implements ABAction { - - private ABListCallback list; - private ABIntegerCallback index; - private ABCallback object; - - @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final List l = this.list.callback(caster, localStore, castId); - if (object != null) { - l.remove(object.callback(caster, localStore, castId)); - } else { - l.remove(index.callback(caster, localStore, castId).intValue()); - } - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java deleted file mode 100644 index 46d034447..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionSortableListRemove.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionSortableListRemove implements ABAction { - - private ABSortableListCallback list; - private ABIntegerCallback index; - private ABCallback object; - - @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final List l = this.list.callback(caster, localStore, castId); - if (object != null) { - l.remove(object.callback(caster, localStore, castId)); - } else { - l.remove(index.callback(caster, localStore, castId).intValue()); - } - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java deleted file mode 100644 index 97b3e55a9..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionResetPeriodicExecute.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABActionResetPeriodicExecute implements ABAction { - - private ABCallback unique; - - @Override - public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { - if (this.unique != null) { - localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" - + this.unique.callback(caster, localStore, castId)); - } else { - localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId); - } - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java deleted file mode 100644 index 9b72c96dc..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniquevalue; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABActionAbilityRemoveUniqueValue implements ABAction { - - private ABAbilityCallback ability; - private ABStringCallback key; - - @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CAbility theAbility = null; - if (ability != null) { - theAbility = ability.callback(caster, localStore, castId); - } else { - theAbility = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - } - theAbility.removeUniqueValue(key.callback(caster, localStore, castId)); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java deleted file mode 100644 index 3508dacb6..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniquevalue; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABActionAbilityStoreUniqueValue implements ABAction { - - private ABAbilityCallback ability; - private ABStringCallback key; - private ABCallback valueToStore; - - @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CAbility theAbility = null; - if (ability != null) { - theAbility = ability.callback(caster, localStore, castId); - } else { - theAbility = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - } - theAbility.addUniqueValue(valueToStore.callback(caster, localStore, castId), - key.callback(caster, localStore, castId)); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java deleted file mode 100644 index 24883d72f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniquevalue; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionBuffRemoveUniqueValue implements ABAction { - - private ABBuffCallback buff; - private ABStringCallback key; - - @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CBuff theAbility = buff.callback(caster, localStore, castId); - theAbility.removeUniqueValue(key.callback(caster, localStore, castId)); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java deleted file mode 100644 index 9579e393c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniquevalue; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionBuffStoreUniqueValue implements ABAction { - - private ABBuffCallback buff; - private ABStringCallback key; - private ABCallback valueToStore; - - @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CBuff theAbility = buff.callback(caster, localStore, castId); - theAbility.addUniqueValue(valueToStore.callback(caster, localStore, castId), key.callback(caster, localStore, castId)); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetSpeed.java deleted file mode 100644 index 1eeb08282..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetSpeed.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionSetSpeed implements ABAction { - - private ABUnitCallback unit; - private ABIntegerCallback value; - - @Override - public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(caster, localStore, castId); - targetUnit.setSpeed(value.callback(caster, localStore, castId)); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java deleted file mode 100644 index a8cf1eea2..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionTransformUnitAppearance implements ABAction { - - private ABUnitCallback unit; - private ABIDCallback id; - - @Override - public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { - final CUnit targetUnit = this.unit.callback(caster, localStore, castId); - localStore.game.unitUpdatedType(targetUnit, id.callback(caster, localStore, castId), false); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java deleted file mode 100644 index 0db20117d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionAddAttackPostDamageListener implements ABAction { - - private ABUnitCallback unit; - private ABAttackPostDamageListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = unit.callback(caster, localStore, castId); - - target.addPostDamageListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java deleted file mode 100644 index 4a0643db3..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java +++ /dev/null @@ -1,23 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackPreDamageListenerPriorityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionAddAttackPreDamageListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABAttackPreDamageListenerPriorityCallback priority; - private ABAttackPreDamageListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.addPreDamageListener(priority.callback(caster, localStore, castId), - listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java deleted file mode 100644 index 2215fa450..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java +++ /dev/null @@ -1,30 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; - -public class ABActionCreateAttackPostDamageListener implements ABAction { - - private ABIntegerCallback priority; - private List actions; - private ABBooleanCallback useCastId; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - boolean ucid = true; - if (useCastId != null) { - ucid = useCastId.callback(caster, localStore, castId); - } - ABAttackPostDamageListener listener = new ABAttackPostDamageListener(localStore, priority, actions, castId, - ucid); - - localStore.put(ABLocalStoreKeys.LASTCREATEDAPoDL, listener); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java deleted file mode 100644 index 31ce3810c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java +++ /dev/null @@ -1,27 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; - -public class ABActionCreateAttackPreDamageListener implements ABAction { - - private List actions; - private ABBooleanCallback useCastId; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - boolean ucid = true; - if (useCastId != null) { - ucid = useCastId.callback(caster, localStore, castId); - } - ABAttackPreDamageListener listener = new ABAttackPreDamageListener(localStore, actions, castId, ucid); - - localStore.put(ABLocalStoreKeys.LASTCREATEDAPrDL, listener); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java deleted file mode 100644 index b249a91df..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveAttackPostDamageListener implements ABAction { - - private ABUnitCallback unit; - private ABAttackPostDamageListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = unit.callback(caster, localStore, castId); - - target.removePostDamageListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java deleted file mode 100644 index 3c2c4eb65..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java +++ /dev/null @@ -1,23 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackPreDamageListenerPriorityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveAttackPreDamageListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABAttackPreDamageListenerPriorityCallback priority; - private ABAttackPreDamageListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.removePreDamageListener(priority.callback(caster, localStore, castId), - listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java deleted file mode 100644 index b9f319e18..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java +++ /dev/null @@ -1,20 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; - -public class ABActionPreDamageListenerAddDamageMultiplier implements ABAction { - - private ABFloatCallback value; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); - damage.addDamageMultiplier(value.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java deleted file mode 100644 index 0b1f6e911..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABBehaviorChangeListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionAddBehaviorChangeListener implements ABAction { - - private ABUnitCallback unit; - private ABBehaviorChangeListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = unit.callback(caster, localStore, castId); - - target.addBehaviorChangeListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java deleted file mode 100644 index 532da49c1..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java +++ /dev/null @@ -1,27 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; - -public class ABActionCreateBehaviorChangeListener implements ABAction { - - private List actions; - private ABBooleanCallback useCastId; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - boolean ucid = true; - if (useCastId != null) { - ucid = useCastId.callback(caster, localStore, castId); - } - ABBehaviorChangeListener listener = new ABBehaviorChangeListener(localStore, actions, castId, ucid); - - localStore.put(ABLocalStoreKeys.LASTCREATEDBCL, listener); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java deleted file mode 100644 index 615e14714..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java +++ /dev/null @@ -1,20 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABBehaviorChangeListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveBehaviorChangeListener implements ABAction { - - private ABUnitCallback unit; - private ABBehaviorChangeListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnit target = unit.callback(caster, localStore, castId); - - target.removeBehaviorChangeListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java deleted file mode 100644 index 95ba1e2d0..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionAddDamageTakenListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABDamageTakenListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.addDamageTakenListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java deleted file mode 100644 index 55d17b907..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenModificationListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionAddDamageTakenModificationListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABDamageTakenModificationListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.addDamageTakenModificationListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java deleted file mode 100644 index fad452f74..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java +++ /dev/null @@ -1,29 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; - -public class ABActionCreateDamageTakenListener implements ABAction { - - private ABIntegerCallback priority; - private List actions; - private ABBooleanCallback useCastId; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - boolean ucid = true; - if (useCastId != null) { - ucid = useCastId.callback(caster, localStore, castId); - } - ABDamageTakenListener listener = new ABDamageTakenListener(localStore, priority, actions, castId, ucid); - - localStore.put(ABLocalStoreKeys.LASTCREATEDDTL, listener); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java deleted file mode 100644 index 1ac1d1689..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java +++ /dev/null @@ -1,30 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; - -public class ABActionCreateDamageTakenModificationListener implements ABAction { - - private ABIntegerCallback priority; - private List actions; - private ABBooleanCallback useCastId; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - boolean ucid = true; - if (useCastId != null) { - ucid = useCastId.callback(caster, localStore, castId); - } - ABDamageTakenModificationListener listener = new ABDamageTakenModificationListener(localStore, priority, - actions, castId, ucid); - - localStore.put(ABLocalStoreKeys.LASTCREATEDDTML, listener); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java deleted file mode 100644 index bba4c86af..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveDamageTakenListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABDamageTakenListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.removeDamageTakenListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java deleted file mode 100644 index 766883504..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDamageTakenModificationListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveDamageTakenModificationListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABDamageTakenModificationListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.removeDamageTakenModificationListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java deleted file mode 100644 index cc9a7c812..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalaction; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; - -public class ABActionDamageTakenModificationSetDamageMultiplier implements ABAction { - - private ABFloatCallback multiplier; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); - - damage.setDamageMultiplier(multiplier.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java deleted file mode 100644 index 16e0b4e91..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalcondition; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; - -public class ABConditionIsTriggeringDamageAnAttack extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).getPrimaryDamageFlags() - .isAttack(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java deleted file mode 100644 index c2d9f6739..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalcondition; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; - -public class ABConditionIsTriggeringDamageRanged extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getPrimaryDamageFlags().isRanged(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java deleted file mode 100644 index 1bfd5a3c7..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java +++ /dev/null @@ -1,23 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDeathReplacementPriorityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDeathReplacementCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionAddDeathReplacementEffect implements ABAction { - - private ABUnitCallback target; - private ABDeathReplacementPriorityCallback priority; - private ABDeathReplacementCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit targetUnit = target.callback(caster, localStore, castId); - - targetUnit.addDeathReplacementEffect(priority.callback(caster, localStore, castId), listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java deleted file mode 100644 index 9e2fa2dba..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java +++ /dev/null @@ -1,27 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; - -public class ABActionCreateDeathReplacementEffect implements ABAction { - - private List actions; - private ABBooleanCallback useCastId; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - boolean ucid = true; - if (useCastId != null) { - ucid = useCastId.callback(caster, localStore, castId); - } - ABDeathReplacementEffect listener = new ABDeathReplacementEffect(localStore, actions, castId, ucid); - - localStore.put(ABLocalStoreKeys.LASTCREATEDDRE, listener); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java deleted file mode 100644 index 8ff3b8365..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java +++ /dev/null @@ -1,22 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDeathReplacementPriorityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABDeathReplacementCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveDeathReplacementEffect implements ABAction { - - private ABUnitCallback target; - private ABDeathReplacementPriorityCallback priority; - private ABDeathReplacementCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - target.callback(caster, localStore, castId).removeDeathReplacementEffect( - priority.callback(caster, localStore, castId), listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java deleted file mode 100644 index ace7e1d1f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.evasion; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABEvasionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionAddEvasionListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABEvasionListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.addEvasionListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java deleted file mode 100644 index 72cefa04f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java +++ /dev/null @@ -1,27 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.evasion; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; - -public class ABActionCreateEvasionListener implements ABAction { - - private List conditions; - private ABBooleanCallback useCastId; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - boolean ucid = true; - if (useCastId != null) { - ucid = useCastId.callback(caster, localStore, castId); - } - ABAttackEvasionListener listener = new ABAttackEvasionListener(localStore, conditions, castId, ucid); - - localStore.put(ABLocalStoreKeys.LASTCREATEDAEL, listener); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java deleted file mode 100644 index 8e7e14dc9..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.evasion; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABEvasionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveEvasionListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABEvasionListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.removeEvasionListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java deleted file mode 100644 index 6d4f6cc75..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java +++ /dev/null @@ -1,20 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityEffectReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionAddAbilityEffectReactionListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABAbilityEffectReactionListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.addAbilityEffectReactionListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java deleted file mode 100644 index 930fce7ac..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java +++ /dev/null @@ -1,20 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityProjReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionAddAbilityProjReactionListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABAbilityProjReactionListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.addAbilityProjReactionListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java deleted file mode 100644 index e7b9048ee..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackProjReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionAddAttackProjReactionListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABAttackProjReactionListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.addAttackProjReactionListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java deleted file mode 100644 index 8022525d0..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java +++ /dev/null @@ -1,28 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; - -public class ABActionCreateAbilityEffectReactionListener implements ABAction { - - private List actions; - private ABBooleanCallback useCastId; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - boolean ucid = true; - if (useCastId != null) { - ucid = useCastId.callback(caster, localStore, castId); - } - ABAbilityEffectReactionListener listener = new ABAbilityEffectReactionListener(localStore, actions, castId, - ucid); - - localStore.put(ABLocalStoreKeys.LASTCREATEDAbERL, listener); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java deleted file mode 100644 index ec8d38745..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java +++ /dev/null @@ -1,27 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; - -public class ABActionCreateAbilityProjReactionListener implements ABAction { - - private List actions; - private ABBooleanCallback useCastId; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - boolean ucid = true; - if (useCastId != null) { - ucid = useCastId.callback(caster, localStore, castId); - } - ABAbilityProjReactionListener listener = new ABAbilityProjReactionListener(localStore, actions, castId, ucid); - - localStore.put(ABLocalStoreKeys.LASTCREATEDAbPRL, listener); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java deleted file mode 100644 index 62f41871c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java +++ /dev/null @@ -1,27 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; - -public class ABActionCreateAttackProjReactionListener implements ABAction { - - private List actions; - private ABBooleanCallback useCastId; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - boolean ucid = true; - if (useCastId != null) { - ucid = useCastId.callback(caster, localStore, castId); - } - ABAttackProjReactionListener listener = new ABAttackProjReactionListener(localStore, actions, castId, ucid); - - localStore.put(ABLocalStoreKeys.LASTCREATEDAtkPRL, listener); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java deleted file mode 100644 index 98fee304d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityEffectReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveAbilityEffectReactionListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABAbilityEffectReactionListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.removeAbilityEffectReactionListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java deleted file mode 100644 index b9048fbb0..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java +++ /dev/null @@ -1,20 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAbilityProjReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveAbilityProjReactionListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABAbilityProjReactionListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.removeAbilityProjReactionListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java deleted file mode 100644 index 92bff6c14..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java +++ /dev/null @@ -1,20 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackProjReactionListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveAttackProjReactionListener implements ABAction { - - private ABUnitCallback targetUnit; - private ABAttackProjReactionListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnit target = targetUnit.callback(caster, localStore, castId); - - target.removeAttackProjReactionListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java deleted file mode 100644 index 67ea32ddd..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java +++ /dev/null @@ -1,15 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.internalaction; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABActionReactionPreventHit implements ABAction { - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - localStore.put(ABLocalStoreKeys.REACTIONALLOWHIT+castId, false); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java deleted file mode 100644 index 7b93debb9..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.internalcallback; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; - -public class ABCallbackGetReactionAttackProjectileDamage extends ABFloatCallback { - - @Override - public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ+castId)).getDamage(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java deleted file mode 100644 index 54b1a5448..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java +++ /dev/null @@ -1,23 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.state; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABUnitStateListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABActionAddUnitStateListener implements ABAction { - - private ABUnitCallback unit; - private ABUnitStateListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = unit.callback(caster, localStore, castId); - - localStore.put(ABLocalStoreKeys.LASTSTATELISTENERADDEDUNIT, target); - target.addStateListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java deleted file mode 100644 index f08d4ca62..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java +++ /dev/null @@ -1,21 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.state; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABUnitStateListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveUnitStateListener implements ABAction { - - private ABUnitCallback unit; - private ABUnitStateListenerCallback listener; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnit target = unit.callback(caster, localStore, castId); - - target.removeStateListener(listener.callback(caster, localStore, castId)); - } -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java deleted file mode 100644 index 6aae3cf19..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionUpdateStateModBuff.java +++ /dev/null @@ -1,23 +0,0 @@ - -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.ABLongCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; - -public class ABActionUpdateStateModBuff implements ABAction { - - private ABStateModBuffCallback buff; - private ABLongCallback value; - - @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final StateModBuff buffObj = this.buff.callback(caster, localStore, castId); - buffObj.setValue(this.value.callback(caster, localStore, castId)); - } - -} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java deleted file mode 100644 index e1128a60c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionRemoveVisionModifier.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier.ABVisionModifierCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionRemoveVisionModifier implements ABAction { - - private ABVisionModifierCallback modifier; - private ABPlayerCallback player; - - @Override - public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { - player.callback(caster, localStore, castId).removeFogModifer(localStore.game, - modifier.callback(caster, localStore, castId)); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java deleted file mode 100644 index 6e5043e18..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionSetBurrowPlaceholder.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABActionSetBurrowPlaceholder implements ABAction { - - @Override - public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { - // TODO Auto-generated method stub - - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java deleted file mode 100644 index ff88b92a9..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABAttackModifierCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; - -public abstract class ABAttackModifierCallback implements ABCallback { - - abstract public ABAttackModifier callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java deleted file mode 100644 index c41a36c25..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; - -public class ABCallbackGetLastCreatedAttackModifier extends ABAttackModifierCallback { - - @Override - public ABAttackModifier callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABAttackModifier) localStore.get(ABLocalStoreKeys.LASTCREATEDAMod); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java deleted file mode 100644 index e6201511c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; - -public class ABCallbackGetLastCreatedTimeOfDayEvent extends ABTimeOfDayEventCallback { - - @Override - public ABTimeOfDayEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABTimeOfDayEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDTODEVENT); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java deleted file mode 100644 index e822a825d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; - -public abstract class ABTimeOfDayEventCallback implements ABCallback { - - abstract public ABTimeOfDayEvent callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java deleted file mode 100644 index 3c3be28ba..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; - -public class ABCallbackGetLastCreatedWidgetEvent extends ABWidgetEventCallback { - - @Override - public ABWidgetEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABWidgetEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDWIDEVENT); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABWidgetEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABWidgetEventCallback.java deleted file mode 100644 index 73f02450f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABWidgetEventCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; - -public abstract class ABWidgetEventCallback implements ABCallback { - - abstract public ABWidgetEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationX.java deleted file mode 100644 index 52087ee8c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationX.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackGetLocationX extends ABFloatCallback { - - private ABLocationCallback location; - - @Override - public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return location.callback(caster, localStore, castId).getX(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationY.java deleted file mode 100644 index f58d99501..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetLocationY.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackGetLocationY extends ABFloatCallback { - - private ABLocationCallback location; - - @Override - public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return location.callback(caster, localStore, castId).getY(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationX.java deleted file mode 100644 index 67e22268f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationX.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackGetUnitLocationX extends ABFloatCallback { - - private ABUnitCallback unit; - - @Override - public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return unit.callback(caster, localStore, castId).getX(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationY.java deleted file mode 100644 index 534ab1ad6..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitLocationY.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackGetUnitLocationY extends ABFloatCallback { - - private ABUnitCallback unit; - - @Override - public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return unit.callback(caster, localStore, castId).getY(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABFloatCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABFloatCallback.java deleted file mode 100644 index 5aeabbeb1..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABFloatCallback.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABFloatCallback implements ABCallback { - - abstract public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABIDCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABIDCallback.java deleted file mode 100644 index 93878012c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABIDCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; - -import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABIDCallback implements ABCallback { - - @Override - abstract public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetListSize.java deleted file mode 100644 index 576dbb0d3..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetListSize.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackGetListSize extends ABIntegerCallback { - - private ABListCallback list; - - @Override - public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return list.callback(caster, localStore, castId).size(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetPlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetPlayerId.java deleted file mode 100644 index bf6ed4b6f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetPlayerId.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackGetPlayerId extends ABIntegerCallback { - - private ABPlayerCallback player; - - @Override - public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return player.callback(caster, localStore, castId).getId(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java deleted file mode 100644 index 4bceca312..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSpellLevel.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABCallbackGetSpellLevel extends ABIntegerCallback { - - @Override - public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitGroupSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitGroupSize.java deleted file mode 100644 index f3e5f459d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitGroupSize.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackGetUnitGroupSize extends ABIntegerCallback { - - private ABUnitGroupCallback group; - - @Override - public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return group.callback(caster, localStore, castId).size(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitQueueSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitQueueSize.java deleted file mode 100644 index 9b1fac0c0..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitQueueSize.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackGetUnitQueueSize extends ABIntegerCallback { - - private ABUnitQueueCallback queue; - - @Override - public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return queue.callback(caster, localStore, castId).size(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABIntegerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABIntegerCallback.java deleted file mode 100644 index 6ef6a948b..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABIntegerCallback.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABIntegerCallback implements ABCallback { - - abstract public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java deleted file mode 100644 index 3cc1df301..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABItemCallback.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABItemCallback implements ABCallback { - - abstract public CItem callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java deleted file mode 100644 index 500c66fb2..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABListCallback implements ABCallback { - - abstract public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListSortType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListSortType.java deleted file mode 100644 index ca4741c7a..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABListSortType.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; - -public enum ABListSortType { - ASC, - DSC, - RAND; -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java deleted file mode 100644 index 56ee75e5a..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABSortableListCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABSortableListCallback> implements ABCallback { - - abstract public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java deleted file mode 100644 index 819f05edb..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABIntegerListCallback.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.integer; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABIntegerListCallback extends ABSortableListCallback { - - abstract public List callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java deleted file mode 100644 index 3a0a04a60..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; - -public abstract class ABAbilityEffectReactionListenerCallback implements ABCallback { - - abstract public ABAbilityEffectReactionListener callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java deleted file mode 100644 index 06aecfe1b..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; - -public abstract class ABAbilityProjReactionListenerCallback implements ABCallback { - - abstract public ABAbilityProjReactionListener callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPostDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPostDamageListenerCallback.java deleted file mode 100644 index 2bfc13165..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPostDamageListenerCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; - -public abstract class ABAttackPostDamageListenerCallback implements ABCallback { - - abstract public ABAttackPostDamageListener callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPreDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPreDamageListenerCallback.java deleted file mode 100644 index f2ee0967e..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackPreDamageListenerCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; - -public abstract class ABAttackPreDamageListenerCallback implements ABCallback { - - abstract public ABAttackPreDamageListener callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackProjReactionListenerCallback.java deleted file mode 100644 index 64e742e5b..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABAttackProjReactionListenerCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; - -public abstract class ABAttackProjReactionListenerCallback implements ABCallback { - - abstract public ABAttackProjReactionListener callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABBehaviorChangeListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABBehaviorChangeListenerCallback.java deleted file mode 100644 index ab3f95535..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABBehaviorChangeListenerCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; - -public abstract class ABBehaviorChangeListenerCallback implements ABCallback { - - abstract public ABBehaviorChangeListener callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java deleted file mode 100644 index 12474126d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; - -public class ABCallbackGetLastCreatedAbilityEffectReactionListener extends ABAbilityEffectReactionListenerCallback { - - @Override - public ABAbilityEffectReactionListener callback(CUnit caster, ABLocalDataStore localStore, - final int castId) { - return (ABAbilityEffectReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbERL); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java deleted file mode 100644 index 2f6ce533e..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; - -public class ABCallbackGetLastCreatedAbilityProjReactionListener extends ABAbilityProjReactionListenerCallback { - - @Override - public ABAbilityProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbPRL); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java deleted file mode 100644 index 1bd6f8510..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; - -public class ABCallbackGetLastCreatedAttackPostDamageListener extends ABAttackPostDamageListenerCallback { - - @Override - public ABAttackPostDamageListener callback(CUnit caster, ABLocalDataStore localStore, - final int castId) { - return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPoDL); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java deleted file mode 100644 index 29b6b71ed..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; - -public class ABCallbackGetLastCreatedAttackPreDamageListener extends ABAttackPreDamageListenerCallback { - - @Override - public ABAttackPreDamageListener callback(CUnit caster, ABLocalDataStore localStore, - final int castId) { - return (ABAttackPreDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPrDL); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java deleted file mode 100644 index 9a612fca4..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; - -public class ABCallbackGetLastCreatedAttackProjReactionListener extends ABAttackProjReactionListenerCallback { - - @Override - public ABAttackProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAtkPRL); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java deleted file mode 100644 index a8a721c24..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; - -public class ABCallbackGetLastCreatedBehaviorChangeListener extends ABBehaviorChangeListenerCallback { - - @Override - public ABBehaviorChangeListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.LASTCREATEDBCL); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java deleted file mode 100644 index 5ca3e2947..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; - -public class ABCallbackGetLastCreatedDamageTakenListener extends ABDamageTakenListenerCallback { - - @Override - public ABDamageTakenListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABDamageTakenListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTL); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java deleted file mode 100644 index 750ab55c4..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; - -public class ABCallbackGetLastCreatedDamageTakenModificationListener extends ABDamageTakenModificationListenerCallback { - - @Override - public ABDamageTakenModificationListener callback(CUnit caster, ABLocalDataStore localStore, - final int castId) { - return (ABDamageTakenModificationListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTML); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java deleted file mode 100644 index e7b576d8b..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; - -public class ABCallbackGetLastCreatedDeathReplacement extends ABDeathReplacementCallback { - - @Override - public ABDeathReplacementEffect callback(CUnit caster, ABLocalDataStore localStore, - final int castId) { - return (ABDeathReplacementEffect) localStore.get(ABLocalStoreKeys.LASTCREATEDDRE); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java deleted file mode 100644 index c0665f381..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; - -public class ABCallbackGetLastCreatedEvasionListener extends ABEvasionListenerCallback { - - @Override - public ABAttackEvasionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAEL); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java deleted file mode 100644 index 96654358f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; - -public class ABCallbackGetLastCreatedUnitStateListener extends ABUnitStateListenerCallback { - - @Override - public ABUnitStateListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABUnitStateListener) localStore.get(ABLocalStoreKeys.LASTCREATEDUSL); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenListenerCallback.java deleted file mode 100644 index 4810825ef..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenListenerCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; - -public abstract class ABDamageTakenListenerCallback implements ABCallback { - - abstract public ABDamageTakenListener callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java deleted file mode 100644 index 4dde0e020..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; - -public abstract class ABDamageTakenModificationListenerCallback implements ABCallback { - - abstract public ABDamageTakenModificationListener callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDeathReplacementCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDeathReplacementCallback.java deleted file mode 100644 index 24fc83d22..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABDeathReplacementCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; - -public abstract class ABDeathReplacementCallback implements ABCallback { - - abstract public ABDeathReplacementEffect callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABEvasionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABEvasionListenerCallback.java deleted file mode 100644 index 79a5b4e51..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABEvasionListenerCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; - -public abstract class ABEvasionListenerCallback implements ABCallback { - - abstract public ABAttackEvasionListener callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABUnitStateListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABUnitStateListenerCallback.java deleted file mode 100644 index f1e52994f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABUnitStateListenerCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; - -public abstract class ABUnitStateListenerCallback implements ABCallback { - - abstract public ABUnitStateListener callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABLongCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABLongCallback.java deleted file mode 100644 index 310dd0139..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABLongCallback.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABLongCallback implements ABCallback { - - abstract public Long callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java deleted file mode 100644 index 891571902..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABOrderIdCallback.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABOrderIdCallback implements ABCallback { - - abstract public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java deleted file mode 100644 index 7100b64ce..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackBooleanToString.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackBooleanToString extends ABStringCallback { - - private ABBooleanCallback value; - - @Override - public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return "" + value.callback(caster, localStore, castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackFloatToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackFloatToString.java deleted file mode 100644 index 8131dccb9..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackFloatToString.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackFloatToString extends ABStringCallback { - - private ABFloatCallback value; - - @Override - public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return "" + value.callback(caster, localStore, castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIntegerToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIntegerToString.java deleted file mode 100644 index c7c55ea88..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIntegerToString.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackIntegerToString extends ABStringCallback { - - private ABIntegerCallback value; - - @Override - public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return "" + value.callback(caster, localStore, castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackLongToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackLongToString.java deleted file mode 100644 index 2952b26ef..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackLongToString.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.ABLongCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackLongToString extends ABStringCallback { - - private ABLongCallback value; - - @Override - public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return "" + value.callback(caster, localStore, castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABStringCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABStringCallback.java deleted file mode 100644 index 14f768ee8..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABStringCallback.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABStringCallback implements ABCallback { - - abstract public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java deleted file mode 100644 index a86588303..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackingUnit.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABCallbackGetAttackingUnit extends ABUnitCallback { - - @Override - public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.ATTACKINGUNIT+castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java deleted file mode 100644 index 5849704e2..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagedUnit.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABCallbackGetDamagedUnit extends ABUnitCallback { - - @Override - public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGEDUNIT + castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java deleted file mode 100644 index 88bfb0616..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDamagingUnit.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABCallbackGetDamagingUnit extends ABUnitCallback { - - @Override - public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGINGUNIT + castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java deleted file mode 100644 index a35ed1182..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetDyingUnit.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABCallbackGetDyingUnit extends ABUnitCallback { - - @Override - public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.DYINGUNIT + castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java deleted file mode 100644 index 6e5148f4b..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetKillingUnit.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABCallbackGetKillingUnit extends ABUnitCallback { - - @Override - public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.KILLINGUNIT + castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java deleted file mode 100644 index f19973837..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetParentCastingUnit.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABCallbackGetParentCastingUnit extends ABUnitCallback { - - @Override - public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.PARENTCASTER); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackPollUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackPollUnitQueue.java deleted file mode 100644 index fb6a28f1e..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackPollUnitQueue.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABCallbackPollUnitQueue extends ABUnitCallback { - - private ABUnitQueueCallback queue; - - @Override - public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return queue.callback(caster, localStore, castId).poll(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABUnitCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABUnitCallback.java deleted file mode 100644 index 98959c99c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABUnitCallback.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABUnitCallback implements ABCallback { - - @Override - abstract public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABUnitGroupCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABUnitGroupCallback.java deleted file mode 100644 index c9f8c0a9b..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABUnitGroupCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; - -import java.util.Set; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABUnitGroupCallback implements ABCallback { - - abstract public Set callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java deleted file mode 100644 index 093e9f9ef..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABUnitQueueCallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; - -import java.util.Queue; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABUnitQueueCallback implements ABCallback { - - abstract public Queue callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java deleted file mode 100644 index 216cd6aae..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABWidgetCallback.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public abstract class ABWidgetCallback implements ABCallback { - - abstract public CWidget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java deleted file mode 100644 index cbf73b580..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsDisabled.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABConditionIsDisabled extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - return ability.isDisabled(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java deleted file mode 100644 index a75473cbd..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABConditionIsFlexAbilityNonPointTarget extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); - - return !ability.isPointTarget(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java deleted file mode 100644 index 76bde6e01..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABConditionIsFlexAbilityNonTargeted extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); - - return !ability.isTargetedSpell(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java deleted file mode 100644 index 537f1736b..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABConditionIsFlexAbilityPointTarget extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); - - return ability.isPointTarget(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java deleted file mode 100644 index ec1ac2979..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveFlexTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABConditionIsFlexAbilityTargeted extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore - .get(ABLocalStoreKeys.ISFLEXABILITY); - - return ability.isTargetedSpell(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java deleted file mode 100644 index 852dbc1bc..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsOnCooldown.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABConditionIsOnCooldown extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - - return ability.getCooldownRemainingTicks(localStore.game, caster) > 0; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java deleted file mode 100644 index acdad0823..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsTransformingToAlternate.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABConditionIsTransformingToAlternate extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Boolean) localStore.get(ABLocalStoreKeys.TRANSFORMINGTOALT + castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java deleted file mode 100644 index 557c85dfa..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackProjectile.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; - -public class ABConditionIsAttackProjectile extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isProjectile(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java deleted file mode 100644 index 6c19be29f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/attack/ABConditionIsAttackRanged.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; - -public class ABConditionIsAttackRanged extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isRanged(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java deleted file mode 100644 index aad92094e..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffMagic.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsBuffMagic extends ABBooleanCallback { - - ABBuffCallback buff; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CBuff theBuff = buff.callback(caster, localStore, castId); - return theBuff.isMagic(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java deleted file mode 100644 index 4d9959bce..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffNegative.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsBuffNegative extends ABBooleanCallback { - - ABBuffCallback buff; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CBuff theBuff = buff.callback(caster, localStore, castId); - return !theBuff.isPositive(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java deleted file mode 100644 index fd9ecb02d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffPositive.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsBuffPositive extends ABBooleanCallback { - - ABBuffCallback buff; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CBuff theBuff = buff.callback(caster, localStore, castId); - return theBuff.isPositive(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java deleted file mode 100644 index 57d06578c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructablebuff; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsDestructableBuffMagic extends ABBooleanCallback { - - ABDestructableBuffCallback buff; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CDestructableBuff theBuff = buff.callback(caster, localStore, castId); - return theBuff.isMagic(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java deleted file mode 100644 index 578dd4716..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionGameplayConstantIsDefendCanDeflect extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return localStore.game.getGameplayConstants().isDefendDeflection(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java deleted file mode 100644 index 62be627af..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionIsItemAbility.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABConditionIsItemAbility extends ABBooleanCallback { - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - - return ability.getItem() != null; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java deleted file mode 100644 index d570626ba..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemHasCharges.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABConditionItemHasCharges extends ABBooleanCallback { - - private ABItemCallback item; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - if (item == null) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - - return ability.getItem().getCharges() > 0; - } else { - return item.callback(caster, localStore, castId).getCharges() > 0; - } - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java deleted file mode 100644 index fc26f4682..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/item/ABConditionItemIsCharged.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; - -public class ABConditionItemIsCharged extends ABBooleanCallback { - - private ABItemCallback item; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - if (item == null) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - - return ability.getItem().getItemType().getNumberOfCharges() > 0; - } else { - return item.callback(caster, localStore, castId).getItemType().getNumberOfCharges() > 0; - } - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java deleted file mode 100644 index 64f3e243a..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionBool.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionBool extends ABBooleanCallback { - - private ABBooleanCallback bool; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return bool.callback(caster, localStore, castId); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java deleted file mode 100644 index 9ace00f2c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionIsNull.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsNull extends ABBooleanCallback { - - private ABCallback value; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return value.callback(caster, localStore, castId) == null; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java deleted file mode 100644 index ee4eebe5b..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNotNull.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionNotNull extends ABBooleanCallback { - - private ABCallback value; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return value.callback(caster, localStore, castId) != null; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java deleted file mode 100644 index de56a0039..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInGroup.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.membership; - -import java.util.Set; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsUnitInGroup extends ABBooleanCallback { - - private ABUnitGroupCallback group; - private ABUnitCallback unit; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Set groupSet = group.callback(caster, localStore, castId); - CUnit rUnit = unit.callback(caster, localStore, castId); - return groupSet.contains(rUnit); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java deleted file mode 100644 index d4f78e46f..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.membership; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsUnitInRangeOfUnit extends ABBooleanCallback { - - private ABUnitCallback caster; - private ABUnitCallback target; - private ABFloatCallback range; - - @Override - public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { - return caster.callback(casterUnit, localStore, castId).canReach( - target.callback(casterUnit, localStore, castId), - range.callback(casterUnit, localStore, castId)); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java deleted file mode 100644 index c6e6624c6..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEq0.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionFloatEq0 extends ABBooleanCallback { - - private ABFloatCallback value; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Float v = value.callback(caster, localStore, castId); - - return v==0; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java deleted file mode 100644 index 6a6e1d649..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt0.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionFloatGt0 extends ABBooleanCallback { - - private ABFloatCallback value; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Float v = value.callback(caster, localStore, castId); - return v > 0; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java deleted file mode 100644 index 5bf0b69d1..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGte.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionFloatGte extends ABBooleanCallback { - - private ABFloatCallback value1; - private ABFloatCallback value2; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Float v1 = value1.callback(caster, localStore, castId); - Float v2 = value2.callback(caster, localStore, castId); - - return v1 >= v2; - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java deleted file mode 100644 index 29e007c31..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLt.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionFloatLt extends ABBooleanCallback { - - private ABFloatCallback value1; - private ABFloatCallback value2; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Float v1 = value1.callback(caster, localStore, castId); - Float v2 = value2.callback(caster, localStore, castId); - - return v1 < v2; - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java deleted file mode 100644 index 0cd0bbb68..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatLte.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionFloatLte extends ABBooleanCallback { - - private ABFloatCallback value1; - private ABFloatCallback value2; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Float v1 = value1.callback(caster, localStore, castId); - Float v2 = value2.callback(caster, localStore, castId); - - return v1 <= v2; - } -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java deleted file mode 100644 index 316756fdb..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionFloatNe extends ABBooleanCallback { - - private ABFloatCallback value1; - private ABFloatCallback value2; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Float v1 = value1.callback(caster, localStore, castId); - Float v2 = value2.callback(caster, localStore, castId); - - return !v1.equals(v2); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java deleted file mode 100644 index d57a16803..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatNe0.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionFloatNe0 extends ABBooleanCallback { - - private ABFloatCallback value; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Float v = value.callback(caster, localStore, castId); - - return v!=0; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java deleted file mode 100644 index 5a7d451be..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIntegerEq extends ABBooleanCallback { - - private ABIntegerCallback value1; - private ABIntegerCallback value2; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer v1 = value1.callback(caster, localStore, castId); - Integer v2 = value2.callback(caster, localStore, castId); - - return v1.equals(v2); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java deleted file mode 100644 index 247d1d4c1..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerEq0.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIntegerEq0 extends ABBooleanCallback { - - private ABIntegerCallback value; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer v1 = value.callback(caster, localStore, castId); - return v1 == 0; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java deleted file mode 100644 index a67f49e60..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIntegerGt extends ABBooleanCallback { - - private ABIntegerCallback value1; - private ABIntegerCallback value2; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer v1 = value1.callback(caster, localStore, castId); - Integer v2 = value2.callback(caster, localStore, castId); - return v1 > v2; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java deleted file mode 100644 index 21e31b705..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGt0.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIntegerGt0 extends ABBooleanCallback { - - private ABIntegerCallback value; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer v1 = value.callback(caster, localStore, castId); - return v1 > 0; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java deleted file mode 100644 index d521c24ee..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerGte.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIntegerGte extends ABBooleanCallback { - - private ABIntegerCallback value1; - private ABIntegerCallback value2; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer v1 = value1.callback(caster, localStore, castId); - Integer v2 = value2.callback(caster, localStore, castId); - return v1 >= v2; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java deleted file mode 100644 index 0cce98915..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsEven.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIntegerIsEven extends ABBooleanCallback { - - private ABIntegerCallback value; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer v1 = value.callback(caster, localStore, castId); - - return (v1 % 2) == 0; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java deleted file mode 100644 index 99d11066d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerIsOdd.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIntegerIsOdd extends ABBooleanCallback { - - private ABIntegerCallback value; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer v1 = value.callback(caster, localStore, castId); - - return (v1 % 2) == 1; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java deleted file mode 100644 index c8b69bc51..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLte.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIntegerLte extends ABBooleanCallback { - - private ABIntegerCallback value1; - private ABIntegerCallback value2; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer v1 = value1.callback(caster, localStore, castId); - Integer v2 = value2.callback(caster, localStore, castId); - return v1 <= v2; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java deleted file mode 100644 index cc42736ee..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIntegerNe extends ABBooleanCallback { - - private ABIntegerCallback value1; - private ABIntegerCallback value2; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer v1 = value1.callback(caster, localStore, castId); - Integer v2 = value2.callback(caster, localStore, castId); - return !v1.equals(v2); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java deleted file mode 100644 index d87e09810..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerNe0.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIntegerNe0 extends ABBooleanCallback { - - private ABIntegerCallback value; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer v1 = value.callback(caster, localStore, castId); - return v1 != 0; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java deleted file mode 100644 index 02b62352c..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/timer/ABConditionIsTimerActive.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.timer; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsTimerActive extends ABBooleanCallback { - - private ABTimerCallback timer; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return timer.callback(caster, localStore, castId).isRunning(); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java deleted file mode 100644 index 3141d9239..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.uniqueflag; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionDoesAbilityHaveUniqueFlag extends ABBooleanCallback { - - ABAbilityCallback ability; - ABStringCallback flag; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CAbility theAbility = ability.callback(caster, localStore, castId); - return theAbility.hasUniqueFlag(flag.callback(caster, localStore, castId)); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java deleted file mode 100644 index a36c96fe7..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.uniqueflag; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionDoesBuffHaveUniqueFlag extends ABBooleanCallback { - - ABBuffCallback buff; - ABStringCallback flag; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CBuff theBuff = buff.callback(caster, localStore, castId); - return theBuff.hasUniqueFlag(flag.callback(caster, localStore, castId)); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java deleted file mode 100644 index 8ec82a65d..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ABConditionIsUnitType.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsUnitType extends ABBooleanCallback { - - private ABUnitCallback unit; - private ABIDCallback unitType; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnit theUnit = caster; - if (unit != null) { - theUnit = unit.callback(caster, localStore, castId); - } - if (theUnit != null) { - return theUnit.getTypeId().equals(unitType.callback(caster, localStore, castId)); - } - return false; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java deleted file mode 100644 index 96121a496..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsUnitBuilding extends ABBooleanCallback { - - private ABUnitCallback unit; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnit theUnit = caster; - if (unit != null) { - theUnit = unit.callback(caster, localStore, castId); - } - if (theUnit != null) { - return theUnit.isBuilding(); - } - return false; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java deleted file mode 100644 index a72f885a3..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHero.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsUnitHero extends ABBooleanCallback { - - private ABUnitCallback unit; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnit theUnit = caster; - if (unit != null) { - theUnit = unit.callback(caster, localStore, castId); - } - if (theUnit != null) { - return theUnit.isHero(); - } - return false; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java deleted file mode 100644 index 309fe20ee..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHidden.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsUnitHidden extends ABBooleanCallback { - - private ABUnitCallback unit; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnit theUnit = caster; - if (unit != null) { - theUnit = unit.callback(caster, localStore, castId); - } - if (theUnit != null) { - return theUnit.isHidden(); - } - return false; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java deleted file mode 100644 index a997f57e6..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsUnitMagicImmune extends ABBooleanCallback { - - private ABUnitCallback unit; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnit theUnit = caster; - if (unit != null) { - theUnit = unit.callback(caster, localStore, castId); - } - if (theUnit != null) { - return theUnit.isMagicImmune(); - } - return false; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java deleted file mode 100644 index d56ea5fee..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsUnitMorphImmune extends ABBooleanCallback { - - private ABUnitCallback unit; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnit theUnit = caster; - if (unit != null) { - theUnit = unit.callback(caster, localStore, castId); - } - if (theUnit != null) { - return theUnit.isMorphImmune(); - } - return false; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java deleted file mode 100644 index 9dba35c47..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitAlive.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsUnitAlive extends ABBooleanCallback { - - private ABUnitCallback unit; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnit theUnit = caster; - if (unit != null) { - theUnit = unit.callback(caster, localStore, castId); - } - if (theUnit != null) { - return !theUnit.isDead(); - } - return true; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java deleted file mode 100644 index 3cb9302ba..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitDead.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionIsUnitDead extends ABBooleanCallback { - - private ABUnitCallback unit; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnit theUnit = caster; - if (unit != null) { - theUnit = unit.callback(caster, localStore, castId); - } - if (theUnit != null) { - return theUnit.isDead(); - } - return false; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java deleted file mode 100644 index a7e442b2e..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionUnitHasResearch.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.tech; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; - -public class ABConditionUnitHasResearch extends ABBooleanCallback { - - private ABUnitCallback unit; - private ABIDCallback researchId; - - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnit theUnit = caster; - if (unit != null) { - theUnit = unit.callback(caster, localStore, castId); - } - if (theUnit != null) { - return theUnit.getLevelOfAppliedUpgrade(researchId.callback(caster, localStore, castId)) > 0; - } - return false; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderAbility.java similarity index 75% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderAbility.java index 9df2a4974..1a25e9e7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderAbility.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; import java.util.List; @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public interface ABAbilityBuilderAbility extends CLevelingAbility, Aliased { public List getLevelData(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAbility.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAbility.java index 40bc363b7..fe5a736c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAbility.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; import java.util.EnumSet; import java.util.List; @@ -13,9 +13,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.GenericSingleIconActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAutoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAutoTarget.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAutoTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAutoTarget.java index 2625197cd..5cbc3dfbd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveAutoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAutoTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; import java.util.List; @@ -8,12 +8,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveFlexTarget.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveFlexTarget.java index 45b45fac9..0b7d6bf4f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveFlexTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; import java.util.List; @@ -9,14 +9,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveNoTarget.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveNoTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveNoTarget.java index 96b5004ce..f1bd1512a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveNoTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; import java.util.List; @@ -8,11 +8,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePairing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePairing.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePairing.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePairing.java index 2ec9aa72d..216d7c126 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePairing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePairing.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; import java.util.HashSet; import java.util.List; @@ -16,13 +16,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorSendOrder; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorSendOrder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABUnitAndRangeComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePointTarget.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePointTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePointTarget.java index 0f165f85a..3dec6e9b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActivePointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePointTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; import java.util.List; @@ -9,11 +9,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveUnitTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveUnitTarget.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveUnitTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveUnitTarget.java index 9692de338..df9ec08a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderActiveUnitTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveUnitTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; import java.util.List; @@ -9,11 +9,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java index ca0949995..a41f07b0f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; import java.util.EnumSet; import java.util.HashSet; @@ -27,18 +27,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehavior; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABTargetTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABManaDepletedCheckTimer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABTargetTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer.ABManaDepletedCheckTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIdUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderNoIcon.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java index dea39326b..3a080bd70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; import java.util.HashSet; import java.util.List; @@ -15,12 +15,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractGenericNoIconAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassive.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java index bf4a109ae..76df80c1c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/ABAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; import java.util.HashSet; import java.util.List; @@ -14,12 +14,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassiveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassiveAbility.java new file mode 100644 index 000000000..dc14a0866 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassiveAbility.java @@ -0,0 +1,5 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability; + +public interface ABAbilityBuilderPassiveAbility extends ABAbilityBuilderAbility { + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderAuraTemplate.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderAuraTemplate.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderAuraTemplate.java index ba2d4ce12..d38d2bdf1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderAuraTemplate.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.template; import java.util.ArrayList; import java.util.EnumSet; @@ -14,10 +14,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABAbilityBuilderAuraTemplate extends AbilityGenericSingleIconPassiveAbility { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderSimpleAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderSimpleAuraTemplate.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderSimpleAuraTemplate.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderSimpleAuraTemplate.java index 31f9c9316..0ee2cf2f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderSimpleAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderSimpleAuraTemplate.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.template; import java.util.ArrayList; import java.util.EnumSet; @@ -18,9 +18,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABAbilityBuilderSimpleAuraTemplate extends AbilityGenericSingleIconPassiveAbility { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatAuraTemplate.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatAuraTemplate.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatAuraTemplate.java index 31c513535..28ac4cf3e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatAuraTemplate.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.template; import java.util.ArrayList; import java.util.EnumSet; @@ -14,12 +14,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericAuraBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABMeleeRangeTargetOverride; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABStatBuffFromDataField; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABGenericAuraBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABMeleeRangeTargetOverride; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABStatBuffFromDataField; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatPassiveTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatPassiveTemplate.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatPassiveTemplate.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatPassiveTemplate.java index 3fdfe1b13..f2658fce0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/ability/template/ABAbilityBuilderStatPassiveTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatPassiveTemplate.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.template; import java.util.List; import com.etheller.warsmash.util.War3ID; @@ -6,11 +6,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbilityGenericSingleIconPassiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABStatBuffFromDataField; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABPermanentPassiveBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABStatBuffFromDataField; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehavior.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehavior.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehavior.java index 5c8dad528..cf28a948f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehavior.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderBase.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderBase.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderBase.java index ff1972150..5b8f81fad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderBase.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior; import java.util.EnumSet; @@ -12,10 +12,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABAbilityTargetStillTargetableVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor.ABAbilityTargetStillTargetableVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CAbstractRangedBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderNoTarget.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderNoTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderNoTarget.java index 11a653d47..362edf312 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorAbilityBuilderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderNoTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior; import java.util.EnumSet; @@ -11,9 +11,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorVisitor; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorFinishTransformation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorFinishTransformation.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorFinishTransformation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorFinishTransformation.java index 8d2d86a8e..8c5bf8556 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorFinishTransformation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorFinishTransformation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.util.WarsmashConstants; @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorVisitor; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorSendOrder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorSendOrder.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorSendOrder.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorSendOrder.java index 82796c7cd..b89aa7168 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABBehaviorSendOrder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorSendOrder.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABOrderStartTransformation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABOrderStartTransformation.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABOrderStartTransformation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABOrderStartTransformation.java index 6b80427d9..a88bc652a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/ABOrderStartTransformation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABOrderStartTransformation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java similarity index 74% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java index c451577be..d5738dd72 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityRunEndCastingActions.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAbilityRunEndCastingActions.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityRunEndCastingActions.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAbilityRunEndCastingActions.java index 266f3b36e..d3d336adb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAbilityRunEndCastingActions.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAbilityRunEndCastingActions.java @@ -1,17 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionAbilityRunEndCastingActions implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionActivateToggledAbility.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionActivateToggledAbility.java index 2d0ebb4b5..95884ae42 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionActivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionActivateToggledAbility.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionActivateToggledAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAddAbility.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAddAbility.java index 23086580c..ba8174b25 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAddAbility.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAddAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAddNewAbility.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAddNewAbility.java index e5effa153..e34f49b1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddNewAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAddNewAbility.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAddNewAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddRallyAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAddRallyAbility.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddRallyAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAddRallyAbility.java index 966776e50..e65b7665c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionAddRallyAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAddRallyAbility.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionAddRallyAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionBeginChanneling.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionBeginChanneling.java index e391cff78..44fb5ba3a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionBeginChanneling.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionBeginChanneling.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionBeginChanneling implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCleanUpCastInstance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionCleanUpCastInstance.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCleanUpCastInstance.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionCleanUpCastInstance.java index 9f39e3cf2..cd7e4946f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCleanUpCastInstance.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionCleanUpCastInstance.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import java.util.HashSet; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionCleanUpCastInstance implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickDisableAbility.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickDisableAbility.java index 201ec64b6..1937e3bea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickDisableAbility.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionClickDisableAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickEnableAbility.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickEnableAbility.java index a259f80b5..326c3cba8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionClickEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickEnableAbility.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionClickEnableAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionCreateAbilityFromId.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionCreateAbilityFromId.java index 97ae26f9e..ba96b4d9b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionCreateAbilityFromId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionCreateAbilityFromId.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCreateAbilityFromId implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionDeactivateToggledAbility.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionDeactivateToggledAbility.java index f6893dd6e..d374a127f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionDeactivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionDeactivateToggledAbility.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionDeactivateToggledAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionFinishChanneling.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionFinishChanneling.java index 11cee6c0f..b9cbd30aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionFinishChanneling.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionFinishChanneling.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionFinishChanneling implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java index 00f093c6c..c6296452e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionPrepUnownedAbilityForUse.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionPrepUnownedAbilityForUse implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionRemoveAbility.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionRemoveAbility.java index 8256a07bd..ff05095e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionRemoveAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionRemoveAbility.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionRemoveAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionResetCooldown.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionResetCooldown.java index 2a90df747..a02108665 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionResetCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionResetCooldown.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionResetCooldown implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionSendStartCastingEvents.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionSendStartCastingEvents.java index c53d12b26..faffcb770 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionSendStartCastingEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionSendStartCastingEvents.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget.ABWidgetCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABActionSendStartCastingEvents implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionStartCooldown.java similarity index 72% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionStartCooldown.java index 9e1ba23ed..f3d68aa4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/ability/ABActionStartCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionStartCooldown.java @@ -1,17 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionStartCooldown implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java index a56a49d67..3c9ac480b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAbilitySetShowIcon implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAddTargetAllowed.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAddTargetAllowed.java index 104b03e70..c2b3694d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionAddTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAddTargetAllowed.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata; import java.util.EnumSet; import java.util.List; @@ -6,12 +6,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABActionAddTargetAllowed implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbility.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbility.java index a8035fbe4..da40e22cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbility.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionDisableAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbilityById.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbilityById.java index 8334a18cb..3d522bd5e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionDisableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbilityById.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionDisableAbilityById implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbility.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbility.java index 84019e19d..7c38abdee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbility.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionEnableAbility implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbilityById.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbilityById.java index 50cabffa2..6e71b1410 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionEnableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbilityById.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionEnableAbilityById implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java index 7b8531ca8..8fe46b8bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata; import java.util.EnumSet; import java.util.List; @@ -6,12 +6,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABActionRemoveTargetAllowed implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAbilityCastRange.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAbilityCastRange.java index 34f4a8ab7..33e875eed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAbilityCastRange.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionSetAbilityCastRange implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java index 1fa4295f0..ae4dcb6ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionSetAutoTargetDestructable implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java index 6f753ba09..cf3897b53 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionSetAutoTargetUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetPreventEndEvents.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetPreventEndEvents.java index ae2f4c58a..80dfbbc23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/abilitydata/ABActionSetPreventEndEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetPreventEndEvents.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionSetPreventEndEvents implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionAddAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionAddAttackModifier.java new file mode 100644 index 000000000..178930aef --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionAddAttackModifier.java @@ -0,0 +1,20 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attack.ABAttackModifierCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionAddAttackModifier implements ABAction { + + private ABUnitCallback unit; + private ABAttackModifierCallback modifier; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnit target = unit.callback(caster, localStore, castId); + + target.addAttackModifier(modifier.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionCreateAttackModifier.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionCreateAttackModifier.java index d39c323ee..a78fdfea8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionCreateAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionCreateAttackModifier.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackModifier; public class ABActionCreateAttackModifier implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionFireModifiedAttack.java similarity index 76% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionFireModifiedAttack.java index ad7c1f0a7..46cc336d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionFireModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionFireModifiedAttack.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attack.ABAttackModifierCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorAttackListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java new file mode 100644 index 000000000..df7715bd4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionRemoveAttackModifier.java @@ -0,0 +1,20 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attack.ABAttackModifierCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveAttackModifier implements ABAction { + + private ABUnitCallback unit; + private ABAttackModifierCallback modifier; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnit target = unit.callback(caster, localStore, castId); + + target.removeAttackModifier(modifier.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionStartModifiedAttack.java similarity index 75% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionStartModifiedAttack.java index 3265ec87d..b15a128ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/ABActionStartModifiedAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/ABActionStartModifiedAttack.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.ABAttackModifierCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attack.ABAttackModifierCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorAttackListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIds; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java index 41241f86e..d522ae9b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddAnimationTag implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java index 344ef75ad..a68527abc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAttackPostDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddPostDamageListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java index 75e658521..555942999 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAttackPreDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierAddPreDamageListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java index 1858c3db6..349143568 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyAllArtFields implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java index aef675ddf..414426a26 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyArt implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java index d24c33562..45b0e2f0a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyArtAndSpeed implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java index f76430737..d2f65fc89 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierApplyDefaultSpeed implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java index 198f652e9..9a2c9f9da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public class ABActionAttackModifierPreventOtherModifications implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java index 91fd8c17b..c5c3e5f36 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; public class ABActionAttackModifierPreventOtherSamePriorityModifications implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java index 68f0e254f..340c13b64 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemoveAnimationTag implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java index a718fd37b..2aae19fa9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPostDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAttackPostDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemovePostDamageListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java index 66a821c28..845f38a7c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.ABAttackPreDamageListenerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAttackPreDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierRemovePreDamageListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java index 0a66b3aaf..8a67ae46a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackArc implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java index 48d6fcbc7..66eb00399 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackDeathTime implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java index 2b1bc9f7f..e84f3e82d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackHoming implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java index af4ca8035..5cf7cc99b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackImpactZ implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java index 2c732a38c..5889d43f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetAttackStartZ implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java index bc43bbb37..cb419e54f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABActionAttackModifierSetSplashFields implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java index 0d54a8cce..049ab4b72 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java index 0963830de..4f009fec6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java index 61f30c765..65693dffe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABWeaponTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java index 1e5d5a6fb..4ebb5f6f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java index bf9b3fead..0dc0506fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionAttemptToResumePreviousBehavior.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAttemptToResumePreviousBehavior implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionChangeAttackActionToMovement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionChangeAttackActionToMovement.java similarity index 78% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionChangeAttackActionToMovement.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionChangeAttackActionToMovement.java index 6bd80a174..cbfef428e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionChangeAttackActionToMovement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionChangeAttackActionToMovement.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorNextBehaviorVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java index ba0943093..ec3db3a16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.behavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; public class ABActionForceBeginCreatedBehavior implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddBuff.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddBuff.java index da3702a40..0ba98b194 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddBuff.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAddBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java index 74e9bf5a4..7a8bfcf94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddNonStackingDisplayBuff.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAddNonStackingDisplayBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddSlowBuff.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddSlowBuff.java index c0fbf0d96..62472f022 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddSlowBuff.java @@ -1,17 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs.ABBuffSlow; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.defaultbuffs.ABBuffSlow; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAddSlowBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddStunBuff.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddStunBuff.java index 685794d1c..97deb35aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionAddStunBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddStunBuff.java @@ -1,17 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs.ABBuffStun; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.defaultbuffs.ABBuffStun; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAddStunBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreatePassiveBuff.java similarity index 78% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreatePassiveBuff.java index 39ea392bf..8c8d8bf43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import java.util.List; import java.util.Map; @@ -6,15 +6,15 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABPermanentPassiveBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABPermanentPassiveBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreatePassiveBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTargetingBuff.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTargetingBuff.java index d700b6755..f65e0a25c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTargetingBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import java.util.List; import java.util.Map; @@ -6,13 +6,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTargetingBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTargetingBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCreateTargetingBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedArtBuff.java similarity index 77% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedArtBuff.java index fde4b24a2..e6014cb08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import java.util.List; import java.util.Map; @@ -6,15 +6,15 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedArtBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedArtBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTimedArtBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedBuff.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedBuff.java index 4291791f2..20ff93cef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import java.util.ArrayList; import java.util.List; @@ -7,18 +7,18 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedLifeBuff.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedLifeBuff.java index 9fec3911c..0b88a6223 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedLifeBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedLifeBuff.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.util.CBuffTimedLife; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCreateTimedLifeBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java similarity index 77% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java index 8b239f2f3..da2b646af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import java.util.ArrayList; import java.util.List; @@ -6,18 +6,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedPausedExpirationBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedPausedExpirationBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTargetingBuff.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTargetingBuff.java index c8948d7c0..c1049a865 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTargetingBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import java.util.List; import java.util.Map; @@ -6,15 +6,15 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTargetingBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedTargetingBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCreateTimedTargetingBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingBuff.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingBuff.java index e849242dc..6ee8602a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import java.util.ArrayList; import java.util.List; @@ -7,18 +7,18 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedTickingBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java index 4152d258c..ad8b305e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import java.util.ArrayList; import java.util.List; @@ -7,18 +7,18 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPausedBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedTickingPausedBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java index 9b4ea0ca3..3b76f04c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import java.util.ArrayList; import java.util.List; @@ -7,18 +7,18 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTickingPostDeathBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedTickingPostDeathBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionDispelBuffs.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionDispelBuffs.java index 6f3aa79a7..1ccdb81e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionDispelBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionDispelBuffs.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import java.util.ArrayList; import java.util.List; @@ -7,11 +7,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionDispelBuffs implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionRemoveBuff.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionRemoveBuff.java index e9f96481d..7a5a69a13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionRemoveBuff.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionRemoveBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java index 556f23346..38c1aa0e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionRemoveNonStackingDisplayBuff.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionRemoveNonStackingDisplayBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageArea.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageArea.java index 133355293..4e8fb4b17 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageArea.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.damage; import java.util.ArrayList; import java.util.List; @@ -6,15 +6,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageAttackSplash.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageAttackSplash.java index a44a646ec..c712da624 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageAttackSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageAttackSplash.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.damage; import java.util.ArrayList; import java.util.List; @@ -6,15 +6,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageBurst.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageBurst.java index da0be5c70..3b1fd5e55 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageBurst.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageBurst.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.damage; import java.util.ArrayList; import java.util.List; @@ -6,15 +6,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageSplash.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageSplash.java index e3b6d3cb8..82e0b134e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageSplash.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.damage; import java.util.ArrayList; import java.util.List; @@ -6,15 +6,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageTarget.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageTarget.java index b76eb07bb..3741253e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageTarget.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.damage; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionHeal.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionHeal.java index 7945c00bd..23e9e986c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/damage/ABActionHeal.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionHeal.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.damage; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionHeal implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/datastore/ABActionDeleteStoredKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/datastore/ABActionDeleteStoredKey.java new file mode 100644 index 000000000..ab45e6a03 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/datastore/ABActionDeleteStoredKey.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.datastore; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionDeleteStoredKey implements ABAction { + + private ABStringCallback key; + + @Override + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + localStore.remove(key.callback(caster, localStore, castId)); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/datastore/ABActionStoreValueLocally.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/datastore/ABActionStoreValueLocally.java index 98f0ddf86..b800a63dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/datastore/ABActionStoreValueLocally.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/datastore/ABActionStoreValueLocally.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.datastore; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.datastore; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionStoreValueLocally implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionCreateDestructable.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionCreateDestructable.java index 3d30cd82c..669c159ef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionCreateDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionCreateDestructable.java @@ -1,18 +1,18 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCreateDestructable implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionDamageDestructable.java similarity index 74% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionDamageDestructable.java index 13f2f759b..cff5ef93a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructable/ABActionDamageDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionDamageDestructable.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.destructable; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CGenericDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionKillDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionKillDestructable.java new file mode 100644 index 000000000..f49b9d8b5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionKillDestructable.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.destructable; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionKillDestructable implements ABAction { + + private ABDestructableCallback dest; + + @Override + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + dest.callback(caster, localStore, castId).setLife(localStore.game, 0); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionRemoveDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionRemoveDestructable.java new file mode 100644 index 000000000..b62935bd7 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructable/ABActionRemoveDestructable.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.destructable; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveDestructable implements ABAction { + + private ABDestructableCallback dest; + + @Override + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + localStore.game.removeDestructable(dest.callback(caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionAddDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionAddDestructableBuff.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionAddDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionAddDestructableBuff.java index d99c09cf4..373bdd4df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionAddDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionAddDestructableBuff.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.destructablebuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff.ABDestructableBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionAddDestructableBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java index 2f85bf2f1..f4df8a20a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java @@ -1,17 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.destructablebuff; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCreateDestructableBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java index a4d006622..db2a1fd54 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionDispelDestructableBuffs.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.destructablebuff; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionDispelDestructableBuffs implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java index b570aae3b..d3ad89f23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionRemoveDestructableBuff.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.destructablebuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.ABDestructableBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff.ABDestructableBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionRemoveDestructableBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java index 9217708c7..acdecca9c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionCreateTimeOfDayEvent.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.events.timeofday; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABTimeOfDayEvent; public class ABActionCreateTimeOfDayEvent implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java index 46229cbff..a8d4cc34f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionRegisterTimeOfDayEvent.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.events.timeofday; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionRegisterTimeOfDayEvent implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java index af50fb9b7..f5dcbab68 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionRegisterUniqueTimeOfDayEvent.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.events.timeofday; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABTimeOfDayEvent; public class ABActionRegisterUniqueTimeOfDayEvent implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java index f8697010d..c9260fe0c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/timeofday/ABActionUnregisterTimeOfDayEvent.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.events.timeofday; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.timeevent.ABTimeOfDayEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionUnregisterTimeOfDayEvent implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/widget/ABActionCreateWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/widget/ABActionCreateWidgetEvent.java new file mode 100644 index 000000000..8a320542f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/widget/ABActionCreateWidgetEvent.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.events.widget; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget.ABWidgetCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABWidgetEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; + +public class ABActionCreateWidgetEvent implements ABAction { + + private ABWidgetCallback widget; + private ABBooleanCallback condition; + private List actions; + + private JassGameEventsWar3 eventType; + + @Override + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + + final ABWidgetEvent event = new ABWidgetEvent(caster, localStore, castId, + this.widget.callback(caster, localStore, castId), this.eventType, this.condition, this.actions); + + localStore.put(ABLocalStoreKeys.LASTCREATEDWIDEVENT, event); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/widget/ABActionRegisterWidgetEvent.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/widget/ABActionRegisterWidgetEvent.java index cf14665be..ad48c6e6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionRegisterWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/widget/ABActionRegisterWidgetEvent.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.events.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent.ABWidgetEventCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.widgetevent.ABWidgetEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABWidgetEvent; public class ABActionRegisterWidgetEvent implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java index 28d1ae7ad..8b6b5e26d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/events/widget/ABActionUnregisterWidgetEvent.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.events.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent.ABWidgetEventCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.widgetevent.ABWidgetEventCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABWidgetEvent; public class ABActionUnregisterWidgetEvent implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java index e971a3ee7..41f92b668 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/floatingtext/ABActionCreateFloatingTextOnUnit.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.floatingtext; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.floatingtext; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; public class ABActionCreateFloatingTextOnUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java index f7ec2094e..69cf04b8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/floatingtext/ABActionCreateNumericFloatingTextOnUnit.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.floatingtext; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.floatingtext; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.TextTagConfigType; public class ABActionCreateNumericFloatingTextOnUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java index f9af680cd..90afd410b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java index c457fab14..d95b2d838 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java index 2198a1085..9bda4e691 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java index 60348cce2..7970946ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTemporarySpellEffectAtLocation implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java index 246cb09b0..7a0afddd9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTemporarySpellEffectAtPoint implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java index b43dc3fa1..24dc015e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateTemporarySpellEffectOnUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionRemoveEffect.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionRemoveEffect.java index fd6d3c651..b6217b49e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/ABActionRemoveEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionRemoveEffect.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx.ABFXCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx.ABFXCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionRemoveEffect implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java index 2fbf61566..b83213a8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.group; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.group; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABGroupEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects.ABGroupEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; public class ABActionCreateGroupEffectAtLocation implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/lightning/ABActionCreateLightningEffect.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/lightning/ABActionCreateLightningEffect.java index c07b527de..90c4a664d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/lightning/ABActionCreateLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/lightning/ABActionCreateLightningEffect.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.lightning; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.lightning; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABActionCreateLightningEffect implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java new file mode 100644 index 000000000..410806b94 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/lightning/ABActionRemoveLightningEffect.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.lightning; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx.ABLightningCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveLightningEffect implements ABAction { + + private ABLightningCallback effect; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + effect.callback(caster, localStore, castId).remove(); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java index a6d3859f7..5d1737ac6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectAtLocation.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.sound; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.sound; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateLoopingSoundEffectAtLocation implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java new file mode 100644 index 000000000..890fe1843 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateLoopingSoundEffectOnUnit.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.sound; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABActionCreateLoopingSoundEffectOnUnit implements ABAction { + + private ABUnitCallback unit; + private ABIDCallback id; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + SimulationRenderComponent ret = localStore.game.unitLoopSoundEffectEvent( + (unit.callback(caster, localStore, castId)), this.id.callback(caster, localStore, castId)); + localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java index e13fb43da..6483deffc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateSoundEffectAtLocation.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.sound; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.sound; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateSoundEffectAtLocation implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java new file mode 100644 index 000000000..39fc12b61 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/sound/ABActionCreateSoundEffectOnUnit.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.sound; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; + +public class ABActionCreateSoundEffectOnUnit implements ABAction { + + private ABUnitCallback unit; + private ABIDCallback id; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + SimulationRenderComponent ret = localStore.game.unitSoundEffectEvent( + (unit.callback(caster, localStore, castId)), this.id.callback(caster, localStore, castId)); + localStore.put(ABLocalStoreKeys.LASTCREATEDFX, ret); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/splat/ABActionCreateUberSplat.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/splat/ABActionCreateUberSplat.java index 2dee1cb26..795771398 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/splat/ABActionCreateUberSplat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/splat/ABActionCreateUberSplat.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.splat; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.splat; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABActionCreateUberSplat implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java index 8973af90a..13ebc8769 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionCreateTerrainBowlAtLocation.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.terrain; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.terrain; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainBowlEffect; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects.ABTerrainBowlEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects.ABTerrainEffect; public class ABActionCreateTerrainBowlAtLocation implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java index 43fb27d1a..46f41425a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionCreateTerrainRippleAtLocation.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.terrain; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.terrain; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainRippleEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects.ABTerrainEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects.ABTerrainRippleEffect; public class ABActionCreateTerrainRippleAtLocation implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java index c2f6f632b..5e05136f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionCreateTerrainWaveAtLocation.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.terrain; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.terrain; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainEffect; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects.ABTerrainWaveEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects.ABTerrainEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects.ABTerrainWaveEffect; public class ABActionCreateTerrainWaveAtLocation implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java index e1501bdfc..e6089812f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/terrain/ABActionModifyTerrainVertex.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.terrain; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.terrain; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionModifyTerrainVertex implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java index 9c435c04c..55a31081a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/gamestate/ABActionSetFalseTimeOfDay.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.gamestate; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.gamestate; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionSetFalseTimeOfDay implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/item/ABActionChargeItem.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/item/ABActionChargeItem.java index bc5aaf881..a27ddeab4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionChargeItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/item/ABActionChargeItem.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.item; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.item; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionChargeItem implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/item/ABActionTransformItem.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/item/ABActionTransformItem.java index ed2f75ca0..9dfdc03f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/item/ABActionTransformItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/item/ABActionTransformItem.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.item; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.item; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionTransformItem implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java index 7142b1a1a..79c76931e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.iterator.destructable; import java.util.ArrayList; import java.util.List; @@ -11,11 +11,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructableEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionIterateDestructablesInRangeOfLocation implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java index dce7d23af..cc0f67c3a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -9,10 +9,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup.ABUnitGroupCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionIterateUnitsInGroup implements ABAction { private static final boolean ALLOW_BREAK_JASS = true; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java index e572111a6..a25c7fe88 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -7,10 +7,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue.ABUnitQueueCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionIterateUnitsInQueue implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java index 81852a2cd..1b750f49e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -10,12 +10,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionIterateUnitsInRangeOfLocationMatchingCondition implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java index 5bb65bcee..885783211 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -10,14 +10,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABUnitComparator; public class ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java index a78a270cd..ccb6cece3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -9,12 +9,12 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionIterateUnitsInRangeOfUnitMatchingCondition implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java index 52dcd56b1..d4c055375 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -9,14 +9,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABUnitComparator; public class ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java index c70a08dcd..10819cfc6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.iterator.unit; import java.util.ArrayList; import java.util.List; @@ -9,9 +9,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionIterateUnitsInRect implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/list/ABActionListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/list/ABActionListRemove.java new file mode 100644 index 000000000..f3c03500c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/list/ABActionListRemove.java @@ -0,0 +1,28 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.list; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.ABListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionListRemove implements ABAction { + + private ABListCallback list; + private ABIntegerCallback index; + private ABCallback object; + + @Override + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + final List l = this.list.callback(caster, localStore, castId); + if (object != null) { + l.remove(object.callback(caster, localStore, castId)); + } else { + l.remove(index.callback(caster, localStore, castId).intValue()); + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/list/ABActionLocationListAdd.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/list/ABActionLocationListAdd.java index 7aca44f8d..b10f8090f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/list/ABActionLocationListAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/list/ABActionLocationListAdd.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.list; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.ABListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionLocationListAdd implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/list/ABActionSortableListRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/list/ABActionSortableListRemove.java new file mode 100644 index 000000000..a8c489d48 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/list/ABActionSortableListRemove.java @@ -0,0 +1,28 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.list; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.ABSortableListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionSortableListRemove implements ABAction { + + private ABSortableListCallback list; + private ABIntegerCallback index; + private ABCallback object; + + @Override + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + final List l = this.list.callback(caster, localStore, castId); + if (object != null) { + l.remove(object.callback(caster, localStore, castId)); + } else { + l.remove(index.callback(caster, localStore, castId).intValue()); + } + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/order/ABActionIssueStopOrder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/order/ABActionIssueStopOrder.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/order/ABActionIssueStopOrder.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/order/ABActionIssueStopOrder.java index 27a7d7368..f1580e50a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/order/ABActionIssueStopOrder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/order/ABActionIssueStopOrder.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.order; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.order; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionIssueStopOrder implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/player/ABActionGiveResourcesToPlayer.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/player/ABActionGiveResourcesToPlayer.java index 8e321742a..593b58ace 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionGiveResourcesToPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/player/ABActionGiveResourcesToPlayer.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.player; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionGiveResourcesToPlayer implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java index ebe81b5ac..334043292 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/player/ABActionSetAbilityEnabledForPlayer.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.player; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionSetAbilityEnabledForPlayer implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java index 7dc46c574..31ea02240 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile; import java.util.List; @@ -6,17 +6,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABActionCreateLocationTargetedCollisionProjectile implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java similarity index 77% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java index 359f7dbff..da5d9ea21 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile; import java.util.List; @@ -6,16 +6,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABProjectileListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.projectile.ABProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java index 112f87cc4..c9084954c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile; import java.util.List; @@ -8,17 +8,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java index 4b01eefc5..7c4511bb5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile; import java.util.ArrayList; import java.util.HashSet; @@ -13,18 +13,18 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.ABAttackSettingsCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABNearestUnitComparator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attacksettings.ABAttackSettingsCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABNearestUnitComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java index c17324d1e..325675614 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java @@ -1,21 +1,21 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABActionCreateUnitTargetedCollisionProjectile implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java similarity index 75% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java index 4c9891274..4abddbffb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java @@ -1,21 +1,21 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.ABAttackSettingsCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABProjectileListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attacksettings.ABAttackSettingsCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.projectile.ABProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java index 6ee7e4c2b..89d76f15e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile; import java.util.List; @@ -7,17 +7,17 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile.ABCollisionProjectileListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.projectile.ABCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetAttackProjectileDamage.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetAttackProjectileDamage.java index 80214f751..386d6cfb2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetAttackProjectileDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetAttackProjectileDamage.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetProjectileDone.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetProjectileDone.java index d1f098438..c1a00117d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileDone.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetProjectileDone.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABActionSetProjectileDone implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetProjectileReflected.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetProjectileReflected.java index ef2044b7b..c5b3edcd0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetProjectileReflected.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABActionSetProjectileReflected implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetProjectileTarget.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetProjectileTarget.java index 1b0590457..8db2b1e8a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/projectile/ABActionSetProjectileTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionSetProjectileTarget.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABActionSetProjectileTarget implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java index c97ef2983..f7155482a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.reaction; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.reaction; import java.util.List; @@ -6,11 +6,11 @@ import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCheckAbilityEffectReaction implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityProjReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/reaction/ABActionCheckAbilityProjReaction.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityProjReaction.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/reaction/ABActionCheckAbilityProjReaction.java index e2d2102b5..ff16827e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/reaction/ABActionCheckAbilityProjReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/reaction/ABActionCheckAbilityProjReaction.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.reaction; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.reaction; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionCheckAbilityProjReaction implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionAddDefenseBonus.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionAddDefenseBonus.java index cff660e61..026f6432d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionAddDefenseBonus.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionAddDefenseBonus implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionAddNonStackingStatBuff.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionAddNonStackingStatBuff.java index 12ba0789a..b88473cad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionAddNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionAddNonStackingStatBuff.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionAddNonStackingStatBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionCreateNonStackingStatBuff.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionCreateNonStackingStatBuff.java index 849744d9b..32501e190 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionCreateNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionCreateNonStackingStatBuff.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABNonStackingStatBuffTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABNonStackingStatBuffTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABActionCreateNonStackingStatBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java index 60bc37f12..601aaaa04 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionRecomputeStatBuffsOnUnit.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABNonStackingStatBuffTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABNonStackingStatBuffTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; public class ABActionRecomputeStatBuffsOnUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionRemoveDefenseBonus.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionRemoveDefenseBonus.java index ab2b25f10..693a2c368 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveDefenseBonus.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionRemoveDefenseBonus.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionRemoveDefenseBonus implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java index 45e54a992..28d6ee8dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionRemoveNonStackingStatBuff.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionRemoveNonStackingStatBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java index 7a14036f4..f2b253646 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/stats/ABActionUpdateNonStackingStatBuff.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.ABNonStackingStatBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABActionUpdateNonStackingStatBuff implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionBreak.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionBreak.java index 3a9fe8625..5c79fc30e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionBreak.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionBreak.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionBreak implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionChainEffect.java similarity index 80% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionChainEffect.java index 873bdbb23..eb66f00b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionChainEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionChainEffect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural; import java.util.ArrayList; import java.util.HashSet; @@ -9,16 +9,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABNearestUnitComparator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABNearestUnitComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABUnitComparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionChainEffect implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionCreateSubroutine.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionCreateSubroutine.java index 06edfee86..7f91069c8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionCreateSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionCreateSubroutine.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCreateSubroutine implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionFor.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionFor.java index 12c524897..b349ad344 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionFor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionFor.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionFor implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionIf.java similarity index 80% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionIf.java index 29bedc3b4..d431f689d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionIf.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionIf implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionPeriodicExecute.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionPeriodicExecute.java index 4c678b6ee..7fe97934a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionPeriodicExecute.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionPeriodicExecute implements ABAction { private final static int HARD_LOOP_CAP = 100; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionResetPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionResetPeriodicExecute.java new file mode 100644 index 000000000..7088a13cd --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionResetPeriodicExecute.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABActionResetPeriodicExecute implements ABAction { + + private ABCallback unique; + + @Override + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { + if (this.unique != null) { + localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + + this.unique.callback(caster, localStore, castId)); + } else { + localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId); + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseAction.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseAction.java index 4c875557d..ba1e7d0a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseAction.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABActionRunReuseAction implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseActionWithArguments.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseActionWithArguments.java index 9dc4607a3..4c640d9b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunReuseActionWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseActionWithArguments.java @@ -1,18 +1,18 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural; import java.util.List; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABActionRunReuseActionWithArguments implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunSubroutine.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunSubroutine.java index 308057203..4d5de81e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionRunSubroutine.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunSubroutine.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionRunSubroutine implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionWhile.java similarity index 81% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionWhile.java index d6af3c690..bf6ece2b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/structural/ABActionWhile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionWhile.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionWhile implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionCreateTimer.java similarity index 74% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionCreateTimer.java index 4c51ddf01..fa0a92346 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionCreateTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionCreateTimer.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.timer; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer.ABTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionCreateTimer implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionKillTimer.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionKillTimer.java index 485b830d5..ceb3f1b73 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionKillTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionKillTimer.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionKillTimer implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionRemoveTimer.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionRemoveTimer.java index 5520688c7..a8cffe362 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionRemoveTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionRemoveTimer.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionRemoveTimer implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionStartTimer.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionStartTimer.java index d514ff918..e6a49c817 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionStartTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionStartTimer.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionStartTimer implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionUpdateTimerTimeout.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionUpdateTimerTimeout.java index 55826be62..017fbb806 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/timer/ABActionUpdateTimerTimeout.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/timer/ABActionUpdateTimerTimeout.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionUpdateTimerTimeout implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java index a81951c22..e021d561e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionAbilityAddUniqueFlag.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniqueflag; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.uniqueflag; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionAbilityAddUniqueFlag implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java index a36c9d860..1a70fe5b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionAbilityRemoveUniqueFlag.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniqueflag; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.uniqueflag; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionAbilityRemoveUniqueFlag implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java index df9545320..773faaa6c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionBuffAddUniqueFlag.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniqueflag; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.uniqueflag; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionBuffAddUniqueFlag implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java index 263b209ce..5d489f17d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniqueflag/ABActionBuffRemoveUniqueFlag.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniqueflag; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.uniqueflag; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionBuffRemoveUniqueFlag implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java new file mode 100644 index 000000000..bdfe0f2bb --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java @@ -0,0 +1,28 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.uniquevalue; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABActionAbilityRemoveUniqueValue implements ABAction { + + private ABAbilityCallback ability; + private ABStringCallback key; + + @Override + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CAbility theAbility = null; + if (ability != null) { + theAbility = ability.callback(caster, localStore, castId); + } else { + theAbility = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + } + theAbility.removeUniqueValue(key.callback(caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java new file mode 100644 index 000000000..f8225eda9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java @@ -0,0 +1,31 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.uniquevalue; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABActionAbilityStoreUniqueValue implements ABAction { + + private ABAbilityCallback ability; + private ABStringCallback key; + private ABCallback valueToStore; + + @Override + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CAbility theAbility = null; + if (ability != null) { + theAbility = ability.callback(caster, localStore, castId); + } else { + theAbility = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + } + theAbility.addUniqueValue(valueToStore.callback(caster, localStore, castId), + key.callback(caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java new file mode 100644 index 000000000..d218d5779 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionBuffRemoveUniqueValue.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.uniquevalue; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionBuffRemoveUniqueValue implements ABAction { + + private ABBuffCallback buff; + private ABStringCallback key; + + @Override + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CBuff theAbility = buff.callback(caster, localStore, castId); + theAbility.removeUniqueValue(key.callback(caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java new file mode 100644 index 000000000..44230910d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionBuffStoreUniqueValue.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.uniquevalue; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionBuffStoreUniqueValue implements ABAction { + + private ABBuffCallback buff; + private ABStringCallback key; + private ABCallback valueToStore; + + @Override + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CBuff theAbility = buff.callback(caster, localStore, castId); + theAbility.addUniqueValue(valueToStore.callback(caster, localStore, castId), key.callback(caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionCreateUnit.java similarity index 71% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionCreateUnit.java index 2936d0d90..8ae5612d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionCreateUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionCreateUnit.java @@ -1,18 +1,18 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitClassification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionCreateUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionHideUnit.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionHideUnit.java index b69f8bba0..5eae71a6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionHideUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionHideUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionHideUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionKillUnit.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionKillUnit.java index cd9dd8152..355db82cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionKillUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionKillUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionKillUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionRemoveUnit.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionRemoveUnit.java index 8586a66e7..89c89e9d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionRemoveUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionRemoveUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionRemoveUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionResurrect.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionResurrect.java index 8fa6b25fa..86fd77e93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionResurrect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionResurrect.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionResurrect implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionSetExplodesOnDeath.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionSetExplodesOnDeath.java index 48e40ac59..fc1581042 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionSetExplodesOnDeath.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionSetExplodesOnDeath.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionSetExplodesOnDeath implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionStartSacrificingUnit.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionStartSacrificingUnit.java index dde4d000f..796831457 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartSacrificingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionStartSacrificingUnit.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionStartSacrificingUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionStartTrainingUnit.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionStartTrainingUnit.java index 2c1c85603..70f721119 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionStartTrainingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionStartTrainingUnit.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionStartTrainingUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionUnhideUnit.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionUnhideUnit.java index 24afcd918..9e81915ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/ABActionUnhideUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/ABActionUnhideUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionUnhideUnit implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java index b12841c4b..a47cc29c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionAddSecondaryAnimationTag.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.animation; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.animation; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionAddSecondaryAnimationTag implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionPlayAnimation.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionPlayAnimation.java index 0580a477f..05ab906b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionPlayAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionPlayAnimation.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.animation; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.animation; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionPlayAnimation implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionQueueAnimation.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionQueueAnimation.java index 1dbf53fc5..92a13bfda 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionQueueAnimation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionQueueAnimation.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.animation; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.animation; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionQueueAnimation implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java index cb9891268..3ea31cafe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/animation/ABActionRemoveSecondaryAnimationTag.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.animation; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.animation; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.SecondaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionRemoveSecondaryAnimationTag implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionDivideUnitAlpha.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionDivideUnitAlpha.java index 75efbd47e..6d03dd0df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionDivideUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionDivideUnitAlpha.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.art; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionDivideUnitAlpha implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java index ade886ee8..c0cb25a8b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionMultiplyUnitAlpha.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.art; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionMultiplyUnitAlpha implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitScale.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionMultiplyUnitScale.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitScale.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionMultiplyUnitScale.java index 88466e7b0..f984277ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionMultiplyUnitScale.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionMultiplyUnitScale.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.art; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionMultiplyUnitScale implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionSetUnitAlpha.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionSetUnitAlpha.java index aec1e7575..76e5728f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/art/ABActionSetUnitAlpha.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/art/ABActionSetUnitAlpha.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.art; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionSetUnitAlpha implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java index 3657425d0..ecb604e6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/movement/ABActionSetUnitFlyHeight.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.movement; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.movement; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionSetUnitFlyHeight implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java index 7c3f469e3..1f7d8e850 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/movement/ABActionSetUnitMovementTypeNoCollision.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.movement; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.movement; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionSetUnitMovementTypeNoCollision implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionAddMp.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionAddMp.java index 987597f15..074d49741 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionAddMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionAddMp.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionAddMp implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSetHp.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSetHp.java index da37dd418..e0d684f4a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSetHp.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionSetHp implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSetMp.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSetMp.java index 339b05a67..d00e2c8e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSetMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSetMp.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionSetMp implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSetSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSetSpeed.java new file mode 100644 index 000000000..331d90514 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSetSpeed.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.stats; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionSetSpeed implements ABAction { + + private ABUnitCallback unit; + private ABIntegerCallback value; + + @Override + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + targetUnit.setSpeed(value.callback(caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSubtractMp.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSubtractMp.java index cd36862bc..45c125309 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/stats/ABActionSubtractMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/stats/ABActionSubtractMp.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.stats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionSubtractMp implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionMergeUnits.java similarity index 74% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionMergeUnits.java index 875c91485..2f7445599 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionMergeUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionMergeUnits.java @@ -1,17 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.transformation; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionMergeUnits implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnit.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnit.java index 734c202d5..f5a58974e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnit.java @@ -1,22 +1,22 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.transformation; import java.util.List; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorFinishTransformation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorFinishTransformation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java new file mode 100644 index 000000000..111c26075 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitAppearance.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.transformation; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionTransformUnitAppearance implements ABAction { + + private ABUnitCallback unit; + private ABIDCallback id; + + @Override + public void runAction(CUnit caster, ABLocalDataStore localStore, final int castId) { + final CUnit targetUnit = this.unit.callback(caster, localStore, castId); + localStore.game.unitUpdatedType(targetUnit, id.callback(caster, localStore, castId), false); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitInstant.java similarity index 78% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitInstant.java index b611def2e..291351c41 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformUnitInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitInstant.java @@ -1,21 +1,21 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.transformation; import java.util.List; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABDelayInstantTransformationTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer.ABDelayInstantTransformationTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABActionTransformUnitInstant implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java similarity index 81% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java index d941e99d6..c6525f169 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.transformation; import java.util.List; @@ -6,16 +6,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler.OnTransformationActions; public class ABActionTransformedUnitAbilityAdd implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java index 86a0bbd54..8274525d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java @@ -1,18 +1,18 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.transformation; import java.util.List; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler; public class ABActionTransformedUnitAbilityRemove implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java index 483d41960..873f8f875 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionDisableWorkerAbilities.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.worker; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.worker; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -15,9 +15,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityAcolyteHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityWispHarvest; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionDisableWorkerAbilities implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java index 98cd7e114..4b43fd5a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionEnableWorkerAbilities.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.worker; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.worker; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; @@ -15,9 +15,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityAcolyteHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityWispHarvest; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionEnableWorkerAbilities implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionInstantReturnResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionInstantReturnResources.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionInstantReturnResources.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionInstantReturnResources.java index e0611c717..18da5bc1f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionInstantReturnResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionInstantReturnResources.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.worker; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.worker; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.harvest.CAbilityHarvest; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.ResourceType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionSendUnitBackToWork.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionSendUnitBackToWork.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionSendUnitBackToWork.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionSendUnitBackToWork.java index 24dd20fcd..02a6710a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unit/worker/ABActionSendUnitBackToWork.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/worker/ABActionSendUnitBackToWork.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.worker; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.worker; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer.ABTimer; public class ABActionSendUnitBackToWork implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitgroup/ABActionAddUnitToGroup.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitgroup/ABActionAddUnitToGroup.java index b61eebc12..fb94313d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionAddUnitToGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitgroup/ABActionAddUnitToGroup.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitgroup; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitgroup; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup.ABUnitGroupCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAddUnitToGroup implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitgroup/ABActionCreateUnitGroup.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitgroup/ABActionCreateUnitGroup.java index fded360d4..a39bcd74e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionCreateUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitgroup/ABActionCreateUnitGroup.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitgroup; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitgroup; import java.util.HashSet; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCreateUnitGroup implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java index d2b60c1c2..2925ef366 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitgroup/ABActionRemoveUnitFromGroup.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitgroup; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitgroup; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.ABUnitGroupCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup.ABUnitGroupCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionRemoveUnitFromGroup implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java new file mode 100644 index 000000000..67ddd5364 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionAddAttackPostDamageListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAttackPostDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionAddAttackPostDamageListener implements ABAction { + + private ABUnitCallback unit; + private ABAttackPostDamageListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = unit.callback(caster, localStore, castId); + + target.addPostDamageListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java new file mode 100644 index 000000000..988d843b1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionAddAttackPreDamageListener.java @@ -0,0 +1,23 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackPreDamageListenerPriorityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAttackPreDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionAddAttackPreDamageListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABAttackPreDamageListenerPriorityCallback priority; + private ABAttackPreDamageListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.addPreDamageListener(priority.callback(caster, localStore, castId), + listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java new file mode 100644 index 000000000..8da7c6b46 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionCreateAttackPostDamageListener.java @@ -0,0 +1,30 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackPostDamageListener; + +public class ABActionCreateAttackPostDamageListener implements ABAction { + + private ABIntegerCallback priority; + private List actions; + private ABBooleanCallback useCastId; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + boolean ucid = true; + if (useCastId != null) { + ucid = useCastId.callback(caster, localStore, castId); + } + ABAttackPostDamageListener listener = new ABAttackPostDamageListener(localStore, priority, actions, castId, + ucid); + + localStore.put(ABLocalStoreKeys.LASTCREATEDAPoDL, listener); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java new file mode 100644 index 000000000..88c5ef50c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionCreateAttackPreDamageListener.java @@ -0,0 +1,27 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackPreDamageListener; + +public class ABActionCreateAttackPreDamageListener implements ABAction { + + private List actions; + private ABBooleanCallback useCastId; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + boolean ucid = true; + if (useCastId != null) { + ucid = useCastId.callback(caster, localStore, castId); + } + ABAttackPreDamageListener listener = new ABAttackPreDamageListener(localStore, actions, castId, ucid); + + localStore.put(ABLocalStoreKeys.LASTCREATEDAPrDL, listener); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java new file mode 100644 index 000000000..27e7c8cc0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionRemoveAttackPostDamageListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAttackPostDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveAttackPostDamageListener implements ABAction { + + private ABUnitCallback unit; + private ABAttackPostDamageListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = unit.callback(caster, localStore, castId); + + target.removePostDamageListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java new file mode 100644 index 000000000..57954f3bc --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/ABActionRemoveAttackPreDamageListener.java @@ -0,0 +1,23 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackPreDamageListenerPriorityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAttackPreDamageListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveAttackPreDamageListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABAttackPreDamageListenerPriorityCallback priority; + private ABAttackPreDamageListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.removePreDamageListener(priority.callback(caster, localStore, castId), + listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java similarity index 74% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java index e0951292e..e9e7c5290 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackDamageFlags; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java new file mode 100644 index 000000000..04eaecce1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java @@ -0,0 +1,20 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalaction; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; + +public class ABActionPreDamageListenerAddDamageMultiplier implements ABAction { + + private ABFloatCallback value; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + damage.addDamageMultiplier(value.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java index 3f7b85d81..3f944049b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerLockDamageModifications implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java index 15f64b038..2a4ecc46d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionPreDamageListenerSetMiss implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java index 8e3f94c28..936f7115d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionSetPreDamageStacking implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java index 60e77cb5f..7e3a5c15f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetAttackBaseDamage extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java index e12559390..d95c9e911 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java index b012ac83f..5e7fe524f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetAttackMaximumSplashRadius extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java index fdda4d450..fa97de533 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java index ce9e9bafe..8459d3712 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABWeaponTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java index 2bf4e7c23..17271e5d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcondition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalcondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileLine; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java index b3881d86d..4da3c4892 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcondition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalcondition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABConditionIsAttackHoming extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java similarity index 73% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java index 5c9988873..00de885f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcondition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalcondition; import java.util.EnumSet; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java new file mode 100644 index 000000000..bfc44cf52 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionAddBehaviorChangeListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.behavior; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABBehaviorChangeListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionAddBehaviorChangeListener implements ABAction { + + private ABUnitCallback unit; + private ABBehaviorChangeListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = unit.callback(caster, localStore, castId); + + target.addBehaviorChangeListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java new file mode 100644 index 000000000..0d430f25b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionCreateBehaviorChangeListener.java @@ -0,0 +1,27 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.behavior; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABBehaviorChangeListener; + +public class ABActionCreateBehaviorChangeListener implements ABAction { + + private List actions; + private ABBooleanCallback useCastId; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + boolean ucid = true; + if (useCastId != null) { + ucid = useCastId.callback(caster, localStore, castId); + } + ABBehaviorChangeListener listener = new ABBehaviorChangeListener(localStore, actions, castId, ucid); + + localStore.put(ABLocalStoreKeys.LASTCREATEDBCL, listener); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java new file mode 100644 index 000000000..8d51dcb61 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/ABActionRemoveBehaviorChangeListener.java @@ -0,0 +1,20 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.behavior; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABBehaviorChangeListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveBehaviorChangeListener implements ABAction { + + private ABUnitCallback unit; + private ABBehaviorChangeListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnit target = unit.callback(caster, localStore, castId); + + target.removeBehaviorChangeListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java index 37568169b..ef66192a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior.internalcallback; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.behavior.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target.ABTargetCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.target.ABTargetCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.BehaviorTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java index d505efc77..ede80f2eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior.internalcondition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.behavior.internalcondition; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java new file mode 100644 index 000000000..6305d1342 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABDamageTakenListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionAddDamageTakenListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABDamageTakenListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.addDamageTakenListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java new file mode 100644 index 000000000..7950dee42 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionAddDamageTakenModificationListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABDamageTakenModificationListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionAddDamageTakenModificationListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABDamageTakenModificationListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.addDamageTakenModificationListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java new file mode 100644 index 000000000..c6b463e2d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenListener.java @@ -0,0 +1,29 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDamageTakenListener; + +public class ABActionCreateDamageTakenListener implements ABAction { + + private ABIntegerCallback priority; + private List actions; + private ABBooleanCallback useCastId; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + boolean ucid = true; + if (useCastId != null) { + ucid = useCastId.callback(caster, localStore, castId); + } + ABDamageTakenListener listener = new ABDamageTakenListener(localStore, priority, actions, castId, ucid); + + localStore.put(ABLocalStoreKeys.LASTCREATEDDTL, listener); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java new file mode 100644 index 000000000..31dc19f5f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionCreateDamageTakenModificationListener.java @@ -0,0 +1,30 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDamageTakenModificationListener; + +public class ABActionCreateDamageTakenModificationListener implements ABAction { + + private ABIntegerCallback priority; + private List actions; + private ABBooleanCallback useCastId; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + boolean ucid = true; + if (useCastId != null) { + ucid = useCastId.callback(caster, localStore, castId); + } + ABDamageTakenModificationListener listener = new ABDamageTakenModificationListener(localStore, priority, + actions, castId, ucid); + + localStore.put(ABLocalStoreKeys.LASTCREATEDDTML, listener); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java new file mode 100644 index 000000000..df73e6e38 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABDamageTakenListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveDamageTakenListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABDamageTakenListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.removeDamageTakenListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java new file mode 100644 index 000000000..1d95a3dfc --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/ABActionRemoveDamageTakenModificationListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABDamageTakenModificationListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveDamageTakenModificationListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABDamageTakenModificationListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.removeDamageTakenModificationListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java index 1061ee0e8..cc1c844ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalaction; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABActionDamageTakenModificationMultiplyDamageMultiplier implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java new file mode 100644 index 000000000..7d3cec345 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken.internalaction; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; + +public class ABActionDamageTakenModificationSetDamageMultiplier implements ABAction { + + private ABFloatCallback multiplier; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + + damage.setDamageMultiplier(multiplier.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java new file mode 100644 index 000000000..431848932 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken.internalcondition; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; + +public class ABConditionIsTriggeringDamageAnAttack extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).getPrimaryDamageFlags() + .isAttack(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java new file mode 100644 index 000000000..b88f564b2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken.internalcondition; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; + +public class ABConditionIsTriggeringDamageRanged extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getPrimaryDamageFlags().isRanged(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java new file mode 100644 index 000000000..81d5f4e97 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionAddDeathReplacementEffect.java @@ -0,0 +1,23 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.death; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDeathReplacementPriorityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABDeathReplacementCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionAddDeathReplacementEffect implements ABAction { + + private ABUnitCallback target; + private ABDeathReplacementPriorityCallback priority; + private ABDeathReplacementCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit targetUnit = target.callback(caster, localStore, castId); + + targetUnit.addDeathReplacementEffect(priority.callback(caster, localStore, castId), listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java new file mode 100644 index 000000000..35a3cec2d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionCreateDeathReplacementEffect.java @@ -0,0 +1,27 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.death; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDeathReplacementEffect; + +public class ABActionCreateDeathReplacementEffect implements ABAction { + + private List actions; + private ABBooleanCallback useCastId; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + boolean ucid = true; + if (useCastId != null) { + ucid = useCastId.callback(caster, localStore, castId); + } + ABDeathReplacementEffect listener = new ABDeathReplacementEffect(localStore, actions, castId, ucid); + + localStore.put(ABLocalStoreKeys.LASTCREATEDDRE, listener); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java new file mode 100644 index 000000000..e384f3ff2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/ABActionRemoveDeathReplacementEffect.java @@ -0,0 +1,22 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.death; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDeathReplacementPriorityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABDeathReplacementCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveDeathReplacementEffect implements ABAction { + + private ABUnitCallback target; + private ABDeathReplacementPriorityCallback priority; + private ABDeathReplacementCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + target.callback(caster, localStore, castId).removeDeathReplacementEffect( + priority.callback(caster, localStore, castId), listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java index 1c4e9e941..b8e82e919 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementFinishReincarnating.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death.internalaction; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.death.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.AnimationTokens.PrimaryTag; import com.etheller.warsmash.viewer5.handlers.w3x.SequenceUtils; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionDeathReplacementFinishReincarnating implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java index 6e2e075e4..bfa65998c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death.internalaction; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.death.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java index 8fd1d1630..1271b4afb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death.internalaction; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.death.internalaction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java new file mode 100644 index 000000000..a0f853332 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionAddEvasionListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.evasion; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABEvasionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionAddEvasionListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABEvasionListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.addEvasionListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java new file mode 100644 index 000000000..1c91c189e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionCreateEvasionListener.java @@ -0,0 +1,27 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.evasion; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackEvasionListener; + +public class ABActionCreateEvasionListener implements ABAction { + + private List conditions; + private ABBooleanCallback useCastId; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + boolean ucid = true; + if (useCastId != null) { + ucid = useCastId.callback(caster, localStore, castId); + } + ABAttackEvasionListener listener = new ABAttackEvasionListener(localStore, conditions, castId, ucid); + + localStore.put(ABLocalStoreKeys.LASTCREATEDAEL, listener); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java new file mode 100644 index 000000000..add0ead33 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/evasion/ABActionRemoveEvasionListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.evasion; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABEvasionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveEvasionListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABEvasionListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.removeEvasionListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java new file mode 100644 index 000000000..3699eba53 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAbilityEffectReactionListener.java @@ -0,0 +1,20 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAbilityEffectReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionAddAbilityEffectReactionListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABAbilityEffectReactionListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.addAbilityEffectReactionListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java new file mode 100644 index 000000000..e06cd38c2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAbilityProjReactionListener.java @@ -0,0 +1,20 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAbilityProjReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionAddAbilityProjReactionListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABAbilityProjReactionListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.addAbilityProjReactionListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java new file mode 100644 index 000000000..bf7cedd58 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionAddAttackProjReactionListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAttackProjReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionAddAttackProjReactionListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABAttackProjReactionListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.addAttackProjReactionListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java new file mode 100644 index 000000000..11286253e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAbilityEffectReactionListener.java @@ -0,0 +1,28 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAbilityEffectReactionListener; + +public class ABActionCreateAbilityEffectReactionListener implements ABAction { + + private List actions; + private ABBooleanCallback useCastId; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + boolean ucid = true; + if (useCastId != null) { + ucid = useCastId.callback(caster, localStore, castId); + } + ABAbilityEffectReactionListener listener = new ABAbilityEffectReactionListener(localStore, actions, castId, + ucid); + + localStore.put(ABLocalStoreKeys.LASTCREATEDAbERL, listener); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java new file mode 100644 index 000000000..9b2f4e6ed --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAbilityProjReactionListener.java @@ -0,0 +1,27 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAbilityProjReactionListener; + +public class ABActionCreateAbilityProjReactionListener implements ABAction { + + private List actions; + private ABBooleanCallback useCastId; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + boolean ucid = true; + if (useCastId != null) { + ucid = useCastId.callback(caster, localStore, castId); + } + ABAbilityProjReactionListener listener = new ABAbilityProjReactionListener(localStore, actions, castId, ucid); + + localStore.put(ABLocalStoreKeys.LASTCREATEDAbPRL, listener); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java new file mode 100644 index 000000000..919052319 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionCreateAttackProjReactionListener.java @@ -0,0 +1,27 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackProjReactionListener; + +public class ABActionCreateAttackProjReactionListener implements ABAction { + + private List actions; + private ABBooleanCallback useCastId; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + boolean ucid = true; + if (useCastId != null) { + ucid = useCastId.callback(caster, localStore, castId); + } + ABAttackProjReactionListener listener = new ABAttackProjReactionListener(localStore, actions, castId, ucid); + + localStore.put(ABLocalStoreKeys.LASTCREATEDAtkPRL, listener); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java new file mode 100644 index 000000000..5fcea7608 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityEffectReactionListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAbilityEffectReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveAbilityEffectReactionListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABAbilityEffectReactionListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.removeAbilityEffectReactionListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java new file mode 100644 index 000000000..605899114 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAbilityProjReactionListener.java @@ -0,0 +1,20 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAbilityProjReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveAbilityProjReactionListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABAbilityProjReactionListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.removeAbilityProjReactionListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java new file mode 100644 index 000000000..1e0981b3f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/ABActionRemoveAttackProjReactionListener.java @@ -0,0 +1,20 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABAttackProjReactionListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveAttackProjReactionListener implements ABAction { + + private ABUnitCallback targetUnit; + private ABAttackProjReactionListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnit target = targetUnit.callback(caster, localStore, castId); + + target.removeAttackProjReactionListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java new file mode 100644 index 000000000..22afb76ce --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java @@ -0,0 +1,15 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction.internalaction; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABActionReactionPreventHit implements ABAction { + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + localStore.put(ABLocalStoreKeys.REACTIONALLOWHIT+castId, false); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java index 3ca141be9..f74f18e40 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.internalcallback; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction.internalcallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java new file mode 100644 index 000000000..78e9367a5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction.internalcallback; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; + +public class ABCallbackGetReactionAttackProjectileDamage extends ABFloatCallback { + + @Override + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ+castId)).getDamage(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java index 634e6ee31..ae4d35566 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalactions; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.sharedinternalactions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; /* diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java index 7a8855358..9dc70fa27 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.sharedinternalcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; /* diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java index c815bd872..4804bdf99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.sharedinternalcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; /* diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java index aa532434a..1c860ba5a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.sharedinternalcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java index 9577cc33a..61182b05c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalcallbacks; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.sharedinternalcallbacks; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java new file mode 100644 index 000000000..9881bec62 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/state/ABActionAddUnitStateListener.java @@ -0,0 +1,23 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.state; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABUnitStateListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABActionAddUnitStateListener implements ABAction { + + private ABUnitCallback unit; + private ABUnitStateListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = unit.callback(caster, localStore, castId); + + localStore.put(ABLocalStoreKeys.LASTSTATELISTENERADDEDUNIT, target); + target.addStateListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java index 5d3cb64e8..84a3d9f98 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/state/ABActionCreateUnitStateListener.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.state; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.state; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABUnitStateListener; public class ABActionCreateUnitStateListener implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java new file mode 100644 index 000000000..e9dc0ff87 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/state/ABActionRemoveUnitStateListener.java @@ -0,0 +1,21 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.state; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.ABUnitStateListenerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveUnitStateListener implements ABAction { + + private ABUnitCallback unit; + private ABUnitStateListenerCallback listener; + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + CUnit target = unit.callback(caster, localStore, castId); + + target.removeStateListener(listener.callback(caster, localStore, castId)); + } +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionAddUnitToQueue.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionAddUnitToQueue.java index eea6d92fd..c91c57c82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionAddUnitToQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionAddUnitToQueue.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitqueue; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitqueue; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue.ABUnitQueueCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAddUnitToQueue implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionClearUnitQueue.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionClearUnitQueue.java index 046023cc5..76e43a5e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionClearUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionClearUnitQueue.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitqueue; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitqueue; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue.ABUnitQueueCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionClearUnitQueue implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionCreateUnitQueue.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionCreateUnitQueue.java index 78968f038..838498e62 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionCreateUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionCreateUnitQueue.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitqueue; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitqueue; import java.util.LinkedList; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCreateUnitQueue implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java index b78a2928d..e8c16fe07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitqueue/ABActionRemoveUnitFromQueue.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitqueue; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitqueue; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.ABUnitQueueCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABSingleAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue.ABUnitQueueCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionRemoveUnitFromQueue implements ABSingleAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionAddStateModBuff.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionAddStateModBuff.java index 3c2adb3cc..6eb8add7e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionAddStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionAddStateModBuff.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitstate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABActionAddStateModBuff implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionCreateStateModBuff.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionCreateStateModBuff.java index e1dc2d486..776674e94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionCreateStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionCreateStateModBuff.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitstate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.ABLongCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs.ABLongCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuffType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionRemoveStateModBuff.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionRemoveStateModBuff.java index a45f9a9e4..cbbf9dadf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionRemoveStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionRemoveStateModBuff.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitstate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.ABStateModBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABActionRemoveStateModBuff implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionSetUnitFadeTimer.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionSetUnitFadeTimer.java index 518b5bfbf..849364ae7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/unitstate/ABActionSetUnitFadeTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionSetUnitFadeTimer.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitstate; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.ABTimerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABActionSetUnitFadeTimer implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionUpdateStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionUpdateStateModBuff.java new file mode 100644 index 000000000..53a7373b0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitstate/ABActionUpdateStateModBuff.java @@ -0,0 +1,23 @@ + +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitstate; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs.ABLongCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod.ABStateModBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; + +public class ABActionUpdateStateModBuff implements ABAction { + + private ABStateModBuffCallback buff; + private ABLongCallback value; + + @Override + public void runAction(final CUnit caster, final ABLocalDataStore localStore, + final int castId) { + final StateModBuff buffObj = this.buff.callback(caster, localStore, castId); + buffObj.setValue(this.value.callback(caster, localStore, castId)); + } + +} \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionCreateLocationVisionModifier.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionCreateLocationVisionModifier.java index d52bae26b..4d72e5ed7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateLocationVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionCreateLocationVisionModifier.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.vision; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CCircleFogModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CTimedCircleFogModifier; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionCreateProjectileVisionModifier.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionCreateProjectileVisionModifier.java index acd31f06f..ceb6eba3a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateProjectileVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionCreateProjectileVisionModifier.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.vision; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CProjectileVisionFogModifier; public class ABActionCreateProjectileVisionModifier implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionCreateUnitVisionModifier.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionCreateUnitVisionModifier.java index 06d735a10..aa6d66171 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/action/vision/ABActionCreateUnitVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionCreateUnitVisionModifier.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.vision; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CUnitVisionFogModifier; public class ABActionCreateUnitVisionModifier implements ABAction { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionRemoveVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionRemoveVisionModifier.java new file mode 100644 index 000000000..8b4db5031 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionRemoveVisionModifier.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.vision; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.visionmodifier.ABVisionModifierCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionRemoveVisionModifier implements ABAction { + + private ABVisionModifierCallback modifier; + private ABPlayerCallback player; + + @Override + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { + player.callback(caster, localStore, castId).removeFogModifer(localStore.game, + modifier.callback(caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionSetBurrowPlaceholder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionSetBurrowPlaceholder.java new file mode 100644 index 000000000..051d41882 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/vision/ABActionSetBurrowPlaceholder.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.vision; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABActionSetBurrowPlaceholder implements ABAction { + + @Override + public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { + // TODO Auto-generated method stub + + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ABCallbackNull.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ABCallbackNull.java index fba272e8b..b9e9043ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ABCallbackNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ABCallbackNull.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackNull implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABAbilityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABAbilityCallback.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABAbilityCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABAbilityCallback.java index 53780aa91..fc8e9d428 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABAbilityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABAbilityCallback.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABAbilityCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackArgumentAbility.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackArgumentAbility.java index 4b6310660..dae10273f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackArgumentAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackArgumentAbility.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetAbilityById.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetAbilityById.java index 2d50d7369..be7b0555f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetAbilityById.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetABAbilityByRawcodeVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor.ABGetABAbilityByRawcodeVisitor; public class ABCallbackGetAbilityById extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java index 906ad095a..785741154 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetBuffSourceAbility.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffSourceAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java index 8ef451761..70bbdb6ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetMatchingAbility.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetMatchingAbility.java index b264bcc28..01f2ceb93 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetMatchingAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetMatchingAbility.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetMatchingAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetPartnerAbility.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetPartnerAbility.java index b7d6295b3..293a6dcc2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetPartnerAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetPartnerAbility.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetPartnerAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetReactionAbility.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetReactionAbility.java index b2a9a4009..fab956094 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetReactionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetReactionAbility.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetReactionAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java similarity index 71% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java index 25ca18eb6..d2154b67b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredAbilityByKey extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetThisAbility.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetThisAbility.java index 03a2ebaa3..faf75b3bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackGetThisAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetThisAbility.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetThisAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackInlineConditionAbility.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackInlineConditionAbility.java index dae421cbb..4e3771304 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackInlineConditionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackInlineConditionAbility.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbility.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbility.java index ed928ec94..ab35050da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbility.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseAbility extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java index 07df8ec03..e58f4f02d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseAbilityWithArguments extends ABAbilityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABAttackModifierCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABAttackModifierCallback.java new file mode 100644 index 000000000..a9b75ff4e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABAttackModifierCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attack; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackModifier; + +public abstract class ABAttackModifierCallback implements ABCallback { + + abstract public ABAttackModifier callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java new file mode 100644 index 000000000..d5bd54725 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attack; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackModifier; + +public class ABCallbackGetLastCreatedAttackModifier extends ABAttackModifierCallback { + + @Override + public ABAttackModifier callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (ABAttackModifier) localStore.get(ABLocalStoreKeys.LASTCREATEDAMod); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java index e91a9d721..86bdf74cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackModifier; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackModifier; public class ABCallbackGetStoredAttackModifierByKey extends ABAttackModifierCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABAttackSettingsCallback.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABAttackSettingsCallback.java index 14d94714c..3c4ffbb7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABAttackSettingsCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABAttackSettingsCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attacksettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public abstract class ABAttackSettingsCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java index 539279a83..84d2c74dd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attacksettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetCurrentAttackSettings extends ABAttackSettingsCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java index 365563e63..00a701b25 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attacksettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetLastCreatedAttackSettings extends ABAttackSettingsCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java index d72642cf7..553d51c45 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attacksettings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetStoredAttackSettingsByKey extends ABAttackSettingsCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABBuffCallback.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABBuffCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABBuffCallback.java index a364ca780..735655c14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABBuffCallback.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABBuffCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackArgumentBuff.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackArgumentBuff.java index 5a175d9a8..836a80902 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackArgumentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackArgumentBuff.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackEnumBuff.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackEnumBuff.java index 8684239f3..6a7007c1c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackEnumBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackEnumBuff.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackEnumBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetBuffById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetBuffById.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetBuffById.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetBuffById.java index af047a0d0..1bf9f9f20 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetBuffById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetBuffById.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffById extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java index 7e7fe0b23..4543ddf2f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetMatchingBuff.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetMatchingBuff.java index 786ad1c4b..bfbe5b578 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetMatchingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetMatchingBuff.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetMatchingBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java similarity index 71% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java index 40d184854..4ee602b2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredBuffByKey extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackInlineConditionBuff.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackInlineConditionBuff.java index 44e26b4fc..5c6c57ff0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackInlineConditionBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackInlineConditionBuff.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuff.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuff.java index 1ad8c8c4a..a41247834 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuff.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java index fa0b8bc24..8f5861589 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBuffWithArguments extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackThisBuff.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackThisBuff.java index 3c591cecb..7a75be1d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/buff/ABCallbackThisBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackThisBuff.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackThisBuff extends ABBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackArgumentDestructable.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackArgumentDestructable.java index d93f1fe6e..0e1eedcc8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackArgumentDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackArgumentDestructable.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java index 486a6f828..dc5efed3d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityTargetedDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java index 9c3c665c0..7dbe12aeb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAttackedDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetEnumDestructable.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetEnumDestructable.java index c5a112367..1f1db8c37 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetEnumDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetEnumDestructable.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetEnumDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java index 5795a2077..f1ea963a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java index 334faab79..869f4a82e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileHitDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java index acefb0d4b..b163a9519 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredDestructableByKey extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java index ba7e9b4e1..87b88b3d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackInlineConditionDestructable.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructable.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructable.java index e3c517ab3..7270e9674 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructable.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructable extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java index d654d5dba..1bd61665c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructableWithArguments extends ABDestructableCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABDestructableCallback.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABDestructableCallback.java index 0ce17ed1d..b640992f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructable/ABDestructableCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABDestructableCallback.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABDestructableCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java index bc95dd7a3..d42fedf0d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentDestructableBuff extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java index 2a78cf2ba..db44e2dbd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackEnumDestructableBuff extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java index c29b02b30..7e24bc2f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedDestructableBuff extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java index 566eca735..4e6eb1db9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredDestructableBuffByKey extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java index 0dcb1e031..825432d70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackInlineConditionDestructableBuff.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionDestructableBuff extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java index b0b3a5858..40b70609b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackMatchingDestructableBuff extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java index f150eec3d..971f0ea31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructableBuff extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java index 04da7f3fa..eb26e6c5f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructableBuffWithArguments extends ABDestructableBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABDestructableBuffCallback.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABDestructableBuffCallback.java index fa489165b..b8d9bea3a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/destructablebuff/ABDestructableBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABDestructableBuffCallback.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABDestructableBuffCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java index 737fc2849..5cce47b82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABAttackPreDamageListenerPriorityCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerPriority; public abstract class ABAttackPreDamageListenerPriorityCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABAttackTypeCallback.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABAttackTypeCallback.java index b5bbc43b8..deee00a79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAttackTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABAttackTypeCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public abstract class ABAttackTypeCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAutocastTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABAutocastTypeCallback.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAutocastTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABAutocastTypeCallback.java index 079ebbf97..167059101 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABAutocastTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABAutocastTypeCallback.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABAutocastTypeCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackConditionalAutocastType.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackConditionalAutocastType.java index b3912d65e..4e89965ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackConditionalAutocastType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackConditionalAutocastType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackConditionalAutocastType extends ABAutocastTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java index f7d02c470..807db934c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetAttackTypeFromString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public class ABCallbackGetAttackTypeFromString extends ABAttackTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java index eb10be6bb..0d8b520b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetAutocastTypeFromString.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetAutocastTypeFromString extends ABAutocastTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java index e592e2911..492e99ac2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetDamageTypeFromString.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABCallbackRawString; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABCallbackRawString; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetDamageTypeFromString extends ABDamageTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java index 2dda9fe19..06e48a07e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetDefenseTypeFromString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABCallbackGetDefenseTypeFromString extends ABDefenseTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java index 63f0eda9d..da79fc67f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetMovementTypeFromString.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetMovementTypeFromString extends ABMovementTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java index 00339f17d..82ad4fb09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetNonStackingStatBuffTypeFromString.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABCallbackRawString; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABCallbackRawString; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; public class ABCallbackGetNonStackingStatBuffTypeFromString extends ABNonStackingStatBuffTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java index 676197f9c..cb0925e0b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public class ABCallbackGetStoredAttackTypeByKey extends ABAttackTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java index 0f10a8e85..b9e5e743b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetStoredDamageTypeByKey extends ABDamageTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java index 1537484ac..d1cf3e3b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABCallbackGetStoredDefenseTypeByKey extends ABDefenseTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java index 79401c121..5f8bbd40b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredMovementTypeByKey extends ABMovementTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java index 0cdc7a0f7..616a3c341 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABCallbackGetStoredTargetTypeByKey extends ABTargetTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java index 666660e6f..25985fe79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABCallbackGetStoredWeaponTypeByKey extends ABWeaponTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java index 8978bf78c..028cfe764 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetTargetTypeFromString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABCallbackGetTargetTypeFromString extends ABTargetTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitDefenseType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetUnitDefenseType.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitDefenseType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetUnitDefenseType.java index f589e8146..6671ccc22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitDefenseType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetUnitDefenseType.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABCallbackGetUnitDefenseType extends ABDefenseTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetUnitMovementType.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitMovementType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetUnitMovementType.java index e7b7661c6..12c2daf3d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitMovementType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetUnitMovementType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitMovementType extends ABMovementTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java index 7f0266a0f..986e5151c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetUnitTypeMovementType.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitTypeMovementType extends ABMovementTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java index a4edbfd7d..003b193fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetWeaponTypeFromString.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABCallbackRawString; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABCallbackRawString; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABCallbackGetWeaponTypeFromString extends ABWeaponTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java index a39a1470b..7df731c8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawDeathEffectPriority.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffectPriority; public class ABCallbackRawDeathEffectPriority extends ABDeathReplacementPriorityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java index 9d7cd5692..0de85ea2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawPreDamageListenerPriority.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListenerPriority; public class ABCallbackRawPreDamageListenerPriority extends ABAttackPreDamageListenerPriorityCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawTargetType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawTargetType.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawTargetType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawTargetType.java index 9762f928e..22c5e3d55 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawTargetType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawTargetType.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABCallbackRawTargetType extends ABTargetTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawWeaponType.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawWeaponType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawWeaponType.java index d6d286e96..7ef3615a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABCallbackRawWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackRawWeaponType.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABCallbackRawWeaponType extends ABWeaponTypeCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDamageTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABDamageTypeCallback.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDamageTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABDamageTypeCallback.java index 57c14017d..bbd902d88 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDamageTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABDamageTypeCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public abstract class ABDamageTypeCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDeathReplacementPriorityCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABDeathReplacementPriorityCallback.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDeathReplacementPriorityCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABDeathReplacementPriorityCallback.java index 7c3b74bdd..ffdec0bd3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDeathReplacementPriorityCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABDeathReplacementPriorityCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffectPriority; public abstract class ABDeathReplacementPriorityCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDefenseTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABDefenseTypeCallback.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDefenseTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABDefenseTypeCallback.java index 1210aa7e8..247b4ec4a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABDefenseTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABDefenseTypeCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public abstract class ABDefenseTypeCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABMovementTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABMovementTypeCallback.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABMovementTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABMovementTypeCallback.java index 061b311c2..20adfcc55 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABMovementTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABMovementTypeCallback.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABMovementTypeCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java index e9087541c..0b65f0fba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABNonStackingStatBuffTypeCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; public abstract class ABNonStackingStatBuffTypeCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABTargetTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABTargetTypeCallback.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABTargetTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABTargetTypeCallback.java index 98979dea1..6194894d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABTargetTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABTargetTypeCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public abstract class ABTargetTypeCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABWeaponTypeCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABWeaponTypeCallback.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABWeaponTypeCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABWeaponTypeCallback.java index 8119469c4..a984043a7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/enums/ABWeaponTypeCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABWeaponTypeCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public abstract class ABWeaponTypeCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java index 51479cbf9..fdc3bdf3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.timeevent; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABTimeOfDayEvent; public class ABCallbackArgumentTimeOfDayEvent extends ABTimeOfDayEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java new file mode 100644 index 000000000..cd0b06f06 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.timeevent; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABTimeOfDayEvent; + +public class ABCallbackGetLastCreatedTimeOfDayEvent extends ABTimeOfDayEventCallback { + + @Override + public ABTimeOfDayEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (ABTimeOfDayEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDTODEVENT); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java index 74ffa11b4..4fff8056a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.timeevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABTimeOfDayEvent; public class ABCallbackGetStoredTimeOfDayEventByKey extends ABTimeOfDayEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java index 1ad7506c6..8055513fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackInlineConditionTimeOfDayEvent.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.timeevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABTimeOfDayEvent; public class ABCallbackInlineConditionTimeOfDayEvent extends ABTimeOfDayEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java index 75dad1b17..c8fe796b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.timeevent; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABTimeOfDayEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseTimeOfDayEvent extends ABTimeOfDayEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java index f00b6238a..41c57c608 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.timeevent; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABTimeOfDayEvent; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABTimeOfDayEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseTimeOfDayEventWithArguments extends ABTimeOfDayEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java new file mode 100644 index 000000000..db6883a8f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABTimeOfDayEventCallback.java @@ -0,0 +1,13 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.timeevent; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABTimeOfDayEvent; + +public abstract class ABTimeOfDayEventCallback implements ABCallback { + + abstract public ABTimeOfDayEvent callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java index fdbcdd364..43a96ab4e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.widgetevent; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABWidgetEvent; public class ABCallbackArgumentWidgetEvent extends ABWidgetEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java new file mode 100644 index 000000000..f5073c8b4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.widgetevent; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABWidgetEvent; + +public class ABCallbackGetLastCreatedWidgetEvent extends ABWidgetEventCallback { + + @Override + public ABWidgetEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (ABWidgetEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDWIDEVENT); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java index e0c8e2753..837b5840e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.widgetevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABWidgetEvent; public class ABCallbackGetStoredWidgetEventByKey extends ABWidgetEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java index ca7b772bd..ff4856103 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackInlineConditionWidgetEvent.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.widgetevent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABWidgetEvent; public class ABCallbackInlineConditionWidgetEvent extends ABWidgetEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java index 03b7b3c22..adafa3a09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.widgetevent; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABWidgetEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseWidgetEvent extends ABWidgetEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java index 6edf1138f..9f113a429 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.widgetevent; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event.ABWidgetEvent; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABWidgetEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseWidgetEventWithArguments extends ABWidgetEventCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABWidgetEventCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABWidgetEventCallback.java new file mode 100644 index 000000000..ab8f71ce2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABWidgetEventCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.widgetevent; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABWidgetEvent; + +public abstract class ABWidgetEventCallback implements ABCallback { + + abstract public ABWidgetEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackAddFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackAddFloat.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackAddFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackAddFloat.java index 4ece80e57..345f42e63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackAddFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackAddFloat.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackAddFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackArgumentFloat.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackArgumentFloat.java index 06b831568..6eff69722 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackArgumentFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackArgumentFloat.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCeilFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackCeilFloat.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCeilFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackCeilFloat.java index 9d65f52d0..8a5081a31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCeilFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackCeilFloat.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCeilFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCos.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackCos.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCos.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackCos.java index b6b8e8a6c..d9b53e48f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackCos.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackCos.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCos extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDegToRad.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackDegToRad.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDegToRad.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackDegToRad.java index 4e30be237..586b334c9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDegToRad.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackDegToRad.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackDegToRad extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDivideFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackDivideFloat.java similarity index 76% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDivideFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackDivideFloat.java index c44e069ab..6f697fa43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackDivideFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackDivideFloat.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackDivideFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFMaxValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackFMaxValue.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFMaxValue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackFMaxValue.java index 84ac784e3..0fc91220e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFMaxValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackFMaxValue.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackFMaxValue extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFloorFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackFloorFloat.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFloorFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackFloorFloat.java index 758c5c580..a03116618 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackFloorFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackFloorFloat.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackFloorFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityArea.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityArea.java index 8e20fb127..555ae1b42 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityArea.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityArea extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastRange.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastRange.java index b7f2f34a0..70ae31ec3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastRange.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityCastRange extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastTime.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastTime.java index b11f20020..e0b9cdcc2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCastTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastTime.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityCastTime extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCooldown.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCooldown.java index a9835e56e..cb8608fd9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCooldown.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityCooldown extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java index 2e8d30b15..37a432a66 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDuration.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDuration.java index d20240980..4d0075184 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDuration.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABCallbackGetAbilityDuration extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java index c00259d59..128217a20 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityHeroDuration extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java index 74bb4fc05..c223c173b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.units.GameObject; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityProjectileSpeed extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java index 58fc1233d..484603525 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityUniqueValueFloat.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java similarity index 74% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java index fc3fac9e3..c3b2dd30d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAngleBetweenLocations.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetAngleBetweenLocations extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java index a0fd79da7..5d6fd7b48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetBuffDurationElapsed.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffDurationElapsed extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java index bd2f68355..9034bc422 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetBuffUniqueValueFloat.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java index 0f72deb08..ac09a6dd6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetDistanceBetweenLocations.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetDistanceBetweenLocations extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java index 8ecdc67eb..558e9e897 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetDistanceBetweenUnits.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetDistanceBetweenUnits extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetLocationX.java new file mode 100644 index 000000000..4ab8b71ca --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetLocationX.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackGetLocationX extends ABFloatCallback { + + private ABLocationCallback location; + + @Override + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return location.callback(caster, localStore, castId).getX(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetLocationY.java new file mode 100644 index 000000000..a4845764c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetLocationY.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackGetLocationY extends ABFloatCallback { + + private ABLocationCallback location; + + @Override + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return location.callback(caster, localStore, castId).getY(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java index 8bc39b629..69a365447 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetParentAbilityDataAsFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java index 214f8f697..3791b964e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredFloatByKey extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java index 79ba332ef..b549c973b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitAcquisitionRange.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitAcquisitionRange extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCastPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitCastPoint.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCastPoint.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitCastPoint.java index c95209ef4..d1cae4fbd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCastPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitCastPoint.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitCastPoint extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java index 38195b4b2..edf169c15 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitCurrentHp.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitCurrentHp extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java index 7d547dc88..b458b8b34 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitCurrentMana.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitCurrentMana extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitFacing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitFacing.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitFacing.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitFacing.java index e1649a4aa..e04419a91 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitFacing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitFacing.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitFacing extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitInitialMana.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitInitialMana.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitInitialMana.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitInitialMana.java index 0ba3b44f9..5972b58b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackGetUnitInitialMana.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitInitialMana.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitInitialMana extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitLocationX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitLocationX.java new file mode 100644 index 000000000..76f59df6f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitLocationX.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackGetUnitLocationX extends ABFloatCallback { + + private ABUnitCallback unit; + + @Override + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return unit.callback(caster, localStore, castId).getX(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitLocationY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitLocationY.java new file mode 100644 index 000000000..cb4cd078c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetUnitLocationY.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackGetUnitLocationY extends ABFloatCallback { + + private ABUnitCallback unit; + + @Override + public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return unit.callback(caster, localStore, castId).getY(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackInlineConditionFloat.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackInlineConditionFloat.java index fec8aa4bc..81d3c2d8f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackInlineConditionFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackInlineConditionFloat.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackIntToFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackIntToFloat.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackIntToFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackIntToFloat.java index 98913dd84..620847c77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackIntToFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackIntToFloat.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackIntToFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMaxFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackMaxFloat.java similarity index 77% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMaxFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackMaxFloat.java index a932e4ad5..e64058d9b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMaxFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackMaxFloat.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackMaxFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMinFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackMinFloat.java similarity index 77% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMinFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackMinFloat.java index cab9e5117..69eae0221 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMinFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackMinFloat.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackMinFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMultiplyFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackMultiplyFloat.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMultiplyFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackMultiplyFloat.java index a7b647ee8..2483cd16c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackMultiplyFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackMultiplyFloat.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackMultiplyFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackNegativeFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackNegativeFloat.java similarity index 72% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackNegativeFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackNegativeFloat.java index 04855d096..2f3ad0411 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackNegativeFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackNegativeFloat.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackNegativeFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackOneGameTick.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackOneGameTick.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackOneGameTick.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackOneGameTick.java index e3e1dc7f3..84bb8ca61 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackOneGameTick.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackOneGameTick.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackOneGameTick extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackPi.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackPi.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackPi.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackPi.java index 36e689e15..da073c853 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackPi.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackPi.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackPi extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomBoundedFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackRandomBoundedFloat.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomBoundedFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackRandomBoundedFloat.java index e89fbaf6f..6b474327b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomBoundedFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackRandomBoundedFloat.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackRandomBoundedFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackRandomFloat.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackRandomFloat.java index d7b0901a0..3acba5e24 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRandomFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackRandomFloat.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackRandomFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRawFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackRawFloat.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRawFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackRawFloat.java index 8fdce9cd8..3ad8cc7ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackRawFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackRawFloat.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackRawFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloat.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloat.java index 82e0a8a91..0cde87408 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloat.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java index 06fada4f7..5e8d9734f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseFloatWithArguments extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSin.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackSin.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSin.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackSin.java index 7c714352f..e3022be4e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSin.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackSin.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackSin extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSubtractFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackSubtractFloat.java similarity index 76% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSubtractFloat.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackSubtractFloat.java index 04e39c196..0f788f66c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackSubtractFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackSubtractFloat.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackSubtractFloat extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTan.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackTan.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTan.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackTan.java index 7d21be451..d77770ab2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTan.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackTan.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackTan extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTicksForDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackTicksForDuration.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTicksForDuration.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackTicksForDuration.java index 5d9e7babe..ff52e9748 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/floats/ABCallbackTicksForDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackTicksForDuration.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackTicksForDuration extends ABFloatCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABFloatCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABFloatCallback.java new file mode 100644 index 000000000..e5d2ae18c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABFloatCallback.java @@ -0,0 +1,10 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABFloatCallback implements ABCallback { + + abstract public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackArgumentFX.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackArgumentFX.java index 6b625352a..cd2a04b03 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackArgumentFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackArgumentFX.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackArgumentFX extends ABFXCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedFX.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedFX.java index d944d3785..6ac85859a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedFX.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackGetLastCreatedFX extends ABFXCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java index 4050dbff7..8830b5a37 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABCallbackGetLastCreatedLightningEffect extends ABLightningCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredFXByKey.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredFXByKey.java index eaf239d2e..bbe38c968 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredFXByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredFXByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackGetStoredFXByKey extends ABFXCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java index 01319b3d5..9b00a7c2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public class ABCallbackGetStoredLightningByKey extends ABLightningCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackInlineConditionFX.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackInlineConditionFX.java index 62db9b83e..5a1abef34 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackInlineConditionFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackInlineConditionFX.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackInlineConditionFX extends ABFXCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFX.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFX.java index bf0b02ea4..721c81e7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFX.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackReuseFX extends ABFXCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFXWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFXWithArguments.java index 79dc9130a..9dd81cf1c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABCallbackReuseFXWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFXWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public class ABCallbackReuseFXWithArguments extends ABFXCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABFXCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABFXCallback.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABFXCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABFXCallback.java index c9e2b9c04..96d6e1e1e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABFXCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABFXCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; public abstract class ABFXCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABLightningCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABLightningCallback.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABLightningCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABLightningCallback.java index ae4c25f35..c9d29633d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/fx/ABLightningCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABLightningCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponentLightning; public abstract class ABLightningCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackArgumentID.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackArgumentID.java index 1a5539977..543751feb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackArgumentID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackArgumentID.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentID extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsID.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsID.java index 8535d40d2..e0f221fc3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsID.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsID extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java index dd849fa33..3464db03e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsIDFromList extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java index 3ba0619ab..db71ea8ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsRandomIDFromList extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java index 6b801911d..a4d3ca890 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityUniqueValueId.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityUnitId.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityUnitId.java index 47a918d43..0e51e9de4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAbilityUnitId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityUnitId.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import java.util.List; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityUnitId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAlias.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAlias.java index 3aa4ea5ba..554f93ce9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAlias.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAlias extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetBuffAlias.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffAlias.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetBuffAlias.java index 6f7512601..ad3f07429 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetBuffAlias.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffAlias extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetBuffIdFromCode.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetBuffIdFromCode.java index 7731e72ba..07444efe1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetBuffIdFromCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetBuffIdFromCode.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetBuffIdFromCode extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetCode.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetCode.java index 9c8d49b85..18a2b0dc3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetCode.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetCode extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstBuffId.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstBuffId.java index befe53a24..8f36e6701 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstBuffId.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetFirstBuffId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstEffectId.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstEffectId.java index d0558d15e..9d5817eef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetFirstEffectId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstEffectId.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import java.util.List; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetFirstEffectId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetItemType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetItemType.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetItemType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetItemType.java index 1ff6c55df..4ec82d09b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetItemType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetItemType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetItemType extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java index 49aaa2ae1..2802d6ea5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetNonCurrentTransformType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetNonCurrentTransformType extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetParentAlias.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetParentAlias.java index 36a0d4eaf..8f25576a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetParentAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetParentAlias.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetParentAlias extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetSecondBuffId.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetSecondBuffId.java index 67a8db598..ee9410720 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetSecondBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetSecondBuffId.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import java.util.List; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetSecondBuffId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetStoredIDByKey.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetStoredIDByKey.java index 0bde8a39e..d930b9f13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetStoredIDByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetStoredIDByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredIDByKey extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetUnitType.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetUnitType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetUnitType.java index 8ec7386cf..ce8f8b0d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetUnitType.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitType extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetWar3IDFromString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetWar3IDFromString.java similarity index 71% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetWar3IDFromString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetWar3IDFromString.java index 26f77e994..f5b33dc22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackGetWar3IDFromString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetWar3IDFromString.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetWar3IDFromString extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackInlineConditionID.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackInlineConditionID.java index d867545cf..ce4369a65 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackInlineConditionID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackInlineConditionID.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionID extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackNullIfFalse.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackNullIfFalse.java index fb1de3b96..3f9315980 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackNullIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackNullIfFalse.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackNullIfFalse extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackRandomItemId.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackRandomItemId.java index f5868a843..3a42415b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomItemId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackRandomItemId.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItemType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABRandomTypeHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABRandomTypeHandler; public class ABCallbackRandomItemId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java index 59de047d1..a5fcc3510 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackRandomMechanicalCritterId.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABRandomTypeHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABRandomTypeHandler; public class ABCallbackRandomMechanicalCritterId extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseID.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseID.java index 37d089515..efbfa475f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseID.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseID extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseIDWithArguments.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseIDWithArguments.java index 99a0650dd..fa57d4e53 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/id/ABCallbackReuseIDWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseIDWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseIDWithArguments extends ABIDCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABIDCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABIDCallback.java new file mode 100644 index 000000000..317f5c3d5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABIDCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABIDCallback implements ABCallback { + + @Override + abstract public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAddInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackAddInteger.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAddInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackAddInteger.java index 0204be56d..cab155e21 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAddInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackAddInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackAddInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAndInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackAndInteger.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAndInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackAndInteger.java index 9815c19f2..0b9d4ec01 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackAndInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackAndInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackAndInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackArgumentInteger.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackArgumentInteger.java index 210b9592e..69ec395ff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackArgumentInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackArgumentInteger.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java index 9128b704b..23982d400 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackCountBuffsOnUnitMatchingCondition.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackCountBuffsOnUnitMatchingCondition extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java similarity index 71% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java index 176797164..92797b75b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackCountUnitsInRangeOfLocation.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCountUnitsInRangeOfLocation extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java index 26af2571c..b01c28980 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackCountUnitsInRangeOfUnit.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCountUnitsInRangeOfUnit extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java index 943442c74..2d747dfc0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackDetectionDropdownConversion.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackDetectionDropdownConversion extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDivideInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackDivideInteger.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDivideInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackDivideInteger.java index c00e17438..61d1f5ae6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackDivideInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackDivideInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackDivideInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java index 3c9fe7fec..b40c0c87d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityCastTimeAsInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java index 52a5d06e2..4a87d78bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java index cf68ac7fe..706f8de3d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityHandleAsInteger.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetAbilityHandleAsInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityManaCost.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityManaCost.java index c0a9405a3..b00e6dbc1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityManaCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityManaCost.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityManaCost extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java index e2d9c50b3..c260d977e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityTargetAttachmentPoints extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java index dd1da6a2c..574a3cb58 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityUniqueValueInteger.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java index 9a3c3aea4..8cec81c71 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetBuffHandleAsInteger.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffHandleAsInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java index baccae853..1f2735c46 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetBuffUniqueValueInteger.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetCastId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetCastId.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetCastId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetCastId.java index 6773f8a8d..750755229 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetCastId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetCastId.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetCastId extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetIntegerFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetIntegerFromList.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetIntegerFromList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetIntegerFromList.java index 90e32f2f3..09a2fe361 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetIntegerFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetIntegerFromList.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.ABSortableListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetIntegerFromList extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemCharges.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemCharges.java index 46ad082ac..64977e583 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemCharges.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetItemCharges extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemLevel.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemLevel.java index 2332a2852..6987b1f2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemLevel.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetItemLevel extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemMaxCharges.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemMaxCharges.java index 5f7d6d892..909fd33d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemMaxCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemMaxCharges.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetItemMaxCharges extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemSlot.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemSlot.java index 7d215b4b9..c266024a8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetItemSlot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemSlot.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetItemSlot extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetListSize.java new file mode 100644 index 000000000..a002547ca --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetListSize.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.ABListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackGetListSize extends ABIntegerCallback { + + private ABListCallback list; + + @Override + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return list.callback(caster, localStore, castId).size(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java index e4ad40f5d..8f65b810b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetNeutralHostilePlayerId.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetNeutralHostilePlayerId extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java index a1f513629..dc859659d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetNeutralPassivePlayerId.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetNeutralPassivePlayerId extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetPlayerId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetPlayerId.java new file mode 100644 index 000000000..b4ec3f1f7 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetPlayerId.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackGetPlayerId extends ABIntegerCallback { + + private ABPlayerCallback player; + + @Override + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return player.callback(caster, localStore, castId).getId(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java index 3782dfdf6..a5902aaf7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileDestructableTargets extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java index 7ba60cb30..0b21f16c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileUnitTargets extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSortableListSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSortableListSize.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSortableListSize.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSortableListSize.java index 4b4a967ce..d90e5e6a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetSortableListSize.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSortableListSize.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABSortableListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.ABSortableListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetSortableListSize extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java new file mode 100644 index 000000000..395578485 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABCallbackGetSpellLevel extends ABIntegerCallback { + + @Override + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java index 1be113d13..7133b9881 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredIntegerByKey extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitGroupSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitGroupSize.java new file mode 100644 index 000000000..41de36b5d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitGroupSize.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup.ABUnitGroupCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackGetUnitGroupSize extends ABIntegerCallback { + + private ABUnitGroupCallback group; + + @Override + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return group.callback(caster, localStore, castId).size(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java index 1170b2f0d..9415f274b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitHandleAsInteger.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitHandleAsInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java index 83523e765..79d95f527 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitMaximumHp.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitMaximumHp extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java index b26e88b7b..fca645ecc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitMaximumMp.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitMaximumMp extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitQueueSize.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitQueueSize.java new file mode 100644 index 000000000..fe13dff96 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitQueueSize.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue.ABUnitQueueCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackGetUnitQueueSize extends ABIntegerCallback { + + private ABUnitQueueCallback queue; + + @Override + public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return queue.callback(caster, localStore, castId).size(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java index f74225303..eb6a28b23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeFoodCost.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitTypeFoodCost extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java index 31cf6c046..fcd890e7f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeGoldCost.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitTypeGoldCost extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java index b2f12e2e2..f68cfdc8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeLumberCost.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitTypeLumberCost extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java index 70139ca8f..e2f326ed0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetUnitTypeSpeed.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitTypeSpeed extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackInlineConditionInteger.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackInlineConditionInteger.java index cfb9e3ed0..eb0e4ba4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackInlineConditionInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackInlineConditionInteger.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIntegerIf.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIntegerIf.java index ff578ecec..dafabd180 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerIf.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIntegerIf.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackIntegerIf extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java index 0f4363e4c..42a7da281 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIntegerZeroIfFalse.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackIntegerZeroIfFalse extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java index bf072754d..994f5ae11 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIntegerZeroIfNull.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackIntegerZeroIfNull extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIterator.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIterator.java index 3af9ee2e4..d8c0032eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackIterator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIterator.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackIterator extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMaxInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackMaxInteger.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMaxInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackMaxInteger.java index f6e397203..d8badfeca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMaxInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackMaxInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackMaxInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMinInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackMinInteger.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMinInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackMinInteger.java index f04c5ffcc..e566fea23 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMinInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackMinInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackMinInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMultiplyInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackMultiplyInteger.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMultiplyInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackMultiplyInteger.java index 1d189ca0f..69ba92b49 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackMultiplyInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackMultiplyInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackMultiplyInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackOrInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackOrInteger.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackOrInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackOrInteger.java index 3bec57dca..4232f090a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackOrInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackOrInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackOrInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackPlayerToStateModValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackPlayerToStateModValue.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackPlayerToStateModValue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackPlayerToStateModValue.java index a72918b17..01edff988 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackPlayerToStateModValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackPlayerToStateModValue.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackPlayerToStateModValue extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRandomInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackRandomInteger.java similarity index 78% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRandomInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackRandomInteger.java index 6519352de..05c79cbe6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRandomInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackRandomInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackRandomInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRawInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackRawInteger.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRawInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackRawInteger.java index 6bbe5b5b0..856690441 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackRawInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackRawInteger.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackRawInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseInteger.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseInteger.java index 65819d69e..f46b9c7c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseInteger.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java index 36822ad22..ff2664432 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseIntegerWithArguments extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackSubtractInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackSubtractInteger.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackSubtractInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackSubtractInteger.java index 907965712..8f7f19426 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackSubtractInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackSubtractInteger.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackSubtractInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java index 128696a0b..7ea46e84f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackTruncateFloatToInteger.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackTruncateFloatToInteger extends ABIntegerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABIntegerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABIntegerCallback.java new file mode 100644 index 000000000..9e1178c17 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABIntegerCallback.java @@ -0,0 +1,10 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABIntegerCallback implements ABCallback { + + abstract public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackArgumentItem.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackArgumentItem.java index 466fa09c5..b39eff009 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackArgumentItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackArgumentItem.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentItem extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java index 199f87339..5c3273a13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityTargetedItem extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAttackedItem.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAttackedItem.java index 7786dc45d..078458fda 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetAttackedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAttackedItem.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAttackedItem extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetLastCreatedItem.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetLastCreatedItem.java index ff65fa150..c260ccec1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetLastCreatedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetLastCreatedItem.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedItem extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetStoredItemByKey.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetStoredItemByKey.java index d84c9def4..f0a884e24 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackGetStoredItemByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetStoredItemByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredItemByKey extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackInlineConditionItem.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackInlineConditionItem.java index a60d7dca3..6d8f0a708 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackInlineConditionItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackInlineConditionItem.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionItem extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItem.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItem.java index d141c3fca..3820e4853 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItem.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseItem extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItemWithArguments.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItemWithArguments.java index c59701c63..3f013467b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/item/ABCallbackReuseItemWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItemWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseItemWithArguments extends ABItemCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABItemCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABItemCallback.java new file mode 100644 index 000000000..439b2032e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABItemCallback.java @@ -0,0 +1,11 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABItemCallback implements ABCallback { + + abstract public CItem callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentList.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentList.java index 80809ba6b..9af5706a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentList.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentList extends ABListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentSortableList.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentSortableList.java index 6872877ed..27a7b665e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackArgumentSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentSortableList.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentSortableList> extends ABSortableListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackGetStoredListByKey.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackGetStoredListByKey.java index 97d867395..2c5016274 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackGetStoredListByKey.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredListByKey extends ABListCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java index 95a147e6e..05266c734 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackGetStoredSortableListByKey.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredSortableListByKey> extends ABSortableListCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackInlineConditionList.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackInlineConditionList.java index 658beb08c..1f0df3ff4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackInlineConditionList.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionList extends ABListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackInlineConditionSortableList.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackInlineConditionSortableList.java index d66ffc304..368092828 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackInlineConditionSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackInlineConditionSortableList.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionSortableList> extends ABSortableListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackListSorted.java similarity index 77% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackListSorted.java index 63162f0ca..42c91abcb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackListSorted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackListSorted.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; import java.util.Collections; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackListSorted> extends ABSortableListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseList.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseList.java index a5bf405ac..98e30cd13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseList.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseList extends ABListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseListWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseListWithArguments.java index 3a745c9d3..6ec7b45f1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseListWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; import java.util.List; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseListWithArguments extends ABListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableList.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableList.java index 8e81930f9..51c25bcdf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableList.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseSortableList> extends ABSortableListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java index abf0bec5a..539fc50cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; import java.util.List; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseSortableListWithArguments> extends ABSortableListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABListCallback.java new file mode 100644 index 000000000..9f7bad66a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABListCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABListCallback implements ABCallback { + + abstract public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABListSortType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABListSortType.java new file mode 100644 index 000000000..632461348 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABListSortType.java @@ -0,0 +1,7 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; + +public enum ABListSortType { + ASC, + DSC, + RAND; +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABSortableListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABSortableListCallback.java new file mode 100644 index 000000000..59ee7d3b1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABSortableListCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABSortableListCallback> implements ABCallback { + + abstract public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java index c2cf0f076..28ae5745f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/integer/ABCallbackEmptyIntegerList.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.integer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.integer; import java.util.ArrayList; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackEmptyIntegerList extends ABIntegerListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java index a68bf4ca7..6c277e91c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/integer/ABCallbackIntegerListOfRange.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.integer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.integer; import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackIntegerListOfRange extends ABIntegerListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/integer/ABIntegerListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/integer/ABIntegerListCallback.java new file mode 100644 index 000000000..2e906056d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/integer/ABIntegerListCallback.java @@ -0,0 +1,13 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.integer; + +import java.util.List; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.ABSortableListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABIntegerListCallback extends ABSortableListCallback { + + abstract public List callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/location/ABCallbackEmptyLocationList.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/location/ABCallbackEmptyLocationList.java index c9db0da7a..c3fd93cf2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABCallbackEmptyLocationList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/location/ABCallbackEmptyLocationList.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.location; import java.util.ArrayList; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackEmptyLocationList extends ABLocationListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/location/ABLocationListCallback.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/location/ABLocationListCallback.java index 6d05416b6..44f0175de 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/list/location/ABLocationListCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/location/ABLocationListCallback.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.location; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.ABListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABLocationListCallback extends ABListCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java new file mode 100644 index 000000000..ab7612ab9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAbilityEffectReactionListenerCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAbilityEffectReactionListener; + +public abstract class ABAbilityEffectReactionListenerCallback implements ABCallback { + + abstract public ABAbilityEffectReactionListener callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java new file mode 100644 index 000000000..f25ab1f70 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAbilityProjReactionListenerCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAbilityProjReactionListener; + +public abstract class ABAbilityProjReactionListenerCallback implements ABCallback { + + abstract public ABAbilityProjReactionListener callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackPostDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackPostDamageListenerCallback.java new file mode 100644 index 000000000..d6caea0ef --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackPostDamageListenerCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackPostDamageListener; + +public abstract class ABAttackPostDamageListenerCallback implements ABCallback { + + abstract public ABAttackPostDamageListener callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackPreDamageListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackPreDamageListenerCallback.java new file mode 100644 index 000000000..64716eb9c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackPreDamageListenerCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackPreDamageListener; + +public abstract class ABAttackPreDamageListenerCallback implements ABCallback { + + abstract public ABAttackPreDamageListener callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackProjReactionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackProjReactionListenerCallback.java new file mode 100644 index 000000000..99f4e45c4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABAttackProjReactionListenerCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackProjReactionListener; + +public abstract class ABAttackProjReactionListenerCallback implements ABCallback { + + abstract public ABAttackProjReactionListener callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABBehaviorChangeListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABBehaviorChangeListenerCallback.java new file mode 100644 index 000000000..02f8399f0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABBehaviorChangeListenerCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABBehaviorChangeListener; + +public abstract class ABBehaviorChangeListenerCallback implements ABCallback { + + abstract public ABBehaviorChangeListener callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java new file mode 100644 index 000000000..9e0b4045a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAbilityEffectReactionListener; + +public class ABCallbackGetLastCreatedAbilityEffectReactionListener extends ABAbilityEffectReactionListenerCallback { + + @Override + public ABAbilityEffectReactionListener callback(CUnit caster, ABLocalDataStore localStore, + final int castId) { + return (ABAbilityEffectReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbERL); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java new file mode 100644 index 000000000..0e35eb0d6 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAbilityProjReactionListener; + +public class ABCallbackGetLastCreatedAbilityProjReactionListener extends ABAbilityProjReactionListenerCallback { + + @Override + public ABAbilityProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbPRL); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java new file mode 100644 index 000000000..634396c5d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackPostDamageListener; + +public class ABCallbackGetLastCreatedAttackPostDamageListener extends ABAttackPostDamageListenerCallback { + + @Override + public ABAttackPostDamageListener callback(CUnit caster, ABLocalDataStore localStore, + final int castId) { + return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPoDL); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java new file mode 100644 index 000000000..3f2573d2f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackPreDamageListener; + +public class ABCallbackGetLastCreatedAttackPreDamageListener extends ABAttackPreDamageListenerCallback { + + @Override + public ABAttackPreDamageListener callback(CUnit caster, ABLocalDataStore localStore, + final int castId) { + return (ABAttackPreDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPrDL); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java new file mode 100644 index 000000000..9460b0920 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackProjReactionListener; + +public class ABCallbackGetLastCreatedAttackProjReactionListener extends ABAttackProjReactionListenerCallback { + + @Override + public ABAttackProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAtkPRL); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java new file mode 100644 index 000000000..1cf9dc704 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABBehaviorChangeListener; + +public class ABCallbackGetLastCreatedBehaviorChangeListener extends ABBehaviorChangeListenerCallback { + + @Override + public ABBehaviorChangeListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.LASTCREATEDBCL); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java new file mode 100644 index 000000000..964c58f85 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDamageTakenListener; + +public class ABCallbackGetLastCreatedDamageTakenListener extends ABDamageTakenListenerCallback { + + @Override + public ABDamageTakenListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (ABDamageTakenListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTL); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java new file mode 100644 index 000000000..3cb4c2d0a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDamageTakenModificationListener; + +public class ABCallbackGetLastCreatedDamageTakenModificationListener extends ABDamageTakenModificationListenerCallback { + + @Override + public ABDamageTakenModificationListener callback(CUnit caster, ABLocalDataStore localStore, + final int castId) { + return (ABDamageTakenModificationListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTML); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java new file mode 100644 index 000000000..ed4f5de12 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDeathReplacementEffect; + +public class ABCallbackGetLastCreatedDeathReplacement extends ABDeathReplacementCallback { + + @Override + public ABDeathReplacementEffect callback(CUnit caster, ABLocalDataStore localStore, + final int castId) { + return (ABDeathReplacementEffect) localStore.get(ABLocalStoreKeys.LASTCREATEDDRE); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java new file mode 100644 index 000000000..fccb5910d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackEvasionListener; + +public class ABCallbackGetLastCreatedEvasionListener extends ABEvasionListenerCallback { + + @Override + public ABAttackEvasionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAEL); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java new file mode 100644 index 000000000..9c53ac11f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABUnitStateListener; + +public class ABCallbackGetLastCreatedUnitStateListener extends ABUnitStateListenerCallback { + + @Override + public ABUnitStateListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (ABUnitStateListener) localStore.get(ABLocalStoreKeys.LASTCREATEDUSL); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java index 029dfcc23..2d6343e9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityEffectReactionListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAbilityEffectReactionListener; public class ABCallbackGetStoredAbilityEffectReactionListenerByKey extends ABAbilityEffectReactionListenerCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java index 33f546c06..2d611c223 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAbilityProjReactionListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAbilityProjReactionListener; public class ABCallbackGetStoredAbilityProjReactionListenerByKey extends ABAbilityProjReactionListenerCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java index c3605f752..a2cf45917 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPostDamageListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackPostDamageListener; public class ABCallbackGetStoredAttackPostDamageListenerByKey extends ABAttackPostDamageListenerCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java index 4acea35aa..73ffb3f8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackPreDamageListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackPreDamageListener; public class ABCallbackGetStoredAttackPreDamageListenerByKey extends ABAttackPreDamageListenerCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java index 98b71d156..6d50d18f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackProjReactionListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackProjReactionListener; public class ABCallbackGetStoredAttackProjReactionListenerByKey extends ABAttackProjReactionListenerCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java index ce35bb482..ae8877644 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABBehaviorChangeListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABBehaviorChangeListener; public class ABCallbackGetStoredBehaviorChangeListenerByKey extends ABBehaviorChangeListenerCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java index 460b5d8e0..80b137799 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDamageTakenListener; public class ABCallbackGetStoredDamageTakenListenerByKey extends ABDamageTakenListenerCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java index df5c7c582..6925cb40a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDamageTakenModificationListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDamageTakenModificationListener; public class ABCallbackGetStoredDamageTakenModificationListenerByKey extends ABDamageTakenModificationListenerCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java index 6f972779d..1df42a972 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABDeathReplacementEffect; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDeathReplacementEffect; public class ABCallbackGetStoredDeathReplacementByKey extends ABDeathReplacementCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java index 53ea8cc89..68a5e0997 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABAttackEvasionListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackEvasionListener; public class ABCallbackGetStoredEvasionListenerByKey extends ABEvasionListenerCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java index f848d13c7..f9895688c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener.ABUnitStateListener; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABUnitStateListener; public class ABCallbackGetStoredUnitStateListenerByKey extends ABUnitStateListenerCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDamageTakenListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDamageTakenListenerCallback.java new file mode 100644 index 000000000..17a34666f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDamageTakenListenerCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDamageTakenListener; + +public abstract class ABDamageTakenListenerCallback implements ABCallback { + + abstract public ABDamageTakenListener callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java new file mode 100644 index 000000000..1393449ce --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDamageTakenModificationListenerCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDamageTakenModificationListener; + +public abstract class ABDamageTakenModificationListenerCallback implements ABCallback { + + abstract public ABDamageTakenModificationListener callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDeathReplacementCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDeathReplacementCallback.java new file mode 100644 index 000000000..9980c7c7a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABDeathReplacementCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABDeathReplacementEffect; + +public abstract class ABDeathReplacementCallback implements ABCallback { + + abstract public ABDeathReplacementEffect callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABEvasionListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABEvasionListenerCallback.java new file mode 100644 index 000000000..b1895d0cd --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABEvasionListenerCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABAttackEvasionListener; + +public abstract class ABEvasionListenerCallback implements ABCallback { + + abstract public ABAttackEvasionListener callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABUnitStateListenerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABUnitStateListenerCallback.java new file mode 100644 index 000000000..0967d18f3 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABUnitStateListenerCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener.ABUnitStateListener; + +public abstract class ABUnitStateListenerCallback implements ABCallback { + + abstract public ABUnitStateListener callback(final CUnit caster, final ABLocalDataStore localStore, + final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackArgumentLocation.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackArgumentLocation.java index c860c08ef..24e214b16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackArgumentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackArgumentLocation.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromOffset.java similarity index 75% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromOffset.java index e6a1bac02..05716367c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromOffset.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCreateLocationFromOffset extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromTarget.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromTarget.java index 8b9f8ef03..b937c2e6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromTarget.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target.ABTargetCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.target.ABTargetCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCreateLocationFromTarget extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXY.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromXY.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXY.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromXY.java index f381074fa..9e6e65dab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXY.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromXY.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCreateLocationFromXY extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java index 9df258b4a..829f72cad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackCreateLocationFromXYOffset.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCreateLocationFromXYOffset extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackImpactLocation.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackImpactLocation.java index 118866b6c..804be0f8a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackImpactLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackImpactLocation.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAttackImpactLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackTargetLocation.java similarity index 71% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackTargetLocation.java index 16b75ce4f..55dd99d60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetAttackTargetLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackTargetLocation.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAttackTargetLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java index 5457cb70e..5421522d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetGroundAttackedLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetLocationFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetLocationFromList.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetLocationFromList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetLocationFromList.java index a65ffe2f2..45a6dfa31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetLocationFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetLocationFromList.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.ABListCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.ABListCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetLocationFromList extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java index 0e3bf5275..d9a94e1d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileCurrentLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetStoredLocationByKey.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetStoredLocationByKey.java index 10ac50c7b..ac01b21dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetStoredLocationByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetStoredLocationByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredLocationByKey extends ABLocationCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetTargetedLocation.java similarity index 73% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetTargetedLocation.java index 897e5a67b..9bae76c2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetTargetedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetTargetedLocation.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetTargetedLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetUnitLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetUnitLocation.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetUnitLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetUnitLocation.java index 318d5e1dc..c3add6737 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackGetUnitLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetUnitLocation.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackInlineConditionLocation.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackInlineConditionLocation.java index 92773fa0f..72c194b2f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackInlineConditionLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackInlineConditionLocation.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackModifyLocationWithOffset.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackModifyLocationWithOffset.java index 6309f80b2..7b15d415e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackModifyLocationWithOffset.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackModifyLocationWithOffset extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java index 54c056804..8f4b60eec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackModifyLocationWithXYOffset.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackModifyLocationWithXYOffset extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackRandomLocationInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackRandomLocationInRange.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackRandomLocationInRange.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackRandomLocationInRange.java index 1b24f251f..848c711fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackRandomLocationInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackRandomLocationInRange.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackRandomLocationInRange extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocation.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocation.java index f748a6381..1ef8655d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocation.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLocation extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocationWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocationWithArguments.java index 32330dc63..afeee4dde 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABCallbackReuseLocationWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocationWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLocationWithArguments extends ABLocationCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABLocationCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABLocationCallback.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABLocationCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABLocationCallback.java index cf14cda22..83c15e347 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/location/ABLocationCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABLocationCallback.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABLocationCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAddLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackAddLong.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAddLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackAddLong.java index 86d06f195..0779b8cce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAddLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackAddLong.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackAddLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAndLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackAndLong.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAndLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackAndLong.java index f1d7dc3f1..73644424f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackAndLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackAndLong.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackAndLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackArgumentLong.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackArgumentLong.java index 0280b7b39..903e01c43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackArgumentLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackArgumentLong.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectedData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackCreateDetectedData.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectedData.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackCreateDetectedData.java index 5bb8c1caa..859095096 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectedData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackCreateDetectedData.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCreateDetectedData extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectorData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackCreateDetectorData.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectorData.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackCreateDetectorData.java index a6892bb64..3284bcbd1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateDetectorData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackCreateDetectorData.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCreateDetectorData extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateOwnershipData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackCreateOwnershipData.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateOwnershipData.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackCreateOwnershipData.java index c61d5d4a9..dc4692160 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackCreateOwnershipData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackCreateOwnershipData.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCreateOwnershipData extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackDivideLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackDivideLong.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackDivideLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackDivideLong.java index 9417d19bc..1b3c237b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackDivideLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackDivideLong.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackDivideLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java index 146c38ef4..f95f315b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java index a6ede1b58..b2a1e6106 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetAbilityUniqueValueLong.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java index 45c69ae70..8bd90ce7f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetBuffUniqueValueLong.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetStoredLongByKey.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetStoredLongByKey.java index ba9ba47cc..fdb0e169b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackGetStoredLongByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetStoredLongByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredLongByKey extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackInlineConditionLong.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackInlineConditionLong.java index fb558a1d5..a2e8168a6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackInlineConditionLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackInlineConditionLong.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMaxLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackMaxLong.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMaxLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackMaxLong.java index 0bde6d5bb..87ed615b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMaxLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackMaxLong.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackMaxLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMinLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackMinLong.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMinLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackMinLong.java index d3d71c601..aefead1a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMinLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackMinLong.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackMinLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMultiplyLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackMultiplyLong.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMultiplyLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackMultiplyLong.java index e6a6bae1d..3c7866ea6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackMultiplyLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackMultiplyLong.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackMultiplyLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackOrLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackOrLong.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackOrLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackOrLong.java index b74bd0d5b..1e6b8327b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackOrLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackOrLong.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackOrLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java index 0c5741fc3..d62942408 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackPlayerMaskAllPlayers.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackPlayerMaskAllPlayers extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java index d29b8c130..a2bfe9bff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackPlayerMaskExcludePlayers.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackPlayerMaskExcludePlayers extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java index 0d3afb152..d1de3a8a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackPlayerMaskIncludePlayers.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackPlayerMaskIncludePlayers extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackRawLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackRawLong.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackRawLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackRawLong.java index 04548b8f7..8db0409fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackRawLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackRawLong.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackRawLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLong.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLong.java index e1f0455b5..e68d442e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLong.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLongWithArguments.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLongWithArguments.java index 019f1d6bd..37ee488ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackReuseLongWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLongWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLongWithArguments extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackSubtractLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackSubtractLong.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackSubtractLong.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackSubtractLong.java index f20734550..be4bf39fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/longs/ABCallbackSubtractLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackSubtractLong.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackSubtractLong extends ABLongCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABLongCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABLongCallback.java new file mode 100644 index 000000000..02d85ff74 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABLongCallback.java @@ -0,0 +1,10 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABLongCallback implements ABCallback { + + abstract public Long callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackArgumentOrderId.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackArgumentOrderId.java index 80890de69..d69276201 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackArgumentOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackArgumentOrderId.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.orderid; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentOrderId extends ABOrderIdCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java index d31f65f50..3a95913c9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.orderid; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredOrderIdByKey extends ABOrderIdCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackIdString.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackIdString.java index 5ac164bec..774b30561 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackIdString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackIdString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.orderid; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.orders.OrderIdUtils; public class ABCallbackIdString extends ABOrderIdCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java index c8b96c07b..c1b691e02 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackInlineConditionOrderId.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.orderid; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionOrderId extends ABOrderIdCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackRawID.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackRawID.java index 77c6b4904..17e2a2088 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackRawID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackRawID.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.orderid; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackRawID extends ABOrderIdCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderId.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderId.java index 6f24ea14e..5deb4ac9a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderId.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.orderid; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseOrderId extends ABOrderIdCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java index 9e32ab355..1acf91086 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.orderid; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseOrderIdWithArguments extends ABOrderIdCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABOrderIdCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABOrderIdCallback.java new file mode 100644 index 000000000..01164ddb5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABOrderIdCallback.java @@ -0,0 +1,10 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.orderid; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABOrderIdCallback implements ABCallback { + + abstract public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackArgumentPlayer.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackArgumentPlayer.java index d9c392ac5..2a57e4c21 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackArgumentPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackArgumentPlayer.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackArgumentPlayer extends ABPlayerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetCastingPlayer.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetCastingPlayer.java index 85816fe98..a1bbe5f79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetCastingPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetCastingPlayer.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetCastingPlayer extends ABPlayerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetOwnerOfUnit.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetOwnerOfUnit.java index a687a37c1..8c721644b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetOwnerOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetOwnerOfUnit.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetOwnerOfUnit extends ABPlayerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetPlayerById.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetPlayerById.java index b08b6d783..3a92694c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetPlayerById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetPlayerById.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetPlayerById extends ABPlayerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java index 54dcbd424..36363867f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackGetStoredPlayerByKey extends ABPlayerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackInlineConditionPlayer.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackInlineConditionPlayer.java index b3857b1f2..7cca22d63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackInlineConditionPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackInlineConditionPlayer.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackInlineConditionPlayer extends ABPlayerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayer.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayer.java index c440c43d7..69186599c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayer.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackReusePlayer extends ABPlayerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayerWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayerWithArguments.java index ab753d3aa..d21cbe4ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABCallbackReusePlayerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayerWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABCallbackReusePlayerWithArguments extends ABPlayerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABPlayerCallback.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABPlayerCallback.java index 5b5221514..3e52f8020 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/player/ABPlayerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABPlayerCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public abstract class ABPlayerCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackArgumentProjectile.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackArgumentProjectile.java index 1c9831e67..b88ed30bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackArgumentProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackArgumentProjectile.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackArgumentProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java index 2e8733037..f8ba36ae7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetLastCreatedProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java index d0fd69490..94d9c7cef 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetReactionAbilityProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java index d5a764d70..23db140a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetReactionAttackProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java index 54c9fabcc..d84e27aaf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetStoredProjectileByKey extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetThisProjectile.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetThisProjectile.java index c78f602b7..bfecf851f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackGetThisProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetThisProjectile.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetThisProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java index 94bda6884..365c61b13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackInlineConditionProjectile.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackInlineConditionProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectile.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectile.java index 217466c59..5385d2358 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectile.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackReuseProjectile extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java index b29f04379..bfd143bd7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackReuseProjectileWithArguments extends ABProjectileCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABProjectileCallback.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABProjectileCallback.java index 16b0cecb8..cfccc65b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/projectile/ABProjectileCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABProjectileCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public abstract class ABProjectileCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java index dc1baf070..c953751eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackArgumentNonStackingStatBuff extends ABNonStackingStatBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java similarity index 71% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java index 43a1d4287..ded09580c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackGetLastCreatedNonStackingStatBuff extends ABNonStackingStatBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java similarity index 73% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java index dbd25c744..b8dee8153 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackGetStoredNonStackingStatBuffByKey extends ABNonStackingStatBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java index 552752bbd..a3934865d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackInlineConditionNonStackingStatBuff.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackInlineConditionNonStackingStatBuff extends ABNonStackingStatBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java index e3e1e86c3..262f1e5bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackReuseNonStackingStatBuff extends ABNonStackingStatBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java index d1f5ea2a9..6bcc8fa31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackReuseNonStackingStatBuffWithArguments extends ABNonStackingStatBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java index a5bdc6bdc..70bac6b25 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABNonStackingStatBuffCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public abstract class ABNonStackingStatBuffCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java index d4f8caa81..c4efd8315 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackArgumentStateModBuff extends ABStateModBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java index 1f59da5b2..b5da5b8b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackGetLastCreatedStateModBuff extends ABStateModBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java index db1ff195c..9956b5e11 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackGetStoredStateModBuffByKey extends ABStateModBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java index a0e950444..7b208cda4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackInlineConditionStateModBuff.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackInlineConditionStateModBuff extends ABStateModBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuff.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuff.java index 127167e67..49b2aa124 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuff.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackReuseStateModBuff extends ABStateModBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java index 7e95754dc..5ba5d84ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public class ABCallbackReuseStateModBuffWithArguments extends ABStateModBuffCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABStateModBuffCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABStateModBuffCallback.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABStateModBuffCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABStateModBuffCallback.java index 54b4cf6c4..5ca0a1d8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/statemod/ABStateModBuffCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABStateModBuffCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; public abstract class ABStateModBuffCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackArgumentString.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackArgumentString.java index 46f7ae329..0d0d4a575 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackArgumentString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackArgumentString.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackBooleanToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackBooleanToString.java new file mode 100644 index 000000000..63e25af78 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackBooleanToString.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackBooleanToString extends ABStringCallback { + + private ABBooleanCallback value; + + @Override + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return "" + value.callback(caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackCatStrings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackCatStrings.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackCatStrings.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackCatStrings.java index 3efe1481f..afb554528 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackCatStrings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackCatStrings.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackCatStrings extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackFloatToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackFloatToString.java new file mode 100644 index 000000000..8fb108b40 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackFloatToString.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackFloatToString extends ABStringCallback { + + private ABFloatCallback value; + + @Override + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return "" + value.callback(caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java index 7a18b5474..37bfa0b5d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java index d3f1beabf..2606b5a2b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityHandleAsString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetAbilityHandleAsString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java index 1bcdc176c..0f073b5e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityUniqueValueString.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAliasAsString.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAliasAsString.java index 3f4b6959a..2f5d96ef6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAliasAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAliasAsString.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAliasAsString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAllowStackingKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAllowStackingKey.java similarity index 73% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAllowStackingKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAllowStackingKey.java index 652e9d5c0..27c2f712b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetAllowStackingKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAllowStackingKey.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; public class ABCallbackGetAllowStackingKey extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java index f862681cc..2f860a332 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetBuffHandleAsString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffHandleAsString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java index 27322e20d..4b8cd0981 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetBuffUniqueValueString.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetCodeAsString.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetCodeAsString.java index 03e07643b..790e89097 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetCodeAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetCodeAsString.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetCodeAsString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetStoredStringByKey.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetStoredStringByKey.java index 021d317e1..2cf078b30 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetStoredStringByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetStoredStringByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredStringByKey extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java index 5da6b63fe..d0c357b55 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetUnitHandleAsString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitHandleAsString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIdToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackIdToString.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIdToString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackIdToString.java index 1b2f789bf..65f4785fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackIdToString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackIdToString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackIdToString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackInlineConditionString.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackInlineConditionString.java index 57e76a9a4..52312c866 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackInlineConditionString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackInlineConditionString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackIntegerToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackIntegerToString.java new file mode 100644 index 000000000..cd3821b53 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackIntegerToString.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackIntegerToString extends ABStringCallback { + + private ABIntegerCallback value; + + @Override + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return "" + value.callback(caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackLongToString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackLongToString.java new file mode 100644 index 000000000..247d25d95 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackLongToString.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs.ABLongCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackLongToString extends ABStringCallback { + + private ABLongCallback value; + + @Override + public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return "" + value.callback(caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackRawString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackRawString.java similarity index 71% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackRawString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackRawString.java index d8026e2f6..66d491113 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackRawString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackRawString.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackRawString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseString.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseString.java index 0086aba48..e75abb753 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseString.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseString extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseStringWithArguments.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseStringWithArguments.java index 08f0778eb..bd9c423a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/strings/ABCallbackReuseStringWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseStringWithArguments.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseStringWithArguments extends ABStringCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABStringCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABStringCallback.java new file mode 100644 index 000000000..0bfc0b137 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABStringCallback.java @@ -0,0 +1,10 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABStringCallback implements ABCallback { + + abstract public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackArgumentTarget.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackArgumentTarget.java index 9939da04e..08cd5792b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackArgumentTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackArgumentTarget.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.target; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentTarget extends ABTargetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetAbilityTarget.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetAbilityTarget.java index ed3c9c307..a2ec73d35 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetAbilityTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetAbilityTarget.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.target; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityTarget extends ABTargetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetStoredTargetByKey.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetStoredTargetByKey.java index eaf6901d4..687b5532d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackGetStoredTargetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetStoredTargetByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.target; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredTargetByKey extends ABTargetCallback { private ABStringCallback key; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackInlineConditionTarget.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackInlineConditionTarget.java index 79bb6bce7..3270a0b07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackInlineConditionTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackInlineConditionTarget.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.target; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionTarget extends ABTargetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTarget.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTarget.java index 753814663..6fa6e86a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTarget.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.target; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseTarget extends ABTargetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTargetWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTargetWithArguments.java index 6ec14b3c6..499d4ec13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABCallbackReuseTargetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTargetWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.target; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseTargetWithArguments extends ABTargetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABTargetCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABTargetCallback.java similarity index 52% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABTargetCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABTargetCallback.java index 402ca448d..5a5937b4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/target/ABTargetCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABTargetCallback.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.target; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABTargetCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackArgumentTimer.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackArgumentTimer.java index 6712993b4..4720115b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackArgumentTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackArgumentTimer.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackArgumentTimer extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetFiringTimer.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetFiringTimer.java index bd2cf60aa..18c6d69c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetFiringTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetFiringTimer.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetFiringTimer extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java index 35a30cf32..3f4964cb9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetLastCreatedTimer extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastStartedTimer.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastStartedTimer.java index b4e75f8d6..5ac42a6c9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetLastStartedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastStartedTimer.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetLastStartedTimer extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java index 87054e532..47d37fcab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackGetStoredTimerByKey extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackInlineConditionTimer.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackInlineConditionTimer.java index bdee51e7a..44272e5f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackInlineConditionTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackInlineConditionTimer.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackInlineConditionTimer extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimer.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimer.java index 1337783f2..4d6b42357 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimer.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackReuseTimer extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java index 1de1bcf13..8c65d008d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABCallbackReuseTimerWithArguments extends ABTimerCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABTimerCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABTimerCallback.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABTimerCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABTimerCallback.java index 71e0e84e2..e3fd3612e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/timer/ABTimerCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABTimerCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public abstract class ABTimerCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackArgumentUnit.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackArgumentUnit.java index 2bdc3c1f6..64583ae5e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackArgumentUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackArgumentUnit.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java index e0064269f..bcb46d990 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityPairedUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java index 09d101c2b..86c125a5c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityTargetedUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackedUnit.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackedUnit.java index f323505aa..f65632545 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetAttackedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackedUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAttackedUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java new file mode 100644 index 000000000..05105de3b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABCallbackGetAttackingUnit extends ABUnitCallback { + + @Override + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.ATTACKINGUNIT+castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java index 65ab0753a..f90729cbf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetBuffCastingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetBuffedUnit.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffedUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetBuffedUnit.java index 6a1e8ee53..167b0dfa9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetBuffedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetBuffedUnit.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffedUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCastingUnit.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCastingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCastingUnit.java index 34147e8a1..bed5e00e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCastingUnit.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetCastingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetChainUnit.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetChainUnit.java index 65f742433..71f5c0627 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetChainUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetChainUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetChainUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit1.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit1.java index 7ce401473..02599ed77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit1.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit1.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetCompUnit1 extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit2.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit2.java index 9cf0931e0..77e26e78c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetCompUnit2.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit2.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetCompUnit2 extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java new file mode 100644 index 000000000..5aff45a91 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABCallbackGetDamagedUnit extends ABUnitCallback { + + @Override + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGEDUNIT + castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java new file mode 100644 index 000000000..7d2fb55c8 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABCallbackGetDamagingUnit extends ABUnitCallback { + + @Override + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGINGUNIT + castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java new file mode 100644 index 000000000..779f48b64 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABCallbackGetDyingUnit extends ABUnitCallback { + + @Override + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.DYINGUNIT + castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetEnumUnit.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetEnumUnit.java index a0b375cb6..471929657 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetEnumUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetEnumUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetEnumUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java new file mode 100644 index 000000000..c4de6dbcd --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABCallbackGetKillingUnit extends ABUnitCallback { + + @Override + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.KILLINGUNIT + castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java index d559a5e2c..23ebaeff7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetListenerUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetListenerUnit.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetListenerUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetListenerUnit.java index ecc5c4b98..48a19cb4e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetListenerUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetListenerUnit.java @@ -1,7 +1,7 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetListenerUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetMatchingUnit.java similarity index 68% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetMatchingUnit.java index 8c88f2d85..2d85c8c4a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetMatchingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetMatchingUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetMatchingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java similarity index 72% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java index 08d74dbcf..1dd032b8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import java.util.List; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABUnitAndRangeComparator; public class ABCallbackGetNearestCorpseInRangeOfUnit extends ABUnitCallback { private static final Rectangle recycleRect = new Rectangle(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java similarity index 72% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java index 6c857e8a2..35a5042e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import java.util.List; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABUnitAndRangeComparator; public class ABCallbackGetNearestUnitInRangeOfUnit extends ABUnitCallback { private static final Rectangle recycleRect = new Rectangle(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetParentCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetParentCastingUnit.java new file mode 100644 index 000000000..730be7c91 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetParentCastingUnit.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABCallbackGetParentCastingUnit extends ABUnitCallback { + + @Override + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.PARENTCASTER); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java index 9fa96524c..9100ed297 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileHitUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java index 77806b1fc..fd87fc786 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileSourceUnit.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABCallbackGetProjectileSourceUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java index e0a427c60..ef725d62e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetReactionAbilityCastingUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java index ab7329869..7c6bbc15e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetReactionAbilityTargetUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java index 370b381d2..f9d5dbd90 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredUnitByKey extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackInlineConditionUnit.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackInlineConditionUnit.java index 5fa393288..36a7d02ab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackInlineConditionUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackInlineConditionUnit.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackPollUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackPollUnitQueue.java new file mode 100644 index 000000000..4307c7722 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackPollUnitQueue.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue.ABUnitQueueCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABCallbackPollUnitQueue extends ABUnitCallback { + + private ABUnitQueueCallback queue; + + @Override + public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return queue.callback(caster, localStore, castId).poll(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnit.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnit.java index d48a3f7ec..60e6ea52a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnit.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnit extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java index 3401db9d4..b0dd56b7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitWithArguments extends ABUnitCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABUnitCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABUnitCallback.java new file mode 100644 index 000000000..9e71f000e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABUnitCallback.java @@ -0,0 +1,11 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABUnitCallback implements ABCallback { + + @Override + abstract public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java index f60ea669d..5d2cc375a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentUnitGroup extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java index c6f714342..ec8097a82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackGetLastCreatedUnitGroup.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup; import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedUnitGroup extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java index abb143718..602abeba8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackGetStoredUnitGroupByKey.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredUnitGroupByKey extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java index 8728f98c8..c6c9083d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackGetUnitGroupByName.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup; import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitGroupByName extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java index ad1899a37..747d404e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackInlineConditionUnitGroup.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup; import java.util.Set; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionUnitGroup extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java index 52eb23a92..6f6e2b397 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitGroup extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java index 17e4621cb..f394031e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup; import java.util.Map; import java.util.Set; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitGroupWithArguments extends ABUnitGroupCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABUnitGroupCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABUnitGroupCallback.java new file mode 100644 index 000000000..174897de5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABUnitGroupCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup; + +import java.util.Set; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABUnitGroupCallback implements ABCallback { + + abstract public Set callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java index ff7d018d9..bc0443d66 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentUnitQueue extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java index 4b9ca048c..c943a3029 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackGetLastCreatedUnitQueue.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue; import java.util.Queue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetLastCreatedUnitQueue extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java index 5e10ff4a5..d7742a4aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackGetStoredUnitQueueByKey.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredUnitQueueByKey extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java index f4eb12085..40a38c9d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackGetUnitQueueByName.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue; import java.util.Queue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetUnitQueueByName extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java index f60d99ea3..b2614ca4f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackInlineConditionUnitQueue.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue; import java.util.Queue; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionUnitQueue extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java index 0d66b6029..0b9d3c29a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitQueue extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java index 1593c21f1..a8dbe43e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue; import java.util.Map; import java.util.Queue; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitQueueWithArguments extends ABUnitQueueCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABUnitQueueCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABUnitQueueCallback.java new file mode 100644 index 000000000..e81c6c7b5 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABUnitQueueCallback.java @@ -0,0 +1,12 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue; + +import java.util.Queue; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABUnitQueueCallback implements ABCallback { + + abstract public Queue callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java index c9a8cc862..1d2e4e64c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.visionmodifier; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackArgumentVisionModifier extends ABVisionModifierCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java index 5c1bb9915..8d3d98294 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.visionmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackGetLastCreatedVisionModifier extends ABVisionModifierCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java index a322f33d3..fd5b60140 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.visionmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackGetStoredVisionModifierByKey extends ABVisionModifierCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java index fb4fdab90..731b6752b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackInlineConditionVisionModifier.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.visionmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackInlineConditionVisionModifier extends ABVisionModifierCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java index 5d79a792b..daf4d7f4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.visionmodifier; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackReuseVisionModifier extends ABVisionModifierCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java index d8ef8ef54..70c6f4681 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.visionmodifier; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public class ABCallbackReuseVisionModifierWithArguments extends ABVisionModifierCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABVisionModifierCallback.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABVisionModifierCallback.java index 1da3f9d6a..e6a8ad99e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/visionmodifier/ABVisionModifierCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABVisionModifierCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.visionmodifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; public abstract class ABVisionModifierCallback implements ABCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackArgumentWidget.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackArgumentWidget.java index e7fb1642d..94eb4a630 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackArgumentWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackArgumentWidget.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentWidget extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackDestructableToWidget.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackDestructableToWidget.java index a6e4d49b5..c7175c0c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackDestructableToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackDestructableToWidget.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackDestructableToWidget extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java index 0a8ef5461..e0ec92d08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetProjectileHitWidget extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java index 625c593bf..e5f983835 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredWidgetByKey extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackInlineConditionWidget.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackInlineConditionWidget.java index 1e1a29935..f2c23cac3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackInlineConditionWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackInlineConditionWidget.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionWidget extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackItemToWidget.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackItemToWidget.java index 9e5e8ccaf..56ac8a248 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackItemToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackItemToWidget.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.ABItemCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackItemToWidget extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidget.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidget.java index 408075197..c4a3dfdf5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidget.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseWidget extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java index 8145e930d..4b3c0bc35 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseWidgetWithArguments extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackUnitToWidget.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackUnitToWidget.java index 178d8bfa4..e9b88f6e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/callback/widget/ABCallbackUnitToWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackUnitToWidget.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackUnitToWidget extends ABWidgetCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABWidgetCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABWidgetCallback.java new file mode 100644 index 000000000..951d95a7c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABWidgetCallback.java @@ -0,0 +1,11 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public abstract class ABWidgetCallback implements ABCallback { + + abstract public CWidget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId); +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABBooleanCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABBooleanCallback.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABBooleanCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABBooleanCallback.java index 9167c2e6b..b90c4a271 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABBooleanCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABBooleanCallback.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition; import com.etheller.warsmash.parsers.jass.JassTextGeneratorExpr; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABBooleanCallback implements ABCallback, JassTextGeneratorExpr { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackArgumentBoolean.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackArgumentBoolean.java index f4ade7ac0..6ed8f206e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackArgumentBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackArgumentBoolean.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackArgumentBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBoolean.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBoolean.java index fead9018d..44623cb19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBoolean.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBooleanWithArguments.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBooleanWithArguments.java index cc214c4cf..3484d4108 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABCallbackReuseBooleanWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBooleanWithArguments.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition; import java.util.Map; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBooleanWithArguments extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABConditionSetCantUseReasonOnFailure.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABConditionSetCantUseReasonOnFailure.java index 6a3435bb5..81a20e4c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ABConditionSetCantUseReasonOnFailure.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABConditionSetCantUseReasonOnFailure.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeysEnum; public class ABConditionSetCantUseReasonOnFailure extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java index 78a83728b..446399c80 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionIsAutoCastCurrentlyActive extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsDisabled.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsDisabled.java new file mode 100644 index 000000000..280da4a10 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsDisabled.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABConditionIsDisabled extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + return ability.isDisabled(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java new file mode 100644 index 000000000..beb60f952 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveFlexTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABConditionIsFlexAbilityNonPointTarget extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); + + return !ability.isPointTarget(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java new file mode 100644 index 000000000..a30a14780 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveFlexTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABConditionIsFlexAbilityNonTargeted extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); + + return !ability.isTargetedSpell(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java new file mode 100644 index 000000000..f2fc0420f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveFlexTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABConditionIsFlexAbilityPointTarget extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); + + return ability.isPointTarget(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java new file mode 100644 index 000000000..ffbeb76c0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveFlexTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABConditionIsFlexAbilityTargeted extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore + .get(ABLocalStoreKeys.ISFLEXABILITY); + + return ability.isTargetedSpell(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsOnCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsOnCooldown.java new file mode 100644 index 000000000..308ef0d47 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsOnCooldown.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABConditionIsOnCooldown extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + + return ability.getCooldownRemainingTicks(localStore.game, caster) > 0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsToggleAbilityActive.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsToggleAbilityActive.java index b357c4876..64d7c478b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionIsToggleAbilityActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsToggleAbilityActive.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionIsToggleAbilityActive extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java new file mode 100644 index 000000000..d6290f034 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java @@ -0,0 +1,15 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABConditionIsTransformingToAlternate extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (Boolean) localStore.get(ABLocalStoreKeys.TRANSFORMINGTOALT + castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCast.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCast.java index b954ecd2a..dc23a8183 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCast.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCast.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionWasAutoCast extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java index c612717f1..52d9ddb08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionWasAutoCastPreviouslyActive extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasCastingInterrupted.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasCastingInterrupted.java index e0a09a229..e5edff310 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/ability/ABConditionWasCastingInterrupted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasCastingInterrupted.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionWasCastingInterrupted extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java new file mode 100644 index 000000000..0f719eb2e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.attack; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; + +public class ABConditionIsAttackProjectile extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isProjectile(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java new file mode 100644 index 000000000..2cd62cf66 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.attack; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; + +public class ABConditionIsAttackRanged extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isRanged(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java index a20ab0d41..3d04a84ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.booleans; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetAbilityUniqueValueBoolean.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityUniqueValueBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetAbilityUniqueValueBoolean.java index 8d86eae0d..8876987f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetAbilityUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetAbilityUniqueValueBoolean.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.booleans; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.ABAbilityCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetAbilityUniqueValueBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetBuffUniqueValueBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetBuffUniqueValueBoolean.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetBuffUniqueValueBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetBuffUniqueValueBoolean.java index e06ba984b..789cd4834 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetBuffUniqueValueBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetBuffUniqueValueBoolean.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.booleans; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackGetBuffUniqueValueBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java index 3e40dca2d..b116881fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.booleans; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetParentAbilityDataAsBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java index f61038208..408e43af7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.booleans; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetStoredBooleanByKey extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackInlineConditionBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackInlineConditionBoolean.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackInlineConditionBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackInlineConditionBoolean.java index 61e0f17ab..c5fed0457 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackInlineConditionBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackInlineConditionBoolean.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.booleans; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackInlineConditionBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackIntegerToBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackIntegerToBoolean.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackIntegerToBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackIntegerToBoolean.java index 93ccb53e2..bd8cdeb8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackIntegerToBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackIntegerToBoolean.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.booleans; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackIntegerToBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackRawBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackRawBoolean.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackRawBoolean.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackRawBoolean.java index c06890176..f4e92db02 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/booleans/ABCallbackRawBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackRawBoolean.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.booleans; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABCallbackRawBoolean extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffAlly.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffAlly.java index bd9d07685..11eea609e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffAlly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffAlly.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.buff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsBuffAlly extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffEnemy.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffEnemy.java index 8cb19a265..2c2cded75 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/buff/ABConditionIsBuffEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffEnemy.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.buff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.ABBuffCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsBuffEnemy extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffMagic.java new file mode 100644 index 000000000..90d08dbda --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffMagic.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.buff; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsBuffMagic extends ABBooleanCallback { + + ABBuffCallback buff; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CBuff theBuff = buff.callback(caster, localStore, castId); + return theBuff.isMagic(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffNegative.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffNegative.java new file mode 100644 index 000000000..2afd8bee4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffNegative.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.buff; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsBuffNegative extends ABBooleanCallback { + + ABBuffCallback buff; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CBuff theBuff = buff.callback(caster, localStore, castId); + return !theBuff.isPositive(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffPositive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffPositive.java new file mode 100644 index 000000000..e8d8e956a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/buff/ABConditionIsBuffPositive.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.buff; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsBuffPositive extends ABBooleanCallback { + + ABBuffCallback buff; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CBuff theBuff = buff.callback(caster, localStore, castId); + return theBuff.isPositive(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java index b035c3337..5e57c5d14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsAttackTypeEqual.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAttackTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAttackTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; public class ABConditionIsAttackTypeEqual extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java index c3612684a..b7b0ce1df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsDamageTypeEqual.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDamageTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDamageTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABConditionIsDamageTypeEqual extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java index 9c7ad01cc..77ee39e2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsDefenseTypeEqual.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDefenseTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDefenseTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABConditionIsDefenseTypeEqual extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java index 76c7f5bf0..b74e80600 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsDefenseTypeInList.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.comparison; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABDefenseTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABDefenseTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; public class ABConditionIsDefenseTypeInList extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsIdEqual.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsIdEqual.java index b101b3c74..1f952d150 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsIdEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsIdEqual.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.comparison; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsIdEqual extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java index 0f2a13b4e..e1618636f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsMovementTypeEqual.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.MovementType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABMovementTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABMovementTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsMovementTypeEqual extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsUnitEqual.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsUnitEqual.java index eeae5e1ac..68d5d77e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsUnitEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsUnitEqual.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsUnitEqual extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java index 5a02a4f31..fd572625e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/comparison/ABConditionIsWeaponTypeEqual.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.comparison; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABWeaponTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABWeaponTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CWeaponType; public class ABConditionIsWeaponTypeEqual extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java similarity index 71% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java index 1648b990c..bbcf9046f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/cost/ABConditionSuccessfullyChargeResources.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.cost; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.cost; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.ABPlayerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.ABPlayerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public class ABConditionSuccessfullyChargeResources extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java index a59647e6a..3b005ebec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructable/ABConditionDoesDestructableHaveBuff.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionDoesDestructableHaveBuff extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java index e42cd6a15..a338db171 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructable/ABConditionDoesDestructableHaveBuffMatchingCondition.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.destructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionDoesDestructableHaveBuffMatchingCondition extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructable/ABConditionIsTree.java similarity index 58% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructable/ABConditionIsTree.java index 730da209c..4bd87cc96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/destructable/ABConditionIsTree.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructable/ABConditionIsTree.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.destructable; import java.util.EnumSet; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABConditionIsTree extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java new file mode 100644 index 000000000..8b99b5b0b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/destructablebuff/ABConditionIsDestructableBuffMagic.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.destructablebuff; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff.ABDestructableBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsDestructableBuffMagic extends ABBooleanCallback { + + ABDestructableBuffCallback buff; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CDestructableBuff theBuff = buff.callback(caster, localStore, castId); + return theBuff.isMagic(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java index c911d54a0..9cc1c2570 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantCanDisableDivineShield.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.game; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionGameplayConstantCanDisableDivineShield extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java new file mode 100644 index 000000000..39ed9871a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantIsDefendCanDeflect.java @@ -0,0 +1,14 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.game; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionGameplayConstantIsDefendCanDeflect extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return localStore.game.getGameplayConstants().isDefendDeflection(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java index 7cd959a57..4489563ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantIsRelativeUpgradeCosts.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.game; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionGameplayConstantIsRelativeUpgradeCosts extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java index bef984380..8cc26dce2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionGameplayConstantSmartAbolishMagic.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.game; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionGameplayConstantSmartAbolishMagic extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionIsTimeOfDayInRange.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionIsTimeOfDayInRange.java index b12aa9cfe..502b74c81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/game/ABConditionIsTimeOfDayInRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/game/ABConditionIsTimeOfDayInRange.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.game; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsTimeOfDayInRange extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionIsItemAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionIsItemAbility.java new file mode 100644 index 000000000..4afeec49a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionIsItemAbility.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.item; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABConditionIsItemAbility extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + + return ability.getItem() != null; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemHasCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemHasCharges.java new file mode 100644 index 000000000..dccebe0ac --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemHasCharges.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.item; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABConditionItemHasCharges extends ABBooleanCallback { + + private ABItemCallback item; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + if (item == null) { + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + + return ability.getItem().getCharges() > 0; + } else { + return item.callback(caster, localStore, castId).getCharges() > 0; + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemIsCharged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemIsCharged.java new file mode 100644 index 000000000..428393a1d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemIsCharged.java @@ -0,0 +1,25 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.item; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABConditionItemIsCharged extends ABBooleanCallback { + + private ABItemCallback item; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + if (item == null) { + ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + + return ability.getItem().getItemType().getNumberOfCharges() > 0; + } else { + return item.callback(caster, localStore, castId).getItemType().getNumberOfCharges() > 0; + } + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationDeepWater.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationDeepWater.java index 0be80d578..13f5c51d2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationDeepWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationDeepWater.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.location; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsLocationDeepWater extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationFlyingOnly.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationFlyingOnly.java index 561a6ae2b..4fc115d0a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationFlyingOnly.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationFlyingOnly.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.location; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsLocationFlyingOnly extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java index 9acc0f045..f0c4a3416 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationPathableForUnitType.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.location; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsLocationPathableForUnitType extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationShallowWater.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationShallowWater.java index 1100c6fe6..f02aa8720 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationShallowWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationShallowWater.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.location; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsLocationShallowWater extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationWalkable.java similarity index 57% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationWalkable.java index fa925ef68..2d3f99d84 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationWalkable.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.location; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsLocationWalkable extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java index 4e45bc9ce..1caaa74cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/location/ABConditionIsLocationWalkableNonWater.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.location; import com.etheller.warsmash.viewer5.handlers.w3x.environment.PathingGrid.PathingType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.ABLocationCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.ABLocationCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsLocationWalkableNonWater extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionAnd.java similarity index 72% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionAnd.java index 7b125fbe2..89b9cc923 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionAnd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionAnd.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.logical; import java.util.List; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionAnd extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionBool.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionBool.java new file mode 100644 index 000000000..341b9a610 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionBool.java @@ -0,0 +1,16 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.logical; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionBool extends ABBooleanCallback { + + private ABBooleanCallback bool; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return bool.callback(caster, localStore, castId); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionIsNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionIsNull.java new file mode 100644 index 000000000..b575812a1 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionIsNull.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.logical; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsNull extends ABBooleanCallback { + + private ABCallback value; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return value.callback(caster, localStore, castId) == null; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionNot.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionNot.java index f5b4094af..9a1d9b5cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionNot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionNot.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.logical; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionNot extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionNotNull.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionNotNull.java new file mode 100644 index 000000000..84abaa6e0 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionNotNull.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.logical; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionNotNull extends ABBooleanCallback { + + private ABCallback value; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return value.callback(caster, localStore, castId) != null; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionOr.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionOr.java index f4e656507..0cd08e850 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/logical/ABConditionOr.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/logical/ABConditionOr.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.logical; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionOr extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionIsUnitInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionIsUnitInGroup.java new file mode 100644 index 000000000..05294d641 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionIsUnitInGroup.java @@ -0,0 +1,23 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.membership; + +import java.util.Set; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup.ABUnitGroupCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsUnitInGroup extends ABBooleanCallback { + + private ABUnitGroupCallback group; + private ABUnitCallback unit; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Set groupSet = group.callback(caster, localStore, castId); + CUnit rUnit = unit.callback(caster, localStore, castId); + return groupSet.contains(rUnit); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java new file mode 100644 index 000000000..4b67b7d4b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionIsUnitInRangeOfUnit.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.membership; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsUnitInRangeOfUnit extends ABBooleanCallback { + + private ABUnitCallback caster; + private ABUnitCallback target; + private ABFloatCallback range; + + @Override + public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int castId) { + return caster.callback(casterUnit, localStore, castId).canReach( + target.callback(casterUnit, localStore, castId), + range.callback(casterUnit, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java similarity index 67% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java index 50af59ded..2a5fffb07 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java @@ -1,16 +1,16 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.membership; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.membership; import java.util.List; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABUnitAndRangeComparator; public class ABConditionMatchingCorpseExistsInRangeOfUnit extends ABBooleanCallback { private static final Rectangle recycleRect = new Rectangle(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java index 6d83f5fee..c6266a0a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.membership; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.membership; import com.badlogic.gdx.math.Rectangle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs.ABUnitAndRangeComparator; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABUnitAndRangeComparator; public class ABConditionMatchingUnitExistsInRangeOfUnit extends ABBooleanCallback { private static final Rectangle recycleRect = new Rectangle(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatEq0.java new file mode 100644 index 000000000..5658fb510 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatEq0.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionFloatEq0 extends ABBooleanCallback { + + private ABFloatCallback value; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Float v = value.callback(caster, localStore, castId); + + return v==0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatEqual.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatEqual.java index b689280fd..c28823d16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatEqual.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatEqual.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionFloatEqual extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatGt.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatGt.java index 9d13ae54b..cc67b617f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionFloatGt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatGt.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionFloatGt extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatGt0.java new file mode 100644 index 000000000..d63fc5056 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatGt0.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionFloatGt0 extends ABBooleanCallback { + + private ABFloatCallback value; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Float v = value.callback(caster, localStore, castId); + return v > 0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatGte.java new file mode 100644 index 000000000..2cb6ab749 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatGte.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionFloatGte extends ABBooleanCallback { + + private ABFloatCallback value1; + private ABFloatCallback value2; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Float v1 = value1.callback(caster, localStore, castId); + Float v2 = value2.callback(caster, localStore, castId); + + return v1 >= v2; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatLt.java new file mode 100644 index 000000000..44f94bf52 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatLt.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionFloatLt extends ABBooleanCallback { + + private ABFloatCallback value1; + private ABFloatCallback value2; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Float v1 = value1.callback(caster, localStore, castId); + Float v2 = value2.callback(caster, localStore, castId); + + return v1 < v2; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatLte.java new file mode 100644 index 000000000..40ae39bbb --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatLte.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionFloatLte extends ABBooleanCallback { + + private ABFloatCallback value1; + private ABFloatCallback value2; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Float v1 = value1.callback(caster, localStore, castId); + Float v2 = value2.callback(caster, localStore, castId); + + return v1 <= v2; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatNe.java new file mode 100644 index 000000000..5c6cde128 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatNe.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionFloatNe extends ABBooleanCallback { + + private ABFloatCallback value1; + private ABFloatCallback value2; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Float v1 = value1.callback(caster, localStore, castId); + Float v2 = value2.callback(caster, localStore, castId); + + return !v1.equals(v2); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatNe0.java new file mode 100644 index 000000000..154c7b12a --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionFloatNe0.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionFloatNe0 extends ABBooleanCallback { + + private ABFloatCallback value; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Float v = value.callback(caster, localStore, castId); + + return v!=0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerEq.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerEq.java new file mode 100644 index 000000000..dcbc46baf --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerEq.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIntegerEq extends ABBooleanCallback { + + private ABIntegerCallback value1; + private ABIntegerCallback value2; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Integer v1 = value1.callback(caster, localStore, castId); + Integer v2 = value2.callback(caster, localStore, castId); + + return v1.equals(v2); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerEq0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerEq0.java new file mode 100644 index 000000000..83223eb48 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerEq0.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIntegerEq0 extends ABBooleanCallback { + + private ABIntegerCallback value; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Integer v1 = value.callback(caster, localStore, castId); + return v1 == 0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGt.java new file mode 100644 index 000000000..c77a6cc9f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGt.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIntegerGt extends ABBooleanCallback { + + private ABIntegerCallback value1; + private ABIntegerCallback value2; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Integer v1 = value1.callback(caster, localStore, castId); + Integer v2 = value2.callback(caster, localStore, castId); + return v1 > v2; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGt0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGt0.java new file mode 100644 index 000000000..3e75de924 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGt0.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIntegerGt0 extends ABBooleanCallback { + + private ABIntegerCallback value; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Integer v1 = value.callback(caster, localStore, castId); + return v1 > 0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGte.java new file mode 100644 index 000000000..acccc7887 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerGte.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIntegerGte extends ABBooleanCallback { + + private ABIntegerCallback value1; + private ABIntegerCallback value2; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Integer v1 = value1.callback(caster, localStore, castId); + Integer v2 = value2.callback(caster, localStore, castId); + return v1 >= v2; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerIsEven.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerIsEven.java new file mode 100644 index 000000000..4c9ffc9af --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerIsEven.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIntegerIsEven extends ABBooleanCallback { + + private ABIntegerCallback value; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Integer v1 = value.callback(caster, localStore, castId); + + return (v1 % 2) == 0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerIsOdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerIsOdd.java new file mode 100644 index 000000000..de9d55cb6 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerIsOdd.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIntegerIsOdd extends ABBooleanCallback { + + private ABIntegerCallback value; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Integer v1 = value.callback(caster, localStore, castId); + + return (v1 % 2) == 1; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerLt.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerLt.java index 99b2282f9..25ec36d38 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/numeric/ABConditionIntegerLt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerLt.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIntegerLt extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerLte.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerLte.java new file mode 100644 index 000000000..357652e9d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerLte.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIntegerLte extends ABBooleanCallback { + + private ABIntegerCallback value1; + private ABIntegerCallback value2; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Integer v1 = value1.callback(caster, localStore, castId); + Integer v2 = value2.callback(caster, localStore, castId); + return v1 <= v2; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerNe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerNe.java new file mode 100644 index 000000000..83b88f8f9 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerNe.java @@ -0,0 +1,20 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIntegerNe extends ABBooleanCallback { + + private ABIntegerCallback value1; + private ABIntegerCallback value2; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Integer v1 = value1.callback(caster, localStore, castId); + Integer v2 = value2.callback(caster, localStore, castId); + return !v1.equals(v2); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerNe0.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerNe0.java new file mode 100644 index 000000000..1c32fd403 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/numeric/ABConditionIntegerNe0.java @@ -0,0 +1,18 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIntegerNe0 extends ABBooleanCallback { + + private ABIntegerCallback value; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + Integer v1 = value.callback(caster, localStore, castId); + return v1 != 0; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/projectile/ABConditionIsProjectileReflected.java similarity index 61% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/projectile/ABConditionIsProjectileReflected.java index ba26d8ab9..ef09e039a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/projectile/ABConditionIsProjectileReflected.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/projectile/ABConditionIsProjectileReflected.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.projectile; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.ABProjectileCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile.ABProjectileCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; public class ABConditionIsProjectileReflected extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java similarity index 56% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java index a60b6afd6..b6a81098b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java @@ -1,17 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.targeting; import java.util.EnumSet; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.ABDestructableCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.ABDestructableCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABConditionIsDestructableValidTarget extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java index ff2e47a46..7b7586c2b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.targeting; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget.ABWidgetCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; public class ABConditionIsPassAllAbilityTargetChecks extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java index 0f41b016f..c1272ef13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.targeting; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; public class ABConditionIsUnitPassAllAbilityTargetChecks extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitValidTarget.java similarity index 73% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitValidTarget.java index e38ade6fe..0e09c94b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsUnitValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitValidTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.targeting; import java.util.EnumSet; import java.util.List; @@ -6,13 +6,13 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsValidTarget.java similarity index 65% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsValidTarget.java index 1f5746fb5..7b865bc87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/targeting/ABConditionIsValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsValidTarget.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.targeting; import java.util.EnumSet; import java.util.List; @@ -6,14 +6,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.ABWidgetCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget.ABWidgetCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; public class ABConditionIsValidTarget extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/timer/ABConditionIsTimerActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/timer/ABConditionIsTimerActive.java new file mode 100644 index 000000000..0c87f8926 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/timer/ABConditionIsTimerActive.java @@ -0,0 +1,17 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.timer; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer.ABTimerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsTimerActive extends ABBooleanCallback { + + private ABTimerCallback timer; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return timer.callback(caster, localStore, castId).isRunning(); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java new file mode 100644 index 000000000..e8af31c2e --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/uniqueflag/ABConditionDoesAbilityHaveUniqueFlag.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.uniqueflag; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionDoesAbilityHaveUniqueFlag extends ABBooleanCallback { + + ABAbilityCallback ability; + ABStringCallback flag; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CAbility theAbility = ability.callback(caster, localStore, castId); + return theAbility.hasUniqueFlag(flag.callback(caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java new file mode 100644 index 000000000..0b8f55379 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/uniqueflag/ABConditionDoesBuffHaveUniqueFlag.java @@ -0,0 +1,21 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.uniqueflag; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.ABBuffCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionDoesBuffHaveUniqueFlag extends ABBooleanCallback { + + ABBuffCallback buff; + ABStringCallback flag; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CBuff theBuff = buff.callback(caster, localStore, castId); + return theBuff.hasUniqueFlag(flag.callback(caster, localStore, castId)); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/ABConditionIsUnitType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/ABConditionIsUnitType.java new file mode 100644 index 000000000..d189c158b --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/ABConditionIsUnitType.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsUnitType extends ABBooleanCallback { + + private ABUnitCallback unit; + private ABIDCallback unitType; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.getTypeId().equals(unitType.callback(caster, localStore, castId)); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java similarity index 64% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java index 7e57a4b3b..233ebc176 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/ability/ABConditionDoesUnitHaveAbilityMatchingCondition.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.ability; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.ability; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityCategory; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionDoesUnitHaveAbilityMatchingCondition extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java similarity index 72% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java index 8ff247097..6c0bc421e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/alliance/ABConditionIsUnitEnemy.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.alliance; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.alliance; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsUnitEnemy extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java similarity index 72% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java index 5ed2e7f3b..b864821be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/alliance/ABConditionIsUnitFriend.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.alliance; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.alliance; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsUnitFriend extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java similarity index 62% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java index 6bc3a6784..8f542268a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/alliance/ABConditionIsUnitShareSpells.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.alliance; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.alliance; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CAllianceType; public class ABConditionIsUnitShareSpells extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java index 78179942d..124d3ba78 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/behavior/ABConditionIsCurrentBehaviorCategoryInList.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.behavior; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.behavior; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java index bf29712d5..e1bcd6f1b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuff.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.buff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionDoesUnitHaveBuff extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java index 10bcb0178..9b1e06f88 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/buff/ABConditionDoesUnitHaveBuffMatchingCondition.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.buff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionDoesUnitHaveBuffMatchingCondition extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java new file mode 100644 index 000000000..3b0c85030 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitBuilding.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.classification; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsUnitBuilding extends ABBooleanCallback { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isBuilding(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitHero.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitHero.java new file mode 100644 index 000000000..b958d764d --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitHero.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.classification; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsUnitHero extends ABBooleanCallback { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isHero(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java similarity index 53% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java index bdca0c7e6..9343b3734 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitHeroDuration.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.classification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitHeroDuration extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitHidden.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitHidden.java new file mode 100644 index 000000000..4dc9db924 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitHidden.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.classification; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsUnitHidden extends ABBooleanCallback { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isHidden(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java new file mode 100644 index 000000000..1a0e1f293 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitMagicImmune.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.classification; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsUnitMagicImmune extends ABBooleanCallback { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isMagicImmune(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java new file mode 100644 index 000000000..090131ba2 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitMorphImmune.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.classification; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsUnitMorphImmune extends ABBooleanCallback { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isMorphImmune(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java index 953edfa05..449dea158 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/classification/ABConditionIsUnitSummoned.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.classification; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitSummoned extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitAlive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitAlive.java new file mode 100644 index 000000000..f48963473 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitAlive.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.state; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsUnitAlive extends ABBooleanCallback { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(caster, localStore, castId); + } + if (theUnit != null) { + return !theUnit.isDead(); + } + return true; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitDead.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitDead.java new file mode 100644 index 000000000..c0face8e4 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitDead.java @@ -0,0 +1,24 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.state; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionIsUnitDead extends ABBooleanCallback { + + private ABUnitCallback unit; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.isDead(); + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java index e663778c6..f3b01693d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitMaxHp.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.state; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsUnitMaxHp extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java index e1273de6e..7ae790978 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitMaxMp.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.state; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsUnitMaxMp extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java similarity index 55% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java index 1ec91ce0c..2e152f014 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitPolymorphed.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.state; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitPolymorphed extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitSleeping.java similarity index 54% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitSleeping.java index 24fe453f1..7001f678f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitSleeping.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitSleeping.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.state; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; public class ABConditionIsUnitSleeping extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java index 3f73bde92..e0b5bf71f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitUpgrading.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.state; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsUnitUpgrading extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitVisible.java similarity index 70% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitVisible.java index fe40c286f..30ba0d75a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/state/ABConditionIsUnitVisible.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/state/ABConditionIsUnitVisible.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.state; import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsUnitVisible extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java index 47efeed73..f6201b8dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionIsUnitConstructing.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.tech; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.tech; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsUnitConstructing extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java index 7cfde7121..281b46763 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionIsUnitConstructingOrUpgrading.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.tech; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.tech; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsUnitConstructingOrUpgrading extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionIsUnitTraining.java similarity index 50% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionIsUnitTraining.java index 5812529cf..3d1d496f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/behavior/condition/unit/tech/ABConditionIsUnitTraining.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionIsUnitTraining.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.tech; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.tech; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.ABUnitCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionIsUnitTraining extends ABBooleanCallback { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionUnitHasResearch.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionUnitHasResearch.java new file mode 100644 index 000000000..2bdbd8b8c --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/unit/tech/ABConditionUnitHasResearch.java @@ -0,0 +1,26 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.tech; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; + +public class ABConditionUnitHasResearch extends ABBooleanCallback { + + private ABUnitCallback unit; + private ABIDCallback researchId; + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + CUnit theUnit = caster; + if (unit != null) { + theUnit = unit.callback(caster, localStore, castId); + } + if (theUnit != null) { + return theUnit.getLevelOfAppliedUpgrade(researchId.callback(caster, localStore, castId)) > 0; + } + return false; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABBuff.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABBuff.java index c0d9bbf88..76dbc775a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import java.util.ArrayList; import java.util.HashSet; @@ -13,8 +13,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.AbstractCBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABDestructableBuff.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABDestructableBuff.java index fb0bebb4e..7ab4dcd6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABDestructableBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import java.util.List; @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABDestructableBuff implements CDestructableBuff { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericArtBuff.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericArtBuff.java index f38645a20..30a39953e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericArtBuff.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericAuraBuff.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericAuraBuff.java index fe6264ee6..970df22f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericAuraBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericAuraBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import java.util.HashMap; import java.util.Map; @@ -7,7 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericPermanentBuff.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericPermanentBuff.java index a4d0cb054..ca466158b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericPermanentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericPermanentBuff.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABGenericPermanentBuff extends ABBuff { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericTimedBuff.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericTimedBuff.java index cfa850602..a0c8f88a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABGenericTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABGenericTimedBuff.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public abstract class ABGenericTimedBuff extends ABBuff { private final float duration; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABPermanentPassiveBuff.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABPermanentPassiveBuff.java index 4743f060f..c2101b29a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABPermanentPassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABPermanentPassiveBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import java.util.List; @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTargetingBuff.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTargetingBuff.java index 8b6473caf..7d9b38742 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTargetingBuff.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABTargetingBuff extends ABBuff { public ABTargetingBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedArtBuff.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedArtBuff.java index cd0f7aa75..698d1449c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedArtBuff.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedBuff.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedBuff.java index 5cea048c4..d3a2a9977 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedBuff.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import java.util.List; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedInstantTransformationBuff.java similarity index 78% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedInstantTransformationBuff.java index a64847901..9a5bb637f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedInstantTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedInstantTransformationBuff.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderPassiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABDelayInstantTransformationTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderPassiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer.ABDelayInstantTransformationTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABTimedInstantTransformationBuff extends ABGenericTimedBuff { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedPausedExpirationBuff.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedPausedExpirationBuff.java index eff05b2f1..7221a3cf8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedPausedExpirationBuff.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import java.util.List; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABTimedPausedExpirationBuff extends ABTimedBuff implements CPausedTickingBuff { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTargetingBuff.java similarity index 81% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTargetingBuff.java index 5fc44a1c4..b253857eb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTargetingBuff.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABTimedTargetingBuff extends ABGenericTimedBuff { public ABTimedTargetingBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbility sourceAbility, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTickingBuff.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTickingBuff.java index f362492c1..8f59e77e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTickingBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import java.util.List; @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABTimedTickingBuff extends ABTimedBuff { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTickingPausedBuff.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTickingPausedBuff.java index 378664e87..51d45e2aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTickingPausedBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import java.util.List; @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABTimedTickingPausedBuff extends ABTimedBuff implements CPausedTickingBuff { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTickingPostDeathBuff.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTickingPostDeathBuff.java index a786b2803..5c4bd7683 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTickingPostDeathBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import java.util.List; @@ -6,8 +6,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABTimedTickingPostDeathBuff extends ABTimedTickingBuff { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTransformationBuff.java similarity index 81% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTransformationBuff.java index 5309541ae..b6fe85ee6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/ABTimedTransformationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedTransformationBuff.java @@ -1,19 +1,19 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorFinishTransformation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABOrderStartTransformation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABDelayInstantTransformationTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorFinishTransformation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABOrderStartTransformation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer.ABDelayInstantTransformationTimer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABTimedTransformationBuff extends ABGenericTimedBuff { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/CPausedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/CPausedTickingBuff.java similarity index 72% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/CPausedTickingBuff.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/CPausedTickingBuff.java index 5cbdcdf35..b056f3006 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/CPausedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/CPausedTickingBuff.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffSlow.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/defaultbuffs/ABBuffSlow.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffSlow.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/defaultbuffs/ABBuffSlow.java index 8b6baec94..c0ba64fc6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffSlow.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/defaultbuffs/ABBuffSlow.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.defaultbuffs; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericTimedBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABGenericTimedBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffStun.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/defaultbuffs/ABBuffStun.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffStun.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/defaultbuffs/ABBuffStun.java index d511c34b0..f4f75ffa0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/buff/defaultbuffs/ABBuffStun.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/defaultbuffs/ABBuffStun.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.defaultbuffs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.defaultbuffs; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABGenericTimedBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABGenericTimedBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CEffectType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingFx; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAbilityBuilderGsonBuilder.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAbilityBuilderGsonBuilder.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAbilityBuilderGsonBuilder.java index 391d1269f..31ca37ceb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAbilityBuilderGsonBuilder.java @@ -1,129 +1,129 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.ability.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.abilitydata.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.attackmodifier.internal.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.behavior.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.buff.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.damage.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.datastore.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructable.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.destructablebuff.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.timeofday.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.events.widget.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.floatingtext.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.group.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.lightning.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.sound.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.splat.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.fx.terrain.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.gamestate.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.item.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.destructable.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.iterator.unit.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.list.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.order.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.player.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.projectile.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.reaction.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.stats.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.structural.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.timer.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniqueflag.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.uniquevalue.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.animation.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.art.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.movement.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.stats.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.transformation.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unit.worker.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitgroup.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalaction.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcallback.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.attack.internalcondition.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior.internalcallback.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.behavior.internalcondition.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalaction.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.damagetaken.internalcondition.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.death.internalaction.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.evasion.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.internalaction.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.reaction.internalcallback.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalactions.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.sharedinternalcallbacks.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitlisteners.state.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitqueue.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.unitstate.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.action.vision.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.ability.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attack.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.attacksettings.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.buff.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructable.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.destructablebuff.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.timeevent.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.event.widgetevent.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.fx.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.item.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.integer.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.list.location.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.listener.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.location.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.longs.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.player.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.projectile.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statbuff.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.statemod.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.target.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.timer.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unit.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitgroup.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.unitqueue.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.visionmodifier.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.widget.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ability.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.attack.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.booleans.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.buff.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.comparison.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.cost.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructable.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.destructablebuff.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.game.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.item.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.location.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.logical.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.membership.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.numeric.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.projectile.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.targeting.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.timer.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.uniqueflag.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.ability.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.alliance.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.behavior.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.buff.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.classification.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.state.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.unit.tech.*; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core; + +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.ability.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.abilitydata.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.attackmodifier.internal.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.behavior.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.buff.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.damage.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.datastore.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.destructable.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.destructablebuff.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.events.timeofday.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.events.widget.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.floatingtext.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.group.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.lightning.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.sound.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.splat.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.fx.terrain.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.gamestate.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.item.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.iterator.destructable.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.iterator.unit.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.list.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.order.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.player.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.projectile.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.reaction.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.stats.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.structural.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.timer.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.uniqueflag.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.uniquevalue.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.animation.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.art.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.movement.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.stats.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.transformation.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unit.worker.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitgroup.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalaction.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalcallback.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.attack.internalcondition.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.behavior.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.behavior.internalcallback.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.behavior.internalcondition.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken.internalaction.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.damagetaken.internalcondition.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.death.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.death.internalaction.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.evasion.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction.internalaction.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.reaction.internalcallback.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.sharedinternalactions.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.sharedinternalcallbacks.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitlisteners.state.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitqueue.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.unitstate.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.action.vision.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attack.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.attacksettings.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.buff.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructable.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.destructablebuff.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.timeevent.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.event.widgetevent.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.fx.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.integer.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.list.location.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.listener.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.location.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.longs.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.orderid.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.player.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.projectile.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statemod.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.target.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.timer.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitgroup.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unitqueue.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.visionmodifier.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.attack.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.booleans.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.buff.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.comparison.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.cost.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.destructable.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.destructablebuff.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.game.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.item.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.location.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.logical.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.membership.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.numeric.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.projectile.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.targeting.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.timer.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.uniqueflag.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.ability.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.alliance.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.behavior.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.buff.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.classification.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.state.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.unit.tech.*; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.typeadapters.RuntimeTypeAdapterFactory; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAction.java similarity index 59% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAction.java index b7d2e7b38..5f5685518 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAction.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core; import com.etheller.warsmash.parsers.jass.JassTextGeneratorStmt; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public interface ABAction extends JassTextGeneratorStmt { public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABCallback.java similarity index 60% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABCallback.java index 3a0ab44c0..6d7c6d0b7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABCallback.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABCallback.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core; import com.etheller.warsmash.parsers.jass.JassTextGeneratorExpr; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public interface ABCallback extends JassTextGeneratorExpr { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABSingleAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABSingleAction.java similarity index 63% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABSingleAction.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABSingleAction.java index ec5e1e46f..4fe3f4787 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/core/ABSingleAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABSingleAction.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core; import com.etheller.warsmash.parsers.jass.JassTextGeneratorCallStmt; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABDataStore.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABDataStore.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABDataStore.java index b8b4273c6..f886dfec3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABDataStore.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore; import java.util.Collection; import java.util.Set; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABGlobalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABGlobalDataStore.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABGlobalDataStore.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABGlobalDataStore.java index ac2ef445d..dfbcd5584 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABGlobalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABGlobalDataStore.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore; import java.util.Collection; import java.util.HashMap; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalDataStore.java similarity index 78% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalDataStore.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalDataStore.java index fab061772..6ff07880a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalDataStore.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalStoreKeys.java similarity index 99% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalStoreKeys.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalStoreKeys.java index 7cca31d01..359e3a7f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalStoreKeys.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore; public class ABLocalStoreKeys { // Core values diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABMapLocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABMapLocalDataStore.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABMapLocalDataStore.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABMapLocalDataStore.java index 248dd6078..e5e6f51e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/datastore/ABMapLocalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABMapLocalDataStore.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore; import java.util.Collection; import java.util.HashMap; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABGroupEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABGroupEffect.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABGroupEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABGroupEffect.java index c26b12ff1..9d0c1d811 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABGroupEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABGroupEffect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainBowlEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainBowlEffect.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainBowlEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainBowlEffect.java index 45f2607b8..aa919a121 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainBowlEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainBowlEffect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects; import com.etheller.warsmash.viewer5.handlers.w3x.environment.Terrain; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainEffect.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainEffect.java index 7b4ef46f1..23e92df16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainEffect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainRippleEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainRippleEffect.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainRippleEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainRippleEffect.java index 065f86041..deab79faf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainRippleEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainRippleEffect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects; import com.etheller.warsmash.viewer5.handlers.w3x.environment.Terrain; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainWaveEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainWaveEffect.java similarity index 98% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainWaveEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainWaveEffect.java index df01f2f65..451422a43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/effects/ABTerrainWaveEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/effects/ABTerrainWaveEffect.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.effects; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.effects; import com.badlogic.gdx.math.Vector2; import com.etheller.warsmash.viewer5.handlers.w3x.environment.Terrain; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABGlobalWidgetEvent.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABGlobalWidgetEvent.java index b1b869b66..88d57fb6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABGlobalWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABGlobalWidgetEvent.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event; import java.util.List; @@ -7,10 +7,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CGlobalWidgetEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABGlobalWidgetEvent extends CGlobalWidgetEvent { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABPlayerEvent.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABPlayerEvent.java index 8b4ab3ce4..38ec7ef08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABPlayerEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABPlayerEvent.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event; import java.util.List; import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayerJass; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABTimeOfDayEvent.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABTimeOfDayEvent.java index 702b23710..141205014 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABTimeOfDayEvent.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event; import java.util.List; import java.util.Objects; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation.TimeOfDayEvent; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; public class ABTimeOfDayEvent implements TimeOfDayEvent { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABWidgetEvent.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABWidgetEvent.java index 085af7b4b..0a450676b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/event/ABWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABWidgetEvent.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.event; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event; import java.util.List; @@ -6,10 +6,10 @@ import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CWidgetEvent; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABRandomTypeHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/handler/ABRandomTypeHandler.java similarity index 97% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABRandomTypeHandler.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/handler/ABRandomTypeHandler.java index 3459a9772..9b99b16d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABRandomTypeHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/handler/ABRandomTypeHandler.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABTransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/handler/ABTransformationHandler.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABTransformationHandler.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/handler/ABTransformationHandler.java index 1a750be38..df22c013c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/handler/ABTransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/handler/ABTransformationHandler.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler; import java.util.EnumSet; import java.util.List; @@ -10,16 +10,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTransformationBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABAltitudeAdjustmentTimer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABDelayTimerTimer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer.ABTransformationMorphAnimationTimer; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor.ABGetInstantTransformationBuffVisitor; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedTransformationBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer.ABAltitudeAdjustmentTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer.ABDelayTimerTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer.ABTransformationMorphAnimationTimer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor.ABGetInstantTransformationBuffVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABNearestUnitComparator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/iterstructs/ABNearestUnitComparator.java similarity index 78% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABNearestUnitComparator.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/iterstructs/ABNearestUnitComparator.java index ebade5411..a5d3c3ead 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABNearestUnitComparator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/iterstructs/ABNearestUnitComparator.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs; import java.util.Comparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitAndRangeComparator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/iterstructs/ABUnitAndRangeComparator.java similarity index 79% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitAndRangeComparator.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/iterstructs/ABUnitAndRangeComparator.java index 1ceac51d9..461262628 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitAndRangeComparator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/iterstructs/ABUnitAndRangeComparator.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/iterstructs/ABUnitComparator.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/iterstructs/ABUnitComparator.java index 62446808f..c835be436 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/iterstructs/ABUnitComparator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/iterstructs/ABUnitComparator.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.iterstructs; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs; import java.util.Comparator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABUnitComparator implements Comparator { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/jass/ABActionJass.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/jass/ABActionJass.java index 51b4582e9..6dbbecce2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABActionJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/jass/ABActionJass.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.jass; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.jass; import java.util.Arrays; import java.util.Collections; @@ -10,8 +10,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABActionJass implements ABAction { private final CodeJassValue jassFunction; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/jass/ABConditionJass.java similarity index 76% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/jass/ABConditionJass.java index db88f74f0..3d1860acf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/jass/ABConditionJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/jass/ABConditionJass.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.jass; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.jass; import java.util.Arrays; import java.util.Collections; @@ -7,8 +7,8 @@ import com.etheller.interpreter.ast.scope.trigger.TriggerBooleanExpression; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABConditionJass extends ABBooleanCallback { private final TriggerBooleanExpression boolExpr; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAbilityEffectReactionListener.java similarity index 81% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAbilityEffectReactionListener.java index e4c0994bc..1d9320746 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAbilityEffectReactionListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; @@ -6,9 +6,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.listeners.CUnitAbilityEffectReactionListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABAbilityEffectReactionListener implements CUnitAbilityEffectReactionListener { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAbilityProjReactionListener.java similarity index 81% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAbilityProjReactionListener.java index eb6a2fc13..65c26478b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAbilityProjReactionListener.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.listeners.CUnitAbilityProjReactionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackEvasionListener.java similarity index 79% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackEvasionListener.java index 20b44d5e1..c7089a111 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackEvasionListener.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackEvasionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackModifier.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackModifier.java index 315f0ecf9..85abc53de 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackModifier.java @@ -1,15 +1,15 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackModifier; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitPriorityLoopData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackPostDamageListener.java similarity index 83% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackPostDamageListener.java index 696d1d205..c7419816d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackPostDamageListener.java @@ -1,14 +1,14 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPostDamageListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackPreDamageListener.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackPreDamageListener.java index bdf1004ba..c736d725b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackPreDamageListener.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttack; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackPreDamageListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackProjReactionListener.java similarity index 81% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackProjReactionListener.java index 8574e25c5..100a9c6ac 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackProjReactionListener.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.listeners.CUnitAttackProjReactionListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABBehaviorChangeListener.java similarity index 79% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABBehaviorChangeListener.java index ff54f0cd0..c5b229523 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABBehaviorChangeListener.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitBehaviorChangeListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenListener.java similarity index 80% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenListener.java index 50e7b0041..dec816507 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenListener.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenModificationListener.java similarity index 81% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenModificationListener.java index a9b1a75b4..cb38f977a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenModificationListener.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitAttackDamageTakenModificationListener; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDeathReplacementEffect.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDeathReplacementEffect.java index 1c61e9fbd..42d56843e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDeathReplacementEffect.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffect; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementResult; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementStacking; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABUnitStateListener.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABUnitStateListener.java index 40a287b9d..ec451e44f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/listener/ABUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABUnitStateListener.java @@ -1,11 +1,11 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.listener; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.listener; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitStateListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; public class ABUnitStateListener implements CUnitStateListener { private CUnit caster; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderConfiguration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderConfiguration.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderConfiguration.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderConfiguration.java index 9354fce19..7b7dd4752 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderConfiguration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderConfiguration.java @@ -1,17 +1,17 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser; import java.util.List; import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderOverrideFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderSpecialConfigFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderSpecialDisplayFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.definitions.impl.ABAbilityBuilderTypeDefinition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.subfields.ABAbilityBuilderOverrideFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.subfields.ABAbilityBuilderSpecialConfigFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.subfields.ABAbilityBuilderSpecialDisplayFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.definitions.impl.ABAbilityBuilderTypeDefinition; public class ABAbilityBuilderConfiguration { private String id; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderDupe.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderDupe.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderDupe.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderDupe.java index 805793af8..b3724cc60 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderDupe.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderDupe.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderFile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderFile.java similarity index 76% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderFile.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderFile.java index 2fd3b41cc..6de514491 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderFile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderFile.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParser.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderParser.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParser.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderParser.java index 9b74d51e8..4ee294d34 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParser.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderParser.java @@ -1,20 +1,20 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser; import java.util.HashMap; import java.util.List; import java.util.Map; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.strings.ABStringCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderOverrideFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderParserTemplateFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderSpecialConfigFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields.ABAbilityBuilderSpecialDisplayFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABMeleeRangeTargetOverride; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABStatBuffFromDataField; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.subfields.ABAbilityBuilderOverrideFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.subfields.ABAbilityBuilderParserTemplateFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.subfields.ABAbilityBuilderSpecialConfigFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.subfields.ABAbilityBuilderSpecialDisplayFields; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABMeleeRangeTargetOverride; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABStatBuffFromDataField; public class ABAbilityBuilderParser { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParserUtil.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderParserUtil.java similarity index 91% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParserUtil.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderParserUtil.java index ca84b1938..a5b56752a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderParserUtil.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderParserUtil.java @@ -1,10 +1,10 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser; import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAbilityBuilderGsonBuilder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAbilityBuilderGsonBuilder; import com.google.gson.Gson; import com.google.gson.JsonParseException; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderTemplateType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderTemplateType.java similarity index 51% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderTemplateType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderTemplateType.java index 6f3fc0dc9..166d6c0cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderTemplateType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderTemplateType.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser; public enum ABAbilityBuilderTemplateType { AURA, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderType.java similarity index 81% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderType.java index 4c704d5dd..828a912e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/ABAbilityBuilderType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/ABAbilityBuilderType.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser; import com.etheller.interpreter.ast.util.CHandle; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderOverrideFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderOverrideFields.java similarity index 84% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderOverrideFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderOverrideFields.java index 3f405248d..6e6eccbbb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderOverrideFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderOverrideFields.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.subfields; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABAutocastTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.enums.ABTargetTypeCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABAutocastTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.enums.ABTargetTypeCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; public class ABAbilityBuilderOverrideFields { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderParserTemplateFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderParserTemplateFields.java similarity index 85% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderParserTemplateFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderParserTemplateFields.java index 3568bdaf9..72c6307b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderParserTemplateFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderParserTemplateFields.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.subfields; import java.util.List; import java.util.Map; import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderTemplateType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABMeleeRangeTargetOverride; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABStatBuffFromDataField; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderTemplateType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABMeleeRangeTargetOverride; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABStatBuffFromDataField; public class ABAbilityBuilderParserTemplateFields { //Template only diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialConfigFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderSpecialConfigFields.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialConfigFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderSpecialConfigFields.java index 192b31e5b..315484510 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialConfigFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderSpecialConfigFields.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.subfields; import java.util.List; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.orderid.ABOrderIdCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.orderid.ABOrderIdCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeysEnum; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java similarity index 87% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java index 2a1e8fef7..07f39222c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/subfields/ABAbilityBuilderSpecialDisplayFields.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.subfields; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.subfields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.floats.ABFloatCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.id.ABIDCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; public class ABAbilityBuilderSpecialDisplayFields { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABDataFieldLetter.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABDataFieldLetter.java similarity index 81% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABDataFieldLetter.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABDataFieldLetter.java index 2e10fc04b..43e2d1a48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABDataFieldLetter.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABDataFieldLetter.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template; import com.etheller.interpreter.ast.util.CHandle; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABMeleeRangeTargetOverride.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABMeleeRangeTargetOverride.java similarity index 80% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABMeleeRangeTargetOverride.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABMeleeRangeTargetOverride.java index ba5551893..8c32fd2ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABMeleeRangeTargetOverride.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABMeleeRangeTargetOverride.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template; public class ABMeleeRangeTargetOverride { private boolean targetMelee; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffFromDataField.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABStatBuffFromDataField.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffFromDataField.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABStatBuffFromDataField.java index 87eca90c2..a36fa379c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffFromDataField.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABStatBuffFromDataField.java @@ -1,6 +1,6 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABStatBuffType.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABStatBuffType.java index 0cc6da2a5..6e934f1c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/parser/template/ABStatBuffType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/parser/template/ABStatBuffType.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABCollisionProjectileListener.java similarity index 88% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABCollisionProjectileListener.java index c954162a2..655181502 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABCollisionProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABCollisionProjectileListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.projectile; import java.util.List; @@ -9,10 +9,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityCollisionProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABProjectileListener.java similarity index 86% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABProjectileListener.java index 38b439989..40ae495ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/projectile/ABProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABProjectileListener.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.projectile; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.projectile; import java.util.List; @@ -8,9 +8,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAbilityProjectileListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABAltitudeAdjustmentTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABAltitudeAdjustmentTimer.java similarity index 93% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABAltitudeAdjustmentTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABAltitudeAdjustmentTimer.java index 12629a8f5..0bc12f2f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABAltitudeAdjustmentTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABAltitudeAdjustmentTimer.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayInstantTransformationTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABDelayInstantTransformationTimer.java similarity index 77% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayInstantTransformationTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABDelayInstantTransformationTimer.java index 54575e7e7..adbed42cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayInstantTransformationTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABDelayInstantTransformationTimer.java @@ -1,13 +1,13 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler.OnTransformationActions; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABDelayInstantTransformationTimer extends CTimer { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayTimerTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABDelayTimerTimer.java similarity index 66% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayTimerTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABDelayTimerTimer.java index 1739066ea..5d8f855e4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABDelayTimerTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABDelayTimerTimer.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABDelayTimerTimer extends CTimer { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABManaDepletedCheckTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABManaDepletedCheckTimer.java similarity index 76% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABManaDepletedCheckTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABManaDepletedCheckTimer.java index 58dd09ea1..6693686a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABManaDepletedCheckTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABManaDepletedCheckTimer.java @@ -1,8 +1,8 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABManaDepletedCheckTimer extends CTimer { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABTimer.java similarity index 74% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABTimer.java index fab2d7282..89ea9219f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABTimer.java @@ -1,12 +1,12 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer; import java.util.List; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; public class ABTimer extends CTimer { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTransformationMorphAnimationTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABTransformationMorphAnimationTimer.java similarity index 95% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTransformationMorphAnimationTimer.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABTransformationMorphAnimationTimer.java index 3c8aa306d..d70bc24a9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/timer/ABTransformationMorphAnimationTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/timer/ABTransformationMorphAnimationTimer.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.timer; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.timer; import java.util.EnumSet; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTemplateTypeDefinition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/definitions/impl/ABAbilityBuilderTemplateTypeDefinition.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTemplateTypeDefinition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/definitions/impl/ABAbilityBuilderTemplateTypeDefinition.java index ef2562be3..41134b414 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTemplateTypeDefinition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/definitions/impl/ABAbilityBuilderTemplateTypeDefinition.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.definitions.impl; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.definitions.impl; import java.util.ArrayList; import java.util.EnumSet; @@ -10,9 +10,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.CAbilityTypeDefinition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbstractCAbilityTypeDefinition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderTemplateType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderTemplateType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.data.CUnitData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTypeDefinition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/definitions/impl/ABAbilityBuilderTypeDefinition.java similarity index 90% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTypeDefinition.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/definitions/impl/ABAbilityBuilderTypeDefinition.java index c72116cbd..b6f8cb100 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/definitions/impl/ABAbilityBuilderTypeDefinition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/definitions/impl/ABAbilityBuilderTypeDefinition.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.definitions.impl; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.definitions.impl; import java.util.ArrayList; import java.util.EnumSet; @@ -10,9 +10,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.CAbilityTypeDefinition; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbstractCAbilityTypeDefinition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl.ABAbilityBuilderAbilityTypeLevelData; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.data.CUnitData; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderAbilityType.java similarity index 82% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderAbilityType.java index 9bf27a75a..b852e92ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderAbilityType.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl; import java.util.List; @@ -10,11 +10,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.skills.CAbilitySpell; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.*; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABMapLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.*; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABMapLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABAbilityBuilderAbilityType extends CAbilityType { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityTypeLevelData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderAbilityTypeLevelData.java similarity index 96% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityTypeLevelData.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderAbilityTypeLevelData.java index e6656db59..dd8c4aa5c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderAbilityTypeLevelData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderAbilityTypeLevelData.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl; import java.util.EnumSet; import java.util.List; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderTemplateType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderTemplateType.java similarity index 69% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderTemplateType.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderTemplateType.java index acd016536..e9bba6e53 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/types/impl/ABAbilityBuilderTemplateType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderTemplateType.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.impl; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl; import java.util.List; @@ -9,14 +9,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CLevelingAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.CAbilityType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.ABAbilityBuilderAuraTemplate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.ABAbilityBuilderSimpleAuraTemplate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.ABAbilityBuilderStatAuraTemplate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.template.ABAbilityBuilderStatPassiveTemplate; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABMapLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.template.ABAbilityBuilderAuraTemplate; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.template.ABAbilityBuilderSimpleAuraTemplate; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.template.ABAbilityBuilderStatAuraTemplate; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.template.ABAbilityBuilderStatPassiveTemplate; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABMapLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParser; public class ABAbilityBuilderTemplateType extends CAbilityType { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABAbilityTargetStillTargetableVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/visitor/ABAbilityTargetStillTargetableVisitor.java similarity index 92% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABAbilityTargetStillTargetableVisitor.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/visitor/ABAbilityTargetStillTargetableVisitor.java index c24312aeb..5c381a505 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABAbilityTargetStillTargetableVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/visitor/ABAbilityTargetStillTargetableVisitor.java @@ -1,9 +1,9 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.*; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.BooleanAbilityTargetCheckReceiver; public final class ABAbilityTargetStillTargetableVisitor implements AbilityTargetVisitor { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetABAbilityByRawcodeVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/visitor/ABGetABAbilityByRawcodeVisitor.java similarity index 94% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetABAbilityByRawcodeVisitor.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/visitor/ABGetABAbilityByRawcodeVisitor.java index 78d8e5d94..bac50a972 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetABAbilityByRawcodeVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/visitor/ABGetABAbilityByRawcodeVisitor.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityAttack; @@ -24,8 +24,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; public class ABGetABAbilityByRawcodeVisitor implements CAbilityVisitor { private static final ABGetABAbilityByRawcodeVisitor INSTANCE = new ABGetABAbilityByRawcodeVisitor(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetInstantTransformationBuffVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/visitor/ABGetInstantTransformationBuffVisitor.java similarity index 89% rename from core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetInstantTransformationBuffVisitor.java rename to core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/visitor/ABGetInstantTransformationBuffVisitor.java index 0185f36aa..a931e12e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilitybuilder/visitor/ABGetInstantTransformationBuffVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/visitor/ABGetInstantTransformationBuffVisitor.java @@ -1,4 +1,4 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.visitor; +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; @@ -30,13 +30,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderPassiveAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedInstantTransformationBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.buff.ABTimedTransformationBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.handler.ABTransformationHandler.OnTransformationActions; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderPassiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedInstantTransformationBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTimedTransformationBuff; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler.OnTransformationActions; public class ABGetInstantTransformationBuffVisitor implements CAbilityVisitor { private static final ABGetInstantTransformationBuffVisitor INSTANCE = new ABGetInstantTransformationBuffVisitor(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java index b0a1c6cda..25e1dc356 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorAbilityVisitor.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderNoTarget; public class BehaviorAbilityVisitor implements CBehaviorVisitor { public static final BehaviorAbilityVisitor INSTANCE = new BehaviorAbilityVisitor(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java index 503e19c50..8b0da2291 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorNextBehaviorVisitor.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderNoTarget; public class BehaviorNextBehaviorVisitor implements CBehaviorVisitor { public static final BehaviorNextBehaviorVisitor INSTANCE = new BehaviorNextBehaviorVisitor(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java index 6b9cff89c..b92d45307 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetUnitVisitor.java @@ -2,8 +2,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderNoTarget; public class BehaviorTargetUnitVisitor implements CBehaviorVisitor { public static final BehaviorTargetUnitVisitor INSTANCE = new BehaviorTargetUnitVisitor(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java index 3a1523bb0..635c4694a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/BehaviorTargetVisitor.java @@ -1,8 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderNoTarget; public class BehaviorTargetVisitor implements CBehaviorVisitor { public static final BehaviorTargetVisitor INSTANCE = new BehaviorTargetVisitor(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java index 41a210279..e9841d07f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/CBehaviorVisitor.java @@ -1,7 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderBase; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.ABBehaviorAbilityBuilderNoTarget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderBase; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderNoTarget; public interface CBehaviorVisitor { T accept(CBehavior target); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUnderConstructionVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUnderConstructionVisitor.java index 9adf85dbc..2eab9de6d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUnderConstructionVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUnderConstructionVisitor.java @@ -27,7 +27,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; public class AbilityDisableWhileUnderConstructionVisitor implements CAbilityVisitor { public static final AbilityDisableWhileUnderConstructionVisitor INSTANCE = new AbilityDisableWhileUnderConstructionVisitor(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUpgradingVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUpgradingVisitor.java index 7a49dc4e6..0198562d0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUpgradingVisitor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/behaviors/build/AbilityDisableWhileUpgradingVisitor.java @@ -27,7 +27,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; public class AbilityDisableWhileUpgradingVisitor implements CAbilityVisitor { public static final AbilityDisableWhileUpgradingVisitor INSTANCE = new AbilityDisableWhileUpgradingVisitor(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java index 2fb9ab928..9da1c2622 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/data/CAbilityData.java @@ -87,12 +87,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.CAbilityTypeDefinitionStandDown; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.CAbilityTypeDefinitionWispHarvest; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.jass.CAbilityTypeJassDefinition; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderDupe; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.types.definitions.impl.ABAbilityBuilderTemplateTypeDefinition; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderDupe; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParserUtil; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.definitions.impl.ABAbilityBuilderTemplateTypeDefinition; public class CAbilityData { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java index 18350e03e..fd6d04d89 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java @@ -163,7 +163,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.ability.ABAbilityBuilderActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDefenseType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CUpgradeClass; diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java index 910ddee6f..4b03ce7cf 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderConfigTree.java @@ -9,9 +9,9 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class AbilityBuilderConfigTree extends JTree { private DefaultMutableTreeNode root; diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderDupeCellRenderer.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderDupeCellRenderer.java index c8a65f8e3..af3053c2f 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderDupeCellRenderer.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderDupeCellRenderer.java @@ -5,7 +5,7 @@ import javax.swing.DefaultListCellRenderer; import javax.swing.JList; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class AbilityBuilderDupeCellRenderer extends DefaultListCellRenderer { @Override diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderJassBrainstorm.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderJassBrainstorm.java index d3a137db0..2366454cb 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderJassBrainstorm.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderJassBrainstorm.java @@ -9,14 +9,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorImpl1; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAbilityBuilderGsonBuilder; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderDupe; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil.AbilityBuilderFileListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAbilityBuilderGsonBuilder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderDupe; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParserUtil; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParserUtil.AbilityBuilderFileListener; import com.google.gson.Gson; public class AbilityBuilderJassBrainstorm { diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java index 72a51ae2c..fa95f812c 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderSmashJassBrainstorm.java @@ -9,14 +9,14 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorImpl1; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAction; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAbilityBuilderGsonBuilder; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderDupe; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParser; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil.AbilityBuilderFileListener; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAbilityBuilderGsonBuilder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderDupe; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParser; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParserUtil; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParserUtil.AbilityBuilderFileListener; import com.google.gson.Gson; public class AbilityBuilderSmashJassBrainstorm { diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderUIPanel.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderUIPanel.java index 678b0a35b..dc911966f 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderUIPanel.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/AbilityBuilderUIPanel.java @@ -20,11 +20,11 @@ import javax.swing.event.ListSelectionListener; import javax.swing.filechooser.FileNameExtensionFilter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.core.ABAbilityBuilderGsonBuilder; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderConfiguration; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderDupe; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderParserUtil; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAbilityBuilderGsonBuilder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderDupe; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderParserUtil; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderType; import com.google.gson.Gson; public class AbilityBuilderUIPanel extends JPanel { diff --git a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java index dca442a7c..6698d0702 100644 --- a/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java +++ b/desktop/src/com/etheller/warsmash/desktop/editor/abilitybuilder/JassGeneratorForType.java @@ -7,9 +7,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbilityDisableType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.autocast.AutocastType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.ABAbilityBuilderType; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilitybuilder.parser.template.ABDataFieldLetter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehaviorCategory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuffType; From 8fde9c66cc6a01487f3ab3e9bdfd45fada0c9cc5 Mon Sep 17 00:00:00 2001 From: Glasir Date: Sat, 13 Dec 2025 14:26:14 -0500 Subject: [PATCH 40/44] Major AB Refactor: Part 7 - Origin Info in the LocalStore * Store information on the effect origin in the LocalStore allowing easier access * Clean up some values in ABLocalStoreKeys * Removed a few items referencing parents that were no longer used --- .../scope/CommonTriggerExecutionScope.java | 2 +- .../ABAbilityBuilderGenericActive.java | 63 ++++++++++--------- .../ability/ABAbilityBuilderNoIcon.java | 12 ++-- .../ability/ABAbilityBuilderPassive.java | 12 ++-- .../ABActionActivateToggledAbility.java | 10 ++- .../ability/ABActionClickDisableAbility.java | 3 +- .../ability/ABActionClickEnableAbility.java | 3 +- .../ABActionDeactivateToggledAbility.java | 7 +-- .../action/ability/ABActionResetCooldown.java | 20 +++--- .../ABActionSendStartCastingEvents.java | 7 +-- .../action/ability/ABActionStartCooldown.java | 5 +- .../ABActionAbilitySetShowIcon.java | 5 +- .../abilitydata/ABActionAddTargetAllowed.java | 6 +- .../abilitydata/ABActionDisableAbility.java | 3 +- .../ABActionDisableAbilityById.java | 15 ++--- .../abilitydata/ABActionEnableAbility.java | 3 +- .../ABActionEnableAbilityById.java | 15 ++--- .../ABActionRemoveTargetAllowed.java | 7 +-- ...ActionAttackModifierApplyAllArtFields.java | 10 +-- .../ABActionAttackModifierApplyArt.java | 10 +-- ...BActionAttackModifierApplyArtAndSpeed.java | 10 +-- .../action/buff/ABActionAddSlowBuff.java | 10 ++- .../action/buff/ABActionAddStunBuff.java | 4 +- .../buff/ABActionCreatePassiveBuff.java | 13 ++-- .../buff/ABActionCreateTargetingBuff.java | 4 +- .../buff/ABActionCreateTimedArtBuff.java | 9 +-- .../action/buff/ABActionCreateTimedBuff.java | 16 ++--- ...ActionCreateTimedPausedExpirationBuff.java | 13 ++-- .../ABActionCreateTimedTargetingBuff.java | 4 +- .../buff/ABActionCreateTimedTickingBuff.java | 20 +++--- .../ABActionCreateTimedTickingPausedBuff.java | 13 ++-- ...ActionCreateTimedTickingPostDeathBuff.java | 13 ++-- .../action/item/ABActionChargeItem.java | 3 +- .../ABActionCheckAbilityEffectReaction.java | 5 +- .../structural/ABActionRunReuseAction.java | 8 +-- .../ABActionRunReuseActionWithArguments.java | 4 +- .../ABActionAbilityRemoveUniqueValue.java | 4 +- .../ABActionAbilityStoreUniqueValue.java | 4 +- .../transformation/ABActionTransformUnit.java | 2 +- .../ABActionTransformUnitInstant.java | 2 +- .../ABActionTransformedUnitAbilityAdd.java | 2 +- .../ABActionTransformedUnitAbilityRemove.java | 3 +- .../ability/ABCallbackGetThisAbility.java | 3 +- .../ability/ABCallbackReuseAbility.java | 5 +- .../ABCallbackReuseAbilityWithArguments.java | 13 ++-- .../callback/buff/ABCallbackReuseBuff.java | 11 ++-- .../ABCallbackReuseBuffWithArguments.java | 3 +- .../ABCallbackReuseDestructable.java | 12 ++-- ...allbackReuseDestructableWithArguments.java | 3 +- .../ABCallbackReuseDestructableBuff.java | 12 ++-- ...ackReuseDestructableBuffWithArguments.java | 4 +- .../ABCallbackReuseTimeOfDayEvent.java | 4 +- ...lbackReuseTimeOfDayEventWithArguments.java | 3 +- .../ABCallbackReuseWidgetEvent.java | 5 +- ...CallbackReuseWidgetEventWithArguments.java | 3 +- .../floats/ABCallbackGetAbilityArea.java | 7 +-- .../floats/ABCallbackGetAbilityCastRange.java | 3 +- .../floats/ABCallbackGetAbilityCastTime.java | 2 +- .../floats/ABCallbackGetAbilityCooldown.java | 3 +- ...ABCallbackGetParentAbilityDataAsFloat.java | 28 --------- .../callback/floats/ABCallbackReuseFloat.java | 4 +- .../ABCallbackReuseFloatWithArguments.java | 3 +- .../callback/fx/ABCallbackReuseFX.java | 4 +- .../fx/ABCallbackReuseFXWithArguments.java | 3 +- .../callback/id/ABCallbackGetParentAlias.java | 16 ----- .../callback/id/ABCallbackReuseID.java | 5 +- .../id/ABCallbackReuseIDWithArguments.java | 3 +- ...ABCallbackGetAbilityCastTimeAsInteger.java | 7 ++- .../ABCallbackGetAbilityManaCost.java | 3 +- ...lbackGetAbilityTargetAttachmentPoints.java | 3 +- .../integers/ABCallbackGetItemCharges.java | 2 +- .../integers/ABCallbackGetItemLevel.java | 2 +- .../integers/ABCallbackGetItemMaxCharges.java | 2 +- .../integers/ABCallbackGetItemSlot.java | 2 +- .../integers/ABCallbackReuseInteger.java | 4 +- .../ABCallbackReuseIntegerWithArguments.java | 3 +- .../callback/item/ABCallbackReuseItem.java | 4 +- .../ABCallbackReuseItemWithArguments.java | 3 +- .../callback/list/ABCallbackReuseList.java | 4 +- .../ABCallbackReuseListWithArguments.java | 13 ++-- .../list/ABCallbackReuseSortableList.java | 4 +- ...allbackReuseSortableListWithArguments.java | 16 ++--- .../location/ABCallbackReuseLocation.java | 4 +- .../ABCallbackReuseLocationWithArguments.java | 3 +- .../callback/longs/ABCallbackReuseLong.java | 4 +- .../ABCallbackReuseLongWithArguments.java | 12 ++-- .../orderid/ABCallbackReuseOrderId.java | 4 +- .../ABCallbackReuseOrderIdWithArguments.java | 3 +- .../player/ABCallbackReusePlayer.java | 4 +- .../ABCallbackReusePlayerWithArguments.java | 3 +- .../projectile/ABCallbackReuseProjectile.java | 4 +- ...BCallbackReuseProjectileWithArguments.java | 13 ++-- .../ABCallbackReuseNonStackingStatBuff.java | 4 +- ...ReuseNonStackingStatBuffWithArguments.java | 3 +- .../statemod/ABCallbackReuseStateModBuff.java | 4 +- ...allbackReuseStateModBuffWithArguments.java | 3 +- .../strings/ABCallbackReuseString.java | 4 +- .../ABCallbackReuseStringWithArguments.java | 13 ++-- .../target/ABCallbackReuseTarget.java | 4 +- .../ABCallbackReuseTargetWithArguments.java | 3 +- .../callback/timer/ABCallbackReuseTimer.java | 4 +- .../ABCallbackReuseTimerWithArguments.java | 3 +- .../unit/ABCallbackGetCastingUnit.java | 2 +- .../unit/ABCallbackGetParentCastingUnit.java | 14 ----- .../callback/unit/ABCallbackReuseUnit.java | 4 +- .../ABCallbackReuseUnitWithArguments.java | 3 +- .../unitgroup/ABCallbackReuseUnitGroup.java | 4 +- ...ABCallbackReuseUnitGroupWithArguments.java | 3 +- .../unitqueue/ABCallbackReuseUnitQueue.java | 4 +- ...ABCallbackReuseUnitQueueWithArguments.java | 4 +- .../ABCallbackReuseVisionModifier.java | 5 +- ...lbackReuseVisionModifierWithArguments.java | 3 +- .../widget/ABCallbackReuseWidget.java | 4 +- .../ABCallbackReuseWidgetWithArguments.java | 3 +- .../condition/ABCallbackReuseBoolean.java | 5 +- .../ABCallbackReuseBooleanWithArguments.java | 4 +- .../ability/ABConditionIsDisabled.java | 3 +- .../ability/ABConditionIsOnCooldown.java | 3 +- .../ABConditionIsToggleAbilityActive.java | 4 +- ...CallbackGetParentAbilityDataAsBoolean.java | 37 ----------- .../item/ABConditionIsItemAbility.java | 3 +- .../item/ABConditionItemHasCharges.java | 3 +- .../item/ABConditionItemIsCharged.java | 3 +- .../ABConditionIsDestructableValidTarget.java | 2 +- ...ConditionIsPassAllAbilityTargetChecks.java | 2 +- ...itionIsUnitPassAllAbilityTargetChecks.java | 2 +- .../ABConditionIsUnitValidTarget.java | 2 +- .../targeting/ABConditionIsValidTarget.java | 2 +- .../core/ABAbilityBuilderGsonBuilder.java | 4 -- .../datastore/ABLocalDataStore.java | 11 +++- .../datastore/ABLocalStoreKeys.java | 8 --- 131 files changed, 291 insertions(+), 577 deletions(-) delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetParentAlias.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetParentCastingUnit.java delete mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java diff --git a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java index a4f67c91b..663338b7e 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java +++ b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java @@ -941,7 +941,7 @@ public static TriggerExecutionScope abilityBuilder(final CUnit caster, final ABL scope.spellTargetDestructable = (CDestructable) localStore .get(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); scope.spellTargetPoint = (AbilityPointTarget) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + castId); - scope.spellAbility = (CAbility) localStore.get(ABLocalStoreKeys.ABILITY); + scope.spellAbility = localStore.originAbility; scope.spellAbilityId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); return scope; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java index a41f07b0f..24d8df47b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java @@ -107,7 +107,7 @@ public ABAbilityBuilderGenericActive(int handleId, War3ID code, War3ID alias, this.levelData = levelData; this.config = config; this.localStore = localStore; - localStore.put(ABLocalStoreKeys.ABILITY, this); + localStore.originAbility = this; if (config.getCastId() != null) { orderId = OrderIdUtils.getOrderId(config.getCastId()); @@ -195,7 +195,8 @@ public void onAdd(CSimulation game, CUnit unit) { @Override public void onAddDisabled(CSimulation game, CUnit unit) { localStore.game = game; - localStore.put(ABLocalStoreKeys.THISUNIT, unit); + localStore.originUnit = unit; + localStore.originPlayer = game.getPlayer(unit.getPlayerIndex()); addInitialUniqueFlags(game, unit); setSpellFields(game, unit); determineToggleableFields(game, unit); @@ -266,8 +267,8 @@ private void determineToggleableFields(CSimulation game, CUnit unit) { } if (config.getDisplayFields() != null && config.getDisplayFields().getAlternateUnitId() != null) { - if (unit.getTypeId().equals( - config.getDisplayFields().getAlternateUnitId().callback(unit, localStore, castId))) { + if (unit.getTypeId() + .equals(config.getDisplayFields().getAlternateUnitId().callback(unit, localStore, castId))) { this.active = true; } } @@ -289,17 +290,20 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.range = this.config.getOverrideFields().getRangeOverride().callback(unit, localStore, castId); } if (this.config.getOverrideFields().getCastTimeOverride() != null) { - this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(unit, localStore, castId); + this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(unit, localStore, + castId); } if (this.config.getOverrideFields().getIgnoreCastTime() != null) { this.ignoreCastTime = this.config.getOverrideFields().getIgnoreCastTime().callback(unit, localStore, castId); } if (this.config.getOverrideFields().getCooldownOverride() != null) { - this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(unit, localStore, castId); + this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(unit, localStore, + castId); } if (this.config.getOverrideFields().getManaCostOverride() != null) { - this.manaCost = this.config.getOverrideFields().getManaCostOverride().callback(unit, localStore, castId); + this.manaCost = this.config.getOverrideFields().getManaCostOverride().callback(unit, localStore, + castId); } if (this.config.getOverrideFields().getAutocastTypeOverride() != null) { this.autocastType = this.config.getOverrideFields().getAutocastTypeOverride().callback(unit, localStore, @@ -307,12 +311,12 @@ protected void setSpellFields(CSimulation game, CUnit unit) { } if (this.config.getOverrideFields().getOnTooltipOverride() != null) { - this.onTooltipOverride = this.config.getOverrideFields().getOnTooltipOverride().callback(unit, localStore, - castId); + this.onTooltipOverride = this.config.getOverrideFields().getOnTooltipOverride().callback(unit, + localStore, castId); } if (this.config.getOverrideFields().getOffTooltipOverride() != null) { - this.offTooltipOverride = this.config.getOverrideFields().getOffTooltipOverride().callback(unit, localStore, - castId); + this.offTooltipOverride = this.config.getOverrideFields().getOffTooltipOverride().callback(unit, + localStore, castId); } if (this.config.getOverrideFields().getPhysicalSpell() != null) { this.physical = this.config.getOverrideFields().getPhysicalSpell().callback(unit, localStore, castId); @@ -344,13 +348,15 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.targetsAllowed.add(CTargetType.NON_ETHEREAL); } - if (this.config.getOverrideFields() != null && this.config.getOverrideFields().getExtraTargetsAllowed() != null) { - for(ABTargetTypeCallback target : this.config.getOverrideFields().getExtraTargetsAllowed()) { + if (this.config.getOverrideFields() != null + && this.config.getOverrideFields().getExtraTargetsAllowed() != null) { + for (ABTargetTypeCallback target : this.config.getOverrideFields().getExtraTargetsAllowed()) { this.targetsAllowed.add(target.callback(unit, localStore, requiredLevel)); } } - if (this.config.getOverrideFields() != null && this.config.getOverrideFields().getExcludedTargetsAllowed() != null) { - for(ABTargetTypeCallback target : this.config.getOverrideFields().getExcludedTargetsAllowed()) { + if (this.config.getOverrideFields() != null + && this.config.getOverrideFields().getExcludedTargetsAllowed() != null) { + for (ABTargetTypeCallback target : this.config.getOverrideFields().getExcludedTargetsAllowed()) { this.targetsAllowed.remove(target.callback(unit, localStore, requiredLevel)); } } @@ -374,8 +380,6 @@ protected void setSpellFields(CSimulation game, CUnit unit) { } } } - localStore.put(ABLocalStoreKeys.ISABILITYMAGIC, this.magic); - localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, this.physical); } @Override @@ -419,7 +423,7 @@ private War3ID getCooldownId() { @Override public void setItemAbility(final CItem item, int slot) { this.item = item; - this.localStore.put(ABLocalStoreKeys.ITEM, item); + this.localStore.originItem = item; this.localStore.put(ABLocalStoreKeys.ITEMSLOT, slot); } @@ -717,10 +721,10 @@ protected void innerCheckExtraCastConditions(CSimulation game, CUnit unit, int o for (ABBooleanCallback condition : config.getExtraCastConditions()) { result = result && condition.callback(unit, localStore, -1); } + String failReason = (String) localStore.remove(ABLocalStoreKeys.CANTUSEREASON); if (result) { receiver.useOk(); } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); if (failReason != null) { receiver.activationCheckFailed(failReason); } else { @@ -942,10 +946,10 @@ protected String innerCheckExtraTargetConditions(CSimulation game, CUnit unit, i for (ABBooleanCallback condition : config.getExtraTargetConditions()) { result = result && condition.callback(unit, localStore, -1); } + String failReason = (String) localStore.remove(ABLocalStoreKeys.CANTUSEREASON); if (result) { return null; } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); if (failReason != null) { return failReason; } else { @@ -970,10 +974,10 @@ protected String innerCheckExtraAutoTargetConditions(CSimulation game, CUnit uni result = result && condition.callback(unit, localStore, -1); } } + String failReason = (String) localStore.remove(ABLocalStoreKeys.CANTUSEREASON); if (result) { return null; } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); if (failReason != null) { return failReason; } else { @@ -994,10 +998,10 @@ protected String innerCheckExtraAutoNoTargetConditions(CSimulation game, CUnit u result = result && condition.callback(unit, localStore, -1); } } + String failReason = (String) localStore.remove(ABLocalStoreKeys.CANTUSEREASON); if (result) { return null; } else { - String failReason = (String) localStore.get(ABLocalStoreKeys.CANTUSEREASON); if (failReason != null) { return failReason; } else { @@ -1024,9 +1028,8 @@ public int getUIFoodCost() { return 0; } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getFoodCost() != null) { - CSimulation game = this.localStore.game; - CUnit unit = (CUnit) this.localStore.get(ABLocalStoreKeys.THISUNIT); - return this.config.getDisplayFields().getFoodCost().callback(unit, localStore, castId); + return this.config.getDisplayFields().getFoodCost().callback(this.localStore.originUnit, localStore, + castId); } return 0; } @@ -1037,9 +1040,8 @@ public int getUIGoldCost() { return 0; } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getGoldCost() != null) { - CSimulation game = this.localStore.game; - CUnit unit = (CUnit) this.localStore.get(ABLocalStoreKeys.THISUNIT); - return this.config.getDisplayFields().getGoldCost().callback(unit, localStore, castId); + return this.config.getDisplayFields().getGoldCost().callback(this.localStore.originUnit, localStore, + castId); } return 0; } @@ -1050,9 +1052,8 @@ public int getUILumberCost() { return 0; } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getLumberCost() != null) { - CSimulation game = this.localStore.game; - CUnit unit = (CUnit) this.localStore.get(ABLocalStoreKeys.THISUNIT); - return this.config.getDisplayFields().getLumberCost().callback(unit, localStore, castId); + return this.config.getDisplayFields().getLumberCost().callback(this.localStore.originUnit, localStore, + castId); } return 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java index 3a080bd70..c1fd5795f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java @@ -49,12 +49,10 @@ public ABAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, List 1); - localStore.put(ABLocalStoreKeys.ISABILITYMAGIC, false); - localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, false); } private void addInitialUniqueFlags(CSimulation game, CUnit unit) { @@ -186,7 +184,7 @@ private War3ID getCooldownId() { @Override public void setItemAbility(final CItem item, int slot) { this.item = item; - this.localStore.put(ABLocalStoreKeys.ITEM, item); + this.localStore.originItem = item; this.localStore.put(ABLocalStoreKeys.ITEMSLOT, slot); } @@ -249,7 +247,8 @@ public void setLevel(CSimulation game, CUnit unit, int level) { @Override public void onAdd(CSimulation game, CUnit unit) { localStore.game = game; - localStore.put(ABLocalStoreKeys.THISUNIT, unit); + localStore.originUnit = unit; + localStore.originPlayer = game.getPlayer(unit.getPlayerIndex()); if (config.getOnAddAbility() != null) { for (ABAction action : config.getOnAddAbility()) { action.runAction(unit, localStore, 0); @@ -260,7 +259,8 @@ public void onAdd(CSimulation game, CUnit unit) { @Override public void onAddDisabled(CSimulation game, CUnit unit) { localStore.game = game; - localStore.put(ABLocalStoreKeys.THISUNIT, unit); + localStore.originUnit = unit; + localStore.originPlayer = game.getPlayer(unit.getPlayerIndex()); addInitialUniqueFlags(game, unit); setSpellFields(game, unit); if (config.getOnAddDisabledAbility() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java index 76df80c1c..77fbb0e3b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java @@ -49,12 +49,10 @@ public ABAbilityBuilderPassive(int handleId, War3ID code, War3ID alias, this.levelData = levelData; this.config = config; this.localStore = localStore; - localStore.put(ABLocalStoreKeys.ABILITY, this); + localStore.originAbility = this; GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); final int levels = editorData.getFieldAsInteger(AbilityFields.LEVELS, 0); localStore.put(ABLocalStoreKeys.ISABILITYLEVELED, levels > 1); - localStore.put(ABLocalStoreKeys.ISABILITYMAGIC, false); - localStore.put(ABLocalStoreKeys.ISABILITYPHYSICAL, false); } private void addInitialUniqueFlags(CSimulation game, CUnit unit) { @@ -192,7 +190,7 @@ private War3ID getCooldownId() { @Override public void setItemAbility(final CItem item, int slot) { this.item = item; - this.localStore.put(ABLocalStoreKeys.ITEM, item); + this.localStore.originItem = item; this.localStore.put(ABLocalStoreKeys.ITEMSLOT, slot); } @@ -262,7 +260,8 @@ public void setLevel(CSimulation game, CUnit unit, int level) { @Override public void onAdd(CSimulation game, CUnit unit) { localStore.game = game; - localStore.put(ABLocalStoreKeys.THISUNIT, unit); + localStore.originUnit = unit; + localStore.originPlayer = game.getPlayer(unit.getPlayerIndex()); if (config.getOnAddAbility() != null) { for (ABAction action : config.getOnAddAbility()) { action.runAction(unit, localStore, 0); @@ -273,7 +272,8 @@ public void onAdd(CSimulation game, CUnit unit) { @Override public void onAddDisabled(CSimulation game, CUnit unit) { localStore.game = game; - localStore.put(ABLocalStoreKeys.THISUNIT, unit); + localStore.originUnit = unit; + localStore.originPlayer = game.getPlayer(unit.getPlayerIndex()); addInitialUniqueFlags(game, unit); setSpellFields(game, unit); if (config.getOnAddDisabledAbility() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionActivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionActivateToggledAbility.java index 95884ae42..bd48dc92c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionActivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionActivateToggledAbility.java @@ -6,16 +6,14 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionActivateToggledAbility implements ABSingleAction { @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - ABAbilityBuilderActiveAbility ability = (ABAbilityBuilderActiveAbility) localStore - .get(ABLocalStoreKeys.ABILITY); - ability.activate(localStore.game, caster); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + if (localStore.originAbility instanceof ABAbilityBuilderActiveAbility) { + ((ABAbilityBuilderActiveAbility) localStore.originAbility).activate(localStore.game, caster); + } } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickDisableAbility.java index 1937e3bea..5c3c587e1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickDisableAbility.java @@ -8,7 +8,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionClickDisableAbility implements ABSingleAction { @@ -22,7 +21,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin abil.setClickDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } } else { - final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = localStore.originAbility; abil.setClickDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickEnableAbility.java index 326c3cba8..72032bdeb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionClickEnableAbility.java @@ -8,7 +8,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionClickEnableAbility implements ABSingleAction { @@ -22,7 +21,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin abil.setClickDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } } else { - final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = localStore.originAbility; abil.setClickDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionDeactivateToggledAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionDeactivateToggledAbility.java index d374a127f..5dd31829a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionDeactivateToggledAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionDeactivateToggledAbility.java @@ -6,15 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionDeactivateToggledAbility implements ABSingleAction { @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - ABAbilityBuilderActiveAbility ability = (ABAbilityBuilderActiveAbility) localStore - .get(ABLocalStoreKeys.ABILITY); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderActiveAbility ability = (ABAbilityBuilderActiveAbility) localStore.originAbility; ability.deactivate(localStore.game, caster); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionResetCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionResetCooldown.java index a02108665..9877b33d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionResetCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionResetCooldown.java @@ -9,7 +9,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionResetCooldown implements ABSingleAction { @@ -18,8 +17,7 @@ public class ABActionResetCooldown implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { theUnit = this.unit.callback(caster, localStore, castId); @@ -31,9 +29,8 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, if (abil != null) { abil.resetCooldown(localStore.game, theUnit); } - } - else { - final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + } else { + final ABAbilityBuilderAbility abil = localStore.originAbility; abil.resetCooldown(localStore.game, theUnit); } } @@ -43,18 +40,15 @@ public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) String unitExpression; if (this.unit != null) { unitExpression = this.unit.generateJassEquivalent(jassTextGenerator); - } - else { + } else { unitExpression = jassTextGenerator.getCaster(); } if (this.alias != null) { return "EndUnitAbilityCooldown(" + unitExpression + ", " + this.alias.generateJassEquivalent(jassTextGenerator) + ")"; - } - else { - return "EndAbilityCooldown(" + unitExpression + ", " - + jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ABILITY", JassTextGeneratorType.AbilityHandle) - + ")"; + } else { + return "EndAbilityCooldown(" + unitExpression + ", " + jassTextGenerator + .getUserDataExpr("AB_LOCAL_STORE_KEY_ABILITY", JassTextGeneratorType.AbilityHandle) + ")"; } } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionSendStartCastingEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionSendStartCastingEvents.java index faffcb770..44c563b29 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionSendStartCastingEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionSendStartCastingEvents.java @@ -7,16 +7,15 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.widget.ABWidgetCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; public class ABActionSendStartCastingEvents implements ABAction { private ABUnitCallback caster; private ABWidgetCallback target; + @Override - public void runAction(final CUnit basecaster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit basecaster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = basecaster; CWidget theTarget = null; if (caster != null) { @@ -25,7 +24,7 @@ public void runAction(final CUnit basecaster, final ABLocalDataStore localStore, if (target != null) { theTarget = target.callback(basecaster, localStore, castId); } - CAbility theAbility = (CAbility) localStore.get(ABLocalStoreKeys.ABILITY); + CAbility theAbility = localStore.originAbility; theUnit.fireSpellEvents(localStore.game, JassGameEventsWar3.EVENT_UNIT_SPELL_CHANNEL, theAbility, theTarget); theUnit.fireSpellEvents(localStore.game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, theAbility, theTarget); theUnit.fireSpellEvents(localStore.game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, theAbility, theTarget); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionStartCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionStartCooldown.java index f3d68aa4d..d25be4d70 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionStartCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionStartCooldown.java @@ -20,8 +20,7 @@ public class ABActionStartCooldown implements ABSingleAction { private ABFloatCallback cooldown; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { theUnit = this.unit.callback(caster, localStore, castId); @@ -42,7 +41,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, final War3ID aliasId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); theUnit.beginCooldown(localStore.game, aliasId, this.cooldown.callback(caster, localStore, castId)); } else { - final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = localStore.originAbility; abil.startCooldown(localStore.game, theUnit); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java index 3c9ac480b..0ac992f77 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAbilitySetShowIcon.java @@ -3,12 +3,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAbilitySetShowIcon implements ABSingleAction { @@ -23,8 +21,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin abil.setIconShowing(show.callback(caster, localStore, castId)); } } else { - final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); - abil.setIconShowing(show.callback(caster, localStore, castId)); + localStore.originAbility.setIconShowing(show.callback(caster, localStore, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAddTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAddTargetAllowed.java index c2b3694d6..ba0889421 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAddTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAddTargetAllowed.java @@ -6,7 +6,7 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -21,9 +21,9 @@ public class ABActionAddTargetAllowed implements ABSingleAction { @Override @SuppressWarnings("unchecked") public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + CAbility ability = localStore.originAbility; if (ability != null && ability instanceof ABAbilityBuilderActiveAbility) { - ((ABAbilityBuilderActiveAbility)ability).getTargetsAllowed().add(this.targetType); + ((ABAbilityBuilderActiveAbility) ability).getTargetsAllowed().add(this.targetType); } else { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbility.java index da40e22cf..7189f16f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbility.java @@ -8,7 +8,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionDisableAbility implements ABSingleAction { @@ -22,7 +21,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } } else { - final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = localStore.originAbility; abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbilityById.java index 3d522bd5e..a10a790db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionDisableAbilityById.java @@ -9,7 +9,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionDisableAbilityById implements ABSingleAction { @@ -18,8 +17,7 @@ public class ABActionDisableAbilityById implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { theUnit = this.unit.callback(caster, localStore, castId); @@ -31,9 +29,8 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, if (abil != null) { abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } - } - else { - final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + } else { + final ABAbilityBuilderAbility abil = localStore.originAbility; abil.setDisabled(true, CAbilityDisableType.ABILITYINTERNAL); } } @@ -43,14 +40,12 @@ public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) String unitExpression; if (this.unit != null) { unitExpression = this.unit.generateJassEquivalent(jassTextGenerator); - } - else { + } else { unitExpression = jassTextGenerator.getCaster(); } if (this.alias != null) { return "TODOJASS"; - } - else { + } else { return "TODOJASS"; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbility.java index 7c38abdee..b6019d330 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbility.java @@ -8,7 +8,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionEnableAbility implements ABSingleAction { @@ -22,7 +21,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } } else { - final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility abil = localStore.originAbility; abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbilityById.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbilityById.java index 6e71b1410..a780a4e69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbilityById.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionEnableAbilityById.java @@ -9,7 +9,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.visitor.ABGetABAbilityByRawcodeVisitor; public class ABActionEnableAbilityById implements ABSingleAction { @@ -18,8 +17,7 @@ public class ABActionEnableAbilityById implements ABSingleAction { private ABUnitCallback unit; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnit theUnit = caster; if (this.unit != null) { theUnit = this.unit.callback(caster, localStore, castId); @@ -31,9 +29,8 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, if (abil != null) { abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } - } - else { - final ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + } else { + final ABAbilityBuilderAbility abil = localStore.originAbility; abil.setDisabled(false, CAbilityDisableType.ABILITYINTERNAL); } } @@ -43,14 +40,12 @@ public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) String unitExpression; if (this.unit != null) { unitExpression = this.unit.generateJassEquivalent(jassTextGenerator); - } - else { + } else { unitExpression = jassTextGenerator.getCaster(); } if (this.alias != null) { return "TODOJASS"; - } - else { + } else { return "TODOJASS"; } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java index 8fe46b8bc..fd6c3a42b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java @@ -20,11 +20,10 @@ public class ABActionRemoveTargetAllowed implements ABSingleAction { @Override @SuppressWarnings("unchecked") - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderAbility ability = localStore.originAbility; if (ability != null && ability instanceof ABAbilityBuilderActiveAbility) { - ((ABAbilityBuilderActiveAbility)ability).getTargetsAllowed().remove(this.targetType); + ((ABAbilityBuilderActiveAbility) ability).getTargetsAllowed().remove(this.targetType); } else { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java index 349143568..191a59c22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java @@ -12,13 +12,13 @@ public class ABActionAttackModifierApplyAllArtFields implements ABAction { private ABBooleanCallback applyArtIfMissing; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = localStore.originAbility; String art = abil.getAbilityStringField("Missileart"); - if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { + if ((art != null && !art.isBlank()) + || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { settings.setProjectileArt(art); } settings.setProjectileSpeed(abil.getAbilityIntField("Missilespeed")); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java index 414426a26..0a2cfaae2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java @@ -12,13 +12,13 @@ public class ABActionAttackModifierApplyArt implements ABAction { private ABBooleanCallback applyArtIfMissing; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = localStore.originAbility; String art = abil.getAbilityStringField("Missileart"); - if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { + if ((art != null && !art.isBlank()) + || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { settings.setProjectileArt(art); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java index 45b0e2f0a..4ae3a470f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java @@ -12,13 +12,13 @@ public class ABActionAttackModifierApplyArtAndSpeed implements ABAction { private ABBooleanCallback applyArtIfMissing; - - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); - ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = localStore.originAbility; String art = abil.getAbilityStringField("Missileart"); - if ((art != null && !art.isBlank()) || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { + if ((art != null && !art.isBlank()) + || (applyArtIfMissing != null && applyArtIfMissing.callback(caster, localStore, castId))) { settings.setProjectileArt(art); } settings.setProjectileSpeed(abil.getAbilityIntField("Missilespeed")); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddSlowBuff.java index 62472f022..cf4e7b15e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddSlowBuff.java @@ -3,7 +3,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; @@ -23,8 +22,7 @@ public class ABActionAddSlowBuff implements ABSingleAction { private ABBooleanCallback leveled; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { War3ID alias = null; boolean isLeveled = false; boolean isShowIcon = true; @@ -42,9 +40,9 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, isShowIcon = showIcon.callback(caster, localStore, castId); } - final ABBuffSlow ability = new ABBuffSlow(localStore.game, localStore.game.getHandleIdAllocator().createId(), alias, localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - this.duration.callback(caster, localStore, castId), isLeveled); + final ABBuffSlow ability = new ABBuffSlow(localStore.game, localStore.game.getHandleIdAllocator().createId(), + alias, localStore, localStore.originAbility, caster, this.duration.callback(caster, localStore, castId), + isLeveled); ability.setIconShowing(isShowIcon); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddStunBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddStunBuff.java index 97deb35aa..3b6bae941 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddStunBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddStunBuff.java @@ -3,7 +3,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; @@ -41,8 +40,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin isShowIcon = showIcon.callback(caster, localStore, castId); } final ABBuffStun ability = new ABBuffStun(localStore.game.getHandleIdAllocator().createId(), alias, localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, - this.duration.callback(caster, localStore, castId), isLeveled); + localStore.originAbility, caster, this.duration.callback(caster, localStore, castId), isLeveled); ability.setIconShowing(isShowIcon); this.unit.callback(caster, localStore, castId).add(localStore.game, ability); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreatePassiveBuff.java index 8c8d8bf43..41dccd01b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; @@ -37,8 +36,7 @@ public class ABActionCreatePassiveBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { ABPermanentPassiveBuff ability = null; boolean isLeveled = false; if (leveled != null) { @@ -53,15 +51,14 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, if (showIcon != null) { ability = new ABPermanentPassiveBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, localStore, onAddActions, - onRemoveActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, + buffId.callback(caster, localStore, castId), localStore.originAbility, caster, localStore, + onAddActions, onRemoveActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, isPositive); localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); } else { ability = new ABPermanentPassiveBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), - caster, localStore, onAddActions, onRemoveActions, true, castId, isLeveled, isPositive); + buffId.callback(caster, localStore, castId), localStore.originAbility, caster, localStore, + onAddActions, onRemoveActions, true, castId, isLeveled, isPositive); localStore.put(ABLocalStoreKeys.LASTCREATEDBUFF, ability); } if (this.artType != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTargetingBuff.java index f65e0a25c..1865baf7d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTargetingBuff.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABTargetingBuff; @@ -24,8 +23,7 @@ public class ABActionCreateTargetingBuff implements ABSingleAction { @Override public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final ABTargetingBuff ability = new ABTargetingBuff(localStore.game.getHandleIdAllocator().createId(), - this.buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster); + this.buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { ability.addUniqueFlag(flag.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedArtBuff.java index e6014cb08..01a71f366 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; @@ -49,20 +48,18 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (dispellable != null) { isDispellable = dispellable.callback(caster, localStore, castId); } else { - isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); + isDispellable = localStore.originAbility.isMagic(); } ABTimedArtBuff ability; if (showIcon != null) { ability = new ABTimedArtBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), showIcon.callback(caster, localStore, castId), isLeveled, isPositive, isDispellable); } else { ability = new ABTimedArtBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), isLeveled, isPositive, isDispellable); } if (artType != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedBuff.java index 20ff93cef..3da808fce 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedBuff.java @@ -6,7 +6,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; @@ -52,8 +51,7 @@ public class ABActionCreateTimedBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { showTimedLife = this.showTimedLifeBar.callback(caster, localStore, castId); @@ -72,11 +70,11 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, if (dispellable != null) { isDispellable = dispellable.callback(caster, localStore, castId); } else { - isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); + isDispellable = localStore.originAbility.isMagic(); } - boolean isMagic = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); - boolean isPhysical = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); + boolean isMagic = localStore.originAbility.isMagic(); + boolean isPhysical = localStore.originAbility.isPhysical(); if (magic != null) { isMagic = magic.callback(caster, localStore, castId); } @@ -87,16 +85,14 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, ABTimedBuff ability; if (showIcon != null) { ability = new ABTimedBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, isPositive, isDispellable); } else { ability = new ABTimedBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, castId, isLeveled, isPositive, isDispellable); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java index da2b646af..8b0e2289c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java @@ -5,7 +5,6 @@ import java.util.Map; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; @@ -70,11 +69,11 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (dispellable != null) { isDispellable = dispellable.callback(caster, localStore, castId); } else { - isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); + isDispellable = localStore.originAbility.isMagic(); } - boolean isMagic = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); - boolean isPhysical = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); + boolean isMagic = localStore.originAbility.isMagic(); + boolean isPhysical = localStore.originAbility.isPhysical(); if (magic != null) { isMagic = magic.callback(caster, localStore, castId); } @@ -85,16 +84,14 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin ABTimedBuff ability; if (showIcon != null) { ability = new ABTimedPausedExpirationBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, isPositive, isDispellable); } else { ability = new ABTimedPausedExpirationBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, castId, isLeveled, isPositive, isDispellable); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTargetingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTargetingBuff.java index c1049a865..0ce6f2127 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTargetingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTargetingBuff.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; @@ -29,8 +28,7 @@ public class ABActionCreateTimedTargetingBuff implements ABSingleAction { @Override public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final ABTimedTargetingBuff ability = new ABTimedTargetingBuff(localStore.game.getHandleIdAllocator().createId(), - this.buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + this.buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, this.duration.callback(caster, localStore, castId)); if (uniqueFlags != null) { for (ABStringCallback flag : uniqueFlags) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingBuff.java index 6ee8602a0..9d4186c57 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingBuff.java @@ -6,7 +6,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; @@ -52,8 +51,7 @@ public class ABActionCreateTimedTickingBuff implements ABSingleAction { private Map uniqueValues; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { boolean showTimedLife = false; if (this.showTimedLifeBar != null) { showTimedLife = this.showTimedLifeBar.callback(caster, localStore, castId); @@ -72,11 +70,11 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, if (dispellable != null) { isDispellable = dispellable.callback(caster, localStore, castId); } else { - isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); + isDispellable = localStore.originAbility.isMagic(); } - boolean isMagic = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); - boolean isPhysical = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); + boolean isMagic = localStore.originAbility.isMagic(); + boolean isPhysical = localStore.originAbility.isPhysical(); if (magic != null) { isMagic = magic.callback(caster, localStore, castId); } @@ -87,15 +85,13 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, ABTimedTickingBuff ability; if (showIcon != null) { ability = new ABTimedTickingBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, - onExpireActions, onTickActions, showIcon.callback(caster, localStore, castId), castId, - isLeveled, isPositive, isDispellable); + onExpireActions, onTickActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, + isPositive, isDispellable); } else { ability = new ABTimedTickingBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, isLeveled, isPositive, isDispellable); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java index ad8b305e9..64fc228cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java @@ -6,7 +6,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; @@ -71,11 +70,11 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (dispellable != null) { isDispellable = dispellable.callback(caster, localStore, castId); } else { - isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); + isDispellable = localStore.originAbility.isMagic(); } - boolean isMagic = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); - boolean isPhysical = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); + boolean isMagic = localStore.originAbility.isMagic(); + boolean isPhysical = localStore.originAbility.isPhysical(); if (magic != null) { isMagic = magic.callback(caster, localStore, castId); } @@ -86,15 +85,13 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin ABTimedTickingPausedBuff ability; if (showIcon != null) { ability = new ABTimedTickingPausedBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, onTickActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, isPositive, isDispellable); } else { ability = new ABTimedTickingPausedBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, isLeveled, isPositive, isDispellable); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java index 3b76f04c5..335cc0085 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java @@ -6,7 +6,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats.ABFloatCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id.ABIDCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.statbuff.ABNonStackingStatBuffCallback; @@ -71,11 +70,11 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (dispellable != null) { isDispellable = dispellable.callback(caster, localStore, castId); } else { - isDispellable = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); + isDispellable = localStore.originAbility.isMagic(); } - boolean isMagic = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYMAGIC, true)); - boolean isPhysical = ((boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYPHYSICAL, false)); + boolean isMagic = localStore.originAbility.isMagic(); + boolean isPhysical = localStore.originAbility.isPhysical(); if (magic != null) { isMagic = magic.callback(caster, localStore, castId); } @@ -86,8 +85,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin ABTimedTickingPostDeathBuff ability; if (showIcon != null) { ability = new ABTimedTickingPostDeathBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, onTickActions, showIcon.callback(caster, localStore, castId), castId, isLeveled, isPositive, isDispellable); @@ -96,8 +94,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin } } else { ability = new ABTimedTickingPostDeathBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), localStore, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY), caster, + buffId.callback(caster, localStore, castId), localStore, localStore.originAbility, caster, duration.callback(caster, localStore, castId), showTimedLife, onAddActions, onRemoveActions, onExpireActions, onTickActions, castId, isLeveled, isPositive, isDispellable); if (artType != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/item/ABActionChargeItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/item/ABActionChargeItem.java index a27ddeab4..70069e043 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/item/ABActionChargeItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/item/ABActionChargeItem.java @@ -8,7 +8,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionChargeItem implements ABSingleAction { @@ -19,7 +18,7 @@ public class ABActionChargeItem implements ABSingleAction { public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { CItem it = null; if (this.item == null) { - final ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + final ABAbilityBuilderAbility ability = localStore.originAbility; it = ability.getItem(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java index f7155482a..44919e4ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/reaction/ABActionCheckAbilityEffectReaction.java @@ -5,12 +5,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit.ABUnitCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCheckAbilityEffectReaction implements ABSingleAction { @@ -24,8 +22,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (this.target != null) { tarU = this.target.callback(caster, localStore, castId); } - if (tarU.checkForAbilityEffectReaction(localStore.game, caster, - (CAbility) localStore.get(ABLocalStoreKeys.ABILITY))) { + if (tarU.checkForAbilityEffectReaction(localStore.game, caster, localStore.originAbility)) { if (this.onHitActions != null) { for (final ABAction periodicAction : this.onHitActions) { periodicAction.runAction(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseAction.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseAction.java index ba1e7d0a9..1620a53d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseAction.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseAction.java @@ -4,12 +4,10 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABActionRunReuseAction implements ABSingleAction { @@ -17,10 +15,8 @@ public class ABActionRunReuseAction implements ABSingleAction { private ABStringCallback name; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseActions() != null) { List actions = config.getReuseActions().get(keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseActionWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseActionWithArguments.java index 4c640d9b4..3b44fbd2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseActionWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionRunReuseActionWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; @@ -21,8 +20,7 @@ public class ABActionRunReuseActionWithArguments implements ABSingleAction { @Override public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseActions() != null) { List actions = config.getReuseActions().get(keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java index bdfe0f2bb..f1d3b23e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityRemoveUniqueValue.java @@ -2,12 +2,10 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAbilityRemoveUniqueValue implements ABAction { @@ -20,7 +18,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (ability != null) { theAbility = ability.callback(caster, localStore, castId); } else { - theAbility = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + theAbility = localStore.originAbility; } theAbility.removeUniqueValue(key.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java index f8225eda9..c7ae55aa4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/uniquevalue/ABActionAbilityStoreUniqueValue.java @@ -2,13 +2,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionAbilityStoreUniqueValue implements ABAction { @@ -22,7 +20,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (ability != null) { theAbility = ability.callback(caster, localStore, castId); } else { - theAbility = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + theAbility = localStore.originAbility; } theAbility.addUniqueValue(valueToStore.callback(caster, localStore, castId), key.callback(caster, localStore, castId)); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnit.java index f5a58974e..bb2a25aa7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnit.java @@ -65,7 +65,7 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI if (this.requiresPayment != null) { charge = this.requiresPayment.callback(caster, localStore, castId); } - ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = localStore.originAbility; if (baseId == null || altId == null) { localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitInstant.java index 291351c41..051271f27 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitInstant.java @@ -57,7 +57,7 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI if (this.requiresPayment != null) { charge = this.requiresPayment.callback(caster, localStore, castId); } - ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = localStore.originAbility; CUnitType baseType = null; if (baseUnitId == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java index c6525f169..a5c89fec8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java @@ -54,7 +54,7 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI } War3ID baseId = baseUnitId.callback(caster, localStore, castId); War3ID altId = alternateUnitId.callback(caster, localStore, castId); - ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = localStore.originAbility; if (baseId == null || altId == null) { localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java index 8274525d1..cb817e112 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityRemove.java @@ -11,7 +11,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.handler.ABTransformationHandler; public class ABActionTransformedUnitAbilityRemove implements ABAction { @@ -39,7 +38,7 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI } War3ID baseId = baseUnitId.callback(caster, localStore, castId); War3ID altId = alternateUnitId.callback(caster, localStore, castId); - ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = localStore.originAbility; if (baseId == null || altId == null) { return; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetThisAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetThisAbility.java index faf75b3bc..8f0bebc75 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetThisAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetThisAbility.java @@ -5,13 +5,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetThisAbility extends ABAbilityCallback { @Override public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CAbility) localStore.get(ABLocalStoreKeys.ABILITY); + return localStore.originAbility; } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbility.java index ab35050da..9b5327dd8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbility.java @@ -3,11 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseAbility extends ABAbilityCallback { @@ -16,8 +14,7 @@ public class ABCallbackReuseAbility extends ABAbilityCallback { @Override public CAbility callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java index e58f4f02d..44b7b198e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackReuseAbilityWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -18,10 +17,8 @@ public class ABCallbackReuseAbilityWithArguments extends ABAbilityCallback { private Map arguments; @Override - public CAbility callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + public CAbility callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); @@ -31,10 +28,12 @@ public CAbility callback(final CUnit caster, final ABLocalDataStore localStore, localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABAbilityCallback) callback).callback(caster, localStore, castId); } else { - System.err.println("Trying to run ReuseAbilityCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseAbilityCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseAbilityCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuff.java index a41247834..7966a3bea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuff.java @@ -3,11 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBuff extends ABBuffCallback { @@ -15,17 +13,16 @@ public class ABCallbackReuseBuff extends ABBuffCallback { private ABStringCallback name; @Override - public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABBuffCallback) { return ((ABBuffCallback) callback).callback(caster, localStore, castId); } else { - System.err.println("Trying to run ReuseBuffCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseBuffCallback, but key is missing or callback was the wrong type: " + keyS); } } else { System.err.println("Trying to run ReuseBuffCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java index 8f5861589..fbc2940ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackReuseBuffWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,7 +18,7 @@ public class ABCallbackReuseBuffWithArguments extends ABBuffCallback { @Override public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructable.java index 7270e9674..0b595a2f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructable.java @@ -3,11 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructable extends ABDestructableCallback { @@ -15,17 +13,17 @@ public class ABCallbackReuseDestructable extends ABDestructableCallback { private ABStringCallback name; @Override - public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABDestructableCallback) { return ((ABDestructableCallback) callback).callback(caster, localStore, castId); } else { - System.err.println("Trying to run ReuseDestructableCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseDestructableCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseDestructableCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java index 1bd61665c..b075c2ab2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackReuseDestructableWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CDestructable; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -20,7 +19,7 @@ public class ABCallbackReuseDestructableWithArguments extends ABDestructableCall @Override public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java index 971f0ea31..04a86f7b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuff.java @@ -3,11 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseDestructableBuff extends ABDestructableBuffCallback { @@ -15,17 +13,17 @@ public class ABCallbackReuseDestructableBuff extends ABDestructableBuffCallback private ABStringCallback name; @Override - public CDestructableBuff callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + public CDestructableBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); if (callback != null && callback instanceof ABDestructableBuffCallback) { return ((ABDestructableBuffCallback) callback).callback(caster, localStore, castId); } else { - System.err.println("Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseDestructableBuffCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseDestructableBuffCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java index eb26e6c5f..9e5872fd6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackReuseDestructableBuffWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.CDestructableBuff; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,8 +18,7 @@ public class ABCallbackReuseDestructableBuffWithArguments extends ABDestructable @Override public CDestructableBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java index c8fe796b1..cfba74cad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEvent.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABTimeOfDayEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; @@ -17,7 +15,7 @@ public class ABCallbackReuseTimeOfDayEvent extends ABTimeOfDayEventCallback { @Override public ABTimeOfDayEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java index 41c57c608..28e11afda 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackReuseTimeOfDayEventWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -20,7 +19,7 @@ public class ABCallbackReuseTimeOfDayEventWithArguments extends ABTimeOfDayEvent @Override public ABTimeOfDayEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java index adafa3a09..fccf0fa1b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEvent.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.event.ABWidgetEvent; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; @@ -16,8 +14,7 @@ public class ABCallbackReuseWidgetEvent extends ABWidgetEventCallback { @Override public ABWidgetEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java index 9f113a429..6b47832cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackReuseWidgetEventWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -20,7 +19,7 @@ public class ABCallbackReuseWidgetEventWithArguments extends ABWidgetEventCallba @Override public ABWidgetEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityArea.java index 555ae1b42..83cb6f0b6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityArea.java @@ -5,21 +5,20 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityArea extends ABFloatCallback { private ABAbilityCallback ability; - + @Override public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (ability == null) { - ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = localStore.originAbility; return abil.getArea(); } else { CAbility abil = ability.callback(caster, localStore, castId); if (abil instanceof ABAbilityBuilderAbility) { - return ((ABAbilityBuilderAbility)abil).getArea(); + return ((ABAbilityBuilderAbility) abil).getArea(); } else { return 0f; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastRange.java index 70ae31ec3..0d697bcd5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastRange.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityCastRange extends ABFloatCallback { @@ -14,7 +13,7 @@ public class ABCallbackGetAbilityCastRange extends ABFloatCallback { @Override public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (ability == null) { - ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = localStore.originAbility; return abil.getCastRange(); } else { CAbility abil = ability.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastTime.java index e0b9cdcc2..54adb8474 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastTime.java @@ -14,7 +14,7 @@ public class ABCallbackGetAbilityCastTime extends ABFloatCallback { @SuppressWarnings("unchecked") @Override public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = localStore.originAbility; if (ability != null) { return ability.getCastTime(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCooldown.java index cb8608fd9..a7dc1cb1c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCooldown.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityCooldown extends ABFloatCallback { @@ -14,7 +13,7 @@ public class ABCallbackGetAbilityCooldown extends ABFloatCallback { @Override public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (ability == null) { - ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = localStore.originAbility; return abil.getCooldown(); } else { CAbility abil = ability.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java deleted file mode 100644 index 69a365447..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetParentAbilityDataAsFloat.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.floats; - -import java.util.List; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.template.ABDataFieldLetter; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; - -public class ABCallbackGetParentAbilityDataAsFloat extends ABFloatCallback { - - private ABDataFieldLetter dataField; - - @SuppressWarnings("unchecked") - @Override - public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - List levelData = (List) localStore - .get(ABLocalStoreKeys.PARENTLEVELDATA); - int parentLevel = (int) ((ABLocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) - .get(ABLocalStoreKeys.CURRENTLEVEL); - - String data = levelData.get(parentLevel - 1).getData().get(dataField.getIndex()); - - return Float.parseFloat(data); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloat.java index 0cde87408..d464e2b52 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloat.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseFloat extends ABFloatCallback { @@ -16,7 +14,7 @@ public class ABCallbackReuseFloat extends ABFloatCallback { @Override public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java index 5e8d9734f..dd102e83c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackReuseFloatWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -18,7 +17,7 @@ public class ABCallbackReuseFloatWithArguments extends ABFloatCallback { @Override public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFX.java index 721c81e7a..fcd6bc4c3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFX.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.SimulationRenderComponent; @@ -17,7 +15,7 @@ public class ABCallbackReuseFX extends ABFXCallback { @Override public SimulationRenderComponent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFXWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFXWithArguments.java index 9dd81cf1c..4dec2d1f7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFXWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackReuseFXWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -20,7 +19,7 @@ public class ABCallbackReuseFXWithArguments extends ABFXCallback { @Override public SimulationRenderComponent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetParentAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetParentAlias.java deleted file mode 100644 index 8f25576a1..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetParentAlias.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.id; - -import com.etheller.warsmash.util.War3ID; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; - -public class ABCallbackGetParentAlias extends ABIDCallback { - - @Override - public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (War3ID) ((ABLocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) - .get(ABLocalStoreKeys.ALIAS); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseID.java index efbfa475f..51d43f8f0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseID.java @@ -3,11 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseID extends ABIDCallback { @@ -16,8 +14,7 @@ public class ABCallbackReuseID extends ABIDCallback { @Override public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseIDWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseIDWithArguments.java index fa57d4e53..629d7b412 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseIDWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackReuseIDWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.util.War3ID; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -20,7 +19,7 @@ public class ABCallbackReuseIDWithArguments extends ABIDCallback { @Override public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java index b40c0c87d..3c7b40977 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java @@ -13,12 +13,13 @@ public class ABCallbackGetAbilityCastTimeAsInteger extends ABIntegerCallback { @SuppressWarnings("unchecked") @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = localStore.originAbility; if (ability != null) { return (int) ability.getCastTime(); } else { - List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); - return (int) levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL))-1).getCastTime(); + List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + return (int) levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getCastTime(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityManaCost.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityManaCost.java index b00e6dbc1..0b577dece 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityManaCost.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityManaCost.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityManaCost extends ABIntegerCallback { @@ -14,7 +13,7 @@ public class ABCallbackGetAbilityManaCost extends ABIntegerCallback { @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (ability == null) { - ABAbilityBuilderActiveAbility abil = (ABAbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderActiveAbility abil = (ABAbilityBuilderActiveAbility) localStore.originAbility; return abil.getChargedManaCost(); } else { CAbility abil = ability.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java index c260d977e..649c94bfc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityTargetAttachmentPoints.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.ability.ABAbilityCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetAbilityTargetAttachmentPoints extends ABIntegerCallback { @@ -14,7 +13,7 @@ public class ABCallbackGetAbilityTargetAttachmentPoints extends ABIntegerCallbac @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (ability == null) { - ABAbilityBuilderAbility abil = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility abil = localStore.originAbility; return abil.getAbilityIntField("Targetattachcount"); } else { CAbility abil = ability.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemCharges.java index 64977e583..8de868195 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemCharges.java @@ -21,7 +21,7 @@ public Integer callback(CUnit caster, ABLocalDataStore localStore, final int cas if (item != null) { theItem = item.callback(caster, localStore, castId); } else { - theItem = (CItem) localStore.get(ABLocalStoreKeys.ITEM); + theItem = localStore.originItem; } if (theItem == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemLevel.java index 6987b1f2d..6a0cbcddb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemLevel.java @@ -21,7 +21,7 @@ public Integer callback(CUnit caster, ABLocalDataStore localStore, final int cas if (item != null) { theItem = item.callback(caster, localStore, castId); } else { - theItem = (CItem) localStore.get(ABLocalStoreKeys.ITEM); + theItem = localStore.originItem; } if (theItem == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemMaxCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemMaxCharges.java index 909fd33d6..d841b7fdc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemMaxCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemMaxCharges.java @@ -21,7 +21,7 @@ public Integer callback(CUnit caster, ABLocalDataStore localStore, final int cas if (item != null) { theItem = item.callback(caster, localStore, castId); } else { - theItem = (CItem) localStore.get(ABLocalStoreKeys.ITEM); + theItem = localStore.originItem; } if (theItem == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemSlot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemSlot.java index c266024a8..1b3e101a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemSlot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemSlot.java @@ -21,7 +21,7 @@ public Integer callback(CUnit caster, ABLocalDataStore localStore, final int cas if (item != null) { theItem = item.callback(caster, localStore, castId); } else { - theItem = (CItem)localStore.get(ABLocalStoreKeys.ITEM); + theItem = localStore.originItem; } if (theItem == null || theItem.getContainedInventory() == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseInteger.java index f46b9c7c0..d76136c33 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseInteger.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseInteger extends ABIntegerCallback { @@ -16,7 +14,7 @@ public class ABCallbackReuseInteger extends ABIntegerCallback { @Override public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java index ff2664432..2d325156f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackReuseIntegerWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,7 +18,7 @@ public class ABCallbackReuseIntegerWithArguments extends ABIntegerCallback { @Override public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItem.java index 3820e4853..7f92e1e6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItem.java @@ -3,11 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseItem extends ABItemCallback { @@ -16,7 +14,7 @@ public class ABCallbackReuseItem extends ABItemCallback { @Override public CItem callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItemWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItemWithArguments.java index 3f013467b..f4637601a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItemWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackReuseItemWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,7 +18,7 @@ public class ABCallbackReuseItemWithArguments extends ABItemCallback { @Override public CItem callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseList.java index 98e30cd13..34d974d14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseList.java @@ -4,11 +4,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseList extends ABListCallback { @@ -19,7 +17,7 @@ public class ABCallbackReuseList extends ABListCallback { @Override public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseListWithArguments.java index 6ec7b45f1..2893d8db1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseListWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,10 +18,8 @@ public class ABCallbackReuseListWithArguments extends ABListCallback { @SuppressWarnings("unchecked") @Override - public List callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); @@ -32,10 +29,12 @@ public List callback(final CUnit caster, final ABLocalDataStore localSto localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABListCallback) callback).callback(caster, localStore, castId); } else { - System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseLocationCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableList.java index 51c25bcdf..e174abdb2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableList.java @@ -4,11 +4,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseSortableList> extends ABSortableListCallback { @@ -18,7 +16,7 @@ public class ABCallbackReuseSortableList> extend @SuppressWarnings("unchecked") @Override public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java index 539fc50cc..3b1621693 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackReuseSortableListWithArguments.java @@ -5,24 +5,22 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; -public class ABCallbackReuseSortableListWithArguments> extends ABSortableListCallback { +public class ABCallbackReuseSortableListWithArguments> + extends ABSortableListCallback { private ABStringCallback name; private Map arguments; @SuppressWarnings("unchecked") @Override - public List callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); @@ -32,10 +30,12 @@ public List callback(final CUnit caster, final ABLocalDataStore localStore, localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABListCallback) callback).callback(caster, localStore, castId); } else { - System.err.println("Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseLocationCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseLocationCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocation.java index 1ef8655d8..39916aa0e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocation.java @@ -3,11 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLocation extends ABLocationCallback { @@ -17,7 +15,7 @@ public class ABCallbackReuseLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocationWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocationWithArguments.java index afeee4dde..56c872176 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocationWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackReuseLocationWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -20,7 +19,7 @@ public class ABCallbackReuseLocationWithArguments extends ABLocationCallback { @Override public AbilityPointTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLong.java index e68d442e1..d88226ac7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLong.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseLong extends ABLongCallback { @@ -15,7 +13,7 @@ public class ABCallbackReuseLong extends ABLongCallback { @Override public Long callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLongWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLongWithArguments.java index 37ee488ab..09d20c25b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLongWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackReuseLongWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -17,10 +16,8 @@ public class ABCallbackReuseLongWithArguments extends ABLongCallback { private Map arguments; @Override - public Long callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + public Long callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); @@ -30,10 +27,11 @@ public Long callback(final CUnit caster, final ABLocalDataStore localStore, localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABLongCallback) callback).callback(caster, localStore, castId); } else { - System.err.println("Trying to run ReuseLongCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseLongCallback, but key is missing or callback was the wrong type: " + keyS); } } else { System.err.println("Trying to run ReuseLongCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderId.java index 5deb4ac9a..fac23155c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderId.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseOrderId extends ABOrderIdCallback { @@ -15,7 +13,7 @@ public class ABCallbackReuseOrderId extends ABOrderIdCallback { @Override public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java index 1acf91086..5e5bb3112 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackReuseOrderIdWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,7 +18,7 @@ public class ABCallbackReuseOrderIdWithArguments extends ABOrderIdCallback { @Override public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayer.java index 69186599c..d4c943b28 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayer.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; @@ -16,7 +14,7 @@ public class ABCallbackReusePlayer extends ABPlayerCallback { @Override public CPlayer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayerWithArguments.java index d21cbe4ab..258960494 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackReusePlayerWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -20,7 +19,7 @@ public class ABCallbackReusePlayerWithArguments extends ABPlayerCallback { @Override public CPlayer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectile.java index 5385d2358..3f5bbf406 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectile.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CProjectile; @@ -16,7 +14,7 @@ public class ABCallbackReuseProjectile extends ABProjectileCallback { @Override public CProjectile callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java index bfd143bd7..9e7b8fa35 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackReuseProjectileWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -18,10 +17,8 @@ public class ABCallbackReuseProjectileWithArguments extends ABProjectileCallback private Map arguments; @Override - public CProjectile callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + public CProjectile callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); @@ -31,10 +28,12 @@ public CProjectile callback(final CUnit caster, final ABLocalDataStore localStor localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABProjectileCallback) callback).callback(caster, localStore, castId); } else { - System.err.println("Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseProjectileCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseProjectileCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java index 262f1e5bf..0d3b950d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuff.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.NonStackingStatBuff; @@ -16,7 +14,7 @@ public class ABCallbackReuseNonStackingStatBuff extends ABNonStackingStatBuffCal @Override public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java index 6bcc8fa31..c69b8a2cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackReuseNonStackingStatBuffWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,7 +18,7 @@ public class ABCallbackReuseNonStackingStatBuffWithArguments extends ABNonStacki @Override public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuff.java index 49b2aa124..6068d38b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuff.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.StateModBuff; @@ -17,7 +15,7 @@ public class ABCallbackReuseStateModBuff extends ABStateModBuffCallback { @Override public StateModBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java index 5ba5d84ac..6518e5a34 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackReuseStateModBuffWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -20,7 +19,7 @@ public class ABCallbackReuseStateModBuffWithArguments extends ABStateModBuffCall @Override public StateModBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseString.java index e75abb753..ce1488430 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseString.java @@ -2,10 +2,8 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseString extends ABStringCallback { @@ -14,7 +12,7 @@ public class ABCallbackReuseString extends ABStringCallback { @Override public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseStringWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseStringWithArguments.java index bd9c423a1..fb3dcb4d8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseStringWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackReuseStringWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; @@ -16,10 +15,8 @@ public class ABCallbackReuseStringWithArguments extends ABStringCallback { private Map arguments; @Override - public String callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); @@ -29,10 +26,12 @@ public String callback(final CUnit caster, final ABLocalDataStore localStore, localStore.put(ABLocalStoreKeys.combineArgumentKey(argKey), arguments.get(argKey)); } } - + return ((ABStringCallback) callback).callback(caster, localStore, castId); } else { - System.err.println("Trying to run ReuseStringCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseStringCallback, but key is missing or callback was the wrong type: " + + keyS); } } else { System.err.println("Trying to run ReuseStringCallback, but none defined"); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTarget.java index 6fa6e86a4..a1e630a03 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTarget.java @@ -3,11 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseTarget extends ABTargetCallback { @@ -16,7 +14,7 @@ public class ABCallbackReuseTarget extends ABTargetCallback { @Override public AbilityTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTargetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTargetWithArguments.java index 499d4ec13..1c03e2024 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTargetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackReuseTargetWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,7 +18,7 @@ public class ABCallbackReuseTargetWithArguments extends ABTargetCallback { @Override public AbilityTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimer.java index 4d6b42357..582d0dad2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimer.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.timers.CTimer; @@ -17,7 +15,7 @@ public class ABCallbackReuseTimer extends ABTimerCallback { @Override public CTimer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java index 8c65d008d..ae12c9b19 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackReuseTimerWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -20,7 +19,7 @@ public class ABCallbackReuseTimerWithArguments extends ABTimerCallback { @Override public CTimer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCastingUnit.java index bed5e00e4..6d949906a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCastingUnit.java @@ -9,7 +9,7 @@ public class ABCallbackGetCastingUnit extends ABUnitCallback { @Override public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return caster; + return localStore.originUnit; } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetParentCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetParentCastingUnit.java deleted file mode 100644 index 730be7c91..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetParentCastingUnit.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.unit; - -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; - -public class ABCallbackGetParentCastingUnit extends ABUnitCallback { - - @Override - public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.PARENTCASTER); - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnit.java index 60e6ea52a..e0bd5027f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnit.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnit extends ABUnitCallback { @@ -16,7 +14,7 @@ public class ABCallbackReuseUnit extends ABUnitCallback { @Override public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java index b0dd56b7b..785e554f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackReuseUnitWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,7 +18,7 @@ public class ABCallbackReuseUnitWithArguments extends ABUnitCallback { @Override public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java index 6f6e2b397..e87b4975c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroup.java @@ -4,11 +4,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitGroup extends ABUnitGroupCallback { @@ -18,7 +16,7 @@ public class ABCallbackReuseUnitGroup extends ABUnitGroupCallback { @Override public Set callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java index f394031e7..9fe21ad34 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackReuseUnitGroupWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -20,7 +19,7 @@ public class ABCallbackReuseUnitGroupWithArguments extends ABUnitGroupCallback { @Override public Set callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java index 0b9d3c29a..ace638072 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueue.java @@ -4,11 +4,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseUnitQueue extends ABUnitQueueCallback { @@ -18,7 +16,7 @@ public class ABCallbackReuseUnitQueue extends ABUnitQueueCallback { @Override public Queue callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java index a8dbe43e2..f2972f842 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackReuseUnitQueueWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,8 +18,7 @@ public class ABCallbackReuseUnitQueueWithArguments extends ABUnitQueueCallback { @Override public Queue callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java index daf4d7f4b..e273d8d7c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifier.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.vision.CFogModifier; @@ -16,8 +14,7 @@ public class ABCallbackReuseVisionModifier extends ABVisionModifierCallback { @Override public CFogModifier callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java index 70c6f4681..7543fb06d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackReuseVisionModifierWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,7 +18,7 @@ public class ABCallbackReuseVisionModifierWithArguments extends ABVisionModifier @Override public CFogModifier callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidget.java index c4a3dfdf5..23ca31787 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidget.java @@ -3,11 +3,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseWidget extends ABWidgetCallback { @@ -16,7 +14,7 @@ public class ABCallbackReuseWidget extends ABWidgetCallback { @Override public CWidget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java index 4b3c0bc35..ca3a345b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackReuseWidgetWithArguments.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -19,7 +18,7 @@ public class ABCallbackReuseWidgetWithArguments extends ABWidgetCallback { @Override public CWidget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) + final ABAbilityBuilderConfiguration config = (localStore.originAbility) .getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBoolean.java index 44623cb19..53b5007c1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBoolean.java @@ -2,11 +2,9 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; public class ABCallbackReuseBoolean extends ABBooleanCallback { @@ -15,8 +13,7 @@ public class ABCallbackReuseBoolean extends ABBooleanCallback { @Override public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBooleanWithArguments.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBooleanWithArguments.java index 3484d4108..1ef6a413d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBooleanWithArguments.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackReuseBooleanWithArguments.java @@ -4,7 +4,6 @@ import com.etheller.warsmash.parsers.jass.JassTextGenerator; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; @@ -18,8 +17,7 @@ public class ABCallbackReuseBooleanWithArguments extends ABBooleanCallback { @Override public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final ABAbilityBuilderConfiguration config = ((ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY)) - .getConfig(); + final ABAbilityBuilderConfiguration config = (localStore.originAbility).getConfig(); final String keyS = name.callback(caster, localStore, castId); if (config.getReuseCallbacks() != null) { ABCallback callback = config.getReuseCallbacks().get(keyS); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsDisabled.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsDisabled.java index 280da4a10..72f4e275c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsDisabled.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsDisabled.java @@ -4,13 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionIsDisabled extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = localStore.originAbility; return ability.isDisabled(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsOnCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsOnCooldown.java index 308ef0d47..8d0c0d03e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsOnCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsOnCooldown.java @@ -4,13 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionIsOnCooldown extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = localStore.originAbility; return ability.getCooldownRemainingTicks(localStore.game, caster) > 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsToggleAbilityActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsToggleAbilityActive.java index 64d7c478b..029b4b653 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsToggleAbilityActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsToggleAbilityActive.java @@ -6,14 +6,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderActiveAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionIsToggleAbilityActive extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderActiveAbility ability = (ABAbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); - + ABAbilityBuilderActiveAbility ability = (ABAbilityBuilderActiveAbility) localStore.originAbility; return ability.isActive(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java deleted file mode 100644 index b116881fc..000000000 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetParentAbilityDataAsBoolean.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.booleans; - -import java.util.List; - -import com.etheller.warsmash.parsers.jass.JassTextGenerator; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; - -public class ABCallbackGetParentAbilityDataAsBoolean extends ABBooleanCallback { - - private ABIntegerCallback dataField; - - @SuppressWarnings("unchecked") - @Override - public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - final List levelData = (List) localStore - .get(ABLocalStoreKeys.PARENTLEVELDATA); - final int parentLevel = (int) ((ABLocalDataStore) localStore.get(ABLocalStoreKeys.PARENTLOCALSTORE)) - .get(ABLocalStoreKeys.CURRENTLEVEL); - - final String data = levelData.get(parentLevel - 1).getData() - .get(this.dataField.callback(caster, localStore, castId)); - final int parsedData = Integer.parseInt(data); - return parsedData == 1; - } - - @Override - public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { - return "GetAbilityDataAsBooleanAU(" + jassTextGenerator.getTriggerLocalStore() + ", ConvertDataFieldLetter(" - + this.dataField.generateJassEquivalent(jassTextGenerator) + "))"; - } - -} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionIsItemAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionIsItemAbility.java index 4afeec49a..91c1e2deb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionIsItemAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionIsItemAbility.java @@ -4,13 +4,12 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionIsItemAbility extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = localStore.originAbility; return ability.getItem() != null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemHasCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemHasCharges.java index dccebe0ac..fa9e22fb7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemHasCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemHasCharges.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionItemHasCharges extends ABBooleanCallback { @@ -14,7 +13,7 @@ public class ABConditionItemHasCharges extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (item == null) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = localStore.originAbility; return ability.getItem().getCharges() > 0; } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemIsCharged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemIsCharged.java index 428393a1d..65a0fea74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemIsCharged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/item/ABConditionItemIsCharged.java @@ -5,7 +5,6 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.item.ABItemCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; -import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABConditionItemIsCharged extends ABBooleanCallback { @@ -14,7 +13,7 @@ public class ABConditionItemIsCharged extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (item == null) { - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = localStore.originAbility; return ability.getItem().getItemType().getNumberOfCharges() > 0; } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java index b6a81098b..5e820c74c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java @@ -25,7 +25,7 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = localStore.originAbility; if (ability != null && ability instanceof ABAbilityBuilderActiveAbility) { targetsAllowed = ((ABAbilityBuilderActiveAbility)ability).getTargetsAllowed(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java index 7b7586c2b..5a71971be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java @@ -23,7 +23,7 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int theCaster = caster.callback(casterUnit, localStore, castId); } - ABAbilityBuilderActiveAbility abil = (ABAbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderActiveAbility abil = (ABAbilityBuilderActiveAbility) localStore.originAbility; final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java index c1272ef13..691975d03 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -25,7 +25,7 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int theCaster = caster.callback(casterUnit, localStore, castId); } - ABAbilityBuilderActiveAbility abil = (ABAbilityBuilderActiveAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderActiveAbility abil = (ABAbilityBuilderActiveAbility) localStore.originAbility; final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitValidTarget.java index 0e09c94b7..f22ebb468 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitValidTarget.java @@ -28,7 +28,7 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = localStore.originAbility; if (ability != null && ability instanceof ABAbilityBuilderActiveAbility) { targetsAllowed = ((ABAbilityBuilderActiveAbility) ability).getTargetsAllowed(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsValidTarget.java index 7b865bc87..9310aa5cf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsValidTarget.java @@ -27,7 +27,7 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int CUnit theCaster = casterUnit; EnumSet targetsAllowed = null; - ABAbilityBuilderAbility ability = (ABAbilityBuilderAbility) localStore.get(ABLocalStoreKeys.ABILITY); + ABAbilityBuilderAbility ability = localStore.originAbility; if (ability != null && ability instanceof ABAbilityBuilderActiveAbility) { targetsAllowed = ((ABAbilityBuilderActiveAbility) ability).getTargetsAllowed(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAbilityBuilderGsonBuilder.java index 31ca37ceb..865134717 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAbilityBuilderGsonBuilder.java @@ -220,7 +220,6 @@ private static void registerBooleanCallbacks(RuntimeTypeAdapterFactory callbackT .registerSubtype(ABCallbackGetStoredBooleanByKey.class, "getStoredBooleanByKey") .registerSubtype(ABCallbackInlineConditionBoolean.class, "inlineConditionBoolean") .registerSubtype(ABCallbackGetAbilityDataAsBoolean.class, "getAbilityDataAsBoolean") - .registerSubtype(ABCallbackGetParentAbilityDataAsBoolean.class, "getParentAbilityDataAsBoolean") .registerSubtype(ABCallbackGetAbilityUniqueValueBoolean.class, "getAbilityUniqueValueBoolean") .registerSubtype(ABCallbackGetBuffUniqueValueBoolean.class, "getBuffUniqueValueBoolean") @@ -329,7 +328,6 @@ private static void registerFloatCallbacks(RuntimeTypeAdapterFactory callbackTyp .registerSubtype(ABCallbackGetStoredFloatByKey.class, "getStoredFloatByKey") .registerSubtype(ABCallbackInlineConditionFloat.class, "inlineConditionFloat") .registerSubtype(ABCallbackGetAbilityDataAsFloat.class, "getAbilityDataAsFloat") - .registerSubtype(ABCallbackGetParentAbilityDataAsFloat.class, "getParentAbilityDataAsFloat") .registerSubtype(ABCallbackGetAbilityUniqueValueFloat.class, "getAbilityUniqueValueFloat") .registerSubtype(ABCallbackGetBuffUniqueValueFloat.class, "getBuffUniqueValueFloat") @@ -405,7 +403,6 @@ private static void registerIdCallbacks(RuntimeTypeAdapterFactory callbackTypeFa .registerSubtype(ABCallbackGetAlias.class, "getAlias") .registerSubtype(ABCallbackGetCode.class, "getCode") .registerSubtype(ABCallbackGetBuffIdFromCode.class, "getBuffIdFromCode") - .registerSubtype(ABCallbackGetParentAlias.class, "getParentAlias") .registerSubtype(ABCallbackGetFirstBuffId.class, "getFirstBuffId") .registerSubtype(ABCallbackGetSecondBuffId.class, "getSecondBuffId") .registerSubtype(ABCallbackGetFirstEffectId.class, "getFirstEffectId") @@ -748,7 +745,6 @@ private static void registerUnitCallbacks(RuntimeTypeAdapterFactory unitCallback .registerSubtype(ABCallbackGetAbilityPairedUnit.class, "getAbilityPairedUnit") .registerSubtype(ABCallbackGetStoredUnitByKey.class, "getStoredUnitByKey") .registerSubtype(ABCallbackInlineConditionUnit.class, "inlineConditionUnit") - .registerSubtype(ABCallbackGetParentCastingUnit.class, "getParentCastingUnit") .registerSubtype(ABCallbackGetProjectileSourceUnit.class, "getProjectileSourceUnit") .registerSubtype(ABCallbackGetProjectileHitUnit.class, "getProjectileHitUnit") .registerSubtype(ABCallbackGetChainUnit.class, "getChainUnit") diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalDataStore.java index 6ff07880a..e106a1a4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalDataStore.java @@ -1,13 +1,18 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CItem; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; public abstract class ABLocalDataStore implements ABDataStore { public CSimulation game = null; -// public CUnit originUnit = null; -// public CAbility originAbility = null; -// public CPlayer originPlayer = null; + public CUnit originUnit = null; + public ABAbilityBuilderAbility originAbility = null; + public CItem originItem = null; + public CPlayer originPlayer = null; // public CUpgradeEffect originUpgrade = null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalStoreKeys.java index 359e3a7f9..58437264d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalStoreKeys.java @@ -4,16 +4,10 @@ public class ABLocalStoreKeys { // Core values public static final String ABILITYEDITORDATA = "_abilityEditorData"; public static final String LEVELDATA = "_levelData"; - public static final String PARENTLEVELDATA = "_parentLevelData"; - public static final String PARENTCASTER = "_parentCaster"; - public static final String PARENTLOCALSTORE = "_parentLocalStore"; public static final String ALIAS = "_alias"; public static final String CODE = "_code"; - public static final String THISUNIT = "_thisUnit"; - public static final String ABILITY = "_ability"; public static final String CURRENTLEVEL = "_currentLevel"; public static final String BUFF = "_buff"; - public static final String ITEM = "_item"; public static final String ITEMSLOT = "_itemSlot"; public static final String ITERATORCOUNT = "_i"; public static final String BREAK = "_break"; @@ -37,8 +31,6 @@ public class ABLocalStoreKeys { public static final String ISFLEXABILITY = "_flexAbility"; public static final String ISPAIRABILITY = "_pairAbility"; public static final String ISABILITYLEVELED = "_isAbilityLeveld"; - public static final String ISABILITYMAGIC = "_isAbilityMagic"; - public static final String ISABILITYPHYSICAL = "_isAbilityPhysical"; // Aura Template From dbeb54689bc5c9ed9febaa098135643532460551 Mon Sep 17 00:00:00 2001 From: Glasir Date: Sat, 13 Dec 2025 14:38:54 -0500 Subject: [PATCH 41/44] Missed file from last push --- .../behavior/callback/player/ABCallbackGetCastingPlayer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetCastingPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetCastingPlayer.java index a1bbe5f79..42ce21579 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetCastingPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetCastingPlayer.java @@ -8,7 +8,7 @@ public class ABCallbackGetCastingPlayer extends ABPlayerCallback { @Override public CPlayer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return localStore.game.getPlayer(caster.getPlayerIndex()); + return localStore.originPlayer; } } From 19441dcea86df0bf9c62e5410891b1d12a193331 Mon Sep 17 00:00:00 2001 From: Glasir Date: Wed, 17 Dec 2025 09:24:20 -0500 Subject: [PATCH 42/44] Major AB Refactor: Part 8 - CastId * Important: Updated how abilities track the level; cast instances will now remember the level of the ability when cast (and won't update after casting) * Added CastId constants for starting values and a reserved non-instance value * Changed non-instance calls (such as costs for the ability icon) to use the non-instance constant castId * Updated combination of Key+castId to consistently use the combineKey function --- .../scope/CommonTriggerExecutionScope.java | 8 +- .../ABAbilityBuilderActiveAutoTarget.java | 55 ++--- .../ABAbilityBuilderActiveFlexTarget.java | 63 ++++-- .../ABAbilityBuilderActiveNoTarget.java | 12 +- .../ABAbilityBuilderActivePairing.java | 57 ++--- .../ABAbilityBuilderActivePointTarget.java | 9 +- .../ABAbilityBuilderActiveUnitTarget.java | 13 +- .../ABAbilityBuilderGenericActive.java | 196 ++++++++++-------- .../ability/ABAbilityBuilderNoIcon.java | 80 +++---- .../ability/ABAbilityBuilderPassive.java | 67 +++--- .../ABAbilityBuilderAuraTemplate.java | 1 - .../ABAbilityBuilderSimpleAuraTemplate.java | 1 - .../ABAbilityBuilderStatAuraTemplate.java | 1 - .../ABAbilityBuilderStatPassiveTemplate.java | 1 - .../ability/ABActionCleanUpCastInstance.java | 3 +- .../abilitydata/ABActionAddTargetAllowed.java | 2 +- .../ABActionRemoveTargetAllowed.java | 2 +- .../ABActionSetAutoTargetDestructable.java | 5 +- .../ABActionSetAutoTargetUnit.java | 2 +- .../ABActionSetPreventEndEvents.java | 5 +- ...ABActionAttackModifierAddAnimationTag.java | 3 +- ...onAttackModifierAddPostDamageListener.java | 3 +- ...ionAttackModifierAddPreDamageListener.java | 3 +- ...ActionAttackModifierApplyAllArtFields.java | 3 +- .../ABActionAttackModifierApplyArt.java | 3 +- ...BActionAttackModifierApplyArtAndSpeed.java | 3 +- ...ActionAttackModifierApplyDefaultSpeed.java | 3 +- ...tackModifierPreventOtherModifications.java | 3 +- ...PreventOtherSamePriorityModifications.java | 6 +- ...ctionAttackModifierRemoveAnimationTag.java | 3 +- ...ttackModifierRemovePostDamageListener.java | 3 +- ...AttackModifierRemovePreDamageListener.java | 3 +- .../ABActionAttackModifierSetAttackArc.java | 3 +- ...ctionAttackModifierSetAttackDeathTime.java | 6 +- ...ABActionAttackModifierSetAttackHoming.java | 9 +- ...BActionAttackModifierSetAttackImpactZ.java | 3 +- ...ABActionAttackModifierSetAttackStartZ.java | 6 +- ...ABActionAttackModifierSetSplashFields.java | 3 +- ...ABCallbackGetModifiedAttackAttackType.java | 3 +- ...ABCallbackGetModifiedAttackDamageType.java | 5 +- ...ABCallbackGetModifiedAttackWeaponType.java | 3 +- .../action/damage/ABActionDamageArea.java | 80 +++---- .../damage/ABActionDamageAttackSplash.java | 54 ++--- .../action/damage/ABActionDamageBurst.java | 43 ++-- .../action/damage/ABActionDamageSplash.java | 55 ++--- .../ABActionCreateDestructableBuff.java | 7 +- ...IterateDestructablesInRangeOfLocation.java | 7 +- .../unit/ABActionIterateUnitsInGroup.java | 10 +- .../unit/ABActionIterateUnitsInQueue.java | 7 +- ...itsInRangeOfLocationMatchingCondition.java | 8 +- ...geOfLocationMatchingConditionWithSort.java | 8 +- ...teUnitsInRangeOfUnitMatchingCondition.java | 8 +- ...nRangeOfUnitMatchingConditionWithSort.java | 8 +- .../unit/ABActionIterateUnitsInRect.java | 4 +- ...teLocationTargetedCollisionProjectile.java | 2 +- ...ctionCreateLocationTargetedProjectile.java | 6 +- ...reateLocationTargetedPseudoProjectile.java | 11 +- ...nCreateUnitTargetedBouncingProjectile.java | 52 ++--- ...CreateUnitTargetedCollisionProjectile.java | 2 +- .../ABActionCreateUnitTargetedProjectile.java | 2 +- ...ionCreateUnitTargetedPseudoProjectile.java | 2 +- .../structural/ABActionChainEffect.java | 12 +- .../structural/ABActionPeriodicExecute.java | 36 ++-- .../ABActionResetPeriodicExecute.java | 4 +- .../transformation/ABActionTransformUnit.java | 11 +- .../ABActionTransformUnitInstant.java | 10 +- .../ABActionTransformedUnitAbilityAdd.java | 2 +- ...ActionPreDamageListenerAddBonusDamage.java | 3 +- ...nPreDamageListenerAddDamageMultiplier.java | 6 +- ...DamageListenerLockDamageModifications.java | 6 +- .../ABActionPreDamageListenerSetMiss.java | 6 +- .../ABActionSetPreDamageStacking.java | 6 +- .../ABCallbackGetAttackBaseDamage.java | 3 +- .../ABCallbackGetAttackDamageType.java | 5 +- ...BCallbackGetAttackMaximumSplashRadius.java | 8 +- .../ABCallbackGetAttackType.java | 3 +- .../ABCallbackGetAttackWeaponType.java | 3 +- .../ABConditionIsAttackArtillery.java | 9 +- .../ABConditionIsAttackHoming.java | 3 +- ...onditionIsUnitValidSplashDamageTarget.java | 2 +- .../ABCallbackGetNewBehaviorTarget.java | 3 +- ...BConditionIsNewBehaviorCategoryInList.java | 3 +- ...nModificationMultiplyDamageMultiplier.java | 6 +- ...eTakenModificationSetDamageMultiplier.java | 6 +- ...ABConditionIsTriggeringDamageAnAttack.java | 4 +- .../ABConditionIsTriggeringDamageRanged.java | 5 +- ...ctionDeathReplacementSetReincarnating.java | 11 +- .../ABActionDeathReplacementSetReviving.java | 11 +- .../ABActionReactionPreventHit.java | 5 +- ...GetReactionAttackProjectileAttackType.java | 4 +- ...backGetReactionAttackProjectileDamage.java | 5 +- .../ABActionSubtractTotalDamageDealt.java | 6 +- .../ABCallbackGetFinalTotalDamageDealt.java | 2 +- .../ABCallbackGetRawTotalDamageDealt.java | 5 +- .../ABCallbackGetTriggeringAttackType.java | 5 +- .../ABCallbackGetTriggeringDamageType.java | 3 +- .../ABCallbackGetCurrentAttackSettings.java | 4 +- .../ABCallbackGetAttackedDestructable.java | 3 +- .../ABCallbackGetEnumDestructable.java | 2 +- ...BCallbackGetProjectileHitDestructable.java | 2 +- .../floats/ABCallbackGetAbilityCastTime.java | 2 +- .../ABCallbackGetAbilityDataAsFloat.java | 7 +- .../floats/ABCallbackGetAbilityDuration.java | 7 +- .../ABCallbackGetAbilityHeroDuration.java | 2 +- .../id/ABCallbackGetAbilityDataAsID.java | 4 +- .../ABCallbackGetAbilityDataAsIDFromList.java | 4 +- ...lbackGetAbilityDataAsRandomIDFromList.java | 4 +- .../id/ABCallbackGetAbilityUnitId.java | 3 +- .../callback/id/ABCallbackGetFirstBuffId.java | 8 +- .../id/ABCallbackGetFirstEffectId.java | 2 +- .../id/ABCallbackGetSecondBuffId.java | 2 +- ...ABCallbackGetAbilityCastTimeAsInteger.java | 2 +- .../ABCallbackGetAbilityDataAsInteger.java | 4 +- ...lbackGetProjectileDestructableTargets.java | 2 +- .../ABCallbackGetProjectileUnitTargets.java | 2 +- .../integers/ABCallbackGetSpellLevel.java | 7 +- .../ABCallbackGetAbilityTargetedItem.java | 2 +- .../item/ABCallbackGetAttackedItem.java | 3 +- .../ABCallbackGetAttackImpactLocation.java | 3 +- .../ABCallbackGetAttackTargetLocation.java | 3 +- .../ABCallbackGetGroundAttackedLocation.java | 3 +- ...BCallbackGetProjectileCurrentLocation.java | 3 +- .../ABCallbackGetTargetedLocation.java | 2 +- .../longs/ABCallbackGetAbilityDataAsLong.java | 4 +- ...ABCallbackGetReactionAttackProjectile.java | 2 +- .../ABCallbackGetThisProjectile.java | 2 +- .../ABCallbackGetAbilityDataAsString.java | 10 +- .../target/ABCallbackGetAbilityTarget.java | 5 +- .../unit/ABCallbackGetAbilityPairedUnit.java | 2 +- .../ABCallbackGetAbilityTargetedUnit.java | 5 +- .../unit/ABCallbackGetAttackedUnit.java | 3 +- .../unit/ABCallbackGetAttackingUnit.java | 2 +- .../callback/unit/ABCallbackGetChainUnit.java | 5 +- .../unit/ABCallbackGetDamagedUnit.java | 2 +- .../unit/ABCallbackGetDamagingUnit.java | 2 +- .../callback/unit/ABCallbackGetDyingUnit.java | 2 +- .../callback/unit/ABCallbackGetEnumUnit.java | 2 +- .../unit/ABCallbackGetKillingUnit.java | 2 +- .../unit/ABCallbackGetMatchingUnit.java | 2 +- ...CallbackGetNearestCorpseInRangeOfUnit.java | 5 +- ...ABCallbackGetNearestUnitInRangeOfUnit.java | 11 +- .../unit/ABCallbackGetProjectileHitUnit.java | 2 +- ...CallbackGetReactionAbilityCastingUnit.java | 2 +- ...BCallbackGetReactionAbilityTargetUnit.java | 3 +- .../ABCallbackGetProjectileHitWidget.java | 6 +- .../ABConditionIsAutoCastTargeting.java | 22 ++ .../ABConditionIsTransformingToAlternate.java | 2 +- .../attack/ABConditionIsAttackProjectile.java | 3 +- .../attack/ABConditionIsAttackRanged.java | 3 +- .../ABCallbackGetAbilityDataAsBoolean.java | 4 +- ...tionMatchingCorpseExistsInRangeOfUnit.java | 9 +- ...ditionMatchingUnitExistsInRangeOfUnit.java | 5 +- .../ABConditionIsDestructableValidTarget.java | 7 +- .../ABConditionIsUnitValidTarget.java | 3 +- .../targeting/ABConditionIsValidTarget.java | 3 +- .../buff/ABDestructableBuff.java | 12 +- .../adjustablebehaviors/buff/ABTimedBuff.java | 6 +- .../core/ABAbilityBuilderGsonBuilder.java | 1 + .../adjustablebehaviors/core/ABConstants.java | 19 ++ .../datastore/ABDataStore.java | 4 + .../datastore/ABGlobalDataStore.java | 18 ++ .../datastore/ABLocalDataStore.java | 13 +- .../datastore/ABLocalStoreKeys.java | 6 +- .../datastore/ABMapLocalDataStore.java | 18 ++ .../event/ABGlobalWidgetEvent.java | 28 +-- .../event/ABPlayerEvent.java | 28 +-- .../event/ABWidgetEvent.java | 28 +-- .../ABAbilityEffectReactionListener.java | 35 ++-- .../ABAbilityProjReactionListener.java | 35 ++-- .../listener/ABAttackEvasionListener.java | 35 ++-- .../listener/ABAttackPostDamageListener.java | 75 ++++--- .../listener/ABAttackPreDamageListener.java | 35 ++-- .../ABAttackProjReactionListener.java | 26 ++- .../listener/ABBehaviorChangeListener.java | 25 ++- .../listener/ABDamageTakenListener.java | 41 ++-- .../ABDamageTakenModificationListener.java | 41 ++-- .../listener/ABDeathReplacementEffect.java | 29 ++- .../ABCollisionProjectileListener.java | 37 ++-- .../projectile/ABProjectileListener.java | 24 +-- .../impl/ABAbilityBuilderAbilityType.java | 1 - .../impl/ABAbilityBuilderTemplateType.java | 1 - 181 files changed, 1217 insertions(+), 899 deletions(-) create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastTargeting.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABConstants.java diff --git a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java index 663338b7e..abfc17c30 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java +++ b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java @@ -936,11 +936,11 @@ public static TriggerExecutionScope abilityBuilder(final CUnit caster, final ABL scope.triggerCastId = castId; // TODO: below: makes it easier on the outside, but it still is very bad for // performance - scope.spellTargetUnit = (CUnit) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); - scope.spellTargetItem = (CItem) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); + scope.spellTargetUnit = (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId)); + scope.spellTargetItem = (CItem) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId)); scope.spellTargetDestructable = (CDestructable) localStore - .get(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); - scope.spellTargetPoint = (AbilityPointTarget) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + castId); + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId)); + scope.spellTargetPoint = (AbilityPointTarget) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, castId)); scope.spellAbility = localStore.originAbility; scope.spellAbilityId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); return scope; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAutoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAutoTarget.java index 5cbc3dfbd..e6b1ba1c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAutoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAutoTarget.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; @@ -26,7 +27,7 @@ public ABAbilityBuilderActiveAutoTarget(int handleId, War3ID code, War3ID alias, ABLocalDataStore localStore) { super(handleId, code, alias, levelData, config, localStore); } - + @Override public void onAdd(CSimulation game, CUnit unit) { this.behavior = this.createRangedBehavior(unit); @@ -47,7 +48,8 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord @Override public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { - castId++; + this.castId = ABConstants.incrementCastId(this.castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), this.getLevel()); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); CWidget target = autoTarget(game, caster); if (target != null) { @@ -55,45 +57,49 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool this.behavior.setCastId(castId); return this.behavior.reset(game, target, orderId, autoOrder); } else { - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId)); return null; } } @Override public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget noTarget) { - this.castId++; + this.castId = ABConstants.incrementCastId(this.castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), this.getLevel()); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); CWidget target = autoTarget(game, caster); if (target != null) { this.runOnOrderIssuedActions(game, caster, orderId); } else { - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId)); } } - + public CWidget autoTarget(CSimulation game, CUnit caster) { CWidget target = null; if (this.config.getSpecialFields() != null && this.config.getSpecialFields().getAutoAquireTarget() != null) { - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); - + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId)); + for (ABAction action : this.config.getSpecialFields().getAutoAquireTarget()) { action.runAction(caster, this.localStore, castId); } - - target = (CWidget) this.localStore.get(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); + + target = (CWidget) this.localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId)); if (target == null) { - target = (CWidget) this.localStore.get(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); + target = (CWidget) this.localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId)); if (target == null) { - target = (CWidget) this.localStore.get(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); + target = (CWidget) this.localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId)); } } } @@ -103,11 +109,14 @@ public CWidget autoTarget(CSimulation game, CUnit caster) { protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver) { CWidget prevTarget = null; - prevTarget = (CWidget) this.localStore.get(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); + prevTarget = (CWidget) this.localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, ABConstants.NO_CAST_ID)); if (prevTarget == null) { - prevTarget = (CWidget) this.localStore.get(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId); + prevTarget = (CWidget) this.localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, ABConstants.NO_CAST_ID)); if (prevTarget == null) { - prevTarget = (CWidget) this.localStore.get(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); + prevTarget = (CWidget) this.localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, ABConstants.NO_CAST_ID)); } } if (target == prevTarget) { @@ -117,8 +126,6 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord return false; } } - - // Unused @@ -126,7 +133,7 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { return null; } - + @Override public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { return null; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveFlexTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveFlexTarget.java index 0b7d6bf4f..6e54167cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveFlexTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveFlexTarget.java @@ -13,6 +13,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderBase; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorAbilityBuilderNoTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; @@ -33,28 +34,31 @@ public ABAbilityBuilderActiveFlexTarget(int handleId, War3ID alias, War3ID code, ABLocalDataStore localStore) { super(handleId, alias, code, levelData, config, localStore); } - + private void setTargeted(CSimulation game, CUnit unit) { if (config.getSpecialFields() != null && config.getSpecialFields().getTargetedSpell() != null) { boolean result = true; for (ABBooleanCallback condition : config.getSpecialFields().getTargetedSpell()) { - result = result && condition.callback(unit, localStore, castId); + result = result && condition.callback(unit, localStore, ABConstants.NO_CAST_ID); } this.targetedSpell = result; } } + private void setPointTarget(CSimulation game, CUnit unit) { if (config.getSpecialFields() != null && config.getSpecialFields().getPointTargeted() != null) { boolean result = true; for (ABBooleanCallback condition : config.getSpecialFields().getPointTargeted()) { - result = result && condition.callback(unit, localStore, castId); + result = result && condition.callback(unit, localStore, ABConstants.NO_CAST_ID); } this.pointTarget = result; } } + protected void determineCastless(CUnit unit) { - if (this.item != null || this.config.getDisplayFields() != null && this.config.getDisplayFields().getCastlessNoTarget() != null - && this.config.getDisplayFields().getCastlessNoTarget().callback(unit, localStore, castId)) { + if (this.item != null || this.config.getDisplayFields() != null + && this.config.getDisplayFields().getCastlessNoTarget() != null && this.config.getDisplayFields() + .getCastlessNoTarget().callback(unit, localStore, ABConstants.NO_CAST_ID)) { this.castless = true; this.behavior = null; } else { @@ -64,6 +68,7 @@ protected void determineCastless(CUnit unit) { } } } + private void setBehavior(final CUnit unit) { if (this.targetedSpell) { if (this.behavior == null || !(this.behavior instanceof ABBehaviorAbilityBuilderBase)) { @@ -88,7 +93,7 @@ public void setLevel(CSimulation game, CUnit unit, int level) { this.setTargeted(game, unit); this.setPointTarget(game, unit); this.setBehavior(unit); - + } @Override @@ -107,26 +112,33 @@ public void onAdd(CSimulation game, CUnit unit) { } @Override - public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, - boolean autoOrder, final AbilityTarget target) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); + public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, + final AbilityTarget target) { + this.localStore.put(ABLocalStoreKeys.ISAUTOCASTTARGETING, autoOrder); if (!this.isTargetedSpell() && castless && orderId == this.getBaseOrderId()) { this.runBeginCastingActions(game, caster, orderId); this.runEndCastingActions(game, caster, orderId); + this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTTARGETING); return false; } + this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTTARGETING); return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } @Override public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { if (this.isTargetedSpell() && !this.isPointTarget()) { - this.castId++; + this.castId = ABConstants.incrementCastId(this.castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), + this.getLevel()); this.behavior.setCastId(this.castId); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, target.visit(AbilityTargetVisitor.UNIT)); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, target.visit(AbilityTargetVisitor.ITEM)); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, target.visit(AbilityTargetVisitor.DESTRUCTABLE)); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId), + target.visit(AbilityTargetVisitor.UNIT)); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId), + target.visit(AbilityTargetVisitor.ITEM)); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId), + target.visit(AbilityTargetVisitor.DESTRUCTABLE)); this.runOnOrderIssuedActions(game, caster, orderId); return this.behavior.reset(game, target, orderId, autoOrder); } else { @@ -137,10 +149,12 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto @Override public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityPointTarget point) { if (this.isTargetedSpell() && this.isPointTarget()) { - this.castId++; + this.castId = ABConstants.incrementCastId(this.castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), + this.getLevel()); this.behavior.setCastId(this.castId); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, point); + localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + this.castId, point); this.runOnOrderIssuedActions(game, caster, orderId); return this.behavior.reset(game, point, orderId, autoOrder); } else { @@ -154,7 +168,9 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool if (castless) { return null; } else { - this.castId++; + this.castId = ABConstants.incrementCastId(this.castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), + this.getLevel()); this.behavior.setCastId(this.castId); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); this.runOnOrderIssuedActions(game, caster, orderId); @@ -167,18 +183,23 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool @Override public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target) { - this.castId++; + this.castId = ABConstants.incrementCastId(this.castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), this.getLevel()); this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); if (this.isTargetedSpell()) { if (this.isPointTarget()) { this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, target.visit(AbilityTargetVisitor.POINT)); + localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + this.castId, + target.visit(AbilityTargetVisitor.POINT)); this.runOnOrderIssuedActions(game, caster, orderId); } else { this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, target.visit(AbilityTargetVisitor.UNIT)); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, target.visit(AbilityTargetVisitor.ITEM)); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, target.visit(AbilityTargetVisitor.DESTRUCTABLE)); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId), + target.visit(AbilityTargetVisitor.UNIT)); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId), + target.visit(AbilityTargetVisitor.ITEM)); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId), + target.visit(AbilityTargetVisitor.DESTRUCTABLE)); this.runOnOrderIssuedActions(game, caster, orderId); } } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveNoTarget.java index f1bd1512a..71df030aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveNoTarget.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; @@ -44,8 +45,8 @@ public void setLevel(CSimulation game, CUnit unit, int level) { protected void determineCastless(CUnit unit) { if (this.item != null || this.config.getDisplayFields() != null - && this.config.getDisplayFields().getCastlessNoTarget() != null - && this.config.getDisplayFields().getCastlessNoTarget().callback(unit, localStore, castId)) { + && this.config.getDisplayFields().getCastlessNoTarget() != null && this.config.getDisplayFields() + .getCastlessNoTarget().callback(unit, localStore, ABConstants.NO_CAST_ID)) { this.castless = true; this.behavior = null; } else { @@ -67,7 +68,7 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final AbilityTarget target) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); + this.localStore.put(ABLocalStoreKeys.ISAUTOCASTTARGETING, autoOrder); // System.err.println("Checking queue notarg level: " + active + " orderID : " + orderId + " offID: " + this.getOffOrderId()); if (castless && orderId == this.getBaseOrderId()) { @@ -87,8 +88,10 @@ public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, fina caster.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this, null); caster.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this, null); caster.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this, null); + this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTTARGETING); return false; } + this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTTARGETING); return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } @@ -105,7 +108,8 @@ public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, bool @Override public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target) { - this.castId++; + this.castId = ABConstants.incrementCastId(this.castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), this.getLevel()); if (!castless) { this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePairing.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePairing.java index 216d7c126..5e8018a0b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePairing.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePairing.java @@ -18,6 +18,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehaviorSendOrder; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.iterstructs.ABUnitAndRangeComparator; @@ -29,8 +30,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CommandStringErrorKeysEnum; -public class ABAbilityBuilderActivePairing extends ABAbilityBuilderGenericActive - implements CPairingAbility { +public class ABAbilityBuilderActivePairing extends ABAbilityBuilderGenericActive implements CPairingAbility { private ABBehavior behavior; private War3ID pairUnitId = null; @@ -56,7 +56,7 @@ public ABAbilityBuilderActivePairing(int handleId, War3ID code, War3ID alias, if (this.castingPrimaryTag == null) { this.castingPrimaryTag = PrimaryTag.STAND; } - + this.allowCastlessDeactivate = false; } @@ -64,44 +64,47 @@ private void setPairingValues(CSimulation game, CUnit unit) { if (this.config.getSpecialFields() != null) { if (this.config.getSpecialFields().getPairAbilityId() != null) { - this.pairAbilityId = this.config.getSpecialFields().getPairAbilityId().callback(unit, localStore, castId); + this.pairAbilityId = this.config.getSpecialFields().getPairAbilityId().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getSpecialFields().getPairUnitId() != null) { - this.pairUnitId = this.config.getSpecialFields().getPairUnitId().callback(unit, localStore, castId); + this.pairUnitId = this.config.getSpecialFields().getPairUnitId().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getSpecialFields().getAutoTargetPartner() != null) { - this.autoTargetPartner = this.config.getSpecialFields().getAutoTargetPartner().callback(unit, localStore, - castId); + this.autoTargetPartner = this.config.getSpecialFields().getAutoTargetPartner().callback(unit, + localStore, ABConstants.NO_CAST_ID); } if (this.config.getSpecialFields().getPairSearchRadius() != null) { this.pairSearchRadius = this.config.getSpecialFields().getPairSearchRadius().callback(unit, localStore, - castId); + ABConstants.NO_CAST_ID); } if (this.config.getSpecialFields().getPairingOrderId() != null) { this.internalOrderId = this.config.getSpecialFields().getPairingOrderId().callback(unit, localStore, - castId); + ABConstants.NO_CAST_ID); } if (this.config.getSpecialFields().getPairingOffOrderId() != null) { - this.internalOffOrderId = this.config.getSpecialFields().getPairingOffOrderId().callback(unit, localStore, - castId); + this.internalOffOrderId = this.config.getSpecialFields().getPairingOffOrderId().callback(unit, + localStore, ABConstants.NO_CAST_ID); } if (this.config.getSpecialFields().getMaxPartners() != null) { - this.maxPartners = this.config.getSpecialFields().getMaxPartners().callback(unit, localStore, castId); + this.maxPartners = this.config.getSpecialFields().getMaxPartners().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getSpecialFields().getOrderPairedUnit() != null) { this.orderPairedUnit = this.config.getSpecialFields().getOrderPairedUnit().callback(unit, localStore, - castId); + ABConstants.NO_CAST_ID); } if (this.config.getSpecialFields().getOrderPairedUnitOrderId() != null) { this.orderPairedUnitOrderId = this.config.getSpecialFields().getOrderPairedUnitOrderId().callback(unit, - localStore, castId); + localStore, ABConstants.NO_CAST_ID); } if (this.config.getSpecialFields().getOrderPairedUnitOffOrderId() != null) { - this.orderPairedUnitOffOrderId = this.config.getSpecialFields().getOrderPairedUnitOffOrderId().callback(unit, - localStore, castId); + this.orderPairedUnitOffOrderId = this.config.getSpecialFields().getOrderPairedUnitOffOrderId() + .callback(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -163,8 +166,7 @@ private boolean checkTargetPrimeOrderId(final CSimulation game, final CUnit unit } private boolean checkTargetInternalOrderId(final CSimulation game, final CUnit unit, final int orderId) { - return (((!this.active || this.separateOnAndOff) - && orderId == this.getPairOrderId(game, unit)) + return (((!this.active || this.separateOnAndOff) && orderId == this.getPairOrderId(game, unit)) || ((this.toggleable && this.active) || this.separateOnAndOff) && orderId == this.getPairOffOrderId(game, unit)); } @@ -179,9 +181,10 @@ private boolean offOrderId(final int orderId) { @Override public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget noTarget) { - this.castId++; + this.castId = ABConstants.incrementCastId(this.castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), this.getLevel()); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); - //Just don't do this + // Just don't do this } // ---- @@ -262,7 +265,8 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord // Targeted @Override public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, CWidget target) { - this.castId++; + this.castId = ABConstants.incrementCastId(this.castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), this.getLevel()); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); // System.err.println(caster.getUnitType().getName() + " Received pair target order: " + orderId + " (Base: " // + this.getBaseOrderId() + ", Internal: " + this.getPairOrderId(game, caster) + ")"); @@ -283,8 +287,8 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto return caster.pollNextOrderBehavior(game); } } - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, targetUnit); - this.localStore.put(ABLocalStoreKeys.ABILITYPAIREDUNIT + castId, targetUnit); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId), targetUnit); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYPAIREDUNIT, castId), targetUnit); this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); // System.out.println("Starting targeted behavior"); @@ -294,8 +298,8 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto } else if (checkTargetInternalOrderId(game, caster, orderId)) { // System.err.println(caster.getUnitType().getName() + " Got internal order"); final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, targetUnit); - this.localStore.put(ABLocalStoreKeys.ABILITYPAIREDUNIT + castId, targetUnit); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId), targetUnit); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYPAIREDUNIT, castId), targetUnit); this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); // System.out.println("Starting internal targeted behavior with target: " + targetUnit); @@ -311,8 +315,7 @@ protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int ord AbilityTargetCheckReceiver receiver) { // System.err.println(unit.getUnitType().getName() + " Checking can pair target order: " + orderId + " (Base: " // + this.getBaseOrderId() + ", Internal: " + this.getPairOrderId(game, unit) + ")"); - if (checkTargetPrimeOrderId(game, unit, orderId) - || checkTargetInternalOrderId(game, unit, orderId)) { + if (checkTargetPrimeOrderId(game, unit, orderId) || checkTargetInternalOrderId(game, unit, orderId)) { final CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); if (targetUnit != null && unit.getPlayerIndex() != targetUnit.getPlayerIndex()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePointTarget.java index 3dec6e9b9..d398b40c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActivePointTarget.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; @@ -53,9 +54,11 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto @Override public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget theTarget) { - this.castId++; + this.castId = ABConstants.incrementCastId(this.castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), this.getLevel()); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+this.castId, theTarget.visit(AbilityTargetVisitor.POINT)); + localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + this.castId, + theTarget.visit(AbilityTargetVisitor.POINT)); this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); this.runOnOrderIssuedActions(game, caster, orderId); } @@ -64,7 +67,7 @@ public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean a public CBehavior beginNoTarget(CSimulation game, CUnit caster, int orderId, boolean autoOrder) { return null; } - + @Override protected boolean innerCheckCanUseSpell(CSimulation game, CUnit unit, int orderId, AbilityActivationReceiver receiver) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveUnitTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveUnitTarget.java index df9ec08a8..c267faf14 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveUnitTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveUnitTarget.java @@ -10,6 +10,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTargetVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.ABBehavior; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; @@ -43,11 +44,15 @@ public CBehavior begin(CSimulation game, CUnit caster, int orderId, boolean auto @Override public void internalBegin(CSimulation game, CUnit caster, int orderId, boolean autoOrder, AbilityTarget target) { - this.castId++; + this.castId = ABConstants.incrementCastId(this.castId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), this.getLevel()); this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, target.visit(AbilityTargetVisitor.UNIT)); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId, target.visit(AbilityTargetVisitor.ITEM)); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, target.visit(AbilityTargetVisitor.DESTRUCTABLE)); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId), + target.visit(AbilityTargetVisitor.UNIT)); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId), + target.visit(AbilityTargetVisitor.ITEM)); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId), + target.visit(AbilityTargetVisitor.DESTRUCTABLE)); this.localStore.put(ABLocalStoreKeys.PREVIOUSBEHAVIOR, caster.getCurrentBehavior()); this.runOnOrderIssuedActions(game, caster, orderId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java index 24d8df47b..100bb1f50 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java @@ -34,6 +34,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; @@ -86,7 +87,7 @@ public abstract class ABAbilityBuilderGenericActive extends AbstractGenericSingl private ABManaDepletedCheckTimer timer; private NonStackingStatBuff manaDrain; - protected int castId = 0; + protected int castId = ABConstants.STARTING_CAST_ID; private War3ID onTooltipOverride = null; private War3ID offTooltipOverride = null; private EnumSet targetsAllowed; @@ -171,12 +172,11 @@ public boolean getAbilityBooleanField(String field) { @Override public void setLevel(CSimulation game, CUnit unit, int level) { super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); setSpellFields(game, unit); determineToggleableFields(game, unit); if (config.getOnLevelChange() != null) { for (ABAction action : config.getOnLevelChange()) { - action.runAction(unit, this.localStore, castId); + action.runAction(unit, this.localStore, ABConstants.NO_CAST_ID); } } } @@ -187,7 +187,7 @@ public void onAdd(CSimulation game, CUnit unit) { determineToggleableFields(game, unit); if (config.getOnAddAbility() != null) { for (ABAction action : config.getOnAddAbility()) { - action.runAction(unit, localStore, castId); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -202,7 +202,7 @@ public void onAddDisabled(CSimulation game, CUnit unit) { determineToggleableFields(game, unit); if (config.getOnAddDisabledAbility() != null) { for (ABAction action : config.getOnAddDisabledAbility()) { - action.runAction(unit, localStore, castId); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -211,7 +211,7 @@ public void onAddDisabled(CSimulation game, CUnit unit) { public void onRemoveDisabled(CSimulation game, CUnit unit) { if (config.getOnRemoveDisabledAbility() != null) { for (ABAction action : config.getOnRemoveDisabledAbility()) { - action.runAction(unit, localStore, castId); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -220,36 +220,40 @@ private void addInitialUniqueFlags(CSimulation game, CUnit unit) { if (this.config.getInitialUniqueFlags() != null && !this.config.getInitialUniqueFlags().isEmpty()) { this.uniqueFlags = new HashSet<>(); for (ABStringCallback flag : this.config.getInitialUniqueFlags()) { - this.uniqueFlags.add(flag.callback(unit, localStore, 0)); + this.uniqueFlags.add(flag.callback(unit, localStore, ABConstants.NO_CAST_ID)); } } } private void determineToggleableFields(CSimulation game, CUnit unit) { if (config.getDisplayFields() != null && config.getDisplayFields().getSeparateOnAndOff() != null) { - this.separateOnAndOff = config.getDisplayFields().getSeparateOnAndOff().callback(unit, localStore, castId); + this.separateOnAndOff = config.getDisplayFields().getSeparateOnAndOff().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (config.getDisplayFields() != null && config.getDisplayFields().getToggleable() != null) { - this.toggleable = config.getDisplayFields().getToggleable().callback(unit, localStore, castId); + this.toggleable = config.getDisplayFields().getToggleable().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (config.getDisplayFields() != null && config.getDisplayFields().getCastToggleOff() != null) { this.allowCastlessDeactivate = !config.getDisplayFields().getCastToggleOff().callback(unit, localStore, - castId); + ABConstants.NO_CAST_ID); } if (config.getDisplayFields() != null && config.getDisplayFields().getAlternateUnitId() != null) { - if (unit.getTypeId() - .equals(config.getDisplayFields().getAlternateUnitId().callback(unit, localStore, castId))) { + if (unit.getTypeId().equals(config.getDisplayFields().getAlternateUnitId().callback(unit, localStore, + ABConstants.NO_CAST_ID))) { this.active = true; } } if (config.getSpecialFields() != null && config.getSpecialFields().getBufferManaRequired() != null) { - this.bufferMana = config.getSpecialFields().getBufferManaRequired().callback(unit, localStore, castId); + this.bufferMana = config.getSpecialFields().getBufferManaRequired().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.toggleable) { localStore.put(ABLocalStoreKeys.ISTOGGLEDABILITY, this); int manaPerSec = 0; if (config.getSpecialFields() != null && config.getSpecialFields().getManaDrainedPerSecond() != null) { - manaPerSec = config.getSpecialFields().getManaDrainedPerSecond().callback(unit, localStore, castId); + manaPerSec = config.getSpecialFields().getManaDrainedPerSecond().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (manaPerSec != 0) { if (manaDrain == null) { @@ -267,8 +271,8 @@ private void determineToggleableFields(CSimulation game, CUnit unit) { } if (config.getDisplayFields() != null && config.getDisplayFields().getAlternateUnitId() != null) { - if (unit.getTypeId() - .equals(config.getDisplayFields().getAlternateUnitId().callback(unit, localStore, castId))) { + if (unit.getTypeId().equals(config.getDisplayFields().getAlternateUnitId().callback(unit, localStore, + ABConstants.NO_CAST_ID))) { this.active = true; } } @@ -284,53 +288,59 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.castTime = levelDataLevel.getCastTime(); if (this.config.getOverrideFields() != null) { if (this.config.getOverrideFields().getAreaOverride() != null) { - this.area = this.config.getOverrideFields().getAreaOverride().callback(unit, localStore, castId); + this.area = this.config.getOverrideFields().getAreaOverride().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getRangeOverride() != null) { - this.range = this.config.getOverrideFields().getRangeOverride().callback(unit, localStore, castId); + this.range = this.config.getOverrideFields().getRangeOverride().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getCastTimeOverride() != null) { this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(unit, localStore, - castId); + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getIgnoreCastTime() != null) { this.ignoreCastTime = this.config.getOverrideFields().getIgnoreCastTime().callback(unit, localStore, - castId); + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getCooldownOverride() != null) { this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(unit, localStore, - castId); + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getManaCostOverride() != null) { this.manaCost = this.config.getOverrideFields().getManaCostOverride().callback(unit, localStore, - castId); + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getAutocastTypeOverride() != null) { this.autocastType = this.config.getOverrideFields().getAutocastTypeOverride().callback(unit, localStore, - castId); + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getOnTooltipOverride() != null) { this.onTooltipOverride = this.config.getOverrideFields().getOnTooltipOverride().callback(unit, - localStore, castId); + localStore, ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getOffTooltipOverride() != null) { this.offTooltipOverride = this.config.getOverrideFields().getOffTooltipOverride().callback(unit, - localStore, castId); + localStore, ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getPhysicalSpell() != null) { - this.physical = this.config.getOverrideFields().getPhysicalSpell().callback(unit, localStore, castId); + this.physical = this.config.getOverrideFields().getPhysicalSpell().callback(unit, localStore, + ABConstants.NO_CAST_ID); this.magic = this.physical ? false : this.magic; // Spells that just declare physical:true default to // magic:false } if (this.config.getOverrideFields().getMagicSpell() != null) { - this.magic = this.config.getOverrideFields().getMagicSpell().callback(unit, localStore, castId); + this.magic = this.config.getOverrideFields().getMagicSpell().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getDispel() != null) { - this.dispel = this.config.getOverrideFields().getDispel().callback(unit, localStore, castId); + this.dispel = this.config.getOverrideFields().getDispel().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getUniversalSpell() != null) { - this.universal = this.config.getOverrideFields().getUniversalSpell().callback(unit, localStore, castId); + this.universal = this.config.getOverrideFields().getUniversalSpell().callback(unit, localStore, + ABConstants.NO_CAST_ID); } } @@ -362,17 +372,19 @@ protected void setSpellFields(CSimulation game, CUnit unit) { } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getHideAreaCursor() != null) { - this.hideAreaCursor = this.config.getDisplayFields().getHideAreaCursor().callback(unit, localStore, castId); + this.hideAreaCursor = this.config.getDisplayFields().getHideAreaCursor().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getAreaCursorOverride() != null) { this.areaCursorOverride = this.config.getDisplayFields().getAreaCursorOverride().callback(unit, localStore, - castId); + ABConstants.NO_CAST_ID); } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getIsMenu() != null) { this.isMenu = this.config.getDisplayFields().getIsMenu().callback(unit, localStore, this.getLevel()); if (this.isMenu) { if (this.config.getDisplayFields().getMenuId() != null) { - this.orderId = this.config.getDisplayFields().getMenuId().callback(unit, localStore, castId); + this.orderId = this.config.getDisplayFields().getMenuId().callback(unit, localStore, + ABConstants.NO_CAST_ID); } else { if (this.orderId == 0) { this.orderId = this.getHandleId(); @@ -615,7 +627,7 @@ public void setAutoCastOn(final CSimulation simulation, final CUnit caster, fina this.localStore.put(ABLocalStoreKeys.ISAUTOCASTON, autoCastOn); if (this.config.getOnChangeAutoCast() != null) { for (ABAction action : this.config.getOnChangeAutoCast()) { - action.runAction(caster, localStore, -1); + action.runAction(caster, localStore, ABConstants.NO_CAST_ID); } } this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTON); @@ -629,9 +641,9 @@ public AutocastType getAutocastType() { protected ABBehavior createNoTargetBehavior(CUnit unit) { ABBehavior beh = new ABBehaviorAbilityBuilderNoTarget(unit, localStore, this); - if (this.item != null - || (this.config.getDisplayFields() != null && this.config.getDisplayFields().getInstantCast() != null - && this.config.getDisplayFields().getInstantCast().callback(unit, localStore, castId))) { + if (this.item != null || (this.config.getDisplayFields() != null + && this.config.getDisplayFields().getInstantCast() != null && this.config.getDisplayFields() + .getInstantCast().callback(unit, localStore, ABConstants.NO_CAST_ID))) { beh.setInstant(true); } if (this.config.getSpecialFields() != null && this.config.getSpecialFields().getBehaviorCategory() != null) { @@ -642,9 +654,9 @@ protected ABBehavior createNoTargetBehavior(CUnit unit) { protected ABBehavior createRangedBehavior(CUnit unit) { ABBehavior beh = new ABBehaviorAbilityBuilderBase(unit, localStore, this); - if (this.item != null - || (this.config.getDisplayFields() != null && this.config.getDisplayFields().getInstantCast() != null - && this.config.getDisplayFields().getInstantCast().callback(unit, localStore, castId))) { + if (this.item != null || (this.config.getDisplayFields() != null + && this.config.getDisplayFields().getInstantCast() != null && this.config.getDisplayFields() + .getInstantCast().callback(unit, localStore, ABConstants.NO_CAST_ID))) { beh.setInstant(true); } if (this.config.getSpecialFields() != null && this.config.getSpecialFields().getBehaviorCategory() != null) { @@ -719,7 +731,7 @@ protected void innerCheckExtraCastConditions(CSimulation game, CUnit unit, int o if (config.getExtraCastConditions() != null) { boolean result = true; for (ABBooleanCallback condition : config.getExtraCastConditions()) { - result = result && condition.callback(unit, localStore, -1); + result = result && condition.callback(unit, localStore, ABConstants.NO_CAST_ID); } String failReason = (String) localStore.remove(ABLocalStoreKeys.CANTUSEREASON); if (result) { @@ -743,7 +755,7 @@ protected abstract boolean innerCheckCanUseSpell(CSimulation game, CUnit unit, i @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, final CWidget target, final AbilityTargetCheckReceiver receiver) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); + this.localStore.put(ABLocalStoreKeys.ISAUTOCASTTARGETING, autoOrder); if (innerCheckCastOrderId(game, unit, orderId)) { innerCheckCanTarget(game, unit, orderId, target, receiver); } else if (orderId == OrderIds.smart) { @@ -751,25 +763,26 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o } else { receiver.orderIdNotAccepted(); } + this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTTARGETING); } @Override public void checkCanAutoTarget(final CSimulation game, final CUnit unit, final int orderId, final CWidget target, final AbilityTargetCheckReceiver receiver) { if (orderId == getBaseOrderId()) { + this.localStore.put( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, ABConstants.NO_CAST_ID), + target.visit(AbilityTargetVisitor.UNIT)); + this.localStore.put( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, ABConstants.NO_CAST_ID), + target.visit(AbilityTargetVisitor.ITEM)); + this.localStore.put( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, ABConstants.NO_CAST_ID), + target.visit(AbilityTargetVisitor.DESTRUCTABLE)); if (innerCheckCanTargetSpell(game, unit, orderId, target, receiver)) { if (innerCheckTargetTargetable(game, unit, target, receiver)) { if (innerCheckTargetInRange(unit, target)) { - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + -1, - target.visit(AbilityTargetVisitor.UNIT)); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + -1, - target.visit(AbilityTargetVisitor.ITEM)); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + -1, - target.visit(AbilityTargetVisitor.DESTRUCTABLE)); String extraFailReason = innerCheckExtraAutoTargetConditions(game, unit, orderId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + -1); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + -1); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + -1); if (extraFailReason != null) { if (!extraFailReason.equals("unknown")) { receiver.targetCheckFailed(extraFailReason); @@ -784,6 +797,12 @@ public void checkCanAutoTarget(final CSimulation game, final CUnit unit, final i } } } + this.localStore + .remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, ABConstants.NO_CAST_ID)); + this.localStore + .remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, ABConstants.NO_CAST_ID)); + this.localStore.remove( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, ABConstants.NO_CAST_ID)); } else { receiver.orderIdNotAccepted(); } @@ -792,7 +811,7 @@ public void checkCanAutoTarget(final CSimulation game, final CUnit unit, final i @Override public void checkCanTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, final AbilityPointTarget target, final AbilityTargetCheckReceiver receiver) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); + this.localStore.put(ABLocalStoreKeys.ISAUTOCASTTARGETING, autoOrder); if (innerCheckCastOrderId(game, unit, orderId)) { innerCheckCanTarget(game, unit, orderId, target, receiver); } else if (orderId == OrderIds.smart) { @@ -800,6 +819,7 @@ public void checkCanTarget(final CSimulation game, final CUnit unit, final int o } else { receiver.orderIdNotAccepted(); } + this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTTARGETING); } @Override @@ -808,9 +828,11 @@ public void checkCanAutoTarget(final CSimulation game, final CUnit unit, final i if (orderId == getBaseOrderId()) { if (innerCheckCanTargetSpell(game, unit, orderId, target, receiver)) { if (innerCheckTargetInRange(unit, target)) { - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + -1, target); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, + ABConstants.NO_CAST_ID), target); String extraFailReason = innerCheckExtraAutoTargetConditions(game, unit, orderId); - localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + -1); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, + ABConstants.NO_CAST_ID)); if (extraFailReason != null) { if (!extraFailReason.equals("unknown")) { receiver.targetCheckFailed(extraFailReason); @@ -832,7 +854,7 @@ public void checkCanAutoTarget(final CSimulation game, final CUnit unit, final i @Override public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, final int orderId, boolean autoOrder, final AbilityTargetCheckReceiver receiver) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); + this.localStore.put(ABLocalStoreKeys.ISAUTOCASTTARGETING, autoOrder); if ((orderId != 0) && ((orderId == getAutoCastOffOrderId()) || (orderId == getAutoCastOnOrderId()))) { receiver.targetOk(null); } else if (innerCheckCastOrderId(game, unit, orderId)) { @@ -840,6 +862,7 @@ public void checkCanTargetNoTarget(final CSimulation game, final CUnit unit, fin } else { receiver.orderIdNotAccepted(); } + this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTTARGETING); } @Override @@ -868,9 +891,12 @@ protected void innerCheckCanTarget(CSimulation game, CUnit unit, int orderId, Ab AbilityTargetCheckReceiver receiver) { if (innerCheckCanTargetSpell(game, unit, orderId, target, receiver)) { if (innerCheckTargetInRange(unit, target)) { - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + -1, target); + localStore.put( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, ABConstants.NO_CAST_ID), + target); String extraFailReason = innerCheckExtraTargetConditions(game, unit, orderId); - localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + -1); + localStore.remove( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, ABConstants.NO_CAST_ID)); if (extraFailReason != null) { if (!extraFailReason.equals("unknown")) { receiver.targetCheckFailed(extraFailReason); @@ -889,19 +915,17 @@ protected void innerCheckCanTarget(CSimulation game, CUnit unit, int orderId, Ab @Override protected void innerCheckCanTarget(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, ABConstants.NO_CAST_ID), + target.visit(AbilityTargetVisitor.UNIT)); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, ABConstants.NO_CAST_ID), + target.visit(AbilityTargetVisitor.ITEM)); + this.localStore.put( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, ABConstants.NO_CAST_ID), + target.visit(AbilityTargetVisitor.DESTRUCTABLE)); if (innerCheckCanTargetSpell(game, unit, orderId, target, receiver)) { if (innerCheckTargetTargetable(game, unit, target, receiver)) { if (innerCheckTargetInRange(unit, target)) { - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + -1, - target.visit(AbilityTargetVisitor.UNIT)); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDITEM + -1, - target.visit(AbilityTargetVisitor.ITEM)); - this.localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + -1, - target.visit(AbilityTargetVisitor.DESTRUCTABLE)); String extraFailReason = innerCheckExtraTargetConditions(game, unit, orderId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + -1); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + -1); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + -1); if (extraFailReason != null) { if (!extraFailReason.equals("unknown")) { receiver.targetCheckFailed(extraFailReason); @@ -916,6 +940,12 @@ protected void innerCheckCanTarget(CSimulation game, CUnit unit, int orderId, CW } } } + this.localStore + .remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, ABConstants.NO_CAST_ID)); + this.localStore + .remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, ABConstants.NO_CAST_ID)); + this.localStore.remove( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, ABConstants.NO_CAST_ID)); } @Override @@ -944,7 +974,7 @@ protected String innerCheckExtraTargetConditions(CSimulation game, CUnit unit, i if (config.getExtraTargetConditions() != null) { boolean result = true; for (ABBooleanCallback condition : config.getExtraTargetConditions()) { - result = result && condition.callback(unit, localStore, -1); + result = result && condition.callback(unit, localStore, ABConstants.NO_CAST_ID); } String failReason = (String) localStore.remove(ABLocalStoreKeys.CANTUSEREASON); if (result) { @@ -966,12 +996,12 @@ protected String innerCheckExtraAutoTargetConditions(CSimulation game, CUnit uni boolean result = true; if (config.getExtraTargetConditions() != null) { for (ABBooleanCallback condition : config.getExtraTargetConditions()) { - result = result && condition.callback(unit, localStore, -1); + result = result && condition.callback(unit, localStore, ABConstants.NO_CAST_ID); } } if (config.getExtraAutoTargetConditions() != null) { for (ABBooleanCallback condition : config.getExtraAutoTargetConditions()) { - result = result && condition.callback(unit, localStore, -1); + result = result && condition.callback(unit, localStore, ABConstants.NO_CAST_ID); } } String failReason = (String) localStore.remove(ABLocalStoreKeys.CANTUSEREASON); @@ -995,7 +1025,7 @@ protected String innerCheckExtraAutoNoTargetConditions(CSimulation game, CUnit u boolean result = true; if (config.getExtraAutoNoTargetConditions() != null) { for (ABBooleanCallback condition : config.getExtraAutoNoTargetConditions()) { - result = result && condition.callback(unit, localStore, -1); + result = result && condition.callback(unit, localStore, ABConstants.NO_CAST_ID); } } String failReason = (String) localStore.remove(ABLocalStoreKeys.CANTUSEREASON); @@ -1029,7 +1059,7 @@ public int getUIFoodCost() { } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getFoodCost() != null) { return this.config.getDisplayFields().getFoodCost().callback(this.localStore.originUnit, localStore, - castId); + ABConstants.NO_CAST_ID); } return 0; } @@ -1041,7 +1071,7 @@ public int getUIGoldCost() { } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getGoldCost() != null) { return this.config.getDisplayFields().getGoldCost().callback(this.localStore.originUnit, localStore, - castId); + ABConstants.NO_CAST_ID); } return 0; } @@ -1053,7 +1083,7 @@ public int getUILumberCost() { } if (this.config.getDisplayFields() != null && this.config.getDisplayFields().getLumberCost() != null) { return this.config.getDisplayFields().getLumberCost().callback(this.localStore.originUnit, localStore, - castId); + ABConstants.NO_CAST_ID); } return 0; } @@ -1065,7 +1095,7 @@ public void onRemove(CSimulation game, CUnit unit) { } if (config.getOnRemoveAbility() != null) { for (ABAction action : config.getOnRemoveAbility()) { - action.runAction(unit, localStore, castId); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -1077,7 +1107,7 @@ public void onDeath(CSimulation game, CUnit unit) { } if (config.getOnDeathPreCast() != null) { for (ABAction action : config.getOnDeathPreCast()) { - action.runAction(unit, localStore, castId); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -1146,7 +1176,8 @@ public void runCancelPreCastActions(final CSimulation game, final CUnit caster, @Override public void activate(final CSimulation game, final CUnit caster) { - Boolean failed = (Boolean) this.localStore.get(ABLocalStoreKeys.FAILEDTOCAST + castId); + Boolean failed = (Boolean) this.localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId)); if (failed != null && failed) { System.err.println("Failed to cast!"); return; @@ -1166,7 +1197,8 @@ public void activate(final CSimulation game, final CUnit caster) { @Override public void deactivate(final CSimulation game, final CUnit caster) { - Boolean failed = (Boolean) this.localStore.get(ABLocalStoreKeys.FAILEDTOCAST + castId); + Boolean failed = (Boolean) this.localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId)); if (failed != null && failed) { System.err.println("Failed to cast!"); return; @@ -1187,12 +1219,14 @@ public void deactivate(final CSimulation game, final CUnit caster) { @Override public boolean checkBeforeQueue(final CSimulation game, final CUnit caster, final int orderId, boolean autoOrder, final AbilityTarget target) { - this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), autoOrder); + this.localStore.put(ABLocalStoreKeys.ISAUTOCASTTARGETING, autoOrder); // System.err.println("Checking queue top level: " + active + " orderID : " + orderId + " offID: " + this.getOffOrderId()); if (this.allowCastlessDeactivate && this.toggleable && this.active && orderId == this.getOffOrderId()) { this.deactivate(game, caster); + this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTTARGETING); return false; } + this.localStore.remove(ABLocalStoreKeys.ISAUTOCASTTARGETING); return super.checkBeforeQueue(game, caster, orderId, autoOrder, target); } @@ -1277,10 +1311,10 @@ public void cleanupInputs() { @Override public void cleanupInputs(int theCastId) { - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDUNIT + theCastId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + theCastId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDITEM + theCastId); - this.localStore.remove(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + theCastId); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, theCastId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, theCastId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, theCastId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, theCastId)); this.localStore.remove(ABLocalStoreKeys.PREVIOUSBEHAVIOR); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java index c1fd5795f..1229a968a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java @@ -17,6 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; @@ -33,18 +34,19 @@ public class ABAbilityBuilderNoIcon extends AbstractGenericNoIconAbility impleme protected ABLocalDataStore localStore; protected CItem item = null; - + protected float cooldown = 0; protected float area = 0; protected float range = 0; protected float castTime = 0; - + protected Set uniqueFlags = null; private int visibleMenuId = 0; - public ABAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, List levelData, - ABAbilityBuilderConfiguration config, ABLocalDataStore localStore) { + public ABAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, + List levelData, ABAbilityBuilderConfiguration config, + ABLocalDataStore localStore) { super(handleId, code, alias); this.levelData = levelData; this.config = config; @@ -54,12 +56,12 @@ public ABAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, List 1); } - + private void addInitialUniqueFlags(CSimulation game, CUnit unit) { if (this.config.getInitialUniqueFlags() != null && !this.config.getInitialUniqueFlags().isEmpty()) { this.uniqueFlags = new HashSet<>(); for (ABStringCallback flag : this.config.getInitialUniqueFlags()) { - this.uniqueFlags.add(flag.callback(unit, localStore, 0)); + this.uniqueFlags.add(flag.callback(unit, localStore, ABConstants.NO_CAST_ID)); } } } @@ -71,38 +73,42 @@ protected void setSpellFields(CSimulation game, CUnit unit) { this.range = levelDataLevel.getCastRange(); if (this.config.getOverrideFields() != null) { if (this.config.getOverrideFields().getAreaOverride() != null) { - this.area = this.config.getOverrideFields().getAreaOverride().callback(unit, localStore, 0); + this.area = this.config.getOverrideFields().getAreaOverride().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getRangeOverride() != null) { - this.range = this.config.getOverrideFields().getRangeOverride().callback(unit, localStore, 0); + this.range = this.config.getOverrideFields().getRangeOverride().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getCastTimeOverride() != null) { - this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(unit, localStore, 0); + this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getCooldownOverride() != null) { - this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(unit, localStore, 0); + this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(unit, localStore, + ABConstants.NO_CAST_ID); } } } - + @Override public int getAbilityIntField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getFieldValue(field); } - + @Override public float getAbilityFloatField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getFieldFloatValue(field); } - + @Override public String getAbilityStringField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getField(field); } - + @Override public boolean getAbilityBooleanField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); @@ -192,7 +198,7 @@ public void setItemAbility(final CItem item, int slot) { public CItem getItem() { return this.item; } - + @Override public boolean hasUniqueFlag(String flag) { if (this.uniqueFlags != null) { @@ -200,34 +206,34 @@ public boolean hasUniqueFlag(String flag) { } return false; } - + public void addUniqueFlag(String flag) { if (this.uniqueFlags == null) { this.uniqueFlags = new HashSet<>(); } this.uniqueFlags.add(flag); } - + public void removeUniqueFlag(String flag) { if (this.uniqueFlags != null) { this.uniqueFlags.remove(flag); } } - + @SuppressWarnings("unchecked") @Override public T getUniqueValue(String key, Class cls) { Object o = this.localStore.get(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); if (o != null && o.getClass() == cls) { - return (T)o; + return (T) o; } return null; } - + public void addUniqueValue(Object item, String key) { this.localStore.put(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId()), item); } - + public void removeUniqueValue(String key) { this.localStore.remove(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); } @@ -235,11 +241,10 @@ public void removeUniqueValue(String key) { @Override public void setLevel(CSimulation game, CUnit unit, int level) { super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); setSpellFields(game, unit); if (config.getOnLevelChange() != null) { for (ABAction action : config.getOnLevelChange()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -251,7 +256,7 @@ public void onAdd(CSimulation game, CUnit unit) { localStore.originPlayer = game.getPlayer(unit.getPlayerIndex()); if (config.getOnAddAbility() != null) { for (ABAction action : config.getOnAddAbility()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -265,7 +270,7 @@ public void onAddDisabled(CSimulation game, CUnit unit) { setSpellFields(game, unit); if (config.getOnAddDisabledAbility() != null) { for (ABAction action : config.getOnAddDisabledAbility()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -274,7 +279,7 @@ public void onAddDisabled(CSimulation game, CUnit unit) { public void onRemove(CSimulation game, CUnit unit) { if (config.getOnRemoveAbility() != null) { for (ABAction action : config.getOnRemoveAbility()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -283,7 +288,7 @@ public void onRemove(CSimulation game, CUnit unit) { public void onRemoveDisabled(CSimulation game, CUnit unit) { if (config.getOnRemoveDisabledAbility() != null) { for (ABAction action : config.getOnRemoveDisabledAbility()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -296,7 +301,7 @@ public void onTick(CSimulation game, CUnit unit) { public void onDeath(CSimulation game, CUnit unit) { if (config.getOnDeathPreCast() != null) { for (ABAction action : config.getOnDeathPreCast()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -338,16 +343,11 @@ public boolean isRequirementsMet(CSimulation game, CUnit unit) { public int getIconVisibleMenuId() { return this.visibleMenuId; } - + @Override public void setIconVisibleMenuId(int menu) { this.visibleMenuId = menu; } - - - - - // Unneeded Methods @Override @@ -375,20 +375,20 @@ protected void innerCheckCanUse(CSimulation game, CUnit unit, int orderId, Abili } @Override - public void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, - CWidget target, AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, CWidget target, + AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override - public void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, - AbilityPointTarget target, AbilityTargetCheckReceiver receiver) { + public void checkCanTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, AbilityPointTarget target, + AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } @Override - public void checkCanTargetNoTarget(CSimulation game, CUnit unit, int orderId, - boolean autoOrder, AbilityTargetCheckReceiver receiver) { + public void checkCanTargetNoTarget(CSimulation game, CUnit unit, int orderId, boolean autoOrder, + AbilityTargetCheckReceiver receiver) { receiver.orderIdNotAccepted(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java index 77fbb0e3b..518973ca7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java @@ -16,6 +16,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.types.definitions.impl.AbilityFields; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.strings.ABStringCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.parser.ABAbilityBuilderConfiguration; @@ -23,21 +24,22 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; -public class ABAbilityBuilderPassive extends AbilityGenericSingleIconPassiveAbility implements ABAbilityBuilderPassiveAbility { +public class ABAbilityBuilderPassive extends AbilityGenericSingleIconPassiveAbility + implements ABAbilityBuilderPassiveAbility { protected List levelData; protected ABAbilityBuilderConfiguration config; protected ABLocalDataStore localStore; protected CItem item = null; - + protected float cooldown = 0; protected float area = 0; protected float range = 0; private float castTime = 0; private War3ID onTooltipOverride = null; - + protected Set uniqueFlags = null; private int visibleMenuId = 0; @@ -54,12 +56,12 @@ public ABAbilityBuilderPassive(int handleId, War3ID code, War3ID alias, final int levels = editorData.getFieldAsInteger(AbilityFields.LEVELS, 0); localStore.put(ABLocalStoreKeys.ISABILITYLEVELED, levels > 1); } - + private void addInitialUniqueFlags(CSimulation game, CUnit unit) { if (this.config.getInitialUniqueFlags() != null && !this.config.getInitialUniqueFlags().isEmpty()) { this.uniqueFlags = new HashSet<>(); for (ABStringCallback flag : this.config.getInitialUniqueFlags()) { - this.uniqueFlags.add(flag.callback(unit, localStore, 0)); + this.uniqueFlags.add(flag.callback(unit, localStore, ABConstants.NO_CAST_ID)); } } } @@ -73,42 +75,46 @@ protected void setSpellFields(CSimulation game, CUnit unit) { } if (this.config.getOverrideFields() != null) { if (this.config.getOverrideFields().getAreaOverride() != null) { - this.area = this.config.getOverrideFields().getAreaOverride().callback(unit, localStore, 0); + this.area = this.config.getOverrideFields().getAreaOverride().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getRangeOverride() != null) { - this.range = this.config.getOverrideFields().getRangeOverride().callback(unit, localStore, 0); + this.range = this.config.getOverrideFields().getRangeOverride().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getCastTimeOverride() != null) { - this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(unit, localStore, 0); + this.castTime = this.config.getOverrideFields().getCastTimeOverride().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getCooldownOverride() != null) { - this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(unit, localStore, 0); + this.cooldown = this.config.getOverrideFields().getCooldownOverride().callback(unit, localStore, + ABConstants.NO_CAST_ID); } if (this.config.getOverrideFields().getOnTooltipOverride() != null) { - this.onTooltipOverride = this.config.getOverrideFields().getOnTooltipOverride().callback(unit, localStore, - 0); + this.onTooltipOverride = this.config.getOverrideFields().getOnTooltipOverride().callback(unit, + localStore, ABConstants.NO_CAST_ID); } } } - + @Override public int getAbilityIntField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getFieldValue(field); } - + @Override public float getAbilityFloatField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getFieldFloatValue(field); } - + @Override public String getAbilityStringField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); return editorData.getField(field); } - + @Override public boolean getAbilityBooleanField(String field) { GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); @@ -198,7 +204,7 @@ public void setItemAbility(final CItem item, int slot) { public CItem getItem() { return this.item; } - + @Override public boolean hasUniqueFlag(String flag) { if (this.uniqueFlags != null) { @@ -206,14 +212,14 @@ public boolean hasUniqueFlag(String flag) { } return false; } - + public void addUniqueFlag(String flag) { if (this.uniqueFlags == null) { this.uniqueFlags = new HashSet<>(); } this.uniqueFlags.add(flag); } - + public void removeUniqueFlag(String flag) { if (this.uniqueFlags != null) { this.uniqueFlags.remove(flag); @@ -225,15 +231,15 @@ public void removeUniqueFlag(String flag) { public T getUniqueValue(String key, Class cls) { Object o = this.localStore.get(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); if (o != null && o.getClass() == cls) { - return (T)o; + return (T) o; } return null; } - + public void addUniqueValue(Object item, String key) { this.localStore.put(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId()), item); } - + public void removeUniqueValue(String key) { this.localStore.remove(ABLocalStoreKeys.combineUniqueValueKey(key, this.getHandleId())); } @@ -242,17 +248,14 @@ public void removeUniqueValue(String key) { public War3ID getOnTooltipOverride() { return onTooltipOverride; } - - @Override public void setLevel(CSimulation game, CUnit unit, int level) { super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); setSpellFields(game, unit); if (config.getOnLevelChange() != null) { for (ABAction action : config.getOnLevelChange()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -264,7 +267,7 @@ public void onAdd(CSimulation game, CUnit unit) { localStore.originPlayer = game.getPlayer(unit.getPlayerIndex()); if (config.getOnAddAbility() != null) { for (ABAction action : config.getOnAddAbility()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -278,7 +281,7 @@ public void onAddDisabled(CSimulation game, CUnit unit) { setSpellFields(game, unit); if (config.getOnAddDisabledAbility() != null) { for (ABAction action : config.getOnAddDisabledAbility()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -287,7 +290,7 @@ public void onAddDisabled(CSimulation game, CUnit unit) { public void onRemove(CSimulation game, CUnit unit) { if (config.getOnRemoveAbility() != null) { for (ABAction action : config.getOnRemoveAbility()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -296,7 +299,7 @@ public void onRemove(CSimulation game, CUnit unit) { public void onRemoveDisabled(CSimulation game, CUnit unit) { if (config.getOnRemoveDisabledAbility() != null) { for (ABAction action : config.getOnRemoveDisabledAbility()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -309,7 +312,7 @@ public void onTick(CSimulation game, CUnit unit) { public void onDeath(CSimulation game, CUnit unit) { if (config.getOnDeathPreCast() != null) { for (ABAction action : config.getOnDeathPreCast()) { - action.runAction(unit, localStore, 0); + action.runAction(unit, localStore, ABConstants.NO_CAST_ID); } } } @@ -363,7 +366,7 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final receiver.cooldownNotYetReady(cooldownRemaining * WarsmashConstants.SIMULATION_STEP_TIME, cooldownLengthDisplay); } - + super.innerCheckCanUse(game, unit, orderId, receiver); } @@ -371,7 +374,7 @@ protected void innerCheckCanUse(final CSimulation game, final CUnit unit, final public int getIconVisibleMenuId() { return this.visibleMenuId; } - + @Override public void setIconVisibleMenuId(int menu) { this.visibleMenuId = menu; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderAuraTemplate.java index d38d2bdf1..c2b31e272 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderAuraTemplate.java @@ -58,7 +58,6 @@ public ABAbilityBuilderAuraTemplate(int handleId, War3ID code, War3ID alias, @Override public void setLevel(CSimulation game, CUnit unit, int level) { super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); targetsAllowed = levelData.get(getLevel()).getTargetsAllowed(); range = levelData.get(getLevel()).getCastRange(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderSimpleAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderSimpleAuraTemplate.java index 0ee2cf2f3..c40a41bc6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderSimpleAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderSimpleAuraTemplate.java @@ -62,7 +62,6 @@ public ABAbilityBuilderSimpleAuraTemplate(int handleId, War3ID code, War3ID alia @Override public void setLevel(CSimulation game, CUnit unit, int level) { super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); targetsAllowed = levelData.get(getLevel()).getTargetsAllowed(); range = levelData.get(getLevel()).getCastRange(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatAuraTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatAuraTemplate.java index 28ac4cf3e..ff2e4432d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatAuraTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatAuraTemplate.java @@ -158,7 +158,6 @@ private void createNewBuffs(ABStatBuffFromDataField parsedBuff) { @Override public void setLevel(CSimulation game, CUnit unit, int level) { super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); this.buff.setLevel(game, unit, level); targetsAllowed = levelData.get(getLevel() - 1).getTargetsAllowed(); range = levelData.get(getLevel() - 1).getArea(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatPassiveTemplate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatPassiveTemplate.java index f2658fce0..e185a50e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatPassiveTemplate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/template/ABAbilityBuilderStatPassiveTemplate.java @@ -96,7 +96,6 @@ private void createNewBuffs(ABStatBuffFromDataField parsedBuff) { @Override public void setLevel(CSimulation game, CUnit unit, int level) { super.setLevel(game, unit, level); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, level); for (ABStatBuffFromDataField statBuff : this.statBuffDataFields) { NonStackingStatBuffType type = statBuff.convertToNonStackingType(levelData.get(getLevel() - 1)); if (type == null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionCleanUpCastInstance.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionCleanUpCastInstance.java index cd7e4946f..b5953ed20 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionCleanUpCastInstance.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionCleanUpCastInstance.java @@ -7,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABActionCleanUpCastInstance implements ABSingleAction { @@ -15,7 +16,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Set keySet = new HashSet<>(localStore.keySet()); for (final String key : keySet) { - if (key.contains("#" + castId)) { + if (key.contains(ABLocalStoreKeys.combineKey("#", castId))) { localStore.remove(key); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAddTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAddTargetAllowed.java index ba0889421..0f896fb18 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAddTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionAddTargetAllowed.java @@ -28,7 +28,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final EnumSet targetsAllowed = levelData - .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getTargetsAllowed(); + .get(localStore.originAbility.getLevel() - 1).getTargetsAllowed(); targetsAllowed.add(this.targetType); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java index fd6c3a42b..961c68b96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionRemoveTargetAllowed.java @@ -28,7 +28,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); final EnumSet targetsAllowed = levelData - .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getTargetsAllowed(); + .get(localStore.originAbility.getLevel() - 1).getTargetsAllowed(); targetsAllowed.remove(this.targetType); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java index ae4dcb6ab..a0b897bd5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetDestructable.java @@ -13,9 +13,8 @@ public class ABActionSetAutoTargetDestructable implements ABSingleAction { private ABDestructableCallback dest; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE + castId, + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId), this.dest.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java index cf3897b53..8d9dc97df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAutoTargetUnit.java @@ -14,7 +14,7 @@ public class ABActionSetAutoTargetUnit implements ABSingleAction { @Override public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - localStore.put(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId, + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId), this.unit.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetPreventEndEvents.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetPreventEndEvents.java index 80dfbbc23..1b7bbd21e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetPreventEndEvents.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetPreventEndEvents.java @@ -10,9 +10,8 @@ public class ABActionSetPreventEndEvents implements ABSingleAction { @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - localStore.put(ABLocalStoreKeys.PREVENTENDEVENTS+castId, true); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PREVENTENDEVENTS, castId), true); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java index d522ae9b8..b6472e2b4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java @@ -14,7 +14,8 @@ public class ABActionAttackModifierAddAnimationTag implements ABAction { private ABStringCallback tag; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); settings.addAnimationName(SecondaryTag.valueOf(tag.callback(caster, localStore, castId))); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java index a68527abc..2b8b96375 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java @@ -13,7 +13,8 @@ public class ABActionAttackModifierAddPostDamageListener implements ABAction { private ABAttackPostDamageListenerCallback listener; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); settings.addPostDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java index 555942999..00bad8c13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java @@ -13,7 +13,8 @@ public class ABActionAttackModifierAddPreDamageListener implements ABAction { private ABAttackPreDamageListenerCallback listener; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); settings.addPreDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java index 191a59c22..ad19d657e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java @@ -14,7 +14,8 @@ public class ABActionAttackModifierApplyAllArtFields implements ABAction { private ABBooleanCallback applyArtIfMissing; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); ABAbilityBuilderAbility abil = localStore.originAbility; String art = abil.getAbilityStringField("Missileart"); if ((art != null && !art.isBlank()) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java index 0a2cfaae2..69977dfee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java @@ -14,7 +14,8 @@ public class ABActionAttackModifierApplyArt implements ABAction { private ABBooleanCallback applyArtIfMissing; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); ABAbilityBuilderAbility abil = localStore.originAbility; String art = abil.getAbilityStringField("Missileart"); if ((art != null && !art.isBlank()) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java index 4ae3a470f..48736856b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java @@ -14,7 +14,8 @@ public class ABActionAttackModifierApplyArtAndSpeed implements ABAction { private ABBooleanCallback applyArtIfMissing; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); ABAbilityBuilderAbility abil = localStore.originAbility; String art = abil.getAbilityStringField("Missileart"); if ((art != null && !art.isBlank()) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java index d2f65fc89..8dba91114 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java @@ -10,7 +10,8 @@ public class ABActionAttackModifierApplyDefaultSpeed implements ABAction { public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); if (settings.getProjectileSpeed() == 0) { settings.setProjectileSpeed(900); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java index 9a2c9f9da..dbbcb8769 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java @@ -10,7 +10,8 @@ public class ABActionAttackModifierPreventOtherModifications implements ABAction { public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore.get(ABLocalStoreKeys.ATTACKMODLOOP + castId); + CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKMODLOOP, castId)); if (loop != null) loop.preventAllOtherModifications(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java index c5c3e5f36..06fb61589 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java @@ -9,9 +9,9 @@ public class ABActionAttackModifierPreventOtherSamePriorityModifications implements ABAction { - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore.get(ABLocalStoreKeys.ATTACKMODLOOP + castId); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKMODLOOP, castId)); if (loop != null) loop.preventOtherModificationsWithSamePriority(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java index 340c13b64..e00ded57d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java @@ -14,7 +14,8 @@ public class ABActionAttackModifierRemoveAnimationTag implements ABAction { private ABStringCallback tag; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); settings.removeAnimationName(SecondaryTag.valueOf(tag.callback(caster, localStore, castId))); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java index 2aae19fa9..d22a67bc4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java @@ -13,7 +13,8 @@ public class ABActionAttackModifierRemovePostDamageListener implements ABAction private ABAttackPostDamageListenerCallback listener; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); settings.removePostDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java index 845f38a7c..072f050cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java @@ -13,7 +13,8 @@ public class ABActionAttackModifierRemovePreDamageListener implements ABAction { private ABAttackPreDamageListenerCallback listener; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); settings.removePreDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java index 8a67ae46a..86d67b7fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java @@ -13,7 +13,8 @@ public class ABActionAttackModifierSetAttackArc implements ABAction { private ABFloatCallback arc; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); if (arc != null) { settings.setProjectileArc(arc.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java index 66eb00399..27fd646a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java @@ -12,9 +12,9 @@ public class ABActionAttackModifierSetAttackDeathTime implements ABAction { private ABFloatCallback deathTime; - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); if (deathTime != null) { settings.setArtDeathTime(deathTime.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java index e84f3e82d..fe70343f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java @@ -12,10 +12,11 @@ public class ABActionAttackModifierSetAttackHoming implements ABAction { private ABBooleanCallback homing; - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); if (homing != null) { - settings.setProjectileHomingEnabled(homing.callback(caster, localStore, castId)); } + settings.setProjectileHomingEnabled(homing.callback(caster, localStore, castId)); + } } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java index 5cf7cc99b..a92df309f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java @@ -13,7 +13,8 @@ public class ABActionAttackModifierSetAttackImpactZ implements ABAction { private ABFloatCallback impactZ; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); if (impactZ != null) { settings.setImpactZ(impactZ.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java index 5889d43f8..072c940fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java @@ -12,9 +12,9 @@ public class ABActionAttackModifierSetAttackStartZ implements ABAction { private ABFloatCallback z; - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); if (z != null) { settings.setZ(z.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java index cb419e54f..dd0b067be 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java @@ -18,7 +18,8 @@ public class ABActionAttackModifierSetSplashFields implements ABAction { private ABFloatCallback damageFactorSmall; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); if (areaOfEffectFullDamage != null) { settings.setAreaOfEffectFullDamage(areaOfEffectFullDamage.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java index 049ab4b72..ad3cbf7e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java @@ -11,7 +11,8 @@ public class ABCallbackGetModifiedAttackAttackType extends ABAttackTypeCallback @Override public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getAttackType(); + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + .getAttackType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java index 4f009fec6..518aa7a10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java @@ -8,10 +8,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetModifiedAttackDamageType extends ABDamageTypeCallback { - + @Override public CDamageType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().getDamageType(); + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + .getWeaponType().getDamageType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java index 65693dffe..dbd9a3694 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java @@ -11,7 +11,8 @@ public class ABCallbackGetModifiedAttackWeaponType extends ABWeaponTypeCallback @Override public CWeaponType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType(); + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + .getWeaponType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageArea.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageArea.java index 4e8fb4b17..1dbc8d4d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageArea.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageArea.java @@ -100,22 +100,24 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI if (theMaxDamage > 0) { List hits = new ArrayList<>(); List counts = new ArrayList<>(); - localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, new CUnitEnumFunction() { - @Override - public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(caster, localStore, castId)) { - hits.add(enumUnit); - if (unitSpecificDamageMod != null) { - counts.add(unitSpecificDamageMod.callback(caster, localStore, castId)); - } else { - counts.add(1f); + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, + new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), + enumUnit); + if (validTarget == null || validTarget.callback(caster, localStore, castId)) { + hits.add(enumUnit); + if (unitSpecificDamageMod != null) { + counts.add(unitSpecificDamageMod.callback(caster, localStore, castId)); + } else { + counts.add(1f); + } + } + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); + return false; } - } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); - return false; - } - }); + }); float count = 0; for (float c : counts) { @@ -123,7 +125,7 @@ public boolean call(final CUnit enumUnit) { } float damPerTar = baseDamage * count > theMaxDamage ? theMaxDamage / count : baseDamage; for (CUnit hit : hits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(caster, localStore, castId); @@ -137,33 +139,35 @@ public boolean call(final CUnit enumUnit) { hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar); } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); } } else { - localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, new CUnitEnumFunction() { - @Override - public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); - if (validTarget == null || validTarget.callback(caster, localStore, castId)) { - if (extraActions != null) { - for (ABAction action : extraActions) { - action.runAction(caster, localStore, castId); + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), pfullRad, + new CUnitEnumFunction() { + @Override + public boolean call(final CUnit enumUnit) { + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), + enumUnit); + if (validTarget == null || validTarget.callback(caster, localStore, castId)) { + if (extraActions != null) { + for (ABAction action : extraActions) { + action.runAction(caster, localStore, castId); + } + } + if (unitSpecificDamageMod != null) { + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage + * unitSpecificDamageMod.callback(caster, localStore, castId)); + } else { + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + } } + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); + return false; } - if (unitSpecificDamageMod != null) { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), - baseDamage * unitSpecificDamageMod.callback(caster, localStore, castId)); - } else { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); - } - } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); - return false; - } - }); + }); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageAttackSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageAttackSplash.java index c712da624..e4e10e462 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageAttackSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageAttackSplash.java @@ -131,13 +131,13 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI Math.max(pfullRad, Math.max(medRad, smallRad)), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), + enumUnit); if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { fullhits.add(enumUnit); if (unitSpecificDamageMod != null) { - counts.add( - unitSpecificDamageMod.callback(caster, localStore, castId)); + counts.add(unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(1f); } @@ -159,7 +159,7 @@ public boolean call(final CUnit enumUnit) { } } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); return false; } }); @@ -172,7 +172,7 @@ public boolean call(final CUnit enumUnit) { ? theMaxDamage / (fullhits.size() + medDam * medhits.size() + smallDam * smallhits.size()) : baseDamage; for (CUnit hit : fullhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(caster, localStore, castId); @@ -188,7 +188,7 @@ public boolean call(final CUnit enumUnit) { } } for (CUnit hit : medhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(caster, localStore, castId); @@ -204,7 +204,7 @@ public boolean call(final CUnit enumUnit) { } } for (CUnit hit : smallhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(caster, localStore, castId); @@ -212,21 +212,22 @@ public boolean call(final CUnit enumUnit) { } if (unitSpecificDamageMod != null) { hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallDam - * unitSpecificDamageMod.callback(caster, localStore, castId)); + CWeaponSoundTypeJass.WHOKNOWS.name(), + damPerTar * smallDam * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallDam); } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); } else { localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(Math.max(pfullRad, pmedRad), psmallRad), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), + enumUnit); if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { if (extraActions != null) { @@ -235,13 +236,13 @@ public boolean call(final CUnit enumUnit) { } } if (unitSpecificDamageMod != null) { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); } } else if (enumUnit.canReach(loc, medRad)) { if (extraActions != null) { @@ -250,13 +251,14 @@ public boolean call(final CUnit enumUnit) { } } if (unitSpecificDamageMod != null) { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), - baseDamage * medDam * unitSpecificDamageMod.callback(caster, localStore, - castId)); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), + baseDamage * medDam * unitSpecificDamageMod.callback(caster, + localStore, castId)); } else { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * medDam); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), + baseDamage * medDam); } } else if (enumUnit.canReach(loc, smallRad)) { if (extraActions != null) { @@ -265,10 +267,10 @@ public boolean call(final CUnit enumUnit) { } } if (unitSpecificDamageMod != null) { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), - baseDamage * smallDam * unitSpecificDamageMod.callback(caster, localStore, - castId)); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), + baseDamage * smallDam * unitSpecificDamageMod.callback(caster, + localStore, castId)); } else { enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), @@ -276,7 +278,7 @@ public boolean call(final CUnit enumUnit) { } } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); return false; } }); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageBurst.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageBurst.java index 3b1fd5e55..35dca0dae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageBurst.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageBurst.java @@ -115,17 +115,17 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI List partialhits = new ArrayList<>(); List counts = new ArrayList<>(); float partialRatio = partialDam / baseDamage; - localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, partialRad), - new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + Math.max(pfullRad, partialRad), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), + enumUnit); if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { fullhits.add(enumUnit); if (unitSpecificDamageMod != null) { - counts.add( - unitSpecificDamageMod.callback(caster, localStore, castId)); + counts.add(unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(1f); } @@ -139,7 +139,7 @@ public boolean call(final CUnit enumUnit) { } } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); return false; } }); @@ -152,7 +152,7 @@ public boolean call(final CUnit enumUnit) { ? theMaxDamage / (fullhits.size() + partialRatio * partialhits.size()) : baseDamage; for (CUnit hit : fullhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(caster, localStore, castId); @@ -168,7 +168,7 @@ public boolean call(final CUnit enumUnit) { } } for (CUnit hit : partialhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(caster, localStore, castId); @@ -176,21 +176,22 @@ public boolean call(final CUnit enumUnit) { } if (unitSpecificDamageMod != null) { hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * partialRatio - * unitSpecificDamageMod.callback(caster, localStore, castId)); + CWeaponSoundTypeJass.WHOKNOWS.name(), + damPerTar * partialRatio * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * partialRatio); } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); } else { - localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(pfullRad, partialRad), - new CUnitEnumFunction() { + localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), + Math.max(pfullRad, partialRad), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), + enumUnit); if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { if (extraActions != null) { @@ -199,13 +200,13 @@ public boolean call(final CUnit enumUnit) { } } if (unitSpecificDamageMod != null) { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); } } else if (enumUnit.canReach(loc, partialRad)) { if (extraActions != null) { @@ -214,8 +215,8 @@ public boolean call(final CUnit enumUnit) { } } if (unitSpecificDamageMod != null) { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), partialDam * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { @@ -224,7 +225,7 @@ public boolean call(final CUnit enumUnit) { } } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); return false; } }); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageSplash.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageSplash.java index 82e0b134e..79a93d29f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageSplash.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/damage/ABActionDamageSplash.java @@ -133,13 +133,13 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI Math.max(pfullRad, Math.max(medRad, smallRad)), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), + enumUnit); if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { fullhits.add(enumUnit); if (unitSpecificDamageMod != null) { - counts.add( - unitSpecificDamageMod.callback(caster, localStore, castId)); + counts.add(unitSpecificDamageMod.callback(caster, localStore, castId)); } else { counts.add(1f); } @@ -161,7 +161,7 @@ public boolean call(final CUnit enumUnit) { } } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); return false; } }); @@ -175,7 +175,7 @@ public boolean call(final CUnit enumUnit) { : baseDamage; for (CUnit hit : fullhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(caster, localStore, castId); @@ -191,7 +191,7 @@ public boolean call(final CUnit enumUnit) { } } for (CUnit hit : medhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(caster, localStore, castId); @@ -199,15 +199,15 @@ public boolean call(final CUnit enumUnit) { } if (unitSpecificDamageMod != null) { hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medRatio - * unitSpecificDamageMod.callback(caster, localStore, castId)); + CWeaponSoundTypeJass.WHOKNOWS.name(), + damPerTar * medRatio * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * medRatio); } } for (CUnit hit : smallhits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, hit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), hit); if (extraActions != null) { for (ABAction action : extraActions) { action.runAction(caster, localStore, castId); @@ -215,21 +215,22 @@ public boolean call(final CUnit enumUnit) { } if (unitSpecificDamageMod != null) { hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallRatio - * unitSpecificDamageMod.callback(caster, localStore, castId)); + CWeaponSoundTypeJass.WHOKNOWS.name(), + damPerTar * smallRatio * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { hit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), damPerTar * smallRatio); } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); } else { localStore.game.getWorldCollision().enumUnitsInRange(loc.getX(), loc.getY(), Math.max(Math.max(pfullRad, pmedRad), psmallRad), new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), + enumUnit); if (validTarget == null || validTarget.callback(caster, localStore, castId)) { if (enumUnit.canReach(loc, fullRad)) { if (extraActions != null) { @@ -238,14 +239,14 @@ public boolean call(final CUnit enumUnit) { } } if (unitSpecificDamageMod != null) { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage * unitSpecificDamageMod.callback(caster, localStore, castId)); } else { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), baseDamage); } } else if (enumUnit.canReach(loc, medRad)) { if (extraActions != null) { @@ -254,12 +255,13 @@ public boolean call(final CUnit enumUnit) { } } if (unitSpecificDamageMod != null) { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), medDam * unitSpecificDamageMod - .callback(caster, localStore, castId)); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), + medDam * unitSpecificDamageMod.callback(caster, localStore, + castId)); } else { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), medDam); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), medDam); } } else if (enumUnit.canReach(loc, smallRad)) { if (extraActions != null) { @@ -268,16 +270,17 @@ public boolean call(final CUnit enumUnit) { } } if (unitSpecificDamageMod != null) { - enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, - CWeaponSoundTypeJass.WHOKNOWS.name(), - smallDam * unitSpecificDamageMod.callback(caster, localStore, castId)); + enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, + ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), + smallDam * unitSpecificDamageMod.callback(caster, localStore, + castId)); } else { enumUnit.damage(localStore.game, ftheSource, flags, ftheAttackType, ftheDamageType, CWeaponSoundTypeJass.WHOKNOWS.name(), smallDam); } } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); return false; } }); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java index f4df8a20a..1654ffe13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java @@ -9,6 +9,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.buff.ABDestructableBuff; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABSingleAction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; @@ -28,7 +29,11 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin isDispellable = dispellable.callback(caster, localStore, castId); } CDestructableBuff ability = new ABDestructableBuff(localStore.game.getHandleIdAllocator().createId(), - buffId.callback(caster, localStore, castId), (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL), + buffId.callback(caster, localStore, castId), + castId != ABConstants.NO_CAST_ID + ? localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), + int.class) + : localStore.originAbility.getLevel(), localStore, onAddActions, onRemoveActions, onDeathActions, castId, caster, isDispellable); localStore.put(ABLocalStoreKeys.LASTCREATEDDESTBUFF, ability); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java index 79c76931e..ee8984664 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/destructable/ABActionIterateDestructablesInRangeOfLocation.java @@ -26,8 +26,7 @@ public class ABActionIterateDestructablesInRangeOfLocation implements ABAction { private List iterationActions; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final AbilityPointTarget target = this.location.callback(caster, localStore, castId); final Float rangeVal = this.range.callback(caster, localStore, castId); @@ -36,7 +35,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, @Override public boolean call(final CDestructable enumDest) { if (enumDest.distance(target.getX(), target.getY()) < rangeVal) { - localStore.put(ABLocalStoreKeys.ENUMDESTRUCTABLE + castId, enumDest); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMDESTRUCTABLE, castId), enumDest); for (final ABAction iterationAction : ABActionIterateDestructablesInRangeOfLocation.this.iterationActions) { iterationAction.runAction(caster, localStore, castId); } @@ -44,7 +43,7 @@ public boolean call(final CDestructable enumDest) { return false; } }); - localStore.remove(ABLocalStoreKeys.ENUMDESTRUCTABLE + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMDESTRUCTABLE, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java index cc0f67c3a..0fef25488 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInGroup.java @@ -21,12 +21,11 @@ public class ABActionIterateUnitsInGroup implements ABAction { private List iterationActions; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Set unitSet = this.unitGroup.callback(caster, localStore, castId); final List unitList = new ArrayList<>(unitSet); for (final CUnit enumUnit : unitList) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), enumUnit); for (final ABAction iterationAction : this.iterationActions) { iterationAction.runAction(caster, localStore, castId); } @@ -35,7 +34,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, break; } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); } @Override @@ -117,8 +116,7 @@ public void generateJassEquivalent(int indent, JassTextGenerator jassTextGenerat sb.append("call FlushChildLocalStore(" + jassTextGenerator.getTriggerLocalStore() + ", AB_LOCAL_STORE_KEY_ENUMUNIT + I2S(" + jassTextGenerator.getCastId() + "))"); jassTextGenerator.println(sb.toString()); - } - else { + } else { // else use ForGroup final List modifiedActionList = new ArrayList<>(this.iterationActions); modifiedActionList.add(0, new JassTextGeneratorCallStmt() { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java index a25c7fe88..bffa962fb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInQueue.java @@ -18,12 +18,11 @@ public class ABActionIterateUnitsInQueue implements ABAction { private List iterationActions; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final Queue unitQueue = this.queue.callback(caster, localStore, castId); final List unitList = new ArrayList<>(unitQueue); for (final CUnit enumUnit : unitList) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), enumUnit); for (final ABAction iterationAction : this.iterationActions) { iterationAction.runAction(caster, localStore, castId); } @@ -32,7 +31,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, break; } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java index 1b750f49e..33f04e584 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingCondition.java @@ -36,9 +36,9 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin @Override public boolean call(final CUnit enumUnit) { if (enumUnit.canReach(target, rangeVal)) { - localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId), enumUnit); if (condition == null || condition.callback(caster, localStore, castId)) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), enumUnit); for (ABAction iterationAction : iterationActions) { iterationAction.runAction(caster, localStore, castId); } @@ -47,8 +47,8 @@ public boolean call(final CUnit enumUnit) { return false; } }); - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java index 885783211..b9eef1335 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfLocationMatchingConditionWithSort.java @@ -41,7 +41,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin @Override public boolean call(final CUnit enumUnit) { if (enumUnit.canReach(target, rangeVal)) { - localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId), enumUnit); if (condition == null || condition.callback(caster, localStore, castId)) { foundUnits.add(enumUnit); } @@ -55,14 +55,14 @@ public boolean call(final CUnit enumUnit) { } for (CUnit unit : foundUnits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, unit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), unit); for (ABAction iterationAction : iterationActions) { iterationAction.runAction(caster, localStore, castId); } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java index ccb6cece3..09c85626c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingCondition.java @@ -36,9 +36,9 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { - localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId), enumUnit); if (condition == null || condition.callback(caster, localStore, castId)) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), enumUnit); for (ABAction iterationAction : iterationActions) { iterationAction.runAction(caster, localStore, castId); } @@ -47,8 +47,8 @@ public boolean call(final CUnit enumUnit) { return false; } }); - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java index d4c055375..9449abec0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRangeOfUnitMatchingConditionWithSort.java @@ -41,7 +41,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { - localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId), enumUnit); if (condition == null || condition.callback(caster, localStore, castId)) { foundUnits.add(enumUnit); } @@ -55,14 +55,14 @@ public boolean call(final CUnit enumUnit) { } for (CUnit unit : foundUnits) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, unit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), unit); for (ABAction iterationAction : iterationActions) { iterationAction.runAction(caster, localStore, castId); } } - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java index 10819cfc6..a4a44ab43 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/iterator/unit/ABActionIterateUnitsInRect.java @@ -28,14 +28,14 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @Override public boolean call(final CUnit enumUnit) { - localStore.put(ABLocalStoreKeys.ENUMUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), enumUnit); for (final ABAction iterationAction : ABActionIterateUnitsInRect.this.iterationActions) { iterationAction.runAction(caster, localStore, castId); } return false; } }); - localStore.remove(ABLocalStoreKeys.ENUMUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java index 31ea02240..aad2255c8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedCollisionProjectile.java @@ -102,7 +102,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin theMaxHits, theHitsPerTarget, theStartingRadius, theEndingRadius, theCollisionInterval, listener, isProvideCounts); - localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.LASTCREATEDPROJECTILE, castId), proj); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java index da5d9ea21..3fe104a0e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedProjectile.java @@ -53,11 +53,11 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin final CAbilityProjectileListener listener = new ABProjectileListener(this.onLaunch, this.onHit, caster, localStore, castId); - final CProjectile proj = localStore.game.createProjectile(theSource, this.id.callback(caster, localStore, castId), - sourceLocation.getX(), sourceLocation.getY(), + final CProjectile proj = localStore.game.createProjectile(theSource, + this.id.callback(caster, localStore, castId), sourceLocation.getX(), sourceLocation.getY(), (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, isHoming, theTarget, listener); - localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.LASTCREATEDPROJECTILE, castId), proj); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java index c9084954c..60d365ebb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java @@ -122,13 +122,12 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin this.canHitTarget, this.onHit, caster, localStore, castId); final CProjectile proj = localStore.game.createPseudoProjectile(theSource, - this.id.callback(caster, localStore, castId), theEffectType, theEffectArtIndex, - sourceLocation.getX(), sourceLocation.getY(), - (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, theCollisionInterval, - theArtSkip, isHoming, theTarget, theMaxHits, theHitsPerTarget, theStartingRadius, theEndingRadius, - listener, isProvideCounts); + this.id.callback(caster, localStore, castId), theEffectType, theEffectArtIndex, sourceLocation.getX(), + sourceLocation.getY(), (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theSpeed, + theCollisionInterval, theArtSkip, isHoming, theTarget, theMaxHits, theHitsPerTarget, theStartingRadius, + theEndingRadius, listener, isProvideCounts); - localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.LASTCREATEDPROJECTILE, castId), proj); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java index 7c4511bb5..02f59808c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedBouncingProjectile.java @@ -87,11 +87,11 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin @Override public void onLaunch(CSimulation game, CProjectile projectile, AbilityTarget target) { if (onLaunch != null) { - localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId), projectile); for (ABAction action : onLaunch) { action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId)); } } @@ -100,18 +100,18 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target if (onHit != null) { CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); - localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); - localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT + castId, targetUnit); - localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST + castId, targetDest); - localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId, + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId), projectile); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId), targetUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId), targetDest); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILECURRENTLOC, castId), new AbilityPointTarget(projectile.getX(), projectile.getY())); for (ABAction action : onHit) { action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); - localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); - localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); - localStore.remove(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILECURRENTLOC, castId)); } startPerformJump(caster, localStore, castId, theTarget, multiBounce, hitUnits, bounces.callback(caster, localStore, castId)); @@ -138,7 +138,7 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theTarget, listener); } - localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.LASTCREATEDPROJECTILE, castId), proj); } private void startPerformJump(final CUnit caster, final ABLocalDataStore localStore, final int castId, @@ -181,7 +181,7 @@ private void performJump(final CUnit caster, final ABLocalDataStore localStore, @Override public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal) && (multiBounce || !hitUnits.contains(enumUnit))) { - localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId), enumUnit); if (condition == null || condition.callback(caster, localStore, castId)) { foundUnits.add(enumUnit); } @@ -189,7 +189,7 @@ public boolean call(final CUnit enumUnit) { return false; } }); - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); final CUnit jumpUnit; if (foundUnits.size() > 0) { @@ -216,11 +216,12 @@ public boolean call(final CUnit enumUnit) { @Override public void onLaunch(CSimulation game, CProjectile projectile, AbilityTarget target) { if (onLaunch != null) { - localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId), + projectile); for (ABAction action : onLaunch) { action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId)); } } @@ -229,18 +230,21 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target if (onHit != null) { CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); - localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); - localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT + castId, targetUnit); - localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST + castId, targetDest); - localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId, + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId), + projectile); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId), + targetUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId), + targetDest); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILECURRENTLOC, castId), new AbilityPointTarget(projectile.getX(), projectile.getY())); for (ABAction action : onHit) { action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); - localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); - localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); - localStore.remove(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILECURRENTLOC, castId)); } startPerformJump(caster, localStore, castId, jumpUnit, multiBounce, hitUnits, bounces.callback(caster, localStore, castId)); @@ -267,7 +271,7 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target (float) AbilityTarget.angleBetween(originUnitTarget, jumpUnit), jumpUnit, listener); } - localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.LASTCREATEDPROJECTILE, castId), proj); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java index 325675614..f0544ecbc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedCollisionProjectile.java @@ -101,7 +101,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin theMaxHits, theHitsPerTarget, theStartingRadius, theEndingRadius, theCollisionInterval, listener, isProvideCounts); - localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.LASTCREATEDPROJECTILE, castId), proj); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java index 4abddbffb..2fd09831b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedProjectile.java @@ -66,7 +66,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin (float) AbilityTarget.angleBetween(sourceLocation, theTarget), theTarget, listener); } - localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.LASTCREATEDPROJECTILE, castId), proj); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java index 89d76f15e..3cc22b948 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java @@ -126,7 +126,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin theCollisionInterval, theArtSkip, isHoming, theTarget, theMaxHits, theHitsPerTarget, theStartingRadius, theEndingRadius, listener, isProvideCounts); - localStore.put(ABLocalStoreKeys.LASTCREATEDPROJECTILE + castId, proj); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.LASTCREATEDPROJECTILE, castId), proj); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionChainEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionChainEffect.java index eb66f00b8..58ba753a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionChainEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionChainEffect.java @@ -64,11 +64,11 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin } } - localStore.put(ABLocalStoreKeys.CHAINUNIT + castId, originUnitTarget); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CHAINUNIT, castId), originUnitTarget); for (ABAction iterationAction : actions) { iterationAction.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.CHAINUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CHAINUNIT, castId)); startPerformJump(caster, localStore, castId, originUnitTarget, multiBounce, hitUnits, bounces.callback(caster, localStore, castId)); @@ -117,7 +117,7 @@ private void performJump(final CUnit caster, final ABLocalDataStore localStore, public boolean call(final CUnit enumUnit) { if (originUnitTarget != enumUnit && originUnitTarget.canReach(enumUnit, rangeVal) && (multiBounce || !hitUnits.contains(enumUnit))) { - localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId), enumUnit); if (condition == null || condition.callback(caster, localStore, castId)) { foundUnits.add(enumUnit); } @@ -125,7 +125,7 @@ public boolean call(final CUnit enumUnit) { return false; } }); - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); CUnit jumpUnit = null; if (foundUnits.size() > 0) { @@ -152,11 +152,11 @@ public boolean call(final CUnit enumUnit) { if (!multiBounce) { hitUnits.add(jumpUnit); } - localStore.put(ABLocalStoreKeys.CHAINUNIT + castId, jumpUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CHAINUNIT, castId), jumpUnit); for (ABAction iterationAction : actions) { iterationAction.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.CHAINUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CHAINUNIT, castId)); } if (remainingJumps > 0) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionPeriodicExecute.java index 7fe97934a..5e618bf8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionPeriodicExecute.java @@ -22,26 +22,27 @@ public class ABActionPeriodicExecute implements ABAction { private ABCallback unique; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { float nextActiveTick = 0; Object u = null; if (this.unique != null) { u = this.unique.callback(caster, localStore, castId); - if (localStore.containsKey(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + u)) { - nextActiveTick = (float) localStore.get(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + u); + if (localStore + .containsKey(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId) + "$" + u)) { + nextActiveTick = (float) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId) + "$" + u); } - } - else { - if (localStore.containsKey(ABLocalStoreKeys.PERIODICNEXTTICK + castId)) { - nextActiveTick = (float) localStore.get(ABLocalStoreKeys.PERIODICNEXTTICK + castId); + } else { + if (localStore.containsKey(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId))) { + nextActiveTick = (float) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId)); } } final int currentTick = localStore.game.getGameTurnTick(); int iter = 0; boolean run = true; - while (run && currentTick >= (int)nextActiveTick && iter < HARD_LOOP_CAP) { + while (run && currentTick >= (int) nextActiveTick && iter < HARD_LOOP_CAP) { if (nextActiveTick <= 0) { if ((this.initialTick != null) && this.initialTick.callback(caster, localStore, castId)) { for (final ABAction periodicAction : this.periodicActions) { @@ -55,8 +56,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, } nextActiveTick = currentTick + (this.delaySeconds.callback(caster, localStore, castId) / WarsmashConstants.SIMULATION_STEP_TIME); - } - else { + } else { for (final ABAction periodicAction : this.periodicActions) { periodicAction.runAction(caster, localStore, castId); final Boolean brk = (Boolean) localStore.remove(ABLocalStoreKeys.BREAK); @@ -72,10 +72,10 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, } if (this.unique != null) { - localStore.put(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + u, nextActiveTick); - } - else { - localStore.put(ABLocalStoreKeys.PERIODICNEXTTICK + castId, nextActiveTick); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId) + "$" + u, + nextActiveTick); + } else { + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId), nextActiveTick); } } @@ -85,15 +85,13 @@ public void generateJassEquivalent(final int indent, final JassTextGenerator jas if (this.unique != null) { uniquenessKeyExpression = "I2S(" + jassTextGenerator.getCastId() + ") + \"$\" + " + this.unique.generateJassEquivalent(jassTextGenerator); - } - else { + } else { uniquenessKeyExpression = "I2S(" + jassTextGenerator.getCastId() + ")"; } String initialTickExpression; if (this.initialTick != null) { initialTickExpression = this.initialTick.generateJassEquivalent(jassTextGenerator); - } - else { + } else { initialTickExpression = "false"; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionResetPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionResetPeriodicExecute.java index 7088a13cd..58a9a1949 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionResetPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionResetPeriodicExecute.java @@ -13,10 +13,10 @@ public class ABActionResetPeriodicExecute implements ABAction { @Override public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { if (this.unique != null) { - localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId + "$" + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId) + "$" + this.unique.callback(caster, localStore, castId)); } else { - localStore.remove(ABLocalStoreKeys.PERIODICNEXTTICK + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnit.java index bb2a25aa7..d1dbd0b00 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnit.java @@ -68,7 +68,7 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI ABAbilityBuilderAbility abil = localStore.originAbility; if (baseId == null || altId == null) { - localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId), true); return; } @@ -100,20 +100,20 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI goldCost = targetType.getGoldCost() - u1.getUnitType().getGoldCost(); lumberCost = targetType.getLumberCost() - u1.getUnitType().getLumberCost(); if (goldCost > pl.getGold() || lumberCost > pl.getLumber()) { - localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId), true); return; } } else { goldCost = targetType.getGoldCost(); lumberCost = targetType.getLumberCost(); if (goldCost > pl.getGold() || lumberCost > pl.getLumber()) { - localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId), true); return; } } foodCost = Math.max(targetType.getFoodUsed() - u1.getUnitType().getFoodUsed(), 0); if (foodCost > 0 && pl.getFoodUsed() + foodCost > pl.getFoodCap()) { - localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId), true); return; } } @@ -172,7 +172,8 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI orderId = addAlternateTagAfter ? activeabil.getBaseOrderId() : activeabil.getOffOrderId(); } - localStore.put(ABLocalStoreKeys.TRANSFORMINGTOALT + castId, addAlternateTagAfter); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.TRANSFORMINGTOALT, castId), + addAlternateTagAfter); localStore.put(ABLocalStoreKeys.NEWBEHAVIOR, new ABBehaviorFinishTransformation(caster, localStore, u1, abil, targetType, isKeepRatios, actions, addAlternateTagAfter, orderId, perm, dur, transTime, landTime, atlAdDelay, altAdTime, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitInstant.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitInstant.java index 051271f27..d4b92bf87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitInstant.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformUnitInstant.java @@ -70,7 +70,7 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI } if (baseId == null || altId == null) { - localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId), true); return; } @@ -103,20 +103,20 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI goldCost = targetType.getGoldCost() - u1.getUnitType().getGoldCost(); lumberCost = targetType.getLumberCost() - u1.getUnitType().getLumberCost(); if (goldCost > pl.getGold() || lumberCost > pl.getLumber()) { - localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId), true); return; } } else { goldCost = targetType.getGoldCost(); lumberCost = targetType.getLumberCost(); if (goldCost > pl.getGold() || lumberCost > pl.getLumber()) { - localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId), true); return; } } foodCost = Math.max(targetType.getFoodUsed() - u1.getUnitType().getFoodUsed(), 0); if (foodCost > 0 && pl.getFoodUsed() + foodCost > pl.getFoodCap()) { - localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId), true); return; } } @@ -145,7 +145,7 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI theBuffId = buffId.callback(caster, localStore, castId); } - localStore.put(ABLocalStoreKeys.TRANSFORMINGTOALT + castId, addAlternateTagAfter); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.TRANSFORMINGTOALT, castId), addAlternateTagAfter); if (transTime > 0) { ABTransformationHandler.playMorphAnimation(u1, addAlternateTagAfter); new ABDelayInstantTransformationTimer(caster, localStore, u1, actions, addAlternateTagAfter, transTime, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java index a5c89fec8..0d86e3685 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unit/transformation/ABActionTransformedUnitAbilityAdd.java @@ -57,7 +57,7 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI ABAbilityBuilderAbility abil = localStore.originAbility; if (baseId == null || altId == null) { - localStore.put(ABLocalStoreKeys.FAILEDTOCAST + castId, true); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId), true); return; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java index e9e7c5290..2f8003d44 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java @@ -40,7 +40,8 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin theAttackType = attackType.callback(caster, localStore, castId); } - CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + CDamageCalculation damage = ((CDamageCalculation) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); CDamageFlags theFlags = null; if (inheritFlags == null || inheritFlags.callback(caster, localStore, castId)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java index 04eaecce1..5c0c7e8cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java @@ -12,9 +12,9 @@ public class ABActionPreDamageListenerAddDamageMultiplier implements ABAction { private ABFloatCallback value; - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); damage.addDamageMultiplier(value.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java index 3f944049b..40a5c5847 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java @@ -9,9 +9,9 @@ public class ABActionPreDamageListenerLockDamageModifications implements ABAction { - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); damage.lock(); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java index 2a4ecc46d..09e5b07cd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java @@ -12,9 +12,9 @@ public class ABActionPreDamageListenerSetMiss implements ABAction { private ABBooleanCallback miss; - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); if (miss != null) { damage.setMiss(miss.callback(caster, localStore, castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java index 936f7115d..e3e926e7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java @@ -14,13 +14,13 @@ public class ABActionSetPreDamageStacking implements ABAction { private ABBooleanCallback allowSamePriorityStacking; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + CDamageCalculation damage = ((CDamageCalculation) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); if (allowStacking != null && !allowStacking.callback(caster, localStore, castId)) { damage.preventAllOtherModifications(); } - if (allowSamePriorityStacking != null - && !allowSamePriorityStacking.callback(caster, localStore, castId)) { + if (allowSamePriorityStacking != null && !allowSamePriorityStacking.callback(caster, localStore, castId)) { damage.preventOtherModificationsWithSamePriority(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java index 7e3a5c15f..6e458e19d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java @@ -10,7 +10,8 @@ public class ABCallbackGetAttackBaseDamage extends ABFloatCallback { @Override public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); return settings.getBaseDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java index d95c9e911..a881ccbec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java @@ -8,10 +8,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CDamageType; public class ABCallbackGetAttackDamageType extends ABDamageTypeCallback { - + @Override public CDamageType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId)).getWeaponType().getDamageType(); + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + .getWeaponType().getDamageType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java index 5e7fe524f..197b1789a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java @@ -7,11 +7,13 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.replacement.CUnitAttackSettings; public class ABCallbackGetAttackMaximumSplashRadius extends ABIntegerCallback { - + @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); - return Math.max(settings.getAreaOfEffectFullDamage(), Math.max(settings.getAreaOfEffectMediumDamage(), settings.getAreaOfEffectSmallDamage())); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + return Math.max(settings.getAreaOfEffectFullDamage(), + Math.max(settings.getAreaOfEffectMediumDamage(), settings.getAreaOfEffectSmallDamage())); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java index fa97de533..1755dd48b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java @@ -11,7 +11,8 @@ public class ABCallbackGetAttackType extends ABAttackTypeCallback { @Override public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getAttackType(); + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + .getAttackType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java index 8459d3712..ff9938be4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java @@ -11,7 +11,8 @@ public class ABCallbackGetAttackWeaponType extends ABWeaponTypeCallback { @Override public CWeaponType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType(); + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + .getWeaponType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java index 17271e5d2..9eba62d92 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java @@ -9,15 +9,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.CUnitAttackMissileSplash; public class ABConditionIsAttackArtillery extends ABBooleanCallback { - + @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnitAttack attack = (CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK+castId); + CUnitAttack attack = (CUnitAttack) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId)); if (attack instanceof CUnitAttackMissileSplash) { - return ((CUnitAttackMissileSplash)attack).isArtillery(); + return ((CUnitAttackMissileSplash) attack).isArtillery(); } if (attack instanceof CUnitAttackMissileLine) { - return ((CUnitAttackMissileLine)attack).isArtillery(); + return ((CUnitAttackMissileLine) attack).isArtillery(); } return false; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java index 4da3c4892..3440fa6fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java @@ -10,7 +10,8 @@ public class ABConditionIsAttackHoming extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS + castId); + CUnitAttackSettings settings = (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); return settings.isProjectileHomingEnabled(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java index 00de885f0..3e68a10d7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java @@ -25,7 +25,7 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int EnumSet targetsAllowed = null; - CUnitAttack atk = (CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId); + CUnitAttack atk = (CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId)); if (atk instanceof CUnitAttackMissileSplash) { targetsAllowed = ((CUnitAttackMissileSplash) atk).getAreaOfEffectTargets(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java index ef66192a2..4e43cd68f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java @@ -12,7 +12,8 @@ public class ABCallbackGetNewBehaviorTarget extends ABTargetCallback { @Override public AbilityTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CBehavior beh = (CBehavior) localStore.get(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + castId); + CBehavior beh = (CBehavior) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.POSTCHANGEBEHAVIOR, castId)); AbilityTarget tar = beh.visit(BehaviorTargetVisitor.INSTANCE); return tar; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java index ede80f2eb..dcb17da08 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java @@ -15,7 +15,8 @@ public class ABConditionIsNewBehaviorCategoryInList extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, int castId) { - CBehavior beh = (CBehavior) localStore.get(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + castId); + CBehavior beh = (CBehavior) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.POSTCHANGEBEHAVIOR, castId)); CBehaviorCategory cat = CBehaviorCategory.IDLE; if (beh != null) { cat = beh.getBehaviorCategory(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java index cc1c844ca..320ea968b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java @@ -12,9 +12,9 @@ public class ABActionDamageTakenModificationMultiplyDamageMultiplier implements private ABFloatCallback multiplier; - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); damage.addDamageMultiplier(multiplier.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java index 7d3cec345..e02f89ce8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java @@ -12,9 +12,9 @@ public class ABActionDamageTakenModificationSetDamageMultiplier implements ABAct private ABFloatCallback multiplier; - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CDamageCalculation damage = ((CDamageCalculation) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); damage.setDamageMultiplier(multiplier.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java index 431848932..8036b6fbe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java @@ -10,8 +10,8 @@ public class ABConditionIsTriggeringDamageAnAttack extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).getPrimaryDamageFlags() - .isAttack(); + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) + .getPrimaryDamageFlags().isAttack(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java index b88f564b2..4c9fa8c04 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java @@ -7,10 +7,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; public class ABConditionIsTriggeringDamageRanged extends ABBooleanCallback { - + @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getPrimaryDamageFlags().isRanged(); + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) + .getPrimaryDamageFlags().isRanged(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java index bfa65998c..07dc478ee 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java @@ -10,11 +10,12 @@ public class ABActionDeathReplacementSetReincarnating implements ABAction { - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnitDeathReplacementResult result = (CUnitDeathReplacementResult)localStore.get(ABLocalStoreKeys.DEATHRESULT+castId); - CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking)localStore.get(ABLocalStoreKeys.DEATHSTACKING+castId); - + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnitDeathReplacementResult result = (CUnitDeathReplacementResult) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHRESULT, castId)); + CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHSTACKING, castId)); + stacking.setAllowStacking(false); stacking.setAllowSamePriorityStacking(false); result.setReincarnating(true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java index 1271b4afb..e76e668c3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java @@ -10,11 +10,12 @@ public class ABActionDeathReplacementSetReviving implements ABAction { - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - CUnitDeathReplacementResult result = (CUnitDeathReplacementResult)localStore.get(ABLocalStoreKeys.DEATHRESULT+castId); - CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking)localStore.get(ABLocalStoreKeys.DEATHSTACKING+castId); - + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + CUnitDeathReplacementResult result = (CUnitDeathReplacementResult) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHRESULT, castId)); + CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHSTACKING, castId)); + stacking.setAllowStacking(false); stacking.setAllowSamePriorityStacking(false); result.setReviving(true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java index 22afb76ce..dbe9e043f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalaction/ABActionReactionPreventHit.java @@ -8,8 +8,7 @@ public class ABActionReactionPreventHit implements ABAction { - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - localStore.put(ABLocalStoreKeys.REACTIONALLOWHIT+castId, false); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONALLOWHIT, castId), false); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java index f74f18e40..d7fae2310 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java @@ -11,8 +11,8 @@ public class ABCallbackGetReactionAttackProjectileAttackType extends ABAttackTyp @Override public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ + castId)).getUnitAttack() - .getAttackType(); + return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKPROJ, castId))) + .getUnitAttack().getAttackType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java index 78e9367a5..996e243c9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java @@ -7,10 +7,11 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; public class ABCallbackGetReactionAttackProjectileDamage extends ABFloatCallback { - + @Override public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ+castId)).getDamage(); + return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKPROJ, castId))) + .getDamage(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java index ae4d35566..7aafb6253 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java @@ -20,13 +20,13 @@ public class ABActionSubtractTotalDamageDealt implements ABAction { private ABFloatCallback amount; private ABFloatCallback minimum; - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { float theMin = 0; if (minimum != null) { theMin = minimum.callback(caster, localStore, castId); } - CDamageCalculation damage = ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)); + CDamageCalculation damage = ((CDamageCalculation) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); damage.subtractTotalDamageDealt(amount.callback(caster, localStore, castId), theMin); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java index 9dc70fa27..683f69e9d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java @@ -16,7 +16,7 @@ public class ABCallbackGetFinalTotalDamageDealt extends ABFloatCallback { @Override public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)) + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) .computeFinalDamage(localStore.game, caster); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java index 4804bdf99..8cdc2572b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java @@ -13,10 +13,11 @@ * It's really meant for PreDamage or DamageTakenModification, when modifying the base damage (think mana shield) */ public class ABCallbackGetRawTotalDamageDealt extends ABFloatCallback { - + @Override public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).computeRawTotalDamage(); + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) + .computeRawTotalDamage(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java index 1c860ba5a..8fd0017c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java @@ -13,10 +13,11 @@ * */ public class ABCallbackGetTriggeringAttackType extends ABAttackTypeCallback { - + @Override public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC+castId)).getAttackType(); + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) + .getAttackType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java index 61182b05c..335707104 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java @@ -16,7 +16,8 @@ public class ABCallbackGetTriggeringDamageType extends ABDamageTypeCallback { @Override public CDamageType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.DAMAGECALC + castId)).getPrimaryDamageType(); + return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) + .getPrimaryDamageType(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java index 84d2c74dd..adf2c1f58 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java @@ -9,8 +9,8 @@ public class ABCallbackGetCurrentAttackSettings extends ABAttackSettingsCallback @Override public CUnitAttackSettings callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - System.err.println("Getting: " + localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId)); - return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.ATTACKSETTINGS+castId); + return (CUnitAttackSettings) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java index 7dbe12aeb..1641cf601 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java @@ -11,7 +11,8 @@ public class ABCallbackGetAttackedDestructable extends ABDestructableCallback { @Override public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); + AbilityTarget tar = (AbilityTarget) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId)); return tar.visit(AbilityTargetVisitor.DESTRUCTABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetEnumDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetEnumDestructable.java index 1f1db8c37..0858c68b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetEnumDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetEnumDestructable.java @@ -9,7 +9,7 @@ public class ABCallbackGetEnumDestructable extends ABDestructableCallback { @Override public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CDestructable) localStore.get(ABLocalStoreKeys.ENUMDESTRUCTABLE+castId); + return (CDestructable) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMDESTRUCTABLE, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java index 869f4a82e..e4e6ea9ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java @@ -9,7 +9,7 @@ public class ABCallbackGetProjectileHitDestructable extends ABDestructableCallba @Override public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CDestructable) localStore.get(ABLocalStoreKeys.PROJECTILEHITDEST+castId); + return (CDestructable) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastTime.java index 54adb8474..e52c75409 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityCastTime.java @@ -20,7 +20,7 @@ public Float callback(final CUnit caster, final ABLocalDataStore localStore, fin } else { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getCastTime(); + return levelData.get(localStore.getLevelDataInstanceLevel(castId)).getCastTime(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java index 37a432a66..bcfd082e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDataAsFloat.java @@ -15,13 +15,12 @@ public class ABCallbackGetAbilityDataAsFloat extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); - final String data = levelData.get(level - 1).getData().get(this.dataField.getIndex()); + final String data = levelData.get(localStore.getLevelDataInstanceLevel(castId)).getData() + .get(this.dataField.getIndex()); if (data.contains("-") || data.isEmpty()) { return 0f; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDuration.java index 4d0075184..dc048fa2e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityDuration.java @@ -16,17 +16,16 @@ public class ABCallbackGetAbilityDuration extends ABFloatCallback { @SuppressWarnings("unchecked") @Override - public Float callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); if (this.target != null) { final CUnit tar = this.target.callback(caster, localStore, castId); if (tar.isHero() || tar.isUnitType(CUnitTypeJass.RESISTANT)) { - return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getDurationHero(); + return levelData.get(localStore.getLevelDataInstanceLevel(castId)).getDurationHero(); } } - return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getDurationNormal(); + return levelData.get(localStore.getLevelDataInstanceLevel(castId)).getDurationNormal(); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java index 128217a20..fc389f317 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityHeroDuration.java @@ -14,7 +14,7 @@ public class ABCallbackGetAbilityHeroDuration extends ABFloatCallback { public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - return levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getDurationHero(); + return levelData.get(localStore.getLevelDataInstanceLevel(castId)).getDurationHero(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsID.java index e0f221fc3..96808a18f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsID.java @@ -19,9 +19,9 @@ public class ABCallbackGetAbilityDataAsID extends ABIDCallback { public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); - final String data = levelData.get(level - 1).getData().get(this.dataField.getIndex()); + final String data = levelData.get(localStore.getLevelDataInstanceLevel(castId)).getData() + .get(this.dataField.getIndex()); if ((data == null) || "-".equals(data) || data.isBlank() || "_".equals(data)) { return War3ID.NONE; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java index 3464db03e..7dabf6446 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsIDFromList.java @@ -21,9 +21,9 @@ public class ABCallbackGetAbilityDataAsIDFromList extends ABIDCallback { public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); - final String data = levelData.get(level - 1).getData().get(this.dataField.getIndex()); + final String data = levelData.get(localStore.getLevelDataInstanceLevel(castId)).getData() + .get(this.dataField.getIndex()); if ((data == null) || "-".equals(data) || data.isBlank() || "_".equals(data)) { return War3ID.NONE; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java index db71ea8ba..fef91a004 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityDataAsRandomIDFromList.java @@ -19,9 +19,9 @@ public class ABCallbackGetAbilityDataAsRandomIDFromList extends ABIDCallback { public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); - final String data = levelData.get(level - 1).getData().get(this.dataField.getIndex()); + final String data = levelData.get(localStore.getLevelDataInstanceLevel(castId)).getData() + .get(this.dataField.getIndex()); if ((data == null) || "-".equals(data) || data.isBlank() || "_".equals(data)) { return War3ID.NONE; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityUnitId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityUnitId.java index 0e51e9de4..2c99f7007 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityUnitId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAbilityUnitId.java @@ -15,9 +15,8 @@ public class ABCallbackGetAbilityUnitId extends ABIDCallback { public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); - War3ID unitId = levelData.get(level - 1).getUnitId(); + War3ID unitId = levelData.get(localStore.getLevelDataInstanceLevel(castId)).getUnitId(); if (unitId == null) { return War3ID.NONE; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstBuffId.java index 8f36e6701..ead249e7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstBuffId.java @@ -12,14 +12,12 @@ public class ABCallbackGetFirstBuffId extends ABIDCallback { private ABIDCallback defaultId; - + @SuppressWarnings("unchecked") @Override - public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final List buffs = ((List) localStore - .get(ABLocalStoreKeys.LEVELDATA)).get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1) - .getBuffs(); + .get(ABLocalStoreKeys.LEVELDATA)).get(localStore.getLevelDataInstanceLevel(castId)).getBuffs(); if ((buffs != null) && !buffs.isEmpty()) { return buffs.get(0); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstEffectId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstEffectId.java index 9d5817eef..e9613d6bb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstEffectId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetFirstEffectId.java @@ -14,7 +14,7 @@ public class ABCallbackGetFirstEffectId extends ABIDCallback { @Override public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { List effects = ((List) localStore.get(ABLocalStoreKeys.LEVELDATA)) - .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getEffects(); + .get(localStore.getLevelDataInstanceLevel(castId)).getEffects(); if (effects != null && !effects.isEmpty()) { return effects.get(0); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetSecondBuffId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetSecondBuffId.java index ee9410720..0fbfefd21 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetSecondBuffId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetSecondBuffId.java @@ -14,7 +14,7 @@ public class ABCallbackGetSecondBuffId extends ABIDCallback { @Override public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { List buffs = ((List) localStore.get(ABLocalStoreKeys.LEVELDATA)) - .get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getBuffs(); + .get(localStore.getLevelDataInstanceLevel(castId)).getBuffs(); if (buffs != null && buffs.size() > 1) { return buffs.get(1); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java index 3c7b40977..fb89865d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityCastTimeAsInteger.java @@ -19,7 +19,7 @@ public Integer callback(CUnit caster, ABLocalDataStore localStore, final int cas } else { List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - return (int) levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1).getCastTime(); + return (int) levelData.get(localStore.getLevelDataInstanceLevel(castId)).getCastTime(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java index 4a87d78bc..4e751be1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetAbilityDataAsInteger.java @@ -18,9 +18,9 @@ public class ABCallbackGetAbilityDataAsInteger extends ABIntegerCallback { public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); - final String data = levelData.get(level - 1).getData().get(this.dataField.getIndex()); + final String data = levelData.get(localStore.getLevelDataInstanceLevel(castId)).getData() + .get(this.dataField.getIndex()); if ("-".equals(data)) { return 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java index a5902aaf7..ab33476a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java @@ -8,7 +8,7 @@ public class ABCallbackGetProjectileDestructableTargets extends ABIntegerCallbac @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Integer) localStore.get(ABLocalStoreKeys.PROJECTILEDESTTARGETS + castId); + return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEDESTTARGETS, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java index 0b21f16c4..26cbf183d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java @@ -10,7 +10,7 @@ public class ABCallbackGetProjectileUnitTargets extends ABIntegerCallback { @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Integer) localStore.get(ABLocalStoreKeys.PROJECTILEUNITTARGETS + castId); + return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEUNITTARGETS, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java index 395578485..72a5e014d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java @@ -1,14 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; public class ABCallbackGetSpellLevel extends ABIntegerCallback { - + @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); + return castId != ABConstants.NO_CAST_ID + ? localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), int.class) + : localStore.originAbility.getLevel(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java index 5c3273a13..efa2fe0e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java @@ -9,7 +9,7 @@ public class ABCallbackGetAbilityTargetedItem extends ABItemCallback { @Override public CItem callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CItem) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDITEM + castId); + return (CItem) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAttackedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAttackedItem.java index 078458fda..7f7979e12 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAttackedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAttackedItem.java @@ -11,7 +11,8 @@ public class ABCallbackGetAttackedItem extends ABItemCallback { @Override public CItem callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); + AbilityTarget tar = (AbilityTarget) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId)); return tar.visit(AbilityTargetVisitor.ITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackImpactLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackImpactLocation.java index 804be0f8a..2efa7d5a6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackImpactLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackImpactLocation.java @@ -9,7 +9,8 @@ public class ABCallbackGetAttackImpactLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.ATTACKIMPACTLOCATION+castId); + return (AbilityPointTarget) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKIMPACTLOCATION, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackTargetLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackTargetLocation.java index 55dd99d60..ffeb2bccf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackTargetLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackTargetLocation.java @@ -11,7 +11,8 @@ public class ABCallbackGetAttackTargetLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); + AbilityTarget tar = (AbilityTarget) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId)); if (tar.visit(AbilityTargetVisitor.POINT) != null) { return tar.visit(AbilityTargetVisitor.POINT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java index 5421522d9..66ed8ba1a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java @@ -11,7 +11,8 @@ public class ABCallbackGetGroundAttackedLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); + AbilityTarget tar = (AbilityTarget) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId)); return tar.visit(AbilityTargetVisitor.POINT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java index d9a94e1d6..2116685d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java @@ -9,7 +9,8 @@ public class ABCallbackGetProjectileCurrentLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); + return (AbilityPointTarget) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILECURRENTLOC, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetTargetedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetTargetedLocation.java index 9bae76c2d..b865a59de 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetTargetedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetTargetedLocation.java @@ -12,7 +12,7 @@ public class ABCallbackGetTargetedLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final AbilityPointTarget target = (AbilityPointTarget) localStore - .get(ABLocalStoreKeys.ABILITYTARGETEDLOCATION + castId); + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, castId)); return target; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java index f95f315b3..82a86cc6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetAbilityDataAsLong.java @@ -18,9 +18,9 @@ public class ABCallbackGetAbilityDataAsLong extends ABLongCallback { public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); - final String data = levelData.get(level - 1).getData().get(this.dataField.getIndex()); + final String data = levelData.get(localStore.getLevelDataInstanceLevel(castId)).getData() + .get(this.dataField.getIndex()); if ("-".equals(data)) { return 0l; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java index 23db140a9..d93c29b82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java @@ -9,7 +9,7 @@ public class ABCallbackGetReactionAttackProjectile extends ABProjectileCallback @Override public CProjectile callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CProjectile) localStore.get(ABLocalStoreKeys.ATTACKPROJ+castId); + return (CProjectile) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKPROJ, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetThisProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetThisProjectile.java index bfecf851f..3d57bfcea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetThisProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetThisProjectile.java @@ -9,7 +9,7 @@ public class ABCallbackGetThisProjectile extends ABProjectileCallback { @Override public CProjectile callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CProjectile) localStore.get(ABLocalStoreKeys.THISPROJECTILE+castId); + return (CProjectile) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java index 37bfa0b5d..e1276f423 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAbilityDataAsString.java @@ -9,16 +9,16 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.types.impl.ABAbilityBuilderAbilityTypeLevelData; public class ABCallbackGetAbilityDataAsString extends ABStringCallback { - + private ABDataFieldLetter dataField; @SuppressWarnings("unchecked") @Override public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - List levelData = (List) localStore.get(ABLocalStoreKeys.LEVELDATA); - int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); - - return levelData.get(level-1).getData().get(dataField.getIndex()); + List levelData = (List) localStore + .get(ABLocalStoreKeys.LEVELDATA); + + return levelData.get(localStore.getLevelDataInstanceLevel(castId)).getData().get(dataField.getIndex()); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetAbilityTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetAbilityTarget.java index a2ec73d35..abda070d6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetAbilityTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetAbilityTarget.java @@ -10,11 +10,12 @@ public class ABCallbackGetAbilityTarget extends ABTargetCallback { @Override public AbilityTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityPointTarget target = (AbilityPointTarget) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDLOCATION+castId); + AbilityPointTarget target = (AbilityPointTarget) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, castId)); if (target != null) { return target; } - CUnit taru = (CUnit) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDUNIT+castId); + CUnit taru = (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId)); if (taru != null) { return taru; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java index bcb46d990..e121ca5e5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java @@ -10,7 +10,7 @@ public class ABCallbackGetAbilityPairedUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.ABILITYPAIREDUNIT + castId); + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYPAIREDUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java index 86c125a5c..54b547964 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java @@ -9,9 +9,8 @@ public class ABCallbackGetAbilityTargetedUnit extends ABUnitCallback { @Override - public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDUNIT + castId); + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackedUnit.java index f65632545..531b88f6e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackedUnit.java @@ -10,7 +10,8 @@ public class ABCallbackGetAttackedUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.ATTACKTARGET+castId); + AbilityTarget tar = (AbilityTarget) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId)); return tar.visit(AbilityTargetVisitor.UNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java index 05105de3b..4c7882fc0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetAttackingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.ATTACKINGUNIT+castId); + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKINGUNIT, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetChainUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetChainUnit.java index 71f5c0627..ddeb6a37e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetChainUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetChainUnit.java @@ -9,9 +9,8 @@ public class ABCallbackGetChainUnit extends ABUnitCallback { @Override - public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.CHAINUNIT + castId); + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CHAINUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java index 5aff45a91..bb2974a82 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetDamagedUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGEDUNIT + castId); + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGEDUNIT, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java index 7d2fb55c8..81c8109dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetDamagingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.DAMAGINGUNIT + castId); + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGINGUNIT, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java index 779f48b64..c5f31823c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetDyingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.DYINGUNIT + castId); + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DYINGUNIT, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetEnumUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetEnumUnit.java index 471929657..ae0c6587c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetEnumUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetEnumUnit.java @@ -10,7 +10,7 @@ public class ABCallbackGetEnumUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.ENUMUNIT + castId); + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java index c4de6dbcd..5ccae5f6b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetKillingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.KILLINGUNIT + castId); + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.KILLINGUNIT, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetMatchingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetMatchingUnit.java index 2d85c8c4a..c87004dc0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetMatchingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetMatchingUnit.java @@ -10,7 +10,7 @@ public class ABCallbackGetMatchingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.MATCHINGUNIT + castId); + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java index 1dd032b8e..5fe9db892 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestCorpseInRangeOfUnit.java @@ -35,11 +35,12 @@ public boolean call(final CUnit enumUnit) { if (ur.getUnit() == null || ur.getRange() > dist) { if (conditions != null) { boolean result = true; - localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId), + enumUnit); for (ABBooleanCallback condition : conditions) { result = result && condition.callback(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); if (result) { ur.setRange(dist); ur.setUnit(enumUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java index 35a5042e8..f90319dff 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetNearestUnitInRangeOfUnit.java @@ -17,14 +17,14 @@ public class ABCallbackGetNearestUnitInRangeOfUnit extends ABUnitCallback { private ABUnitCallback originUnit; private ABFloatCallback range; private List conditions; - + @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(caster, localStore, castId); Float rangeVal = range.callback(caster, localStore, castId); - + final ABUnitAndRangeComparator ur = new ABUnitAndRangeComparator(); - + recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); localStore.game.getWorldCollision().enumUnitsInRect(recycleRect, new CUnitEnumFunction() { @@ -35,11 +35,12 @@ public boolean call(final CUnit enumUnit) { if (ur.getUnit() == null || ur.getRange() > dist) { if (conditions != null) { boolean result = true; - localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId), + enumUnit); for (ABBooleanCallback condition : conditions) { result = result && condition.callback(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); if (result) { ur.setRange(dist); ur.setUnit(enumUnit); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java index 9100ed297..b1b2c3f31 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java @@ -10,7 +10,7 @@ public class ABCallbackGetProjectileHitUnit extends ABUnitCallback { @Override public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java index ef725d62e..84f053419 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetReactionAbilityCastingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.REACTIONABILITYCASTER + castId); + return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONABILITYCASTER, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java index 7c6bbc15e..0bc9b73e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java @@ -10,7 +10,8 @@ public class ABCallbackGetReactionAbilityTargetUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore.get(ABLocalStoreKeys.REACTIONABILITYCASTER+castId); + AbilityTarget tar = (AbilityTarget) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONABILITYCASTER, castId)); return tar.visit(AbilityTargetVisitor.UNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java index e0ec92d08..5ac37c3fe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java @@ -10,8 +10,10 @@ public class ABCallbackGetProjectileHitWidget extends ABWidgetCallback { @Override public CWidget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - final CWidget unit = (CWidget) localStore.get(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); - final CWidget dest = (CWidget) localStore.get(ABLocalStoreKeys.PROJECTILEHITDEST + castId); + final CWidget unit = (CWidget) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId)); + final CWidget dest = (CWidget) localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId)); if (unit != null) { return unit; } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastTargeting.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastTargeting.java new file mode 100644 index 000000000..c601919bb --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastTargeting.java @@ -0,0 +1,22 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ability; + +import com.etheller.warsmash.parsers.jass.JassTextGenerator; +import com.etheller.warsmash.parsers.jass.JassTextGeneratorType; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; + +public class ABConditionIsAutoCastTargeting extends ABBooleanCallback { + + @Override + public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { + return (Boolean) localStore.get(ABLocalStoreKeys.ISAUTOCASTTARGETING); + } + + @Override + public String generateJassEquivalent(JassTextGenerator jassTextGenerator) { + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_ISAUTOCAST", JassTextGeneratorType.Boolean); + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java index d6290f034..1525d5ce4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java @@ -9,7 +9,7 @@ public class ABConditionIsTransformingToAlternate extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Boolean) localStore.get(ABLocalStoreKeys.TRANSFORMINGTOALT + castId); + return (Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.TRANSFORMINGTOALT, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java index 0f719eb2e..7a478bc02 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java @@ -10,7 +10,8 @@ public class ABConditionIsAttackProjectile extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isProjectile(); + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + .getWeaponType().isProjectile(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java index 2cd62cf66..65dd19a62 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java @@ -10,7 +10,8 @@ public class ABConditionIsAttackRanged extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.THEATTACK + castId)).getWeaponType().isRanged(); + return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + .getWeaponType().isRanged(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java index 3d04a84ee..f1fd9af6f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetAbilityDataAsBoolean.java @@ -19,9 +19,9 @@ public class ABCallbackGetAbilityDataAsBoolean extends ABBooleanCallback { public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { final List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - final int level = (int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL); - final String data = levelData.get(level - 1).getData().get(this.dataField.getIndex()); + final String data = levelData.get(localStore.getLevelDataInstanceLevel(castId)).getData() + .get(this.dataField.getIndex()); if (data.equals("-")) { return false; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java index 2a5fffb07..30badba79 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingCorpseExistsInRangeOfUnit.java @@ -23,9 +23,9 @@ public class ABConditionMatchingCorpseExistsInRangeOfUnit extends ABBooleanCallb public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { CUnit originUnitTarget = originUnit.callback(caster, localStore, castId); Float rangeVal = range.callback(caster, localStore, castId); - + final ABUnitAndRangeComparator ur = new ABUnitAndRangeComparator(); - + recycleRect.set(originUnitTarget.getX() - rangeVal, originUnitTarget.getY() - rangeVal, rangeVal * 2, rangeVal * 2); localStore.game.getWorldCollision().enumCorpsesInRect(recycleRect, new CUnitEnumFunction() { @@ -35,11 +35,12 @@ public boolean call(final CUnit enumUnit) { if (ur.getUnit() == null) { if (conditions != null) { boolean result = true; - localStore.put(ABLocalStoreKeys.MATCHINGUNIT+castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId), + enumUnit); for (ABBooleanCallback condition : conditions) { result = result && condition.callback(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT+castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); if (result) { ur.setUnit(enumUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java index c6266a0a4..ae8f65aec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/membership/ABConditionMatchingUnitExistsInRangeOfUnit.java @@ -32,9 +32,10 @@ public boolean call(final CUnit enumUnit) { if (originUnitTarget.canReach(enumUnit, rangeVal)) { if (ur.getUnit() == null) { if (condition != null) { - localStore.put(ABLocalStoreKeys.MATCHINGUNIT + castId, enumUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId), + enumUnit); boolean result = condition.callback(caster, localStore, castId); - localStore.remove(ABLocalStoreKeys.MATCHINGUNIT + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); if (result) { ur.setUnit(enumUnit); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java index 5e820c74c..fe0a56edd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsDestructableValidTarget.java @@ -27,14 +27,13 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int EnumSet targetsAllowed = null; ABAbilityBuilderAbility ability = localStore.originAbility; if (ability != null && ability instanceof ABAbilityBuilderActiveAbility) { - targetsAllowed = ((ABAbilityBuilderActiveAbility)ability).getTargetsAllowed(); + targetsAllowed = ((ABAbilityBuilderActiveAbility) ability).getTargetsAllowed(); } else { List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL))-1) - .getTargetsAllowed(); + targetsAllowed = levelData.get(localStore.getLevelDataInstanceLevel(castId)).getTargetsAllowed(); } - + if (targetsAllowed.isEmpty()) { return true; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitValidTarget.java index f22ebb468..2bee0fb2f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitValidTarget.java @@ -34,8 +34,7 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int } else { List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1) - .getTargetsAllowed(); + targetsAllowed = levelData.get(localStore.getLevelDataInstanceLevel(castId)).getTargetsAllowed(); } if (targetsAllowed.isEmpty()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsValidTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsValidTarget.java index 9310aa5cf..c836d9a4b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsValidTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsValidTarget.java @@ -33,8 +33,7 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int } else { List levelData = (List) localStore .get(ABLocalStoreKeys.LEVELDATA); - targetsAllowed = levelData.get(((int) localStore.get(ABLocalStoreKeys.CURRENTLEVEL)) - 1) - .getTargetsAllowed(); + targetsAllowed = levelData.get(localStore.getLevelDataInstanceLevel(castId)).getTargetsAllowed(); } if (targetsAllowed.isEmpty()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABDestructableBuff.java index 7ab4dcd6f..0828c769c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABDestructableBuff.java @@ -62,35 +62,35 @@ public War3ID getAlias() { @Override public void onAdd(CSimulation game, CDestructable dest) { - localStore.put(ABLocalStoreKeys.BUFFEDDEST + castId, this); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.BUFFEDDEST, castId), this); if (onAddActions != null) { for (ABAction action : onAddActions) { action.runAction(this.caster, localStore, castId); } } - localStore.remove(ABLocalStoreKeys.BUFFEDDEST + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.BUFFEDDEST, castId)); } @Override public void onRemove(CSimulation game, CDestructable dest) { - localStore.put(ABLocalStoreKeys.BUFFEDDEST + castId, this); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.BUFFEDDEST, castId), this); if (onRemoveActions != null) { for (ABAction action : onRemoveActions) { action.runAction(this.caster, localStore, castId); } } - localStore.remove(ABLocalStoreKeys.BUFFEDDEST + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.BUFFEDDEST, castId)); } @Override public void onDeath(CSimulation game, CDestructable dest) { - localStore.put(ABLocalStoreKeys.BUFFEDDEST + castId, this); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.BUFFEDDEST, castId), this); if (onDeathActions != null) { for (ABAction action : onDeathActions) { action.runAction(this.caster, localStore, castId); } } - localStore.remove(ABLocalStoreKeys.BUFFEDDEST + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.BUFFEDDEST, castId)); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedBuff.java index d3a2a9977..84982bafb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/buff/ABTimedBuff.java @@ -50,7 +50,11 @@ public ABTimedBuff(int handleId, War3ID alias, ABLocalDataStore localStore, CAbi this.onExpireActions = onExpireActions; this.castId = castId; - this.setLevel(null, null, (int) localStore.getOrDefault(ABLocalStoreKeys.CURRENTLEVEL, 1)); + if (localStore.originAbility != null) { + this.setLevel(null, null, localStore.originAbility.getLevel()); + } else { + this.setLevel(null, null, 1); + } } public void setArtType(CEffectType artType) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAbilityBuilderGsonBuilder.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAbilityBuilderGsonBuilder.java index 865134717..843b576a2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAbilityBuilderGsonBuilder.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABAbilityBuilderGsonBuilder.java @@ -892,6 +892,7 @@ private static void registerConditions(RuntimeTypeAdapterFactory conditionTypeFa .registerSubtype(ABConditionIsFlexAbilityNonPointTarget.class, "isFlexAbilityNonPointTarget") .registerSubtype(ABConditionIsToggleAbilityActive.class, "isToggleAbilityActive") .registerSubtype(ABConditionIsTransformingToAlternate.class, "isTransformingToAlternate") + .registerSubtype(ABConditionIsAutoCastTargeting.class, "isAutoCastTargeting") .registerSubtype(ABConditionWasAutoCast.class, "wasAutoCast") diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABConstants.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABConstants.java new file mode 100644 index 000000000..6ebf02537 --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/core/ABConstants.java @@ -0,0 +1,19 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core; + +public class ABConstants { + public static int NO_CAST_ID = 0; + public static int STARTING_CAST_ID = 0; + public static int STARTING_TRIGGER_ID = 0; + public static int STARTING_TRIGGER_PRIORITY_ID = 1; + + public static int incrementCastId(int castId) { + if (castId + 1 == NO_CAST_ID) { + return castId+2; + } + return castId+1; + } + + public static int incrementTriggerId(int castId) { + return incrementCastId(castId); + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABDataStore.java index f886dfec3..d28ff86b2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABDataStore.java @@ -27,4 +27,8 @@ public interface ABDataStore { public Collection values(); + int getInt(String key); + + int getIntOrDefault(String key, int def); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABGlobalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABGlobalDataStore.java index dfbcd5584..a8a27953d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABGlobalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABGlobalDataStore.java @@ -54,6 +54,24 @@ public T getOrDefault(String key, T def, Class D) { return null; } + @Override + public int getInt(String key) { + Object val = store.get(key); + if (val != null && val instanceof Integer) { + return (int) val; + } + return 0; + } + + @Override + public int getIntOrDefault(String key, int def) { + Object val = store.getOrDefault(key, def); + if (val != null && val instanceof Integer) { + return (int) val; + } + return 0; + } + @Override public Object put(String key, Object value) { return store.put(key, value); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalDataStore.java index e106a1a4c..4c0c7f814 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalDataStore.java @@ -4,7 +4,9 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.ability.ABAbilityBuilderAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CPlayer; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.upgrade.CUpgradeEffect; public abstract class ABLocalDataStore implements ABDataStore { @@ -13,6 +15,15 @@ public abstract class ABLocalDataStore implements ABDataStore { public ABAbilityBuilderAbility originAbility = null; public CItem originItem = null; public CPlayer originPlayer = null; -// public CUpgradeEffect originUpgrade = null; + public CUpgradeEffect originUpgrade = null; + public int getLevelDataInstanceLevel(int castId) { + if (castId != ABConstants.NO_CAST_ID) { + return this.getInt(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId)) - 1; + } + if (this.originAbility != null) { + return this.originAbility.getLevel() - 1; + } + return 0; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalStoreKeys.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalStoreKeys.java index 58437264d..25a015095 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalStoreKeys.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABLocalStoreKeys.java @@ -6,7 +6,6 @@ public class ABLocalStoreKeys { public static final String LEVELDATA = "_levelData"; public static final String ALIAS = "_alias"; public static final String CODE = "_code"; - public static final String CURRENTLEVEL = "_currentLevel"; public static final String BUFF = "_buff"; public static final String ITEMSLOT = "_itemSlot"; public static final String ITERATORCOUNT = "_i"; @@ -16,6 +15,8 @@ public class ABLocalStoreKeys { public static final String PREVIOUSBEHAVIOR = "_previousBehavior"; public static final String NEWBEHAVIOR = "_newBehavior"; + public static final String CASTINSTANCELEVEL = "_castInLvl#"; + public static final String FAILEDTOCAST = "_failedToCast#"; public static final String TRANSFORMINGTOALT = "_transformingToAlt#"; public static final String CHANNELING = "_channeling#"; @@ -25,6 +26,7 @@ public class ABLocalStoreKeys { public static final String CANTUSEREASON = "_cantUseReason"; + public static final String ISAUTOCASTTARGETING = "_isAutoCastTar"; public static final String ISAUTOCAST = "_isAutoCast#"; public static final String ISTOGGLEDABILITY = "_toggledAbility"; @@ -203,7 +205,7 @@ public class ABLocalStoreKeys { public static String combineKey(String key, int castId) { return key + castId; } - + public static String combineUserKey(String key, int castId) { return "__" + key; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABMapLocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABMapLocalDataStore.java index e5e6f51e5..240448863 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABMapLocalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABMapLocalDataStore.java @@ -59,6 +59,24 @@ public T getOrDefault(String key, T def, Class D) { return null; } + @Override + public int getInt(String key) { + Object val = store.get(key); + if (val != null && val instanceof Integer) { + return (int) val; + } + return 0; + } + + @Override + public int getIntOrDefault(String key, int def) { + Object val = store.getOrDefault(key, def); + if (val != null && val instanceof Integer) { + return (int) val; + } + return 0; + } + @Override public Object put(String key, Object value) { return store.put(key, value); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABGlobalWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABGlobalWidgetEvent.java index 88d57fb6b..a10f3d9df 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABGlobalWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABGlobalWidgetEvent.java @@ -37,19 +37,19 @@ public ABGlobalWidgetEvent(CUnit caster, ABLocalDataStore localStore, int castId public void fire(final CWidget triggerWidget, final TriggerExecutionScope scope) { if (condition == null || condition.callback(caster, localStore, castId)) { if (scope instanceof CommonTriggerExecutionScope) { - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDUNIT, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetUnit()); - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDLOCATION + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDLOCATION, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetPoint()); - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDITEM + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDITEM, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetItem()); - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetDestructable()); - this.localStore.put(ABLocalStoreKeys.EVENTCASTINGUNIT + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTCASTINGUNIT, castId), ((CommonTriggerExecutionScope) scope).getSpellAbilityUnit()); - this.localStore.put(ABLocalStoreKeys.EVENTABILITYID + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITYID, castId), ((CommonTriggerExecutionScope) scope).getSpellAbilityId()); - this.localStore.put(ABLocalStoreKeys.EVENTABILITY + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITY, castId), ((CommonTriggerExecutionScope) scope).getSpellAbility()); } if (actions != null) { @@ -57,13 +57,13 @@ public void fire(final CWidget triggerWidget, final TriggerExecutionScope scope) action.runAction(caster, localStore, castId); } } - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDLOCATION + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDITEM + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTCASTINGUNIT + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTABILITYID + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTABILITY + castId); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDUNIT, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDLOCATION, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDITEM, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTCASTINGUNIT, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITYID, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITY, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABPlayerEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABPlayerEvent.java index 38ec7ef08..90a479677 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABPlayerEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABPlayerEvent.java @@ -37,19 +37,19 @@ public ABPlayerEvent(CUnit caster, ABLocalDataStore localStore, int castId, CPla public void fire(final CUnit hero, final TriggerExecutionScope scope) { if (condition == null || condition.callback(caster, localStore, castId)) { if (scope instanceof CommonTriggerExecutionScope) { - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDUNIT, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetUnit()); - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDLOCATION + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDLOCATION, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetPoint()); - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDITEM + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDITEM, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetItem()); - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetDestructable()); - this.localStore.put(ABLocalStoreKeys.EVENTCASTINGUNIT + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTCASTINGUNIT, castId), ((CommonTriggerExecutionScope) scope).getSpellAbilityUnit()); - this.localStore.put(ABLocalStoreKeys.EVENTABILITYID + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITYID, castId), ((CommonTriggerExecutionScope) scope).getSpellAbilityId()); - this.localStore.put(ABLocalStoreKeys.EVENTABILITY + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITY, castId), ((CommonTriggerExecutionScope) scope).getSpellAbility()); } if (actions != null) { @@ -57,13 +57,13 @@ public void fire(final CUnit hero, final TriggerExecutionScope scope) { action.runAction(caster, localStore, castId); } } - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDLOCATION + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDITEM + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTCASTINGUNIT + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTABILITYID + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTABILITY + castId); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDUNIT, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDLOCATION, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDITEM, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTCASTINGUNIT, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITYID, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITY, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABWidgetEvent.java index 0a450676b..db1bf884e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/event/ABWidgetEvent.java @@ -37,19 +37,19 @@ public ABWidgetEvent(CUnit caster, ABLocalDataStore localStore, int castId, CWid public void fire(final CWidget triggerWidget, final TriggerExecutionScope scope) { if (condition == null || condition.callback(caster, localStore, castId)) { if (scope instanceof CommonTriggerExecutionScope) { - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDUNIT, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetUnit()); - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDLOCATION + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDLOCATION, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetPoint()); - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDITEM + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDITEM, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetItem()); - this.localStore.put(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE, castId), ((CommonTriggerExecutionScope) scope).getSpellTargetDestructable()); - this.localStore.put(ABLocalStoreKeys.EVENTCASTINGUNIT + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTCASTINGUNIT, castId), ((CommonTriggerExecutionScope) scope).getSpellAbilityUnit()); - this.localStore.put(ABLocalStoreKeys.EVENTABILITYID + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITYID, castId), ((CommonTriggerExecutionScope) scope).getSpellAbilityId()); - this.localStore.put(ABLocalStoreKeys.EVENTABILITY + castId, + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITY, castId), ((CommonTriggerExecutionScope) scope).getSpellAbility()); } if (actions != null) { @@ -57,13 +57,13 @@ public void fire(final CWidget triggerWidget, final TriggerExecutionScope scope) action.runAction(caster, localStore, castId); } } - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDUNIT + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDLOCATION + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDITEM + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTCASTINGUNIT + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTABILITYID + castId); - this.localStore.remove(ABLocalStoreKeys.EVENTABILITY + castId); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDUNIT, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDLOCATION, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDITEM, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTTARGETEDDESTRUCTABLE, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTCASTINGUNIT, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITYID, castId)); + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.EVENTABILITY, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAbilityEffectReactionListener.java index 1d9320746..681032a94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAbilityEffectReactionListener.java @@ -7,6 +7,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.listeners.CUnitAbilityEffectReactionListener; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; @@ -14,11 +15,12 @@ public class ABAbilityEffectReactionListener implements CUnitAbilityEffectReacti private ABLocalDataStore localStore; private List actions; - - private int triggerId = 0; + + private int triggerId = ABConstants.STARTING_TRIGGER_ID; private boolean useCastId; - - public ABAbilityEffectReactionListener(ABLocalDataStore localStore, List actions, int castId, boolean useCastId) { + + public ABAbilityEffectReactionListener(ABLocalDataStore localStore, List actions, int castId, + boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; @@ -26,25 +28,30 @@ public ABAbilityEffectReactionListener(ABLocalDataStore localStore, List actions; - - private int triggerId = 0; + + private int triggerId = ABConstants.STARTING_TRIGGER_ID; private boolean useCastId; - - public ABAbilityProjReactionListener(ABLocalDataStore localStore, List actions, int castId, boolean useCastId) { + + public ABAbilityProjReactionListener(ABLocalDataStore localStore, List actions, int castId, + boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; @@ -26,25 +28,30 @@ public ABAbilityProjReactionListener(ABLocalDataStore localStore, List this.triggerId = castId; } } - + @Override public boolean onHit(final CSimulation simulation, CUnit source, CUnit target, CProjectile projectile) { if (!this.useCastId) { - this.triggerId++; + this.triggerId = ABConstants.incrementTriggerId(triggerId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId), + this.localStore.originAbility.getLevel()); } - localStore.put(ABLocalStoreKeys.REACTIONALLOWHIT+triggerId, true); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONALLOWHIT, triggerId), true); if (actions != null) { - localStore.put(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId, source); - localStore.put(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId, target); - localStore.put(ABLocalStoreKeys.ABILITYPROJ+triggerId, projectile); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONABILITYCASTER, triggerId), source); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONABILITYTARGET, triggerId), target); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYPROJ, triggerId), projectile); for (ABAction action : actions) { action.runAction(target, localStore, triggerId); } - localStore.remove(ABLocalStoreKeys.REACTIONABILITYCASTER+triggerId); - localStore.remove(ABLocalStoreKeys.REACTIONABILITYTARGET+triggerId); - localStore.remove(ABLocalStoreKeys.ABILITYPROJ+triggerId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONABILITYCASTER, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONABILITYTARGET, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYPROJ, triggerId)); + } + if (!this.useCastId) { + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId)); } - return (boolean) localStore.remove(ABLocalStoreKeys.REACTIONALLOWHIT+triggerId); + return (boolean) localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONALLOWHIT, triggerId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackEvasionListener.java index c7089a111..b6564bfd9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackEvasionListener.java @@ -5,6 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.condition.ABBooleanCallback; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; @@ -14,11 +15,12 @@ public class ABAttackEvasionListener implements CUnitAttackEvasionListener { private ABLocalDataStore localStore; private List conditions; - - private int triggerId = 0; + + private int triggerId = ABConstants.STARTING_TRIGGER_ID; private boolean useCastId; - - public ABAttackEvasionListener(ABLocalDataStore localStore, List conditions, int castId, boolean useCastId) { + + public ABAttackEvasionListener(ABLocalDataStore localStore, List conditions, int castId, + boolean useCastId) { this.localStore = localStore; this.conditions = conditions; this.useCastId = useCastId; @@ -26,23 +28,28 @@ public ABAttackEvasionListener(ABLocalDataStore localStore, List actions; - - private int triggerId = 0; + + private int triggerId = ABConstants.STARTING_TRIGGER_PRIORITY_ID; private boolean useCastId; - - public ABAttackPostDamageListener(ABLocalDataStore localStore, ABIntegerCallback priority, List actions, int castId, boolean useCastId) { + + public ABAttackPostDamageListener(ABLocalDataStore localStore, ABIntegerCallback priority, List actions, + int castId, boolean useCastId) { this.localStore = localStore; this.priority = priority; this.actions = actions; @@ -31,41 +33,52 @@ public ABAttackPostDamageListener(ABLocalDataStore localStore, ABIntegerCallback this.triggerId = castId; } } - - @Override - public void onHit(CSimulation simulation, AbilityTarget target, CUnitAttack attack, - CDamageCalculation damage) { - localStore.put(ABLocalStoreKeys.ATTACKINGUNIT+triggerId, damage.getSource()); - localStore.put(ABLocalStoreKeys.ATTACKTARGET+triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGECALC+triggerId, damage); - localStore.put(ABLocalStoreKeys.THEATTACK + this.triggerId, attack); - if (actions != null) { - for (ABAction action : actions) { - action.runAction(damage.getSource(), localStore, triggerId); - } - } - localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT+triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKTARGET+triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGECALC+triggerId); - localStore.remove(ABLocalStoreKeys.THEATTACK + this.triggerId); - if (!this.useCastId) { - this.triggerId++; - } - } @Override public int getPriority(CSimulation simulation, CUnit attacker, AbilityTarget target, CUnitAttack attack) { if (priority == null) { return 0; } - localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + this.triggerId, attacker); - localStore.put(ABLocalStoreKeys.ATTACKTARGET + this.triggerId, target); - localStore.put(ABLocalStoreKeys.THEATTACK + this.triggerId, attack); + if (!this.useCastId) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId), + this.localStore.originAbility.getLevel()); + } + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKINGUNIT, this.triggerId), attacker); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, this.triggerId), target); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, this.triggerId), attack); int prio = this.priority.callback(attacker, this.localStore, this.triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + this.triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKTARGET + this.triggerId); - localStore.remove(ABLocalStoreKeys.THEATTACK + this.triggerId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKINGUNIT, this.triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, this.triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, this.triggerId)); + if (!this.useCastId) { + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId)); + } return prio; } + @Override + public void onHit(CSimulation simulation, AbilityTarget target, CUnitAttack attack, CDamageCalculation damage) { + if (!this.useCastId) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId), + this.localStore.originAbility.getLevel()); + } + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKINGUNIT, triggerId), damage.getSource()); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, triggerId), target); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId), damage); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, this.triggerId), attack); + if (actions != null) { + for (ABAction action : actions) { + action.runAction(damage.getSource(), localStore, triggerId); + } + } + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKINGUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, this.triggerId)); + if (!this.useCastId) { + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId)); + this.triggerId = ABConstants.incrementTriggerId(triggerId); + } + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackPreDamageListener.java index c736d725b..2f23e4d9c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackPreDamageListener.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; @@ -18,7 +19,7 @@ public class ABAttackPreDamageListener implements CUnitAttackPreDamageListener { private ABLocalDataStore localStore; private List actions; - private int triggerId = 0; + private int triggerId = ABConstants.STARTING_TRIGGER_ID; private boolean useCastId; public ABAttackPreDamageListener(ABLocalDataStore localStore, List actions, int castId, @@ -34,25 +35,31 @@ public ABAttackPreDamageListener(ABLocalDataStore localStore, List act @Override public void onAttack(CSimulation simulation, AbilityTarget target, AbilityPointTarget attackImpactLocation, CUnitAttack attack, CUnitAttackSettings settings, CDamageCalculation calc) { - localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + triggerId, calc.getSource()); - localStore.put(ABLocalStoreKeys.ATTACKTARGET + triggerId, target); - localStore.put(ABLocalStoreKeys.ATTACKIMPACTLOCATION + triggerId, attackImpactLocation); - localStore.put(ABLocalStoreKeys.THEATTACK + triggerId, attack); - localStore.put(ABLocalStoreKeys.ATTACKSETTINGS + triggerId, settings); - localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, calc); + if (!this.useCastId) { + this.triggerId = ABConstants.incrementTriggerId(triggerId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId), + this.localStore.originAbility.getLevel()); + } + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKINGUNIT, triggerId), calc.getSource()); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, triggerId), target); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKIMPACTLOCATION, triggerId), + attackImpactLocation); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, triggerId), attack); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, triggerId), settings); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId), calc); if (actions != null) { for (ABAction action : actions) { action.runAction(calc.getSource(), localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKTARGET + triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKIMPACTLOCATION + triggerId); - localStore.remove(ABLocalStoreKeys.THEATTACK + triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKSETTINGS + triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKINGUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKIMPACTLOCATION, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId)); if (!this.useCastId) { - this.triggerId++; + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackProjReactionListener.java index 100a9c6ac..8873813ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABAttackProjReactionListener.java @@ -5,6 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.projectile.CAttackProjectile; @@ -15,7 +16,7 @@ public class ABAttackProjReactionListener implements CUnitAttackProjReactionList private ABLocalDataStore localStore; private List actions; - private int triggerId = 0; + private int triggerId = ABConstants.STARTING_TRIGGER_ID; private boolean useCastId; public ABAttackProjReactionListener(ABLocalDataStore localStore, List actions, int castId, @@ -31,21 +32,26 @@ public ABAttackProjReactionListener(ABLocalDataStore localStore, List @Override public boolean onHit(final CSimulation simulation, CUnit source, CUnit target, CAttackProjectile projectile) { if (!this.useCastId) { - this.triggerId++; + this.triggerId = ABConstants.incrementTriggerId(triggerId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId), + this.localStore.originAbility.getLevel()); } - localStore.put(ABLocalStoreKeys.REACTIONALLOWHIT + triggerId, true); - localStore.put(ABLocalStoreKeys.ATTACKINGUNIT + triggerId, source); - localStore.put(ABLocalStoreKeys.ATTACKTARGET + triggerId, target); - localStore.put(ABLocalStoreKeys.ATTACKPROJ + triggerId, projectile); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONALLOWHIT, triggerId), true); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKINGUNIT, triggerId), source); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, triggerId), target); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKPROJ, triggerId), projectile); if (actions != null) { for (ABAction action : actions) { action.runAction(target, localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.ATTACKINGUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKTARGET + triggerId); - localStore.remove(ABLocalStoreKeys.ATTACKPROJ + triggerId); - return (boolean) localStore.remove(ABLocalStoreKeys.REACTIONALLOWHIT + triggerId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKINGUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKPROJ, triggerId)); + if (!this.useCastId) { + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId)); + } + return (boolean) localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONALLOWHIT, triggerId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABBehaviorChangeListener.java index c5b229523..7b22dc279 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABBehaviorChangeListener.java @@ -5,6 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.behaviors.CBehavior; @@ -15,10 +16,11 @@ public class ABBehaviorChangeListener implements CUnitBehaviorChangeListener { private ABLocalDataStore localStore; private List actions; - private int triggerId = 0; + private int triggerId = ABConstants.STARTING_TRIGGER_ID; private boolean useCastId; - public ABBehaviorChangeListener(ABLocalDataStore localStore, List actions, int castId, boolean useCastId) { + public ABBehaviorChangeListener(ABLocalDataStore localStore, List actions, int castId, + boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; @@ -30,19 +32,24 @@ public ABBehaviorChangeListener(ABLocalDataStore localStore, List acti @Override public void onChange(CSimulation game, CUnit unit, CBehavior previousBehavior, CBehavior newBehavior, boolean ongoing) { - localStore.put(ABLocalStoreKeys.PRECHANGEBEHAVIOR + triggerId, previousBehavior); - localStore.put(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + triggerId, newBehavior); - localStore.put(ABLocalStoreKeys.BEHAVIORONGOING + triggerId, ongoing); + if (!this.useCastId) { + this.triggerId = ABConstants.incrementTriggerId(triggerId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId), + this.localStore.originAbility.getLevel()); + } + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PRECHANGEBEHAVIOR, triggerId), previousBehavior); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.POSTCHANGEBEHAVIOR, triggerId), newBehavior); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.BEHAVIORONGOING, triggerId), ongoing); if (actions != null) { for (ABAction action : actions) { action.runAction(unit, localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.PRECHANGEBEHAVIOR + triggerId); - localStore.remove(ABLocalStoreKeys.POSTCHANGEBEHAVIOR + triggerId); - localStore.remove(ABLocalStoreKeys.BEHAVIORONGOING + triggerId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PRECHANGEBEHAVIOR, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.POSTCHANGEBEHAVIOR, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.BEHAVIORONGOING, triggerId)); if (!this.useCastId) { - this.triggerId++; + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenListener.java index dec816507..279b73a7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenListener.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; @@ -17,7 +18,7 @@ public class ABDamageTakenListener implements CUnitAttackDamageTakenListener { private ABIntegerCallback priority; private List actions; - private int triggerId = 0; + private int triggerId = ABConstants.STARTING_TRIGGER_PRIORITY_ID; private boolean useCastId; public ABDamageTakenListener(ABLocalDataStore localStore, ABIntegerCallback priority, List actions, @@ -36,31 +37,43 @@ public int getPriority(CSimulation simulation, CUnit target, CDamageCalculation if (priority == null) { return 0; } - localStore.put(ABLocalStoreKeys.DAMAGINGUNIT + triggerId, damage.getSource()); - localStore.put(ABLocalStoreKeys.DAMAGEDUNIT + triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); + if (!this.useCastId) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId), + this.localStore.originAbility.getLevel()); + } + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGINGUNIT, triggerId), damage.getSource()); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGEDUNIT, triggerId), target); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId), damage); int prio = this.priority.callback(target, this.localStore, this.triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGINGUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGEDUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId)); + if (!this.useCastId) { + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId)); + } return prio; } @Override public void onDamage(CSimulation simulation, CUnit target, CDamageCalculation damage) { - localStore.put(ABLocalStoreKeys.DAMAGINGUNIT + triggerId, damage.getSource()); - localStore.put(ABLocalStoreKeys.DAMAGEDUNIT + triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); + if (!this.useCastId) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId), + this.localStore.originAbility.getLevel()); + } + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGINGUNIT, triggerId), damage.getSource()); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGEDUNIT, triggerId), target); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId), damage); if (actions != null) { for (ABAction action : actions) { action.runAction(target, localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGINGUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGEDUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId)); if (!this.useCastId) { - this.triggerId++; + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId)); + this.triggerId = ABConstants.incrementTriggerId(triggerId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenModificationListener.java index cb38f977a..bc2a5a975 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDamageTakenModificationListener.java @@ -6,6 +6,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.behavior.callback.integers.ABIntegerCallback; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CDamageCalculation; @@ -17,7 +18,7 @@ public class ABDamageTakenModificationListener implements CUnitAttackDamageTaken private ABIntegerCallback priority; private List actions; - private int triggerId = 0; + private int triggerId = ABConstants.STARTING_TRIGGER_PRIORITY_ID; private boolean useCastId; public ABDamageTakenModificationListener(ABLocalDataStore localStore, ABIntegerCallback priority, @@ -36,31 +37,43 @@ public int getPriority(CSimulation simulation, CUnit target, CDamageCalculation if (priority == null) { return 0; } - localStore.put(ABLocalStoreKeys.DAMAGINGUNIT + triggerId, damage.getSource()); - localStore.put(ABLocalStoreKeys.DAMAGEDUNIT + triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); + if (!this.useCastId) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId), + this.localStore.originAbility.getLevel()); + } + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGINGUNIT, triggerId), damage.getSource()); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGEDUNIT, triggerId), target); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId), damage); int prio = this.priority.callback(target, this.localStore, this.triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGINGUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGEDUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId)); + if (!this.useCastId) { + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId)); + } return prio; } @Override public void onDamage(CSimulation simulation, CUnit target, CDamageCalculation damage) { - localStore.put(ABLocalStoreKeys.DAMAGINGUNIT + triggerId, damage.getSource()); - localStore.put(ABLocalStoreKeys.DAMAGEDUNIT + triggerId, target); - localStore.put(ABLocalStoreKeys.DAMAGECALC + triggerId, damage); + if (!this.useCastId) { + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId), + this.localStore.originAbility.getLevel()); + } + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGINGUNIT, triggerId), damage.getSource()); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGEDUNIT, triggerId), target); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId), damage); if (actions != null) { for (ABAction action : actions) { action.runAction(target, localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.DAMAGINGUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGEDUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.DAMAGECALC + triggerId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGINGUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGEDUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, triggerId)); if (!this.useCastId) { - this.triggerId++; + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId)); + this.triggerId = ABConstants.incrementTriggerId(triggerId); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDeathReplacementEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDeathReplacementEffect.java index 42d56843e..3cffc7f22 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDeathReplacementEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/listener/ABDeathReplacementEffect.java @@ -5,6 +5,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABAction; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.core.ABConstants; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalDataStore; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.adjustablebehaviors.datastore.ABLocalStoreKeys; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.attacks.listeners.CUnitDeathReplacementEffect; @@ -16,10 +17,11 @@ public class ABDeathReplacementEffect implements CUnitDeathReplacementEffect { private ABLocalDataStore localStore; private List actions; - private int triggerId = 0; + private int triggerId = ABConstants.STARTING_TRIGGER_ID; private boolean useCastId; - public ABDeathReplacementEffect(ABLocalDataStore localStore, List actions, int castId, boolean useCastId) { + public ABDeathReplacementEffect(ABLocalDataStore localStore, List actions, int castId, + boolean useCastId) { this.localStore = localStore; this.actions = actions; this.useCastId = useCastId; @@ -31,22 +33,27 @@ public ABDeathReplacementEffect(ABLocalDataStore localStore, List acti @Override public CUnitDeathReplacementStacking onDeath(CSimulation simulation, CUnit unit, CUnit killer, CUnitDeathReplacementResult result) { - localStore.put(ABLocalStoreKeys.KILLINGUNIT + triggerId, killer); - localStore.put(ABLocalStoreKeys.DYINGUNIT + triggerId, unit); - localStore.put(ABLocalStoreKeys.DEATHRESULT + triggerId, result); + if (!this.useCastId) { + this.triggerId = ABConstants.incrementTriggerId(triggerId); + this.localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId), + this.localStore.originAbility.getLevel()); + } + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.KILLINGUNIT, triggerId), killer); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DYINGUNIT, triggerId), unit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHRESULT, triggerId), result); CUnitDeathReplacementStacking stacking = new CUnitDeathReplacementStacking(); - localStore.put(ABLocalStoreKeys.DEATHSTACKING + triggerId, stacking); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHSTACKING, triggerId), stacking); if (actions != null) { for (ABAction action : actions) { action.runAction(unit, localStore, triggerId); } } - localStore.remove(ABLocalStoreKeys.KILLINGUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.DYINGUNIT + triggerId); - localStore.remove(ABLocalStoreKeys.DEATHRESULT + triggerId); - localStore.remove(ABLocalStoreKeys.DEATHSTACKING + triggerId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.KILLINGUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DYINGUNIT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHRESULT, triggerId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHSTACKING, triggerId)); if (!this.useCastId) { - this.triggerId++; + this.localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, this.triggerId)); } return stacking; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABCollisionProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABCollisionProjectileListener.java index 655181502..743760a03 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABCollisionProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABCollisionProjectileListener.java @@ -28,7 +28,8 @@ public class ABCollisionProjectileListener implements CAbilityCollisionProjectil private int castId; public ABCollisionProjectileListener(List onLaunch, List onPreHits, - List canHitTarget, List onHit, CUnit caster, ABLocalDataStore localStore, int castId) { + List canHitTarget, List onHit, CUnit caster, ABLocalDataStore localStore, + int castId) { super(); this.onLaunch = onLaunch; this.onPreHits = onPreHits; @@ -42,22 +43,22 @@ public ABCollisionProjectileListener(List onLaunch, List onP @Override public void onLaunch(CSimulation game, CProjectile projectile, AbilityTarget target) { if (onLaunch != null) { - localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId), projectile); for (ABAction action : onLaunch) { action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId)); } } @Override public void onPreHits(CSimulation game, CProjectile projectile, AbilityPointTarget loc) { if (onPreHits != null) { - localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId), projectile); for (ABAction action : onPreHits) { action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId)); } } @@ -67,13 +68,13 @@ public boolean canHitTarget(CSimulation game, CWidget target) { if (canHitTarget != null) { CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); - localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT + castId, targetUnit); - localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST + castId, targetDest); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId), targetUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId), targetDest); for (ABBooleanCallback condition : canHitTarget) { result = result && condition.callback(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); - localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId)); } return result; } @@ -83,31 +84,31 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target if (onHit != null) { CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); - localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); - localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT + castId, targetUnit); - localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST + castId, targetDest); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId), projectile); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId), targetUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId), targetDest); for (ABAction action : onHit) { action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); - localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); - localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId)); } } @Override public void setUnitTargets(int units) { - localStore.put(ABLocalStoreKeys.PROJECTILEUNITTARGETS + castId, units); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEUNITTARGETS, castId), units); } @Override public void setDestructableTargets(int dests) { - localStore.put(ABLocalStoreKeys.PROJECTILEDESTTARGETS + castId, dests); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEDESTTARGETS, castId), dests); } @Override public void setCurrentLocation(AbilityPointTarget loc) { - localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId, loc); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILECURRENTLOC, castId), loc); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABProjectileListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABProjectileListener.java index 40ae495ea..11fc78df3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABProjectileListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/projectile/ABProjectileListener.java @@ -23,8 +23,8 @@ public class ABProjectileListener implements CAbilityProjectileListener { private ABLocalDataStore localStore; private int castId; - public ABProjectileListener(List onLaunch, List onHit, CUnit caster, ABLocalDataStore localStore, - int castId) { + public ABProjectileListener(List onLaunch, List onHit, CUnit caster, + ABLocalDataStore localStore, int castId) { super(); this.onLaunch = onLaunch; this.onHit = onHit; @@ -36,11 +36,11 @@ public ABProjectileListener(List onLaunch, List onHit, CUnit @Override public void onLaunch(CSimulation game, CProjectile projectile, AbilityTarget target) { if (onLaunch != null) { - localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId), projectile); for (ABAction action : onLaunch) { action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId)); } } @@ -49,18 +49,18 @@ public void onHit(CSimulation game, CProjectile projectile, AbilityTarget target if (onHit != null) { CUnit targetUnit = target.visit(AbilityTargetVisitor.UNIT); CDestructable targetDest = target.visit(AbilityTargetVisitor.DESTRUCTABLE); - localStore.put(ABLocalStoreKeys.THISPROJECTILE + castId, projectile); - localStore.put(ABLocalStoreKeys.PROJECTILEHITUNIT + castId, targetUnit); - localStore.put(ABLocalStoreKeys.PROJECTILEHITDEST + castId, targetDest); - localStore.put(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId, + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId), projectile); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId), targetUnit); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId), targetDest); + localStore.put(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILECURRENTLOC, castId), new AbilityPointTarget(projectile.getX(), projectile.getY())); for (ABAction action : onHit) { action.runAction(caster, localStore, castId); } - localStore.remove(ABLocalStoreKeys.PROJECTILEHITUNIT + castId); - localStore.remove(ABLocalStoreKeys.PROJECTILEHITDEST + castId); - localStore.remove(ABLocalStoreKeys.THISPROJECTILE + castId); - localStore.remove(ABLocalStoreKeys.PROJECTILECURRENTLOC + castId); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId)); + localStore.remove(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILECURRENTLOC, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderAbilityType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderAbilityType.java index b852e92ca..9be950e20 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderAbilityType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderAbilityType.java @@ -32,7 +32,6 @@ public CAbility createAbility(int handleId) { ABLocalDataStore localStore = new ABMapLocalDataStore(); localStore.put(ABLocalStoreKeys.ABILITYEDITORDATA, this.abilityEditorData); localStore.put(ABLocalStoreKeys.LEVELDATA, getLevelData()); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, 1); localStore.put(ABLocalStoreKeys.ALIAS, getAlias()); localStore.put(ABLocalStoreKeys.CODE, getCode()); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderTemplateType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderTemplateType.java index e9bba6e53..10465d84f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderTemplateType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/types/impl/ABAbilityBuilderTemplateType.java @@ -34,7 +34,6 @@ public CAbility createAbility(int handleId) { ABLocalDataStore localStore = new ABMapLocalDataStore(); localStore.put(ABLocalStoreKeys.ABILITYEDITORDATA, this.abilityEditorData); localStore.put(ABLocalStoreKeys.LEVELDATA, getLevelData()); - localStore.put(ABLocalStoreKeys.CURRENTLEVEL, 1); localStore.put(ABLocalStoreKeys.ALIAS, getAlias()); switch (parser.getTemplateType()) { From eb53238b10e721af3b743794620058449f080e40 Mon Sep 17 00:00:00 2001 From: Glasir Date: Wed, 17 Dec 2025 09:34:41 -0500 Subject: [PATCH 43/44] Minor fix to DamageCalculation where misses were not accounted for in final damage --- .../w3x/simulation/combat/CDamageCalculation.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java index 8f3c8875b..7664b8fa2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CDamageCalculation.java @@ -85,6 +85,9 @@ public void applyMultiplier() { } public float computeFinalDamage(CSimulation simulation, CUnit unit) { + if (this.miss) { + return 0; + } float trueDamage = 0; if (!isImmuneToPrimaryDamage(simulation, unit) && (!unit.isInvulnerable() || this.isPassInvulnerable(simulation, unit))) { @@ -103,10 +106,13 @@ public float computeFinalDamage(CSimulation simulation, CUnit unit) { } public float computeRawPrimaryDamage() { - return this.primaryAmount * this.damageMultiplier * (this.splash ? this.splashFactor : 1); + return this.miss ? 0 : this.primaryAmount * this.damageMultiplier * (this.splash ? this.splashFactor : 1); } public float computeRawBonusDamage() { + if (this.miss) { + return 0; + } float trueDamage = 0; if (bonusDamages != null) { @@ -119,7 +125,7 @@ public float computeRawBonusDamage() { } public float computeRawTotalDamage() { - return this.computeRawPrimaryDamage() + this.computeRawBonusDamage(); + return this.miss ? 0 : this.computeRawPrimaryDamage() + this.computeRawBonusDamage(); } public boolean isImmuneToPrimaryDamage(CSimulation simulation, CUnit unit) { @@ -339,7 +345,6 @@ public void resetLoop() { } public void subtractTotalDamageDealt(float reduction, float minimum) { - System.err.println("Reducing damage: start:" + this.primaryAmount + " reduction:" + reduction + " min:" + minimum); float primMinus = this.primaryAmount - reduction; if (primMinus > minimum) { this.primaryAmount = primMinus; @@ -369,8 +374,7 @@ public void subtractTotalDamageDealt(float reduction, float minimum) { this.primaryAmount = Math.max(minimum, primMinus); } } - System.err.println("Reduced damage: final:" + this.primaryAmount); - + } public CBonusDamage addBonusDamage(float amount, CAttackType attackType, CDamageType damageType, From d212d995572895be3e0192afb34e1aafe0aee8f2 Mon Sep 17 00:00:00 2001 From: Glasir Date: Wed, 17 Dec 2025 10:55:29 -0500 Subject: [PATCH 44/44] Major AB Refactor: Part 9 - LocalStore Gets * Update most LocalStore get calls to use the new class syntax rather than casts * This is not done for parameterized classes --- .../scope/CommonTriggerExecutionScope.java | 14 +++++--- .../ABAbilityBuilderActiveAutoTarget.java | 28 ++++++++------- .../ABAbilityBuilderGenericActive.java | 20 +++++------ .../ability/ABAbilityBuilderNoIcon.java | 10 +++--- .../ability/ABAbilityBuilderPassive.java | 10 +++--- .../ABBehaviorAbilityBuilderBase.java | 16 ++++----- .../ABBehaviorAbilityBuilderNoTarget.java | 16 ++++----- .../ABBehaviorFinishTransformation.java | 2 +- .../ABActionAbilityAttemptToApplyEffect.java | 5 +-- .../action/ability/ABActionStartCooldown.java | 2 +- .../ABActionSetAbilityCastRange.java | 7 ++-- ...ABActionAttackModifierAddAnimationTag.java | 4 +-- ...onAttackModifierAddPostDamageListener.java | 4 +-- ...ionAttackModifierAddPreDamageListener.java | 4 +-- ...ActionAttackModifierApplyAllArtFields.java | 4 +-- .../ABActionAttackModifierApplyArt.java | 4 +-- ...BActionAttackModifierApplyArtAndSpeed.java | 4 +-- ...ActionAttackModifierApplyDefaultSpeed.java | 4 +-- ...tackModifierPreventOtherModifications.java | 4 +-- ...PreventOtherSamePriorityModifications.java | 4 +-- ...ctionAttackModifierRemoveAnimationTag.java | 4 +-- ...ttackModifierRemovePostDamageListener.java | 4 +-- ...AttackModifierRemovePreDamageListener.java | 4 +-- .../ABActionAttackModifierSetAttackArc.java | 4 +-- ...ctionAttackModifierSetAttackDeathTime.java | 4 +-- ...ABActionAttackModifierSetAttackHoming.java | 4 +-- ...BActionAttackModifierSetAttackImpactZ.java | 4 +-- ...ABActionAttackModifierSetAttackStartZ.java | 4 +-- ...ABActionAttackModifierSetSplashFields.java | 4 +-- ...ABCallbackGetModifiedAttackAttackType.java | 2 +- ...ABCallbackGetModifiedAttackDamageType.java | 2 +- ...ABCallbackGetModifiedAttackWeaponType.java | 2 +- ...ctionAttemptToReOrderPreviousBehavior.java | 2 +- .../ABActionForceBeginCreatedBehavior.java | 2 +- .../action/buff/ABActionAddSlowBuff.java | 2 +- .../action/buff/ABActionAddStunBuff.java | 2 +- .../buff/ABActionCreatePassiveBuff.java | 2 +- .../buff/ABActionCreateTimedArtBuff.java | 2 +- .../action/buff/ABActionCreateTimedBuff.java | 2 +- ...ActionCreateTimedPausedExpirationBuff.java | 2 +- .../buff/ABActionCreateTimedTickingBuff.java | 2 +- .../ABActionCreateTimedTickingPausedBuff.java | 2 +- ...ActionCreateTimedTickingPostDeathBuff.java | 2 +- .../ABActionCreateDestructableBuff.java | 7 ++-- .../ABActionCreateSpellEffectAtLocation.java | 2 +- .../fx/ABActionCreateSpellEffectAtPoint.java | 2 +- .../fx/ABActionCreateSpellEffectOnUnit.java | 2 +- ...nCreateTemporarySpellEffectAtLocation.java | 2 +- ...tionCreateTemporarySpellEffectAtPoint.java | 2 +- ...ctionCreateTemporarySpellEffectOnUnit.java | 2 +- .../ABActionCreateGroupEffectAtLocation.java | 2 +- .../ABActionCreateLightningEffect.java | 2 +- ...reateLocationTargetedPseudoProjectile.java | 2 +- ...ionCreateUnitTargetedPseudoProjectile.java | 2 +- .../structural/ABActionPeriodicExecute.java | 8 ++--- ...ActionPreDamageListenerAddBonusDamage.java | 4 +-- ...nPreDamageListenerAddDamageMultiplier.java | 4 +-- ...DamageListenerLockDamageModifications.java | 4 +-- .../ABActionPreDamageListenerSetMiss.java | 4 +-- .../ABActionSetPreDamageStacking.java | 4 +-- .../ABCallbackGetAttackBaseDamage.java | 4 +-- .../ABCallbackGetAttackDamageType.java | 2 +- ...BCallbackGetAttackMaximumSplashRadius.java | 4 +-- .../ABCallbackGetAttackType.java | 2 +- .../ABCallbackGetAttackWeaponType.java | 2 +- .../ABConditionIsAttackArtillery.java | 4 +-- .../ABConditionIsAttackHoming.java | 4 +-- ...onditionIsUnitValidSplashDamageTarget.java | 2 +- .../ABCallbackGetNewBehaviorTarget.java | 4 +-- ...BConditionIsNewBehaviorCategoryInList.java | 4 +-- ...nModificationMultiplyDamageMultiplier.java | 4 +-- ...eTakenModificationSetDamageMultiplier.java | 4 +-- ...ABConditionIsTriggeringDamageAnAttack.java | 2 +- .../ABConditionIsTriggeringDamageRanged.java | 2 +- ...ctionDeathReplacementSetReincarnating.java | 9 ++--- .../ABActionDeathReplacementSetReviving.java | 9 ++--- ...GetReactionAttackProjectileAttackType.java | 2 +- ...backGetReactionAttackProjectileDamage.java | 2 +- .../ABActionSubtractTotalDamageDealt.java | 4 +-- .../ABCallbackGetFinalTotalDamageDealt.java | 2 +- .../ABCallbackGetRawTotalDamageDealt.java | 2 +- .../ABCallbackGetTriggeringAttackType.java | 2 +- .../ABCallbackGetTriggeringDamageType.java | 2 +- .../ability/ABCallbackArgumentAbility.java | 2 +- .../ABCallbackGetLastCreatedAbility.java | 2 +- .../ability/ABCallbackGetMatchingAbility.java | 2 +- .../ability/ABCallbackGetPartnerAbility.java | 2 +- .../ability/ABCallbackGetReactionAbility.java | 2 +- .../ABCallbackGetStoredAbilityByKey.java | 13 +++---- ...BCallbackGetLastCreatedAttackModifier.java | 2 +- ...BCallbackGetStoredAttackModifierByKey.java | 9 ++--- .../ABCallbackGetCurrentAttackSettings.java | 4 +-- ...BCallbackGetLastCreatedAttackSettings.java | 2 +- ...BCallbackGetStoredAttackSettingsByKey.java | 7 ++-- .../callback/buff/ABCallbackArgumentBuff.java | 8 ++--- .../callback/buff/ABCallbackEnumBuff.java | 2 +- .../buff/ABCallbackGetLastCreatedBuff.java | 2 +- .../buff/ABCallbackGetMatchingBuff.java | 2 +- .../buff/ABCallbackGetStoredBuffByKey.java | 13 +++---- .../callback/buff/ABCallbackThisBuff.java | 2 +- .../ABCallbackArgumentDestructable.java | 9 ++--- ...allbackGetAbilityTargetedDestructable.java | 2 +- .../ABCallbackGetAttackedDestructable.java | 4 +-- .../ABCallbackGetEnumDestructable.java | 2 +- .../ABCallbackGetLastCreatedDestructable.java | 2 +- ...BCallbackGetProjectileHitDestructable.java | 2 +- .../ABCallbackGetStoredDestructableByKey.java | 16 ++++----- .../ABCallbackArgumentDestructableBuff.java | 2 +- .../ABCallbackEnumDestructableBuff.java | 2 +- ...allbackGetLastCreatedDestructableBuff.java | 2 +- ...allbackGetStoredDestructableBuffByKey.java | 9 +++-- .../ABCallbackMatchingDestructableBuff.java | 2 +- .../ABCallbackGetStoredAttackTypeByKey.java | 10 +++--- .../ABCallbackGetStoredDamageTypeByKey.java | 16 ++++----- .../ABCallbackGetStoredDefenseTypeByKey.java | 16 ++++----- .../ABCallbackGetStoredMovementTypeByKey.java | 16 ++++----- .../ABCallbackGetStoredTargetTypeByKey.java | 10 +++--- .../ABCallbackGetStoredWeaponTypeByKey.java | 10 +++--- .../ABCallbackArgumentTimeOfDayEvent.java | 2 +- ...BCallbackGetLastCreatedTimeOfDayEvent.java | 2 +- ...BCallbackGetStoredTimeOfDayEventByKey.java | 9 ++--- .../ABCallbackArgumentWidgetEvent.java | 2 +- .../ABCallbackGetLastCreatedWidgetEvent.java | 2 +- .../ABCallbackGetStoredWidgetEventByKey.java | 9 ++--- .../floats/ABCallbackArgumentFloat.java | 2 +- .../ABCallbackGetAbilityProjectileSpeed.java | 2 +- .../floats/ABCallbackGetStoredFloatByKey.java | 16 ++++----- .../callback/fx/ABCallbackArgumentFX.java | 2 +- .../fx/ABCallbackGetLastCreatedFX.java | 2 +- ...CallbackGetLastCreatedLightningEffect.java | 2 +- .../fx/ABCallbackGetStoredFXByKey.java | 12 ++++--- .../fx/ABCallbackGetStoredLightningByKey.java | 9 ++--- .../callback/id/ABCallbackArgumentID.java | 2 +- .../callback/id/ABCallbackGetAlias.java | 2 +- .../id/ABCallbackGetBuffIdFromCode.java | 2 +- .../callback/id/ABCallbackGetCode.java | 2 +- .../id/ABCallbackGetStoredIDByKey.java | 9 ++--- .../integers/ABCallbackArgumentInteger.java | 2 +- .../integers/ABCallbackGetItemCharges.java | 2 +- .../integers/ABCallbackGetItemLevel.java | 2 +- .../integers/ABCallbackGetItemMaxCharges.java | 2 +- .../integers/ABCallbackGetItemSlot.java | 2 +- ...lbackGetProjectileDestructableTargets.java | 2 +- .../ABCallbackGetProjectileUnitTargets.java | 2 +- .../integers/ABCallbackGetSpellLevel.java | 3 +- .../ABCallbackGetStoredIntegerByKey.java | 13 +++---- .../callback/integers/ABCallbackIterator.java | 11 +++--- .../callback/item/ABCallbackArgumentItem.java | 2 +- .../ABCallbackGetAbilityTargetedItem.java | 2 +- .../item/ABCallbackGetAttackedItem.java | 4 +-- .../item/ABCallbackGetLastCreatedItem.java | 2 +- .../item/ABCallbackGetStoredItemByKey.java | 9 +++-- .../callback/list/ABCallbackArgumentList.java | 2 +- .../list/ABCallbackArgumentSortableList.java | 2 +- ...tCreatedAbilityEffectReactionListener.java | 2 +- ...astCreatedAbilityProjReactionListener.java | 2 +- ...etLastCreatedAttackPostDamageListener.java | 2 +- ...GetLastCreatedAttackPreDamageListener.java | 2 +- ...LastCreatedAttackProjReactionListener.java | 2 +- ...kGetLastCreatedBehaviorChangeListener.java | 2 +- ...backGetLastCreatedDamageTakenListener.java | 2 +- ...reatedDamageTakenModificationListener.java | 2 +- ...allbackGetLastCreatedDeathReplacement.java | 2 +- ...CallbackGetLastCreatedEvasionListener.java | 2 +- ...llbackGetLastCreatedUnitStateListener.java | 2 +- ...redAbilityEffectReactionListenerByKey.java | 9 ++--- ...toredAbilityProjReactionListenerByKey.java | 10 +++--- ...etStoredAttackPostDamageListenerByKey.java | 10 +++--- ...GetStoredAttackPreDamageListenerByKey.java | 9 ++--- ...StoredAttackProjReactionListenerByKey.java | 10 +++--- ...kGetStoredBehaviorChangeListenerByKey.java | 10 +++--- ...backGetStoredDamageTakenListenerByKey.java | 9 ++--- ...dDamageTakenModificationListenerByKey.java | 9 ++--- ...allbackGetStoredDeathReplacementByKey.java | 9 ++--- ...CallbackGetStoredEvasionListenerByKey.java | 10 +++--- ...llbackGetStoredUnitStateListenerByKey.java | 9 ++--- .../location/ABCallbackArgumentLocation.java | 2 +- .../ABCallbackGetAttackImpactLocation.java | 4 +-- .../ABCallbackGetAttackTargetLocation.java | 4 +-- .../ABCallbackGetGroundAttackedLocation.java | 4 +-- ...BCallbackGetProjectileCurrentLocation.java | 4 +-- .../ABCallbackGetStoredLocationByKey.java | 7 ++-- .../ABCallbackGetTargetedLocation.java | 5 +-- .../longs/ABCallbackArgumentLong.java | 2 +- .../longs/ABCallbackGetStoredLongByKey.java | 9 ++--- .../orderid/ABCallbackArgumentOrderId.java | 2 +- .../ABCallbackGetStoredOrderIdByKey.java | 10 +++--- .../player/ABCallbackArgumentPlayer.java | 2 +- .../ABCallbackGetStoredPlayerByKey.java | 7 ++-- .../ABCallbackArgumentProjectile.java | 2 +- .../ABCallbackGetLastCreatedProjectile.java | 2 +- ...BCallbackGetReactionAbilityProjectile.java | 2 +- ...ABCallbackGetReactionAttackProjectile.java | 2 +- .../ABCallbackGetStoredProjectileByKey.java | 7 ++-- .../ABCallbackGetThisProjectile.java | 2 +- ...ABCallbackArgumentNonStackingStatBuff.java | 2 +- ...backGetLastCreatedNonStackingStatBuff.java | 2 +- ...backGetStoredNonStackingStatBuffByKey.java | 16 ++++----- .../ABCallbackArgumentStateModBuff.java | 2 +- .../ABCallbackGetLastCreatedStateModBuff.java | 2 +- .../ABCallbackGetStoredStateModBuffByKey.java | 7 ++-- .../strings/ABCallbackArgumentString.java | 2 +- .../strings/ABCallbackGetAliasAsString.java | 2 +- .../strings/ABCallbackGetCodeAsString.java | 2 +- .../ABCallbackGetStoredStringByKey.java | 16 ++++----- .../target/ABCallbackArgumentTarget.java | 2 +- .../target/ABCallbackGetAbilityTarget.java | 8 +++-- .../ABCallbackGetStoredTargetByKey.java | 7 ++-- .../timer/ABCallbackArgumentTimer.java | 2 +- .../timer/ABCallbackGetFiringTimer.java | 2 +- .../timer/ABCallbackGetLastCreatedTimer.java | 2 +- .../timer/ABCallbackGetLastStartedTimer.java | 2 +- .../timer/ABCallbackGetStoredTimerByKey.java | 9 ++--- .../callback/unit/ABCallbackArgumentUnit.java | 2 +- .../unit/ABCallbackGetAbilityPairedUnit.java | 2 +- .../ABCallbackGetAbilityTargetedUnit.java | 2 +- .../unit/ABCallbackGetAttackedUnit.java | 4 +-- .../unit/ABCallbackGetAttackingUnit.java | 2 +- .../unit/ABCallbackGetBuffCastingUnit.java | 2 +- .../callback/unit/ABCallbackGetChainUnit.java | 2 +- .../callback/unit/ABCallbackGetCompUnit1.java | 2 +- .../callback/unit/ABCallbackGetCompUnit2.java | 9 ++--- .../unit/ABCallbackGetDamagedUnit.java | 2 +- .../unit/ABCallbackGetDamagingUnit.java | 2 +- .../callback/unit/ABCallbackGetDyingUnit.java | 2 +- .../callback/unit/ABCallbackGetEnumUnit.java | 2 +- .../unit/ABCallbackGetKillingUnit.java | 2 +- .../unit/ABCallbackGetLastCreatedUnit.java | 2 +- .../unit/ABCallbackGetMatchingUnit.java | 2 +- .../unit/ABCallbackGetProjectileHitUnit.java | 2 +- ...CallbackGetReactionAbilityCastingUnit.java | 2 +- ...BCallbackGetReactionAbilityTargetUnit.java | 4 +-- .../unit/ABCallbackGetStoredUnitByKey.java | 9 +++-- .../ABCallbackArgumentUnitGroup.java | 2 +- .../ABCallbackArgumentUnitQueue.java | 2 +- .../ABCallbackArgumentVisionModifier.java | 2 +- ...BCallbackGetLastCreatedVisionModifier.java | 2 +- ...BCallbackGetStoredVisionModifierByKey.java | 7 ++-- .../widget/ABCallbackArgumentWidget.java | 2 +- .../ABCallbackGetProjectileHitWidget.java | 8 ++--- .../ABCallbackGetStoredWidgetByKey.java | 10 +++--- .../condition/ABCallbackArgumentBoolean.java | 2 +- .../ABConditionIsAutoCastCurrentlyActive.java | 2 +- .../ABConditionIsAutoCastTargeting.java | 2 +- ...BConditionIsFlexAbilityNonPointTarget.java | 2 +- .../ABConditionIsFlexAbilityNonTargeted.java | 2 +- .../ABConditionIsFlexAbilityPointTarget.java | 2 +- .../ABConditionIsFlexAbilityTargeted.java | 4 +-- .../ABConditionIsTransformingToAlternate.java | 2 +- .../ability/ABConditionWasAutoCast.java | 2 +- ...BConditionWasAutoCastPreviouslyActive.java | 2 +- .../ABConditionWasCastingInterrupted.java | 2 +- .../attack/ABConditionIsAttackProjectile.java | 2 +- .../attack/ABConditionIsAttackRanged.java | 2 +- .../ABCallbackGetStoredBooleanByKey.java | 13 +++---- ...ConditionIsPassAllAbilityTargetChecks.java | 2 +- ...itionIsUnitPassAllAbilityTargetChecks.java | 2 +- .../datastore/ABDataStore.java | 8 +++++ .../datastore/ABGlobalDataStore.java | 36 +++++++++++++++++++ .../datastore/ABMapLocalDataStore.java | 36 +++++++++++++++++++ .../handler/ABTransformationHandler.java | 6 ++-- 261 files changed, 701 insertions(+), 540 deletions(-) diff --git a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java index abfc17c30..b4358c633 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java +++ b/core/src/com/etheller/warsmash/parsers/jass/scope/CommonTriggerExecutionScope.java @@ -936,11 +936,15 @@ public static TriggerExecutionScope abilityBuilder(final CUnit caster, final ABL scope.triggerCastId = castId; // TODO: below: makes it easier on the outside, but it still is very bad for // performance - scope.spellTargetUnit = (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId)); - scope.spellTargetItem = (CItem) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId)); - scope.spellTargetDestructable = (CDestructable) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId)); - scope.spellTargetPoint = (AbilityPointTarget) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, castId)); + scope.spellTargetUnit = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId), CUnit.class); + scope.spellTargetItem = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId), CItem.class); + scope.spellTargetDestructable = localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId), CDestructable.class); + scope.spellTargetPoint = localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, castId), + AbilityPointTarget.class); scope.spellAbility = localStore.originAbility; scope.spellAbilityId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); return scope; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAutoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAutoTarget.java index e6b1ba1c5..dde52bf09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAutoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderActiveAutoTarget.java @@ -92,14 +92,15 @@ public CWidget autoTarget(CSimulation game, CUnit caster) { action.runAction(caster, this.localStore, castId); } - target = (CWidget) this.localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId)); + target = this.localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId), + CWidget.class); if (target == null) { - target = (CWidget) this.localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId)); + target = this.localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, castId), + CWidget.class); if (target == null) { - target = (CWidget) this.localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId)); + target = this.localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId), CWidget.class); } } } @@ -109,14 +110,17 @@ public CWidget autoTarget(CSimulation game, CUnit caster) { protected boolean innerCheckCanTargetSpell(CSimulation game, CUnit unit, int orderId, CWidget target, AbilityTargetCheckReceiver receiver) { CWidget prevTarget = null; - prevTarget = (CWidget) this.localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, ABConstants.NO_CAST_ID)); + prevTarget = this.localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, ABConstants.NO_CAST_ID), + CWidget.class); if (prevTarget == null) { - prevTarget = (CWidget) this.localStore.get( - ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, ABConstants.NO_CAST_ID)); + prevTarget = this.localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, ABConstants.NO_CAST_ID), + CWidget.class); if (prevTarget == null) { - prevTarget = (CWidget) this.localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, ABConstants.NO_CAST_ID)); + prevTarget = this.localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, ABConstants.NO_CAST_ID), + CWidget.class); } } if (target == prevTarget) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java index 100bb1f50..29ae2ae58 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderGenericActive.java @@ -128,7 +128,7 @@ public ABAbilityBuilderGenericActive(int handleId, War3ID code, War3ID alias, autocastType = config.getAutoCastType(); } - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); final String animNames = editorData.getField(AbilityFields.ANIM_NAMES); final EnumSet primaryTags = EnumSet.noneOf(AnimationTokens.PrimaryTag.class); this.castingSecondaryTags = EnumSet.noneOf(AnimationTokens.SecondaryTag.class); @@ -147,25 +147,25 @@ public ABAbilityBuilderGenericActive(int handleId, War3ID code, War3ID alias, @Override public int getAbilityIntField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getFieldValue(field); } @Override public float getAbilityFloatField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getFieldFloatValue(field); } @Override public String getAbilityStringField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getField(field); } @Override public boolean getAbilityBooleanField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getFieldValue(field) != 0; } @@ -344,7 +344,7 @@ protected void setSpellFields(CSimulation game, CUnit unit) { } } - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); final int requiredLevel = editorData.getFieldAsInteger(AbilityFields.REQUIRED_LEVEL, 0); this.targetsAllowed = levelDataLevel.getTargetsAllowed(); if ((requiredLevel < 6 || game.getGameplayConstants().isMagicImmuneResistsUltimates()) && !isPhysical() @@ -1176,8 +1176,8 @@ public void runCancelPreCastActions(final CSimulation game, final CUnit caster, @Override public void activate(final CSimulation game, final CUnit caster) { - Boolean failed = (Boolean) this.localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId)); + Boolean failed = this.localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId), + Boolean.class); if (failed != null && failed) { System.err.println("Failed to cast!"); return; @@ -1197,8 +1197,8 @@ public void activate(final CSimulation game, final CUnit caster) { @Override public void deactivate(final CSimulation game, final CUnit caster) { - Boolean failed = (Boolean) this.localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId)); + Boolean failed = this.localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.FAILEDTOCAST, castId), + Boolean.class); if (failed != null && failed) { System.err.println("Failed to cast!"); return; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java index 1229a968a..29355b0b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderNoIcon.java @@ -52,7 +52,7 @@ public ABAbilityBuilderNoIcon(int handleId, War3ID code, War3ID alias, this.config = config; this.localStore = localStore; localStore.originAbility = this; - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); final int levels = editorData.getFieldAsInteger(AbilityFields.LEVELS, 0); localStore.put(ABLocalStoreKeys.ISABILITYLEVELED, levels > 1); } @@ -93,25 +93,25 @@ protected void setSpellFields(CSimulation game, CUnit unit) { @Override public int getAbilityIntField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getFieldValue(field); } @Override public float getAbilityFloatField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getFieldFloatValue(field); } @Override public String getAbilityStringField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getField(field); } @Override public boolean getAbilityBooleanField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getFieldValue(field) != 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java index 518973ca7..94ce84582 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/ability/ABAbilityBuilderPassive.java @@ -52,7 +52,7 @@ public ABAbilityBuilderPassive(int handleId, War3ID code, War3ID alias, this.config = config; this.localStore = localStore; localStore.originAbility = this; - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); final int levels = editorData.getFieldAsInteger(AbilityFields.LEVELS, 0); localStore.put(ABLocalStoreKeys.ISABILITYLEVELED, levels > 1); } @@ -99,25 +99,25 @@ protected void setSpellFields(CSimulation game, CUnit unit) { @Override public int getAbilityIntField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getFieldValue(field); } @Override public float getAbilityFloatField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getFieldFloatValue(field); } @Override public String getAbilityStringField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getField(field); } @Override public boolean getAbilityBooleanField(String field) { - GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getFieldValue(field) != 0; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderBase.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderBase.java index 5b8f81fad..a632d36f2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderBase.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderBase.java @@ -210,7 +210,7 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { cleanupInputs(); return beh; } - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + CBehavior newBehavior = localStore.get(ABLocalStoreKeys.NEWBEHAVIOR, CBehavior.class); if (newBehavior != null) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); return newBehavior; @@ -239,7 +239,7 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { CBehavior prevBeh = this.unit.getCurrentBehavior(); this.ability.runBeginCastingActions(game, unit, orderId); - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + CBehavior newBehavior = localStore.get(ABLocalStoreKeys.NEWBEHAVIOR, CBehavior.class); if (newBehavior != null) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); return newBehavior; @@ -253,7 +253,7 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { return this; } - this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + this.channeling = localStore.getBoolean(ABLocalStoreKeys.CHANNELING); if (!this.channeling) { this.unit.getUnitAnimationListener().playAnimation(this.firstAnimation, this.ability.getCastingPrimaryTag(), this.ability.getCastingSecondaryTags(), 1.0f, true); @@ -278,7 +278,7 @@ public CBehavior update(final CSimulation game, boolean withinFacingWindow) { cleanupInputs(); return beh; } - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + CBehavior newBehavior = localStore.get(ABLocalStoreKeys.NEWBEHAVIOR, CBehavior.class); if (newBehavior != null) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); return newBehavior; @@ -314,7 +314,7 @@ private CBehavior tryDoEffect(CSimulation game, boolean wasChanneling) { } this.ability.runEndCastingActions(game, unit, orderId); - this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + this.channeling = (boolean) localStore.getBoolean(ABLocalStoreKeys.CHANNELING); this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this.ability, this.target); if (this.unit.getCurrentBehavior() != prevBeh) { @@ -353,7 +353,7 @@ public void begin(final CSimulation game) { this.unit.beginBehavior(game, beh); return; } - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + CBehavior newBehavior = localStore.get(ABLocalStoreKeys.NEWBEHAVIOR, CBehavior.class); if (newBehavior != null) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); this.unit.beginBehavior(game, newBehavior); @@ -367,13 +367,13 @@ public void begin(final CSimulation game) { public boolean doChannelTick(CSimulation game, CUnit caster, AbilityTarget target) { this.ability.runChannelTickActions(game, caster, orderId); - return (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + return (boolean) localStore.getBoolean(ABLocalStoreKeys.CHANNELING); } @Override public void end(final CSimulation game, boolean interrupted) { checkEndChannel(game, interrupted); - Boolean preventEndEvents = (Boolean) this.localStore.get(ABLocalStoreKeys.PREVENTENDEVENTS + this.castId); + Boolean preventEndEvents = this.localStore.get(ABLocalStoreKeys.PREVENTENDEVENTS + this.castId, Boolean.class); if (preventEndEvents == null || !preventEndEvents) { if (!interrupted) { this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, this.target); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderNoTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderNoTarget.java index 362edf312..bc5f14437 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderNoTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorAbilityBuilderNoTarget.java @@ -152,7 +152,7 @@ public CBehavior update(final CSimulation game) { cleanupInputs(); return beh; } - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + CBehavior newBehavior = localStore.get(ABLocalStoreKeys.NEWBEHAVIOR, CBehavior.class); if (newBehavior != null) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); return newBehavior; @@ -173,7 +173,7 @@ public CBehavior update(final CSimulation game) { this.ability.startCooldown(game, this.unit); this.ability.runBeginCastingActions(game, unit, orderId); - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + CBehavior newBehavior = localStore.get(ABLocalStoreKeys.NEWBEHAVIOR, CBehavior.class); if (newBehavior != null) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); return newBehavior; @@ -181,7 +181,7 @@ public CBehavior update(final CSimulation game) { this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_CAST, this.ability, null); - this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + this.channeling = localStore.getBoolean(ABLocalStoreKeys.CHANNELING); if (!this.channeling) { this.unit.getUnitAnimationListener().playAnimation(this.firstAnimation, this.ability.getCastingPrimaryTag(), this.ability.getCastingSecondaryTags(), 1.0f, true); @@ -200,7 +200,7 @@ public CBehavior update(final CSimulation game) { cleanupInputs(); return beh; } - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + CBehavior newBehavior = localStore.get(ABLocalStoreKeys.NEWBEHAVIOR, CBehavior.class); if (newBehavior != null) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); return newBehavior; @@ -225,7 +225,7 @@ private CBehavior tryDoEffect(CSimulation game, boolean wasChanneling) { this.doneEffect = true; this.ability.runEndCastingActions(game, unit, orderId); - this.channeling = (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + this.channeling = localStore.getBoolean(ABLocalStoreKeys.CHANNELING); this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_EFFECT, this.ability, null); } this.channeling = this.channeling && this.doChannelTick(game, this.unit); @@ -257,7 +257,7 @@ public void begin(final CSimulation game) { this.unit.beginBehavior(game, beh); return; } - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + CBehavior newBehavior = localStore.get(ABLocalStoreKeys.NEWBEHAVIOR, CBehavior.class); if (newBehavior != null) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); this.unit.beginBehavior(game, newBehavior); @@ -271,13 +271,13 @@ public void begin(final CSimulation game) { public boolean doChannelTick(CSimulation game, CUnit caster) { this.ability.runChannelTickActions(game, caster, orderId); - return (boolean) localStore.get(ABLocalStoreKeys.CHANNELING); + return localStore.getBoolean(ABLocalStoreKeys.CHANNELING); } @Override public void end(final CSimulation game, boolean interrupted) { checkEndChannel(game, interrupted); - Boolean preventEndEvents = (Boolean) this.localStore.get(ABLocalStoreKeys.PREVENTENDEVENTS + this.castId); + Boolean preventEndEvents = this.localStore.get(ABLocalStoreKeys.PREVENTENDEVENTS + this.castId, Boolean.class); if (preventEndEvents == null || !preventEndEvents) { if (!interrupted) { this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorFinishTransformation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorFinishTransformation.java index 8c5bf8556..7269c9a7b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorFinishTransformation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/ABBehaviorFinishTransformation.java @@ -117,7 +117,7 @@ public CBehavior update(CSimulation game) { this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_FINISH, this.ability, null); this.unit.fireSpellEvents(game, JassGameEventsWar3.EVENT_UNIT_SPELL_ENDCAST, this.ability, null); - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + CBehavior newBehavior = localStore.get(ABLocalStoreKeys.NEWBEHAVIOR, CBehavior.class); if (this.equals(newBehavior)) { } localStore.remove(ABLocalStoreKeys.PREVIOUSBEHAVIOR); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java index d5738dd72..781ed522b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionAbilityAttemptToApplyEffect.java @@ -35,8 +35,9 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (activationReceiver.isOk()) { final BooleanAbilityTargetCheckReceiver booleanTargetReceiver = BooleanAbilityTargetCheckReceiver .getInstance().reset(); - active.checkCanTarget(localStore.game, theCaster, orderId, - ((Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId))), + active.checkCanTarget( + localStore.game, theCaster, orderId, (localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), Boolean.class)), theTarget, booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { if (theCaster.chargeMana(active.getChargedManaCost())) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionStartCooldown.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionStartCooldown.java index d25be4d70..6a3f8d8af 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionStartCooldown.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/ability/ABActionStartCooldown.java @@ -38,7 +38,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin } } else { if (this.cooldown != null) { - final War3ID aliasId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + final War3ID aliasId = localStore.get(ABLocalStoreKeys.ALIAS, War3ID.class); theUnit.beginCooldown(localStore.game, aliasId, this.cooldown.callback(caster, localStore, castId)); } else { final ABAbilityBuilderAbility abil = localStore.originAbility; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAbilityCastRange.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAbilityCastRange.java index 33e875eed..2522e8c8a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAbilityCastRange.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/abilitydata/ABActionSetAbilityCastRange.java @@ -14,10 +14,9 @@ public class ABActionSetAbilityCastRange implements ABSingleAction { private ABFloatCallback range; @Override - public void runAction(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - ABAbilityBuilderActiveAbility ability = (ABAbilityBuilderActiveAbility) localStore - .get(ABLocalStoreKeys.ISTOGGLEDABILITY); + public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + ABAbilityBuilderActiveAbility ability = localStore.get(ABLocalStoreKeys.ISTOGGLEDABILITY, + ABAbilityBuilderActiveAbility.class); ability.setCastRange(range.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java index b6472e2b4..eb3034f3c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddAnimationTag.java @@ -14,8 +14,8 @@ public class ABActionAttackModifierAddAnimationTag implements ABAction { private ABStringCallback tag; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); settings.addAnimationName(SecondaryTag.valueOf(tag.callback(caster, localStore, castId))); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java index 2b8b96375..14fcf4a62 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPostDamageListener.java @@ -13,8 +13,8 @@ public class ABActionAttackModifierAddPostDamageListener implements ABAction { private ABAttackPostDamageListenerCallback listener; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); settings.addPostDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java index 00bad8c13..825f65255 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierAddPreDamageListener.java @@ -13,8 +13,8 @@ public class ABActionAttackModifierAddPreDamageListener implements ABAction { private ABAttackPreDamageListenerCallback listener; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); settings.addPreDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java index ad19d657e..e739bf115 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyAllArtFields.java @@ -14,8 +14,8 @@ public class ABActionAttackModifierApplyAllArtFields implements ABAction { private ABBooleanCallback applyArtIfMissing; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); ABAbilityBuilderAbility abil = localStore.originAbility; String art = abil.getAbilityStringField("Missileart"); if ((art != null && !art.isBlank()) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java index 69977dfee..976170238 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArt.java @@ -14,8 +14,8 @@ public class ABActionAttackModifierApplyArt implements ABAction { private ABBooleanCallback applyArtIfMissing; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); ABAbilityBuilderAbility abil = localStore.originAbility; String art = abil.getAbilityStringField("Missileart"); if ((art != null && !art.isBlank()) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java index 48736856b..68ea9d7bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyArtAndSpeed.java @@ -14,8 +14,8 @@ public class ABActionAttackModifierApplyArtAndSpeed implements ABAction { private ABBooleanCallback applyArtIfMissing; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); ABAbilityBuilderAbility abil = localStore.originAbility; String art = abil.getAbilityStringField("Missileart"); if ((art != null && !art.isBlank()) diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java index 8dba91114..605cfa97a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierApplyDefaultSpeed.java @@ -10,8 +10,8 @@ public class ABActionAttackModifierApplyDefaultSpeed implements ABAction { public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); if (settings.getProjectileSpeed() == 0) { settings.setProjectileSpeed(900); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java index dbbcb8769..1e414046c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherModifications.java @@ -10,8 +10,8 @@ public class ABActionAttackModifierPreventOtherModifications implements ABAction { public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKMODLOOP, castId)); + CUnitPriorityLoopData loop = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKMODLOOP, castId), + CUnitPriorityLoopData.class); if (loop != null) loop.preventAllOtherModifications(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java index 06fb61589..38c8f00fd 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierPreventOtherSamePriorityModifications.java @@ -10,8 +10,8 @@ public class ABActionAttackModifierPreventOtherSamePriorityModifications implements ABAction { public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitPriorityLoopData loop = (CUnitPriorityLoopData) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKMODLOOP, castId)); + CUnitPriorityLoopData loop = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKMODLOOP, castId), + CUnitPriorityLoopData.class); if (loop != null) loop.preventOtherModificationsWithSamePriority(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java index e00ded57d..a4a8b3645 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemoveAnimationTag.java @@ -14,8 +14,8 @@ public class ABActionAttackModifierRemoveAnimationTag implements ABAction { private ABStringCallback tag; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); settings.removeAnimationName(SecondaryTag.valueOf(tag.callback(caster, localStore, castId))); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java index d22a67bc4..0db5cd63a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePostDamageListener.java @@ -13,8 +13,8 @@ public class ABActionAttackModifierRemovePostDamageListener implements ABAction private ABAttackPostDamageListenerCallback listener; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); settings.removePostDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java index 072f050cc..52857ee74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierRemovePreDamageListener.java @@ -13,8 +13,8 @@ public class ABActionAttackModifierRemovePreDamageListener implements ABAction { private ABAttackPreDamageListenerCallback listener; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); settings.removePreDamageListener(listener.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java index 86d67b7fa..8b72016c7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackArc.java @@ -13,8 +13,8 @@ public class ABActionAttackModifierSetAttackArc implements ABAction { private ABFloatCallback arc; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); if (arc != null) { settings.setProjectileArc(arc.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java index 27fd646a4..9181e02b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackDeathTime.java @@ -13,8 +13,8 @@ public class ABActionAttackModifierSetAttackDeathTime implements ABAction { private ABFloatCallback deathTime; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); if (deathTime != null) { settings.setArtDeathTime(deathTime.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java index fe70343f3..b015dfebc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackHoming.java @@ -13,8 +13,8 @@ public class ABActionAttackModifierSetAttackHoming implements ABAction { private ABBooleanCallback homing; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); if (homing != null) { settings.setProjectileHomingEnabled(homing.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java index a92df309f..999f73aea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackImpactZ.java @@ -13,8 +13,8 @@ public class ABActionAttackModifierSetAttackImpactZ implements ABAction { private ABFloatCallback impactZ; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); if (impactZ != null) { settings.setImpactZ(impactZ.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java index 072c940fe..2206cec24 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetAttackStartZ.java @@ -13,8 +13,8 @@ public class ABActionAttackModifierSetAttackStartZ implements ABAction { private ABFloatCallback z; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); if (z != null) { settings.setZ(z.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java index dd0b067be..d6f3116ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABActionAttackModifierSetSplashFields.java @@ -18,8 +18,8 @@ public class ABActionAttackModifierSetSplashFields implements ABAction { private ABFloatCallback damageFactorSmall; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); if (areaOfEffectFullDamage != null) { settings.setAreaOfEffectFullDamage(areaOfEffectFullDamage.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java index ad3cbf7e7..3d557a389 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackAttackType.java @@ -11,7 +11,7 @@ public class ABCallbackGetModifiedAttackAttackType extends ABAttackTypeCallback @Override public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId), CUnitAttack.class) .getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java index 518aa7a10..bd6202766 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackDamageType.java @@ -11,7 +11,7 @@ public class ABCallbackGetModifiedAttackDamageType extends ABDamageTypeCallback @Override public CDamageType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId), CUnitAttack.class) .getWeaponType().getDamageType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java index dbd9a3694..16740799b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/attackmodifier/internal/ABCallbackGetModifiedAttackWeaponType.java @@ -11,7 +11,7 @@ public class ABCallbackGetModifiedAttackWeaponType extends ABWeaponTypeCallback @Override public CWeaponType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId), CUnitAttack.class) .getWeaponType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java index 4ebb5f6f0..23c0cb4a3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionAttemptToReOrderPreviousBehavior.java @@ -14,7 +14,7 @@ public class ABActionAttemptToReOrderPreviousBehavior implements ABAction { @Override public void runAction(CUnit caster, ABLocalDataStore localStore, int castId) { - CBehavior b = (CBehavior) localStore.get(ABLocalStoreKeys.PREVIOUSBEHAVIOR); + CBehavior b = localStore.get(ABLocalStoreKeys.PREVIOUSBEHAVIOR, CBehavior.class); if (b != null && b != caster.getCurrentBehavior()) { if (checkForOrders == null || checkForOrders.callback(caster, localStore, castId)) { if (caster.getOrderQueue().isEmpty()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java index ec3db3a16..24cbef175 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/behavior/ABActionForceBeginCreatedBehavior.java @@ -17,7 +17,7 @@ public void runAction(CUnit caster, ABLocalDataStore localStore, final int castI if (unit != null) { targetUnit = this.unit.callback(caster, localStore, castId); } - CBehavior newBehavior = (CBehavior) localStore.get(ABLocalStoreKeys.NEWBEHAVIOR); + CBehavior newBehavior = localStore.get(ABLocalStoreKeys.NEWBEHAVIOR, CBehavior.class); if (newBehavior != null) { localStore.remove(ABLocalStoreKeys.NEWBEHAVIOR); targetUnit.beginBehavior(localStore.game, newBehavior, true); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddSlowBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddSlowBuff.java index cf4e7b15e..929801eaa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddSlowBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddSlowBuff.java @@ -34,7 +34,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (leveled != null) { isLeveled = leveled.callback(caster, localStore, castId); } else { - isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + isLeveled = localStore.getBooleanOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } if (showIcon != null) { isShowIcon = showIcon.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddStunBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddStunBuff.java index 3b6bae941..d7caa2af0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddStunBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionAddStunBuff.java @@ -34,7 +34,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (leveled != null) { isLeveled = leveled.callback(caster, localStore, castId); } else { - isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + isLeveled = localStore.getBooleanOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } if (showIcon != null) { isShowIcon = showIcon.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreatePassiveBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreatePassiveBuff.java index 41dccd01b..e1e002b57 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreatePassiveBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreatePassiveBuff.java @@ -42,7 +42,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (leveled != null) { isLeveled = leveled.callback(caster, localStore, castId); } else { - isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + isLeveled = localStore.getBooleanOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedArtBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedArtBuff.java index 01a71f366..58ae6967e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedArtBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedArtBuff.java @@ -38,7 +38,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (leveled != null) { isLeveled = leveled.callback(caster, localStore, castId); } else { - isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + isLeveled = localStore.getBooleanOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedBuff.java index 3da808fce..ffd061c78 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedBuff.java @@ -60,7 +60,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (leveled != null) { isLeveled = leveled.callback(caster, localStore, castId); } else { - isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + isLeveled = localStore.getBooleanOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java index 8b0e2289c..c1acc558c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedPausedExpirationBuff.java @@ -59,7 +59,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (leveled != null) { isLeveled = leveled.callback(caster, localStore, castId); } else { - isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + isLeveled = localStore.getBooleanOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingBuff.java index 9d4186c57..85d16a004 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingBuff.java @@ -60,7 +60,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (leveled != null) { isLeveled = leveled.callback(caster, localStore, castId); } else { - isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + isLeveled = localStore.getBooleanOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java index 64fc228cb..8ac1a1b61 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPausedBuff.java @@ -60,7 +60,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (leveled != null) { isLeveled = leveled.callback(caster, localStore, castId); } else { - isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + isLeveled = localStore.getBooleanOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java index 335cc0085..477d1c5d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/buff/ABActionCreateTimedTickingPostDeathBuff.java @@ -60,7 +60,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (leveled != null) { isLeveled = leveled.callback(caster, localStore, castId); } else { - isLeveled = (boolean) localStore.getOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); + isLeveled = localStore.getBooleanOrDefault(ABLocalStoreKeys.ISABILITYLEVELED, false); } boolean isPositive = true; if (positive != null) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java index 1654ffe13..1f51f1471 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/destructablebuff/ABActionCreateDestructableBuff.java @@ -30,10 +30,9 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin } CDestructableBuff ability = new ABDestructableBuff(localStore.game.getHandleIdAllocator().createId(), buffId.callback(caster, localStore, castId), - castId != ABConstants.NO_CAST_ID - ? localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), - int.class) - : localStore.originAbility.getLevel(), + castId != ABConstants.NO_CAST_ID ? localStore.getIntOrDefault( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), + localStore.originAbility.getLevel()) : localStore.originAbility.getLevel(), localStore, onAddActions, onRemoveActions, onDeathActions, castId, caster, isDispellable); localStore.put(ABLocalStoreKeys.LASTCREATEDDESTBUFF, ability); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java index 90afd410b..d19c05e74 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtLocation.java @@ -29,7 +29,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, } War3ID theId = null; if (id == null) { - theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + theId = localStore.get(ABLocalStoreKeys.ALIAS, War3ID.class); } else { theId = id.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java index d95b2d838..f468f1616 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectAtPoint.java @@ -26,7 +26,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, } War3ID theId = null; if (id == null) { - theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + theId = localStore.get(ABLocalStoreKeys.ALIAS, War3ID.class); } else { theId = id.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java index 9bda4e691..992607264 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateSpellEffectOnUnit.java @@ -21,7 +21,7 @@ public class ABActionCreateSpellEffectOnUnit implements ABAction { public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { War3ID theId = null; if (id == null) { - theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + theId = localStore.get(ABLocalStoreKeys.ALIAS, War3ID.class); } else { theId = id.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java index 7970946ba..415f2a03f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtLocation.java @@ -28,7 +28,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin } War3ID theId = null; if (id == null) { - theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + theId = localStore.get(ABLocalStoreKeys.ALIAS, War3ID.class); } else { theId = id.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java index 7a0afddd9..4da936b67 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectAtPoint.java @@ -27,7 +27,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, } War3ID theId = null; if (id == null) { - theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + theId = localStore.get(ABLocalStoreKeys.ALIAS, War3ID.class); } else { theId = id.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java index 24dc015e9..aed5a7568 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/ABActionCreateTemporarySpellEffectOnUnit.java @@ -20,7 +20,7 @@ public class ABActionCreateTemporarySpellEffectOnUnit implements ABSingleAction public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { War3ID theId = null; if (id == null) { - theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + theId = localStore.get(ABLocalStoreKeys.ALIAS, War3ID.class); } else { theId = id.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java index b83213a8f..2255cfde0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/group/ABActionCreateGroupEffectAtLocation.java @@ -26,7 +26,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, float rad = radius.callback(caster, localStore, castId); War3ID theId = null; if (id == null) { - theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + theId = localStore.get(ABLocalStoreKeys.ALIAS, War3ID.class); } else { theId = id.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/lightning/ABActionCreateLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/lightning/ABActionCreateLightningEffect.java index 90c4a664d..03e49f594 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/lightning/ABActionCreateLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/fx/lightning/ABActionCreateLightningEffect.java @@ -26,7 +26,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin } War3ID theId = null; if (id == null) { - theId = (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + theId = localStore.get(ABLocalStoreKeys.ALIAS, War3ID.class); } else { theId = id.callback(caster, localStore, castId); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java index 60d365ebb..cf9a73ad8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateLocationTargetedPseudoProjectile.java @@ -103,7 +103,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin isProvideCounts = this.provideCounts.callback(caster, localStore, castId); } - final GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + final GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); if (this.speed != null) { theSpeed = this.speed.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java index 3cc22b948..77ef64c2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/projectile/ABActionCreateUnitTargetedPseudoProjectile.java @@ -102,7 +102,7 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin isProvideCounts = this.provideCounts.callback(caster, localStore, castId); } - final GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + final GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); if (this.speed != null) { theSpeed = this.speed.callback(caster, localStore, castId); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionPeriodicExecute.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionPeriodicExecute.java index 5e618bf8d..7b59b2de0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionPeriodicExecute.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/structural/ABActionPeriodicExecute.java @@ -29,13 +29,13 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin u = this.unique.callback(caster, localStore, castId); if (localStore .containsKey(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId) + "$" + u)) { - nextActiveTick = (float) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId) + "$" + u); + nextActiveTick = localStore + .getFloat(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId) + "$" + u); } } else { if (localStore.containsKey(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId))) { - nextActiveTick = (float) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId)); + nextActiveTick = localStore + .getFloat(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PERIODICNEXTTICK, castId)); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java index 2f8003d44..f969b1e95 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddBonusDamage.java @@ -40,8 +40,8 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin theAttackType = attackType.callback(caster, localStore, castId); } - CDamageCalculation damage = ((CDamageCalculation) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); + CDamageCalculation damage = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), + CDamageCalculation.class); CDamageFlags theFlags = null; if (inheritFlags == null || inheritFlags.callback(caster, localStore, castId)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java index 5c0c7e8cc..ac4f4aaa8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerAddDamageMultiplier.java @@ -13,8 +13,8 @@ public class ABActionPreDamageListenerAddDamageMultiplier implements ABAction { private ABFloatCallback value; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); + CDamageCalculation damage = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), + CDamageCalculation.class); damage.addDamageMultiplier(value.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java index 40a5c5847..c09b299b3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerLockDamageModifications.java @@ -10,8 +10,8 @@ public class ABActionPreDamageListenerLockDamageModifications implements ABAction { public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); + CDamageCalculation damage = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), + CDamageCalculation.class); damage.lock(); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java index 09e5b07cd..8e7b8a712 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionPreDamageListenerSetMiss.java @@ -13,8 +13,8 @@ public class ABActionPreDamageListenerSetMiss implements ABAction { private ABBooleanCallback miss; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); + CDamageCalculation damage = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), + CDamageCalculation.class); if (miss != null) { damage.setMiss(miss.callback(caster, localStore, castId)); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java index e3e926e7a..2e402cf8d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalaction/ABActionSetPreDamageStacking.java @@ -14,8 +14,8 @@ public class ABActionSetPreDamageStacking implements ABAction { private ABBooleanCallback allowSamePriorityStacking; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); + CDamageCalculation damage = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), + CDamageCalculation.class); if (allowStacking != null && !allowStacking.callback(caster, localStore, castId)) { damage.preventAllOtherModifications(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java index 6e458e19d..8b34bcf03 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackBaseDamage.java @@ -10,8 +10,8 @@ public class ABCallbackGetAttackBaseDamage extends ABFloatCallback { @Override public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); return settings.getBaseDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java index a881ccbec..d67670304 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackDamageType.java @@ -11,7 +11,7 @@ public class ABCallbackGetAttackDamageType extends ABDamageTypeCallback { @Override public CDamageType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId), CUnitAttack.class)) .getWeaponType().getDamageType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java index 197b1789a..206586a46 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackMaximumSplashRadius.java @@ -10,8 +10,8 @@ public class ABCallbackGetAttackMaximumSplashRadius extends ABIntegerCallback { @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); return Math.max(settings.getAreaOfEffectFullDamage(), Math.max(settings.getAreaOfEffectMediumDamage(), settings.getAreaOfEffectSmallDamage())); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java index 1755dd48b..062f22855 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackType.java @@ -11,7 +11,7 @@ public class ABCallbackGetAttackType extends ABAttackTypeCallback { @Override public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId), CUnitAttack.class)) .getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java index ff9938be4..3034ef4e7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcallback/ABCallbackGetAttackWeaponType.java @@ -11,7 +11,7 @@ public class ABCallbackGetAttackWeaponType extends ABWeaponTypeCallback { @Override public CWeaponType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId), CUnitAttack.class)) .getWeaponType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java index 9eba62d92..4d72dc451 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackArtillery.java @@ -12,8 +12,8 @@ public class ABConditionIsAttackArtillery extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnitAttack attack = (CUnitAttack) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId)); + CUnitAttack attack = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId), + CUnitAttack.class); if (attack instanceof CUnitAttackMissileSplash) { return ((CUnitAttackMissileSplash) attack).isArtillery(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java index 3440fa6fd..d45876389 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsAttackHoming.java @@ -10,8 +10,8 @@ public class ABConditionIsAttackHoming extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CUnitAttackSettings settings = (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + CUnitAttackSettings settings = localStore + .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), CUnitAttackSettings.class); return settings.isProjectileHomingEnabled(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java index 3e68a10d7..3dfbfe40b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/attack/internalcondition/ABConditionIsUnitValidSplashDamageTarget.java @@ -25,7 +25,7 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int EnumSet targetsAllowed = null; - CUnitAttack atk = (CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId)); + CUnitAttack atk = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId), CUnitAttack.class); if (atk instanceof CUnitAttackMissileSplash) { targetsAllowed = ((CUnitAttackMissileSplash) atk).getAreaOfEffectTargets(); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java index 4e43cd68f..b29bc2163 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcallback/ABCallbackGetNewBehaviorTarget.java @@ -12,8 +12,8 @@ public class ABCallbackGetNewBehaviorTarget extends ABTargetCallback { @Override public AbilityTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - CBehavior beh = (CBehavior) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.POSTCHANGEBEHAVIOR, castId)); + CBehavior beh = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.POSTCHANGEBEHAVIOR, castId), + CBehavior.class); AbilityTarget tar = beh.visit(BehaviorTargetVisitor.INSTANCE); return tar; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java index dcb17da08..c9441b508 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/behavior/internalcondition/ABConditionIsNewBehaviorCategoryInList.java @@ -15,8 +15,8 @@ public class ABConditionIsNewBehaviorCategoryInList extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, int castId) { - CBehavior beh = (CBehavior) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.POSTCHANGEBEHAVIOR, castId)); + CBehavior beh = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.POSTCHANGEBEHAVIOR, castId), + CBehavior.class); CBehaviorCategory cat = CBehaviorCategory.IDLE; if (beh != null) { cat = beh.getBehaviorCategory(); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java index 320ea968b..8bdab0ea0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationMultiplyDamageMultiplier.java @@ -13,8 +13,8 @@ public class ABActionDamageTakenModificationMultiplyDamageMultiplier implements private ABFloatCallback multiplier; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); + CDamageCalculation damage = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), + CDamageCalculation.class); damage.addDamageMultiplier(multiplier.callback(caster, localStore, castId)); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java index e02f89ce8..c741212c9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalaction/ABActionDamageTakenModificationSetDamageMultiplier.java @@ -13,8 +13,8 @@ public class ABActionDamageTakenModificationSetDamageMultiplier implements ABAct private ABFloatCallback multiplier; public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CDamageCalculation damage = ((CDamageCalculation) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); + CDamageCalculation damage = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), + CDamageCalculation.class); damage.setDamageMultiplier(multiplier.callback(caster, localStore, castId)); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java index 8036b6fbe..c1feda6e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageAnAttack.java @@ -10,7 +10,7 @@ public class ABConditionIsTriggeringDamageAnAttack extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), CDamageCalculation.class)) .getPrimaryDamageFlags().isAttack(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java index 4c9fa8c04..c50001ddf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/damagetaken/internalcondition/ABConditionIsTriggeringDamageRanged.java @@ -10,7 +10,7 @@ public class ABConditionIsTriggeringDamageRanged extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), CDamageCalculation.class)) .getPrimaryDamageFlags().isRanged(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java index 07dc478ee..a858843d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReincarnating.java @@ -11,10 +11,11 @@ public class ABActionDeathReplacementSetReincarnating implements ABAction { public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitDeathReplacementResult result = (CUnitDeathReplacementResult) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHRESULT, castId)); - CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHSTACKING, castId)); + CUnitDeathReplacementResult result = localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHRESULT, castId), CUnitDeathReplacementResult.class); + CUnitDeathReplacementStacking stacking = localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHSTACKING, castId), + CUnitDeathReplacementStacking.class); stacking.setAllowStacking(false); stacking.setAllowSamePriorityStacking(false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java index e76e668c3..ef636df12 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/death/internalaction/ABActionDeathReplacementSetReviving.java @@ -11,10 +11,11 @@ public class ABActionDeathReplacementSetReviving implements ABAction { public void runAction(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - CUnitDeathReplacementResult result = (CUnitDeathReplacementResult) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHRESULT, castId)); - CUnitDeathReplacementStacking stacking = (CUnitDeathReplacementStacking) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHSTACKING, castId)); + CUnitDeathReplacementResult result = localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHRESULT, castId), CUnitDeathReplacementResult.class); + CUnitDeathReplacementStacking stacking = localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DEATHSTACKING, castId), + CUnitDeathReplacementStacking.class); stacking.setAllowStacking(false); stacking.setAllowSamePriorityStacking(false); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java index d7fae2310..b875842f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileAttackType.java @@ -11,7 +11,7 @@ public class ABCallbackGetReactionAttackProjectileAttackType extends ABAttackTyp @Override public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKPROJ, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKPROJ, castId), CAttackProjectile.class)) .getUnitAttack().getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java index 996e243c9..1611a6d2a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/reaction/internalcallback/ABCallbackGetReactionAttackProjectileDamage.java @@ -10,7 +10,7 @@ public class ABCallbackGetReactionAttackProjectileDamage extends ABFloatCallback @Override public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CAttackProjectile) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKPROJ, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKPROJ, castId), CAttackProjectile.class)) .getDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java index 7aafb6253..fed9a7c30 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalactions/ABActionSubtractTotalDamageDealt.java @@ -25,8 +25,8 @@ public void runAction(final CUnit caster, final ABLocalDataStore localStore, fin if (minimum != null) { theMin = minimum.callback(caster, localStore, castId); } - CDamageCalculation damage = ((CDamageCalculation) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))); + CDamageCalculation damage = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), + CDamageCalculation.class); damage.subtractTotalDamageDealt(amount.callback(caster, localStore, castId), theMin); } } \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java index 683f69e9d..e9ccd18c6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetFinalTotalDamageDealt.java @@ -16,7 +16,7 @@ public class ABCallbackGetFinalTotalDamageDealt extends ABFloatCallback { @Override public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), CDamageCalculation.class)) .computeFinalDamage(localStore.game, caster); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java index 8cdc2572b..c88813b16 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetRawTotalDamageDealt.java @@ -16,7 +16,7 @@ public class ABCallbackGetRawTotalDamageDealt extends ABFloatCallback { @Override public Float callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), CDamageCalculation.class)) .computeRawTotalDamage(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java index 8fd0017c5..baeee1af7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringAttackType.java @@ -16,7 +16,7 @@ public class ABCallbackGetTriggeringAttackType extends ABAttackTypeCallback { @Override public CAttackType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), CDamageCalculation.class)) .getAttackType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java index 335707104..304cc2a11 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/action/unitlisteners/sharedinternalcallbacks/ABCallbackGetTriggeringDamageType.java @@ -16,7 +16,7 @@ public class ABCallbackGetTriggeringDamageType extends ABDamageTypeCallback { @Override public CDamageType callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CDamageCalculation) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGECALC, castId), CDamageCalculation.class)) .getPrimaryDamageType(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackArgumentAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackArgumentAbility.java index dae10273f..e6c495dc6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackArgumentAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackArgumentAbility.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentAbility extends ABAbilityCallback { @Override public CAbility callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABAbilityCallback) { return ((ABAbilityCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java index 70bbdb6ad..a142b124e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetLastCreatedAbility.java @@ -11,7 +11,7 @@ public class ABCallbackGetLastCreatedAbility extends ABAbilityCallback { @Override public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CAbility) localStore.get(ABLocalStoreKeys.LASTCREATEDABILITY); + return localStore.get(ABLocalStoreKeys.LASTCREATEDABILITY, CAbility.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetMatchingAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetMatchingAbility.java index 01f2ceb93..a754cac36 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetMatchingAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetMatchingAbility.java @@ -11,7 +11,7 @@ public class ABCallbackGetMatchingAbility extends ABAbilityCallback { @Override public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CAbility) localStore.get(ABLocalStoreKeys.MATCHINGABILITY); + return localStore.get(ABLocalStoreKeys.MATCHINGABILITY, CAbility.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetPartnerAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetPartnerAbility.java index 293a6dcc2..5b8bd7b09 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetPartnerAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetPartnerAbility.java @@ -11,7 +11,7 @@ public class ABCallbackGetPartnerAbility extends ABAbilityCallback { @Override public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CAbility) localStore.get(ABLocalStoreKeys.LASTPARTNERABILITY); + return localStore.get(ABLocalStoreKeys.LASTPARTNERABILITY, CAbility.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetReactionAbility.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetReactionAbility.java index fab956094..335ccf447 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetReactionAbility.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetReactionAbility.java @@ -11,7 +11,7 @@ public class ABCallbackGetReactionAbility extends ABAbilityCallback { @Override public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CAbility) localStore.get(ABLocalStoreKeys.REACTIONABILITY); + return localStore.get(ABLocalStoreKeys.REACTIONABILITY, CAbility.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java index d2154b67b..55a586120 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/ability/ABCallbackGetStoredAbilityByKey.java @@ -16,12 +16,13 @@ public class ABCallbackGetStoredAbilityByKey extends ABAbilityCallback { @Override public CAbility callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (CAbility) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); - } - else { - return (CAbility) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + CAbility.class); + } else { + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + CAbility.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java index d5bd54725..75046fc41 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetLastCreatedAttackModifier.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedAttackModifier extends ABAttackModifierCall @Override public ABAttackModifier callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABAttackModifier) localStore.get(ABLocalStoreKeys.LASTCREATEDAMod); + return localStore.get(ABLocalStoreKeys.LASTCREATEDAMod, ABAttackModifier.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java index 86bdf74cf..d6dde81b9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attack/ABCallbackGetStoredAttackModifierByKey.java @@ -14,11 +14,12 @@ public class ABCallbackGetStoredAttackModifierByKey extends ABAttackModifierCall @Override public ABAttackModifier callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABAttackModifier) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABAttackModifier.class); } else { - return (ABAttackModifier) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABAttackModifier.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java index adf2c1f58..5ec20ce3d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetCurrentAttackSettings.java @@ -9,8 +9,8 @@ public class ABCallbackGetCurrentAttackSettings extends ABAttackSettingsCallback @Override public CUnitAttackSettings callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnitAttackSettings) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKSETTINGS, castId), + CUnitAttackSettings.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java index 00a701b25..22351d59e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetLastCreatedAttackSettings.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedAttackSettings extends ABAttackSettingsCall @Override public CUnitAttackSettings callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.LASTCREATEDASettings); + return localStore.get(ABLocalStoreKeys.LASTCREATEDASettings, CUnitAttackSettings.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java index 553d51c45..61e2d25b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/attacksettings/ABCallbackGetStoredAttackSettingsByKey.java @@ -14,9 +14,12 @@ public class ABCallbackGetStoredAttackSettingsByKey extends ABAttackSettingsCall @Override public CUnitAttackSettings callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + CUnitAttackSettings.class); } else { - return (CUnitAttackSettings) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + CUnitAttackSettings.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackArgumentBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackArgumentBuff.java index 836a80902..df3c6b366 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackArgumentBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackArgumentBuff.java @@ -13,14 +13,14 @@ public class ABCallbackArgumentBuff extends ABBuffCallback { private ABStringCallback name; @Override - public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABBuffCallback) { return ((ABBuffCallback) cbck).callback(caster, localStore, castId); } else { - System.err.println("Trying to run ReuseBuffCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseBuffCallback, but key is missing or callback was the wrong type: " + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackEnumBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackEnumBuff.java index 6a7007c1c..07eb212bf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackEnumBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackEnumBuff.java @@ -12,7 +12,7 @@ public class ABCallbackEnumBuff extends ABBuffCallback { @Override public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (CBuff) localStore.get(ABLocalStoreKeys.ENUMBUFF); + return localStore.get(ABLocalStoreKeys.ENUMBUFF, CBuff.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java index 4543ddf2f..5bcd50798 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetLastCreatedBuff.java @@ -11,7 +11,7 @@ public class ABCallbackGetLastCreatedBuff extends ABBuffCallback { @Override public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (CBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDBUFF); + return localStore.get(ABLocalStoreKeys.LASTCREATEDBUFF, CBuff.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetMatchingBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetMatchingBuff.java index bfbe5b578..8a28e209e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetMatchingBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetMatchingBuff.java @@ -11,7 +11,7 @@ public class ABCallbackGetMatchingBuff extends ABBuffCallback { @Override public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (CBuff) localStore.get(ABLocalStoreKeys.MATCHINGBUFF); + return localStore.get(ABLocalStoreKeys.MATCHINGBUFF, CBuff.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java index 4ee602b2c..b1b152abc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackGetStoredBuffByKey.java @@ -16,12 +16,13 @@ public class ABCallbackGetStoredBuffByKey extends ABBuffCallback { @Override public CBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (CBuff) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); - } - else { - return (CBuff) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + CBuff.class); + } else { + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + CBuff.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackThisBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackThisBuff.java index 7a75be1d0..45b253733 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackThisBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/buff/ABCallbackThisBuff.java @@ -12,7 +12,7 @@ public class ABCallbackThisBuff extends ABBuffCallback { @Override public CBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (CBuff) localStore.get(ABLocalStoreKeys.BUFF); + return localStore.get(ABLocalStoreKeys.BUFF, CBuff.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackArgumentDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackArgumentDestructable.java index 0e1eedcc8..4c0351e8a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackArgumentDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackArgumentDestructable.java @@ -13,14 +13,15 @@ public class ABCallbackArgumentDestructable extends ABDestructableCallback { private ABStringCallback name; @Override - public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABDestructableCallback) { return ((ABDestructableCallback) cbck).callback(caster, localStore, castId); } else { - System.err.println("Trying to run ReuseDestructableCallback, but key is missing or callback was the wrong type: " + keyS); + System.err.println( + "Trying to run ReuseDestructableCallback, but key is missing or callback was the wrong type: " + + keyS); } return null; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java index dc5efed3d..fbacb8637 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAbilityTargetedDestructable.java @@ -9,7 +9,7 @@ public class ABCallbackGetAbilityTargetedDestructable extends ABDestructableCall @Override public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CDestructable) localStore.get(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE); + return localStore.get(ABLocalStoreKeys.ABILITYTARGETEDDESTRUCTABLE, CDestructable.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java index 1641cf601..44ebafd02 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetAttackedDestructable.java @@ -11,8 +11,8 @@ public class ABCallbackGetAttackedDestructable extends ABDestructableCallback { @Override public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId)); + AbilityTarget tar = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId), + AbilityTarget.class); return tar.visit(AbilityTargetVisitor.DESTRUCTABLE); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetEnumDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetEnumDestructable.java index 0858c68b5..76f816808 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetEnumDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetEnumDestructable.java @@ -9,7 +9,7 @@ public class ABCallbackGetEnumDestructable extends ABDestructableCallback { @Override public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CDestructable) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMDESTRUCTABLE, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMDESTRUCTABLE, castId), CDestructable.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java index f1ea963a7..3f1907b38 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetLastCreatedDestructable.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedDestructable extends ABDestructableCallback @Override public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CDestructable) localStore.get(ABLocalStoreKeys.LASTCREATEDDESTRUCTABLE); + return localStore.get(ABLocalStoreKeys.LASTCREATEDDESTRUCTABLE, CDestructable.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java index e4e6ea9ad..8dec3d7aa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetProjectileHitDestructable.java @@ -9,7 +9,7 @@ public class ABCallbackGetProjectileHitDestructable extends ABDestructableCallba @Override public CDestructable callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CDestructable) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId), CDestructable.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java index b163a9519..74576d715 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructable/ABCallbackGetStoredDestructableByKey.java @@ -14,15 +14,15 @@ public class ABCallbackGetStoredDestructableByKey extends ABDestructableCallback private ABBooleanCallback instanceValue; @Override - public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public CDestructable callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (CDestructable) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); - } - else { - return (CDestructable) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + CDestructable.class); + } else { + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + CDestructable.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java index d42fedf0d..96e856274 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackArgumentDestructableBuff.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentDestructableBuff extends ABDestructableBuffCallba @Override public CDestructableBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABDestructableBuffCallback) { return ((ABDestructableBuffCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java index db44e2dbd..451f9af55 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackEnumDestructableBuff.java @@ -9,7 +9,7 @@ public class ABCallbackEnumDestructableBuff extends ABDestructableBuffCallback { @Override public CDestructableBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CDestructableBuff) localStore.get(ABLocalStoreKeys.ENUMDESTBUFF); + return localStore.get(ABLocalStoreKeys.ENUMDESTBUFF, CDestructableBuff.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java index 7e24bc2f8..54990988c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetLastCreatedDestructableBuff.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedDestructableBuff extends ABDestructableBuff @Override public CDestructableBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CDestructableBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDDESTBUFF); + return localStore.get(ABLocalStoreKeys.LASTCREATEDDESTBUFF, CDestructableBuff.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java index 4e6eb1db9..da21e1e97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackGetStoredDestructableBuffByKey.java @@ -11,13 +11,16 @@ public class ABCallbackGetStoredDestructableBuffByKey extends ABDestructableBuff private ABStringCallback key; private ABBooleanCallback instanceValue; - + @Override public CDestructableBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (CDestructableBuff) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + CDestructableBuff.class); } else { - return (CDestructableBuff) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + CDestructableBuff.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java index 40b70609b..d8d82e33f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/destructablebuff/ABCallbackMatchingDestructableBuff.java @@ -9,7 +9,7 @@ public class ABCallbackMatchingDestructableBuff extends ABDestructableBuffCallba @Override public CDestructableBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CDestructableBuff) localStore.get(ABLocalStoreKeys.MATCHINGDESTBUFF); + return localStore.get(ABLocalStoreKeys.MATCHINGDESTBUFF, CDestructableBuff.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java index cb0925e0b..034f90360 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredAttackTypeByKey.java @@ -15,11 +15,13 @@ public class ABCallbackGetStoredAttackTypeByKey extends ABAttackTypeCallback { @Override public CAttackType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (CAttackType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + CAttackType.class); } else { - return (CAttackType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + CAttackType.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java index b9e5e743b..ddde27900 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDamageTypeByKey.java @@ -13,15 +13,15 @@ public class ABCallbackGetStoredDamageTypeByKey extends ABDamageTypeCallback { private ABBooleanCallback instanceValue; @Override - public CDamageType callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public CDamageType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (CDamageType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); - } - else { - return (CDamageType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + CDamageType.class); + } else { + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + CDamageType.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java index d1cf3e3b7..0f570aba4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredDefenseTypeByKey.java @@ -13,15 +13,15 @@ public class ABCallbackGetStoredDefenseTypeByKey extends ABDefenseTypeCallback { private ABBooleanCallback instanceValue; @Override - public CDefenseType callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public CDefenseType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (CDefenseType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); - } - else { - return (CDefenseType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + CDefenseType.class); + } else { + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + CDefenseType.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java index 5f8bbd40b..f5a7065d9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredMovementTypeByKey.java @@ -13,15 +13,15 @@ public class ABCallbackGetStoredMovementTypeByKey extends ABMovementTypeCallback private ABBooleanCallback instanceValue; @Override - public MovementType callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public MovementType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (MovementType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); - } - else { - return (MovementType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + MovementType.class); + } else { + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + MovementType.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java index 616a3c341..63f3e5ca8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredTargetTypeByKey.java @@ -15,11 +15,13 @@ public class ABCallbackGetStoredTargetTypeByKey extends ABTargetTypeCallback { @Override public CTargetType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (CTargetType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + CTargetType.class); } else { - return (CTargetType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + CTargetType.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java index 25985fe79..c3bae160e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/enums/ABCallbackGetStoredWeaponTypeByKey.java @@ -15,11 +15,13 @@ public class ABCallbackGetStoredWeaponTypeByKey extends ABWeaponTypeCallback { @Override public CWeaponType callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (CWeaponType) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + CWeaponType.class); } else { - return (CWeaponType) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + CWeaponType.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java index fdc3bdf3b..3b8e66ee8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackArgumentTimeOfDayEvent.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentTimeOfDayEvent extends ABTimeOfDayEventCallback { @Override public ABTimeOfDayEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABTimeOfDayEventCallback) { return ((ABTimeOfDayEventCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java index cd0b06f06..c4d7401b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetLastCreatedTimeOfDayEvent.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedTimeOfDayEvent extends ABTimeOfDayEventCall @Override public ABTimeOfDayEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABTimeOfDayEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDTODEVENT); + return localStore.get(ABLocalStoreKeys.LASTCREATEDTODEVENT, ABTimeOfDayEvent.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java index 4fff8056a..5bf3f6c63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/timeevent/ABCallbackGetStoredTimeOfDayEventByKey.java @@ -15,11 +15,12 @@ public class ABCallbackGetStoredTimeOfDayEventByKey extends ABTimeOfDayEventCall @Override public ABTimeOfDayEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABTimeOfDayEvent) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABTimeOfDayEvent.class); } else { - return (ABTimeOfDayEvent) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABTimeOfDayEvent.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java index 43a96ab4e..c2bdc55ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackArgumentWidgetEvent.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentWidgetEvent extends ABWidgetEventCallback { @Override public ABWidgetEvent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABWidgetEventCallback) { return ((ABWidgetEventCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java index f5073c8b4..467e8d6dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetLastCreatedWidgetEvent.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedWidgetEvent extends ABWidgetEventCallback { @Override public ABWidgetEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABWidgetEvent) localStore.get(ABLocalStoreKeys.LASTCREATEDWIDEVENT); + return localStore.get(ABLocalStoreKeys.LASTCREATEDWIDEVENT, ABWidgetEvent.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java index 837b5840e..1526ac228 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/event/widgetevent/ABCallbackGetStoredWidgetEventByKey.java @@ -15,11 +15,12 @@ public class ABCallbackGetStoredWidgetEventByKey extends ABWidgetEventCallback { @Override public ABWidgetEvent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABWidgetEvent) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABWidgetEvent.class); } else { - return (ABWidgetEvent) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABWidgetEvent.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackArgumentFloat.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackArgumentFloat.java index 6eff69722..92c498c29 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackArgumentFloat.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackArgumentFloat.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentFloat extends ABFloatCallback { public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABFloatCallback) { return ((ABFloatCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java index c223c173b..b4f437b52 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetAbilityProjectileSpeed.java @@ -12,7 +12,7 @@ public class ABCallbackGetAbilityProjectileSpeed extends ABFloatCallback { public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - final GameObject editorData = (GameObject) localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA); + final GameObject editorData = localStore.get(ABLocalStoreKeys.ABILITYEDITORDATA, GameObject.class); return editorData.getFieldAsFloat(AbilityFields.PROJECTILE_SPEED, 0); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java index 3791b964e..8122e9d6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/floats/ABCallbackGetStoredFloatByKey.java @@ -13,15 +13,15 @@ public class ABCallbackGetStoredFloatByKey extends ABFloatCallback { private ABBooleanCallback instanceValue; @Override - public Float callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public Float callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (Float) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); - } - else { - return (Float) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + Float.class); + } else { + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + Float.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackArgumentFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackArgumentFX.java index cd2a04b03..4f0230c7c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackArgumentFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackArgumentFX.java @@ -16,7 +16,7 @@ public class ABCallbackArgumentFX extends ABFXCallback { public SimulationRenderComponent callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABFXCallback) { return ((ABFXCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedFX.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedFX.java index 6ac85859a..6cbd3eaa2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedFX.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedFX.java @@ -10,7 +10,7 @@ public class ABCallbackGetLastCreatedFX extends ABFXCallback { @Override public SimulationRenderComponent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.LASTCREATEDFX); + return localStore.get(ABLocalStoreKeys.LASTCREATEDFX, SimulationRenderComponent.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java index 8830b5a37..a117447ec 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetLastCreatedLightningEffect.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedLightningEffect extends ABLightningCallback @Override public SimulationRenderComponentLightning callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (SimulationRenderComponentLightning) localStore.get(ABLocalStoreKeys.LASTCREATEDLIGHTNING); + return localStore.get(ABLocalStoreKeys.LASTCREATEDLIGHTNING, SimulationRenderComponentLightning.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredFXByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredFXByKey.java index bbe38c968..7b216ef2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredFXByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredFXByKey.java @@ -11,14 +11,16 @@ public class ABCallbackGetStoredFXByKey extends ABFXCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; - + @Override - public SimulationRenderComponent callback(CUnit caster, ABLocalDataStore localStore, - final int castId) { + public SimulationRenderComponent callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + SimulationRenderComponent.class); } else { - return (SimulationRenderComponent) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + SimulationRenderComponent.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java index 9b00a7c2c..8ce3ea6cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/fx/ABCallbackGetStoredLightningByKey.java @@ -15,11 +15,12 @@ public class ABCallbackGetStoredLightningByKey extends ABLightningCallback { @Override public SimulationRenderComponentLightning callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (SimulationRenderComponentLightning) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + SimulationRenderComponentLightning.class); } else { - return (SimulationRenderComponentLightning) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + SimulationRenderComponentLightning.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackArgumentID.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackArgumentID.java index 543751feb..42b8002de 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackArgumentID.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackArgumentID.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentID extends ABIDCallback { @Override public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABIDCallback) { return ((ABIDCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAlias.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAlias.java index 554f93ce9..f46937ff4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAlias.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetAlias.java @@ -12,7 +12,7 @@ public class ABCallbackGetAlias extends ABIDCallback { @Override public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (War3ID) localStore.get(ABLocalStoreKeys.ALIAS); + return localStore.get(ABLocalStoreKeys.ALIAS, War3ID.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetBuffIdFromCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetBuffIdFromCode.java index 07444efe1..d9baa8938 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetBuffIdFromCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetBuffIdFromCode.java @@ -12,7 +12,7 @@ public class ABCallbackGetBuffIdFromCode extends ABIDCallback { @Override public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return ((War3ID) localStore.get(ABLocalStoreKeys.CODE)).set(0, 'B'); + return (localStore.get(ABLocalStoreKeys.CODE, War3ID.class)).set(0, 'B'); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetCode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetCode.java index 18a2b0dc3..81e4b3b4e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetCode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetCode.java @@ -18,7 +18,7 @@ public War3ID callback(final CUnit caster, final ABLocalDataStore localStore, if (ability != null) { return ability.callback(caster, localStore, castId).getCode(); } - return (War3ID) localStore.get(ABLocalStoreKeys.CODE); + return localStore.get(ABLocalStoreKeys.CODE, War3ID.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetStoredIDByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetStoredIDByKey.java index d930b9f13..51f260b2c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetStoredIDByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/id/ABCallbackGetStoredIDByKey.java @@ -15,11 +15,12 @@ public class ABCallbackGetStoredIDByKey extends ABIDCallback { @Override public War3ID callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (War3ID) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + War3ID.class); } else { - return (War3ID) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + War3ID.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackArgumentInteger.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackArgumentInteger.java index 69ec395ff..3f55d85b0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackArgumentInteger.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackArgumentInteger.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentInteger extends ABIntegerCallback { public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABIntegerCallback) { return ((ABIntegerCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemCharges.java index 8de868195..056f3c147 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemCharges.java @@ -12,7 +12,7 @@ public class ABCallbackGetItemCharges extends ABIntegerCallback { @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); + Integer slot = localStore.get(ABLocalStoreKeys.ITEMSLOT, Integer.class); if (slot != null) { return slot; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemLevel.java index 6a0cbcddb..e71cb48a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemLevel.java @@ -12,7 +12,7 @@ public class ABCallbackGetItemLevel extends ABIntegerCallback { @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); + Integer slot = localStore.get(ABLocalStoreKeys.ITEMSLOT, Integer.class); if (slot != null) { return slot; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemMaxCharges.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemMaxCharges.java index d841b7fdc..caa6364d4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemMaxCharges.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemMaxCharges.java @@ -12,7 +12,7 @@ public class ABCallbackGetItemMaxCharges extends ABIntegerCallback { @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); + Integer slot = localStore.get(ABLocalStoreKeys.ITEMSLOT, Integer.class); if (slot != null) { return slot; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemSlot.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemSlot.java index 1b3e101a3..66bf908f3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemSlot.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetItemSlot.java @@ -12,7 +12,7 @@ public class ABCallbackGetItemSlot extends ABIntegerCallback { @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - Integer slot = (Integer) localStore.get(ABLocalStoreKeys.ITEMSLOT); + Integer slot = localStore.get(ABLocalStoreKeys.ITEMSLOT, Integer.class); if (slot != null) { return slot; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java index ab33476a1..085463914 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileDestructableTargets.java @@ -8,7 +8,7 @@ public class ABCallbackGetProjectileDestructableTargets extends ABIntegerCallbac @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEDESTTARGETS, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEDESTTARGETS, castId), Integer.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java index 26cbf183d..246d32c0b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetProjectileUnitTargets.java @@ -10,7 +10,7 @@ public class ABCallbackGetProjectileUnitTargets extends ABIntegerCallback { @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEUNITTARGETS, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEUNITTARGETS, castId), Integer.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java index 72a5e014d..822039f13 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetSpellLevel.java @@ -10,7 +10,8 @@ public class ABCallbackGetSpellLevel extends ABIntegerCallback { @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { return castId != ABConstants.NO_CAST_ID - ? localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), int.class) + ? localStore.getIntOrDefault(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CASTINSTANCELEVEL, castId), + localStore.originAbility.getLevel()) : localStore.originAbility.getLevel(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java index 7133b9881..3e3985faf 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackGetStoredIntegerByKey.java @@ -15,12 +15,13 @@ public class ABCallbackGetStoredIntegerByKey extends ABIntegerCallback { @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (Integer) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); - } - else { - return (Integer) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + Integer.class); + } else { + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + Integer.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIterator.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIterator.java index d8c0032eb..643ec90c4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIterator.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/integers/ABCallbackIterator.java @@ -8,14 +8,15 @@ public class ABCallbackIterator extends ABIntegerCallback { private ABCallback unique; - + @Override public Integer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (this.unique != null) { - return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT+"$"+this.unique.callback(caster, localStore, castId), castId)); - } - else { - return (Integer) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey( + ABLocalStoreKeys.ITERATORCOUNT + "$" + this.unique.callback(caster, localStore, castId), castId), + Integer.class); + } else { + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ITERATORCOUNT, castId), Integer.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackArgumentItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackArgumentItem.java index b39eff009..8613e5c95 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackArgumentItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackArgumentItem.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentItem extends ABItemCallback { @Override public CItem callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABItemCallback) { return ((ABItemCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java index efa2fe0e2..94253df90 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAbilityTargetedItem.java @@ -9,7 +9,7 @@ public class ABCallbackGetAbilityTargetedItem extends ABItemCallback { @Override public CItem callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CItem) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDITEM, castId), CItem.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAttackedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAttackedItem.java index 7f7979e12..72a8fc69f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAttackedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetAttackedItem.java @@ -11,8 +11,8 @@ public class ABCallbackGetAttackedItem extends ABItemCallback { @Override public CItem callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId)); + AbilityTarget tar = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId), + AbilityTarget.class); return tar.visit(AbilityTargetVisitor.ITEM); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetLastCreatedItem.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetLastCreatedItem.java index c260ccec1..4fc0778e8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetLastCreatedItem.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetLastCreatedItem.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedItem extends ABItemCallback { @Override public CItem callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CItem) localStore.get(ABLocalStoreKeys.LASTCREATEDITEM); + return localStore.get(ABLocalStoreKeys.LASTCREATEDITEM, CItem.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetStoredItemByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetStoredItemByKey.java index f0a884e24..96ae791f9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetStoredItemByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/item/ABCallbackGetStoredItemByKey.java @@ -11,13 +11,16 @@ public class ABCallbackGetStoredItemByKey extends ABItemCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; - + @Override public CItem callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (CItem) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + CItem.class); } else { - return (CItem) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + CItem.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentList.java index 9af5706a3..5f20b97d3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentList.java @@ -17,7 +17,7 @@ public class ABCallbackArgumentList extends ABListCallback { @Override public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABListCallback) { return ((ABListCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentSortableList.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentSortableList.java index 27a7b665e..392337f8a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentSortableList.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/list/ABCallbackArgumentSortableList.java @@ -18,7 +18,7 @@ public class ABCallbackArgumentSortableList> ext public List callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABListCallback) { return ((ABListCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java index 9e0b4045a..dcd4de01c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityEffectReactionListener.java @@ -10,7 +10,7 @@ public class ABCallbackGetLastCreatedAbilityEffectReactionListener extends ABAbi @Override public ABAbilityEffectReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABAbilityEffectReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbERL); + return localStore.get(ABLocalStoreKeys.LASTCREATEDAbERL, ABAbilityEffectReactionListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java index 0e35eb0d6..6dc9a54ad 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAbilityProjReactionListener.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedAbilityProjReactionListener extends ABAbili @Override public ABAbilityProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAbPRL); + return localStore.get(ABLocalStoreKeys.LASTCREATEDAbPRL, ABAbilityProjReactionListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java index 634396c5d..9852d283c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPostDamageListener.java @@ -10,7 +10,7 @@ public class ABCallbackGetLastCreatedAttackPostDamageListener extends ABAttackPo @Override public ABAttackPostDamageListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPoDL); + return localStore.get(ABLocalStoreKeys.LASTCREATEDAPoDL, ABAttackPostDamageListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java index 3f2573d2f..6977fb2f4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackPreDamageListener.java @@ -10,7 +10,7 @@ public class ABCallbackGetLastCreatedAttackPreDamageListener extends ABAttackPre @Override public ABAttackPreDamageListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABAttackPreDamageListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAPrDL); + return localStore.get(ABLocalStoreKeys.LASTCREATEDAPrDL, ABAttackPreDamageListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java index 9460b0920..59c9f6283 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedAttackProjReactionListener.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedAttackProjReactionListener extends ABAttack @Override public ABAttackProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAtkPRL); + return localStore.get(ABLocalStoreKeys.LASTCREATEDAtkPRL, ABAttackProjReactionListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java index 1cf9dc704..ab6d9e28b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedBehaviorChangeListener.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedBehaviorChangeListener extends ABBehaviorCh @Override public ABBehaviorChangeListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.LASTCREATEDBCL); + return localStore.get(ABLocalStoreKeys.LASTCREATEDBCL, ABBehaviorChangeListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java index 964c58f85..0f45e88cb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenListener.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedDamageTakenListener extends ABDamageTakenLi @Override public ABDamageTakenListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABDamageTakenListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTL); + return localStore.get(ABLocalStoreKeys.LASTCREATEDDTL, ABDamageTakenListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java index 3cb4c2d0a..46a1957f6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDamageTakenModificationListener.java @@ -10,7 +10,7 @@ public class ABCallbackGetLastCreatedDamageTakenModificationListener extends ABD @Override public ABDamageTakenModificationListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABDamageTakenModificationListener) localStore.get(ABLocalStoreKeys.LASTCREATEDDTML); + return localStore.get(ABLocalStoreKeys.LASTCREATEDDTML, ABDamageTakenModificationListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java index ed4f5de12..af6f41c96 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedDeathReplacement.java @@ -10,7 +10,7 @@ public class ABCallbackGetLastCreatedDeathReplacement extends ABDeathReplacement @Override public ABDeathReplacementEffect callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABDeathReplacementEffect) localStore.get(ABLocalStoreKeys.LASTCREATEDDRE); + return localStore.get(ABLocalStoreKeys.LASTCREATEDDRE, ABDeathReplacementEffect.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java index fccb5910d..cafc473e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedEvasionListener.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedEvasionListener extends ABEvasionListenerCa @Override public ABAttackEvasionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.LASTCREATEDAEL); + return localStore.get(ABLocalStoreKeys.LASTCREATEDAEL, ABAttackEvasionListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java index 9c53ac11f..5f3bc06b1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetLastCreatedUnitStateListener.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedUnitStateListener extends ABUnitStateListen @Override public ABUnitStateListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (ABUnitStateListener) localStore.get(ABLocalStoreKeys.LASTCREATEDUSL); + return localStore.get(ABLocalStoreKeys.LASTCREATEDUSL, ABUnitStateListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java index 2d6343e9d..b9fc6ca85 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityEffectReactionListenerByKey.java @@ -14,11 +14,12 @@ public class ABCallbackGetStoredAbilityEffectReactionListenerByKey extends ABAbi @Override public ABAbilityEffectReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABAbilityEffectReactionListener) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABAbilityEffectReactionListener.class); } else { - return (ABAbilityEffectReactionListener) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABAbilityEffectReactionListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java index 2d611c223..f7fa3c066 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAbilityProjReactionListenerByKey.java @@ -12,12 +12,14 @@ public class ABCallbackGetStoredAbilityProjReactionListenerByKey extends ABAbili private ABBooleanCallback instanceValue; @Override - public ABAbilityProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, - final int castId) { + public ABAbilityProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABAbilityProjReactionListener.class); } else { - return (ABAbilityProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABAbilityProjReactionListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java index a2cf45917..9369cca6a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPostDamageListenerByKey.java @@ -12,12 +12,14 @@ public class ABCallbackGetStoredAttackPostDamageListenerByKey extends ABAttackPo private ABBooleanCallback instanceValue; @Override - public ABAttackPostDamageListener callback(CUnit caster, ABLocalDataStore localStore, - final int castId) { + public ABAttackPostDamageListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABAttackPostDamageListener.class); } else { - return (ABAttackPostDamageListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABAttackPostDamageListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java index 73ffb3f8c..26d0ebbe9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackPreDamageListenerByKey.java @@ -14,11 +14,12 @@ public class ABCallbackGetStoredAttackPreDamageListenerByKey extends ABAttackPre @Override public ABAttackPreDamageListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABAttackPreDamageListener) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABAttackPreDamageListener.class); } else { - return (ABAttackPreDamageListener) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABAttackPreDamageListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java index 6d50d18f2..9cd782ce0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredAttackProjReactionListenerByKey.java @@ -12,12 +12,14 @@ public class ABCallbackGetStoredAttackProjReactionListenerByKey extends ABAttack private ABBooleanCallback instanceValue; @Override - public ABAttackProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, - final int castId) { + public ABAttackProjReactionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABAttackProjReactionListener.class); } else { - return (ABAttackProjReactionListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABAttackProjReactionListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java index ae8877644..8bdbab7c5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredBehaviorChangeListenerByKey.java @@ -12,12 +12,14 @@ public class ABCallbackGetStoredBehaviorChangeListenerByKey extends ABBehaviorCh private ABBooleanCallback instanceValue; @Override - public ABBehaviorChangeListener callback(CUnit caster, ABLocalDataStore localStore, - final int castId) { + public ABBehaviorChangeListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABBehaviorChangeListener.class); } else { - return (ABBehaviorChangeListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABBehaviorChangeListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java index 80b137799..c55ed2d63 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenListenerByKey.java @@ -14,11 +14,12 @@ public class ABCallbackGetStoredDamageTakenListenerByKey extends ABDamageTakenLi @Override public ABDamageTakenListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABDamageTakenListener) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABDamageTakenListener.class); } else { - return (ABDamageTakenListener) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABDamageTakenListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java index 6925cb40a..d19d1f5b5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDamageTakenModificationListenerByKey.java @@ -14,11 +14,12 @@ public class ABCallbackGetStoredDamageTakenModificationListenerByKey extends ABD @Override public ABDamageTakenModificationListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABDamageTakenModificationListener) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABDamageTakenModificationListener.class); } else { - return (ABDamageTakenModificationListener) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABDamageTakenModificationListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java index 1df42a972..a6f403841 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredDeathReplacementByKey.java @@ -14,11 +14,12 @@ public class ABCallbackGetStoredDeathReplacementByKey extends ABDeathReplacement @Override public ABDeathReplacementEffect callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABDeathReplacementEffect) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABDeathReplacementEffect.class); } else { - return (ABDeathReplacementEffect) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABDeathReplacementEffect.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java index 68a5e0997..f7b3634d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredEvasionListenerByKey.java @@ -12,12 +12,14 @@ public class ABCallbackGetStoredEvasionListenerByKey extends ABEvasionListenerCa private ABBooleanCallback instanceValue; @Override - public ABAttackEvasionListener callback(CUnit caster, ABLocalDataStore localStore, - final int castId) { + public ABAttackEvasionListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABAttackEvasionListener.class); } else { - return (ABAttackEvasionListener) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABAttackEvasionListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java index f9895688c..dcd86bb95 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/listener/ABCallbackGetStoredUnitStateListenerByKey.java @@ -14,11 +14,12 @@ public class ABCallbackGetStoredUnitStateListenerByKey extends ABUnitStateListen @Override public ABUnitStateListener callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (ABUnitStateListener) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + ABUnitStateListener.class); } else { - return (ABUnitStateListener) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + ABUnitStateListener.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackArgumentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackArgumentLocation.java index 24e214b16..3b85e5eea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackArgumentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackArgumentLocation.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABLocationCallback) { return ((ABLocationCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackImpactLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackImpactLocation.java index 2efa7d5a6..481cf205f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackImpactLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackImpactLocation.java @@ -9,8 +9,8 @@ public class ABCallbackGetAttackImpactLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (AbilityPointTarget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKIMPACTLOCATION, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKIMPACTLOCATION, castId), + AbilityPointTarget.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackTargetLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackTargetLocation.java index ffeb2bccf..f15b98d1b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackTargetLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetAttackTargetLocation.java @@ -11,8 +11,8 @@ public class ABCallbackGetAttackTargetLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId)); + AbilityTarget tar = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId), + AbilityTarget.class); if (tar.visit(AbilityTargetVisitor.POINT) != null) { return tar.visit(AbilityTargetVisitor.POINT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java index 66ed8ba1a..2034edba9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetGroundAttackedLocation.java @@ -11,8 +11,8 @@ public class ABCallbackGetGroundAttackedLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId)); + AbilityTarget tar = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId), + AbilityTarget.class); return tar.visit(AbilityTargetVisitor.POINT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java index 2116685d6..b4df7c90d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetProjectileCurrentLocation.java @@ -9,8 +9,8 @@ public class ABCallbackGetProjectileCurrentLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (AbilityPointTarget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILECURRENTLOC, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILECURRENTLOC, castId), + AbilityPointTarget.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetStoredLocationByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetStoredLocationByKey.java index ac01b21dc..a06c40b4c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetStoredLocationByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetStoredLocationByKey.java @@ -14,9 +14,12 @@ public class ABCallbackGetStoredLocationByKey extends ABLocationCallback { @Override public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + AbilityPointTarget.class); } else { - return (AbilityPointTarget) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + AbilityPointTarget.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetTargetedLocation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetTargetedLocation.java index b865a59de..095ca1b99 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetTargetedLocation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/location/ABCallbackGetTargetedLocation.java @@ -11,8 +11,9 @@ public class ABCallbackGetTargetedLocation extends ABLocationCallback { @Override public AbilityPointTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - final AbilityPointTarget target = (AbilityPointTarget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, castId)); + final AbilityPointTarget target = localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, castId), + AbilityPointTarget.class); return target; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackArgumentLong.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackArgumentLong.java index 903e01c43..fc7b11ea9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackArgumentLong.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackArgumentLong.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentLong extends ABLongCallback { public Long callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABLongCallback) { return ((ABLongCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetStoredLongByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetStoredLongByKey.java index fdb0e169b..526b13c7a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetStoredLongByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/longs/ABCallbackGetStoredLongByKey.java @@ -14,11 +14,12 @@ public class ABCallbackGetStoredLongByKey extends ABLongCallback { @Override public Long callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (Long) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + Long.class); } else { - return (Long) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + Long.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackArgumentOrderId.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackArgumentOrderId.java index d69276201..5801119c8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackArgumentOrderId.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackArgumentOrderId.java @@ -14,7 +14,7 @@ public class ABCallbackArgumentOrderId extends ABOrderIdCallback { @Override public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABOrderIdCallback) { return ((ABOrderIdCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java index 3a95913c9..583bdcd87 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/orderid/ABCallbackGetStoredOrderIdByKey.java @@ -15,11 +15,13 @@ public class ABCallbackGetStoredOrderIdByKey extends ABOrderIdCallback { @Override public Integer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (Integer) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + Integer.class); } else { - return (Integer) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + Integer.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackArgumentPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackArgumentPlayer.java index 2a57e4c21..5cf824ef8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackArgumentPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackArgumentPlayer.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentPlayer extends ABPlayerCallback { @Override public CPlayer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABPlayerCallback) { return ((ABPlayerCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java index 36363867f..350321d39 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/player/ABCallbackGetStoredPlayerByKey.java @@ -14,9 +14,12 @@ public class ABCallbackGetStoredPlayerByKey extends ABPlayerCallback { @Override public CPlayer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (CPlayer) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + CPlayer.class); } else { - return (CPlayer) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + CPlayer.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackArgumentProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackArgumentProjectile.java index b88ed30bc..a34363015 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackArgumentProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackArgumentProjectile.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentProjectile extends ABProjectileCallback { @Override public CProjectile callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABProjectileCallback) { return ((ABProjectileCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java index f8ba36ae7..a44f2d311 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetLastCreatedProjectile.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedProjectile extends ABProjectileCallback { @Override public CProjectile callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CProjectile) localStore.get(ABLocalStoreKeys.LASTCREATEDPROJECTILE); + return localStore.get(ABLocalStoreKeys.LASTCREATEDPROJECTILE, CProjectile.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java index 94d9c7cef..c3efad72e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAbilityProjectile.java @@ -12,7 +12,7 @@ public class ABCallbackGetReactionAbilityProjectile extends ABProjectileCallback @Override public CProjectile callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (CProjectile) localStore.get(ABLocalStoreKeys.ABILITYPROJ); + return localStore.get(ABLocalStoreKeys.ABILITYPROJ, CProjectile.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java index d93c29b82..708095381 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetReactionAttackProjectile.java @@ -9,7 +9,7 @@ public class ABCallbackGetReactionAttackProjectile extends ABProjectileCallback @Override public CProjectile callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CProjectile) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKPROJ, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKPROJ, castId), CProjectile.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java index d84e27aaf..238bfa1d1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetStoredProjectileByKey.java @@ -14,9 +14,12 @@ public class ABCallbackGetStoredProjectileByKey extends ABProjectileCallback { @Override public CProjectile callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (CProjectile) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + CProjectile.class); } else { - return (CProjectile) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + CProjectile.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetThisProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetThisProjectile.java index 3d57bfcea..5e2cdcf2f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetThisProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/projectile/ABCallbackGetThisProjectile.java @@ -9,7 +9,7 @@ public class ABCallbackGetThisProjectile extends ABProjectileCallback { @Override public CProjectile callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CProjectile) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THISPROJECTILE, castId), CProjectile.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java index c953751eb..59b23918b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackArgumentNonStackingStatBuff.java @@ -16,7 +16,7 @@ public class ABCallbackArgumentNonStackingStatBuff extends ABNonStackingStatBuff public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABNonStackingStatBuffCallback) { return ((ABNonStackingStatBuffCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java index ded09580c..6170e1010 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetLastCreatedNonStackingStatBuff.java @@ -11,7 +11,7 @@ public class ABCallbackGetLastCreatedNonStackingStatBuff extends ABNonStackingSt @Override public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (NonStackingStatBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDNSSB); + return localStore.get(ABLocalStoreKeys.LASTCREATEDNSSB, NonStackingStatBuff.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java index b8dee8153..787213f86 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statbuff/ABCallbackGetStoredNonStackingStatBuffByKey.java @@ -13,15 +13,15 @@ public class ABCallbackGetStoredNonStackingStatBuffByKey extends ABNonStackingSt private ABBooleanCallback instanceValue; @Override - public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public NonStackingStatBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (NonStackingStatBuff) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); - } - else { - return (NonStackingStatBuff) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + NonStackingStatBuff.class); + } else { + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + NonStackingStatBuff.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java index c4efd8315..5744c50e2 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackArgumentStateModBuff.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentStateModBuff extends ABStateModBuffCallback { @Override public StateModBuff callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABStateModBuffCallback) { return ((ABStateModBuffCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java index b5da5b8b4..84e8792a0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetLastCreatedStateModBuff.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedStateModBuff extends ABStateModBuffCallback @Override public StateModBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (StateModBuff) localStore.get(ABLocalStoreKeys.LASTCREATEDSMB); + return localStore.get(ABLocalStoreKeys.LASTCREATEDSMB, StateModBuff.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java index 9956b5e11..9196cb8e3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/statemod/ABCallbackGetStoredStateModBuffByKey.java @@ -14,9 +14,12 @@ public class ABCallbackGetStoredStateModBuffByKey extends ABStateModBuffCallback @Override public StateModBuff callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (StateModBuff) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + StateModBuff.class); } else { - return (StateModBuff) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + StateModBuff.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackArgumentString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackArgumentString.java index 0d0d4a575..8cbec43e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackArgumentString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackArgumentString.java @@ -14,7 +14,7 @@ public class ABCallbackArgumentString extends ABStringCallback { public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABStringCallback) { return ((ABStringCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAliasAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAliasAsString.java index 2f5d96ef6..9393c3cbe 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAliasAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetAliasAsString.java @@ -9,7 +9,7 @@ public class ABCallbackGetAliasAsString extends ABStringCallback { @Override public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((War3ID) localStore.get(ABLocalStoreKeys.ALIAS)).asStringValue(); + return (localStore.get(ABLocalStoreKeys.ALIAS, War3ID.class)).asStringValue(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetCodeAsString.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetCodeAsString.java index 790e89097..6b4133e25 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetCodeAsString.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetCodeAsString.java @@ -9,7 +9,7 @@ public class ABCallbackGetCodeAsString extends ABStringCallback { @Override public String callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((War3ID) localStore.get(ABLocalStoreKeys.CODE)).asStringValue(); + return (localStore.get(ABLocalStoreKeys.CODE, War3ID.class)).asStringValue(); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetStoredStringByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetStoredStringByKey.java index 2cf078b30..72387e495 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetStoredStringByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/strings/ABCallbackGetStoredStringByKey.java @@ -12,15 +12,15 @@ public class ABCallbackGetStoredStringByKey extends ABStringCallback { private ABBooleanCallback instanceValue; @Override - public String callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { + public String callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (String) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); - } - else { - return (String) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + String.class); + } else { + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + String.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackArgumentTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackArgumentTarget.java index 08cd5792b..6fcfea894 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackArgumentTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackArgumentTarget.java @@ -16,7 +16,7 @@ public class ABCallbackArgumentTarget extends ABTargetCallback { public AbilityTarget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABTargetCallback) { return ((ABTargetCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetAbilityTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetAbilityTarget.java index abda070d6..09545789d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetAbilityTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetAbilityTarget.java @@ -10,12 +10,14 @@ public class ABCallbackGetAbilityTarget extends ABTargetCallback { @Override public AbilityTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityPointTarget target = (AbilityPointTarget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, castId)); + AbilityPointTarget target = localStore.get( + ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDLOCATION, castId), + AbilityPointTarget.class); if (target != null) { return target; } - CUnit taru = (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId)); + CUnit taru = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId), + CUnit.class); if (taru != null) { return taru; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetStoredTargetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetStoredTargetByKey.java index 687b5532d..3d76f7fe9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetStoredTargetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/target/ABCallbackGetStoredTargetByKey.java @@ -14,9 +14,12 @@ public class ABCallbackGetStoredTargetByKey extends ABTargetCallback { @Override public AbilityTarget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (AbilityTarget) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + AbilityTarget.class); } else { - return (AbilityTarget) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + AbilityTarget.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackArgumentTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackArgumentTimer.java index 4720115b5..0cc27b0dc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackArgumentTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackArgumentTimer.java @@ -16,7 +16,7 @@ public class ABCallbackArgumentTimer extends ABTimerCallback { public CTimer callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABTimerCallback) { return ((ABTimerCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetFiringTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetFiringTimer.java index 18c6d69c5..d351a5251 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetFiringTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetFiringTimer.java @@ -9,7 +9,7 @@ public class ABCallbackGetFiringTimer extends ABTimerCallback { @Override public CTimer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CTimer) localStore.get(ABLocalStoreKeys.FIRINGTIMER); + return localStore.get(ABLocalStoreKeys.FIRINGTIMER, CTimer.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java index 3f4964cb9..c32a8f814 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastCreatedTimer.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedTimer extends ABTimerCallback { @Override public CTimer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CTimer) localStore.get(ABLocalStoreKeys.LASTCREATEDTIMER); + return localStore.get(ABLocalStoreKeys.LASTCREATEDTIMER, CTimer.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastStartedTimer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastStartedTimer.java index 5ac42a6c9..6488b3319 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastStartedTimer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetLastStartedTimer.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastStartedTimer extends ABTimerCallback { @Override public CTimer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CTimer) localStore.get(ABLocalStoreKeys.LASTSTARTEDTIMER); + return localStore.get(ABLocalStoreKeys.LASTSTARTEDTIMER, CTimer.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java index 47d37fcab..3aa5fcf9c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/timer/ABCallbackGetStoredTimerByKey.java @@ -14,11 +14,12 @@ public class ABCallbackGetStoredTimerByKey extends ABTimerCallback { @Override public CTimer callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (CTimer) localStore.get( - ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + CTimer.class); } else { - return (CTimer) localStore - .get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + CTimer.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackArgumentUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackArgumentUnit.java index 64583ae5e..4cdbe4544 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackArgumentUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackArgumentUnit.java @@ -15,7 +15,7 @@ public class ABCallbackArgumentUnit extends ABUnitCallback { public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABUnitCallback) { return ((ABUnitCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java index e121ca5e5..f8b52fa8c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityPairedUnit.java @@ -10,7 +10,7 @@ public class ABCallbackGetAbilityPairedUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYPAIREDUNIT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYPAIREDUNIT, castId), CUnit.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java index 54b547964..cd3a79f35 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAbilityTargetedUnit.java @@ -10,7 +10,7 @@ public class ABCallbackGetAbilityTargetedUnit extends ABUnitCallback { @Override public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ABILITYTARGETEDUNIT, castId), CUnit.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackedUnit.java index 531b88f6e..110c71b2d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackedUnit.java @@ -10,8 +10,8 @@ public class ABCallbackGetAttackedUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId)); + AbilityTarget tar = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKTARGET, castId), + AbilityTarget.class); return tar.visit(AbilityTargetVisitor.UNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java index 4c7882fc0..35e72fc97 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetAttackingUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetAttackingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKINGUNIT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ATTACKINGUNIT, castId), CUnit.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java index f90729cbf..f6effe0c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetBuffCastingUnit.java @@ -11,7 +11,7 @@ public class ABCallbackGetBuffCastingUnit extends ABUnitCallback { @Override public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.BUFFCASTINGUNIT); + return localStore.get(ABLocalStoreKeys.BUFFCASTINGUNIT, CUnit.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetChainUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetChainUnit.java index ddeb6a37e..29f6acc8e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetChainUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetChainUnit.java @@ -10,7 +10,7 @@ public class ABCallbackGetChainUnit extends ABUnitCallback { @Override public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CHAINUNIT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.CHAINUNIT, castId), CUnit.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit1.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit1.java index 02599ed77..82a653e53 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit1.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit1.java @@ -10,7 +10,7 @@ public class ABCallbackGetCompUnit1 extends ABUnitCallback { @Override public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.COMPUNIT1); + return localStore.get(ABLocalStoreKeys.COMPUNIT1, CUnit.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit2.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit2.java index 77e26e78c..a980c4b37 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit2.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetCompUnit2.java @@ -9,16 +9,13 @@ public class ABCallbackGetCompUnit2 extends ABUnitCallback { @Override - public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, - final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.COMPUNIT2); + public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { + return localStore.get(ABLocalStoreKeys.COMPUNIT2, CUnit.class); } @Override public String generateJassEquivalent(final JassTextGenerator jassTextGenerator) { - return jassTextGenerator.getUserDataExpr( - "AB_LOCAL_STORE_KEY_COMPUNIT2", - JassTextGeneratorType.UnitHandle); + return jassTextGenerator.getUserDataExpr("AB_LOCAL_STORE_KEY_COMPUNIT2", JassTextGeneratorType.UnitHandle); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java index bb2974a82..f671a98b8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagedUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetDamagedUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGEDUNIT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGEDUNIT, castId), CUnit.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java index 81c8109dc..ec50f1cd1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDamagingUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetDamagingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGINGUNIT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DAMAGINGUNIT, castId), CUnit.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java index c5f31823c..ebb046b42 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetDyingUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetDyingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DYINGUNIT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.DYINGUNIT, castId), CUnit.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetEnumUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetEnumUnit.java index ae0c6587c..a15fd0c48 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetEnumUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetEnumUnit.java @@ -10,7 +10,7 @@ public class ABCallbackGetEnumUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ENUMUNIT, castId), CUnit.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java index 5ccae5f6b..3f25145ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetKillingUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetKillingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.KILLINGUNIT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.KILLINGUNIT, castId), CUnit.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java index 23ebaeff7..719ca92ca 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetLastCreatedUnit.java @@ -10,7 +10,7 @@ public class ABCallbackGetLastCreatedUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.LASTCREATEDUNIT); + return localStore.get(ABLocalStoreKeys.LASTCREATEDUNIT, CUnit.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetMatchingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetMatchingUnit.java index c87004dc0..089a341f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetMatchingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetMatchingUnit.java @@ -10,7 +10,7 @@ public class ABCallbackGetMatchingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.MATCHINGUNIT, castId), CUnit.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java index b1b2c3f31..60e794eed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetProjectileHitUnit.java @@ -10,7 +10,7 @@ public class ABCallbackGetProjectileHitUnit extends ABUnitCallback { @Override public CUnit callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId), CUnit.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java index 84f053419..83c16d387 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityCastingUnit.java @@ -8,7 +8,7 @@ public class ABCallbackGetReactionAbilityCastingUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONABILITYCASTER, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONABILITYCASTER, castId), CUnit.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java index 0bc9b73e2..f2400fab3 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetReactionAbilityTargetUnit.java @@ -10,8 +10,8 @@ public class ABCallbackGetReactionAbilityTargetUnit extends ABUnitCallback { @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - AbilityTarget tar = (AbilityTarget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONABILITYCASTER, castId)); + AbilityTarget tar = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.REACTIONABILITYCASTER, castId), + AbilityTarget.class); return tar.visit(AbilityTargetVisitor.UNIT); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java index f9d5dbd90..52ad806bc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unit/ABCallbackGetStoredUnitByKey.java @@ -10,13 +10,16 @@ public class ABCallbackGetStoredUnitByKey extends ABUnitCallback { private ABStringCallback key; private ABBooleanCallback instanceValue; - + @Override public CUnit callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (CUnit) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + CUnit.class); } else { - return (CUnit) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + CUnit.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java index 5d2cc375a..82bb86a36 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitgroup/ABCallbackArgumentUnitGroup.java @@ -17,7 +17,7 @@ public class ABCallbackArgumentUnitGroup extends ABUnitGroupCallback { public Set callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABUnitGroupCallback) { return ((ABUnitGroupCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java index bc0443d66..8a08ec793 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/unitqueue/ABCallbackArgumentUnitQueue.java @@ -17,7 +17,7 @@ public class ABCallbackArgumentUnitQueue extends ABUnitQueueCallback { public Queue callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABUnitQueueCallback) { return ((ABUnitQueueCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java index 1d2e4e64c..a3b89ac3c 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackArgumentVisionModifier.java @@ -16,7 +16,7 @@ public class ABCallbackArgumentVisionModifier extends ABVisionModifierCallback { public CFogModifier callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABVisionModifierCallback) { return ((ABVisionModifierCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java index 8d3d98294..4feac7dba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetLastCreatedVisionModifier.java @@ -9,7 +9,7 @@ public class ABCallbackGetLastCreatedVisionModifier extends ABVisionModifierCall @Override public CFogModifier callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (CFogModifier) localStore.get(ABLocalStoreKeys.LASTCREATEDVISIONMODIFIER); + return localStore.get(ABLocalStoreKeys.LASTCREATEDVISIONMODIFIER, CFogModifier.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java index fd5b60140..b5a2fa9cc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/visionmodifier/ABCallbackGetStoredVisionModifierByKey.java @@ -14,9 +14,12 @@ public class ABCallbackGetStoredVisionModifierByKey extends ABVisionModifierCall @Override public CFogModifier callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if (instanceValue == null || instanceValue.callback(caster, localStore, castId)) { - return (CFogModifier) localStore.get(ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(key.callback(caster, localStore, castId), castId), + CFogModifier.class); } else { - return (CFogModifier) localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId)); + return localStore.get(ABLocalStoreKeys.combineUserKey(key.callback(caster, localStore, castId), castId), + CFogModifier.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackArgumentWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackArgumentWidget.java index 94eb4a630..fe3e5aa47 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackArgumentWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackArgumentWidget.java @@ -16,7 +16,7 @@ public class ABCallbackArgumentWidget extends ABWidgetCallback { public CWidget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABWidgetCallback) { return ((ABWidgetCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java index 5ac37c3fe..b2550c233 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetProjectileHitWidget.java @@ -10,10 +10,10 @@ public class ABCallbackGetProjectileHitWidget extends ABWidgetCallback { @Override public CWidget callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - final CWidget unit = (CWidget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId)); - final CWidget dest = (CWidget) localStore - .get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId)); + final CWidget unit = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITUNIT, castId), + CWidget.class); + final CWidget dest = localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.PROJECTILEHITDEST, castId), + CWidget.class); if (unit != null) { return unit; } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java index e5f983835..13971f802 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/callback/widget/ABCallbackGetStoredWidgetByKey.java @@ -16,11 +16,13 @@ public class ABCallbackGetStoredWidgetByKey extends ABWidgetCallback { @Override public CWidget callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (CWidget) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + CWidget.class); } else { - return (CWidget) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + CWidget.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackArgumentBoolean.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackArgumentBoolean.java index 6ed8f206e..dab94d809 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackArgumentBoolean.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ABCallbackArgumentBoolean.java @@ -14,7 +14,7 @@ public class ABCallbackArgumentBoolean extends ABBooleanCallback { @Override public Boolean callback(final CUnit caster, final ABLocalDataStore localStore, final int castId) { final String keyS = name.callback(caster, localStore, castId); - ABCallback cbck = (ABCallback) localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS)); + ABCallback cbck = localStore.get(ABLocalStoreKeys.combineArgumentKey(keyS), ABCallback.class); if (cbck != null && cbck instanceof ABBooleanCallback) { return ((ABBooleanCallback) cbck).callback(caster, localStore, castId); } else { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java index 446399c80..8ebf755fc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastCurrentlyActive.java @@ -11,7 +11,7 @@ public class ABConditionIsAutoCastCurrentlyActive extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Boolean) localStore.get(ABLocalStoreKeys.ISAUTOCASTON); + return localStore.get(ABLocalStoreKeys.ISAUTOCASTON, Boolean.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastTargeting.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastTargeting.java index c601919bb..9c1c292da 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastTargeting.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsAutoCastTargeting.java @@ -11,7 +11,7 @@ public class ABConditionIsAutoCastTargeting extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Boolean) localStore.get(ABLocalStoreKeys.ISAUTOCASTTARGETING); + return localStore.get(ABLocalStoreKeys.ISAUTOCASTTARGETING, Boolean.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java index beb60f952..af648516b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonPointTarget.java @@ -10,7 +10,7 @@ public class ABConditionIsFlexAbilityNonPointTarget extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); + ABAbilityBuilderActiveFlexTarget ability = localStore.get(ABLocalStoreKeys.ISFLEXABILITY, ABAbilityBuilderActiveFlexTarget.class); return !ability.isPointTarget(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java index a30a14780..b85e0ff4d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityNonTargeted.java @@ -10,7 +10,7 @@ public class ABConditionIsFlexAbilityNonTargeted extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); + ABAbilityBuilderActiveFlexTarget ability = localStore.get(ABLocalStoreKeys.ISFLEXABILITY, ABAbilityBuilderActiveFlexTarget.class); return !ability.isTargetedSpell(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java index f2fc0420f..0d663a215 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityPointTarget.java @@ -10,7 +10,7 @@ public class ABConditionIsFlexAbilityPointTarget extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore.get(ABLocalStoreKeys.ISFLEXABILITY); + ABAbilityBuilderActiveFlexTarget ability = localStore.get(ABLocalStoreKeys.ISFLEXABILITY, ABAbilityBuilderActiveFlexTarget.class); return ability.isPointTarget(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java index ffbeb76c0..a90fe98f8 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsFlexAbilityTargeted.java @@ -10,8 +10,8 @@ public class ABConditionIsFlexAbilityTargeted extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - ABAbilityBuilderActiveFlexTarget ability = (ABAbilityBuilderActiveFlexTarget) localStore - .get(ABLocalStoreKeys.ISFLEXABILITY); + ABAbilityBuilderActiveFlexTarget ability = localStore.get(ABLocalStoreKeys.ISFLEXABILITY, + ABAbilityBuilderActiveFlexTarget.class); return ability.isTargetedSpell(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java index 1525d5ce4..5c4e8b9db 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionIsTransformingToAlternate.java @@ -9,7 +9,7 @@ public class ABConditionIsTransformingToAlternate extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.TRANSFORMINGTOALT, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.TRANSFORMINGTOALT, castId), Boolean.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCast.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCast.java index dc23a8183..72ef590ea 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCast.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCast.java @@ -11,7 +11,7 @@ public class ABConditionWasAutoCast extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId)); + return localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), Boolean.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java index 52d9ddb08..767298eae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasAutoCastPreviouslyActive.java @@ -11,7 +11,7 @@ public class ABConditionWasAutoCastPreviouslyActive extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Boolean) localStore.get(ABLocalStoreKeys.WASAUTOCASTON); + return localStore.get(ABLocalStoreKeys.WASAUTOCASTON, Boolean.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasCastingInterrupted.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasCastingInterrupted.java index e5edff310..0e5125cae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasCastingInterrupted.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/ability/ABConditionWasCastingInterrupted.java @@ -11,7 +11,7 @@ public class ABConditionWasCastingInterrupted extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return (Boolean) localStore.get(ABLocalStoreKeys.INTERRUPTED); + return localStore.get(ABLocalStoreKeys.INTERRUPTED, Boolean.class); } @Override diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java index 7a478bc02..e78310936 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackProjectile.java @@ -10,7 +10,7 @@ public class ABConditionIsAttackProjectile extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId), CUnitAttack.class)) .getWeaponType().isProjectile(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java index 65dd19a62..12b3efe5d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/attack/ABConditionIsAttackRanged.java @@ -10,7 +10,7 @@ public class ABConditionIsAttackRanged extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { - return ((CUnitAttack) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId))) + return (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.THEATTACK, castId), CUnitAttack.class)) .getWeaponType().isRanged(); } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java index 408e43af7..16535bab4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/booleans/ABCallbackGetStoredBooleanByKey.java @@ -15,12 +15,13 @@ public class ABCallbackGetStoredBooleanByKey extends ABBooleanCallback { @Override public Boolean callback(CUnit caster, ABLocalDataStore localStore, final int castId) { if ((this.instanceValue == null) || this.instanceValue.callback(caster, localStore, castId)) { - return (Boolean) localStore.get(ABLocalStoreKeys - .combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId)); - } - else { - return (Boolean) localStore - .get(ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId)); + return localStore.get( + ABLocalStoreKeys.combineUserInstanceKey(this.key.callback(caster, localStore, castId), castId), + Boolean.class); + } else { + return localStore.get( + ABLocalStoreKeys.combineUserKey(this.key.callback(caster, localStore, castId), castId), + Boolean.class); } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java index 5a71971be..e7a309acb 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsPassAllAbilityTargetChecks.java @@ -28,7 +28,7 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int .getInstance().reset(); abil.checkCanTarget(localStore.game, theCaster, abil.getBaseOrderId(), - ((Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId))), + (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), Boolean.class)), target.callback(casterUnit, localStore, castId), booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java index 691975d03..af6d15bc7 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/behavior/condition/targeting/ABConditionIsUnitPassAllAbilityTargetChecks.java @@ -30,7 +30,7 @@ public Boolean callback(CUnit casterUnit, ABLocalDataStore localStore, final int .getInstance().reset(); abil.checkCanTarget(localStore.game, theCaster, abil.getBaseOrderId(), - ((Boolean) localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId))), theTarget, + (localStore.get(ABLocalStoreKeys.combineKey(ABLocalStoreKeys.ISAUTOCAST, castId), Boolean.class)), theTarget, booleanTargetReceiver); if (booleanTargetReceiver.isTargetable()) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABDataStore.java index d28ff86b2..31bf548a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABDataStore.java @@ -31,4 +31,12 @@ public interface ABDataStore { int getIntOrDefault(String key, int def); + boolean getBoolean(String key); + + boolean getBooleanOrDefault(String key, boolean def); + + float getFloat(String key); + + float getFloatOrDefault(String key, float def); + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABGlobalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABGlobalDataStore.java index a8a27953d..d4d2c39e6 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABGlobalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABGlobalDataStore.java @@ -72,6 +72,42 @@ public int getIntOrDefault(String key, int def) { return 0; } + @Override + public boolean getBoolean(String key) { + Object val = store.get(key); + if (val != null && val instanceof Boolean) { + return (boolean) val; + } + return false; + } + + @Override + public boolean getBooleanOrDefault(String key, boolean def) { + Object val = store.getOrDefault(key, def); + if (val != null && val instanceof Boolean) { + return (boolean) val; + } + return false; + } + + @Override + public float getFloat(String key) { + Object val = store.get(key); + if (val != null && val instanceof Float) { + return (float) val; + } + return 0f; + } + + @Override + public float getFloatOrDefault(String key, float def) { + Object val = store.getOrDefault(key, def); + if (val != null && val instanceof Float) { + return (float) val; + } + return 0f; + } + @Override public Object put(String key, Object value) { return store.put(key, value); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABMapLocalDataStore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABMapLocalDataStore.java index 240448863..f5e538adc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABMapLocalDataStore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/datastore/ABMapLocalDataStore.java @@ -77,6 +77,42 @@ public int getIntOrDefault(String key, int def) { return 0; } + @Override + public boolean getBoolean(String key) { + Object val = store.get(key); + if (val != null && val instanceof Boolean) { + return (boolean) val; + } + return false; + } + + @Override + public boolean getBooleanOrDefault(String key, boolean def) { + Object val = store.getOrDefault(key, def); + if (val != null && val instanceof Boolean) { + return (boolean) val; + } + return false; + } + + @Override + public float getFloat(String key) { + Object val = store.get(key); + if (val != null && val instanceof Float) { + return (float) val; + } + return 0f; + } + + @Override + public float getFloatOrDefault(String key, float def) { + Object val = store.getOrDefault(key, def); + if (val != null && val instanceof Float) { + return (float) val; + } + return 0f; + } + @Override public Object put(String key, Object value) { return store.put(key, value); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/handler/ABTransformationHandler.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/handler/ABTransformationHandler.java index df22c013c..d6037e4d5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/handler/ABTransformationHandler.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/adjustablebehaviors/handler/ABTransformationHandler.java @@ -102,7 +102,7 @@ public static void beginTakingOff(final ABLocalDataStore localStore, final CUnit final boolean keepRatios, final OnTransformationActions actions, final CAbility ability, final boolean addAlternateTagAfter, final boolean immediateTakeoff, final float altitudeAdjustmentDelay, final float altitudeAdjustmentDuration) { - CTimer timer = (CTimer) localStore.get(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT); + CTimer timer = localStore.get(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT, CTimer.class); if (timer != null) { localStore.game.unregisterTimer(timer); } @@ -133,7 +133,7 @@ public static void beginLanding(final ABLocalDataStore localStore, final CUnit u timer.start(localStore.game); localStore.put(ABLocalStoreKeys.WAITING_ANIMATION, timer); } - CTimer timer = (CTimer) localStore.get(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT); + CTimer timer = localStore.get(ABLocalStoreKeys.ACTIVE_ALTITUDE_ADJUSTMENT, CTimer.class); if (timer != null) { localStore.game.unregisterTimer(timer); } @@ -147,7 +147,7 @@ public static void startSlowTransformation(final ABLocalDataStore localStore, fi final CAbility ability, final boolean addAlternateTagAfter, final boolean takingOff, final boolean landing, final boolean immediateTakeoff, final boolean immediateLanding, final float altitudeAdjustmentDelay, final float landingDelay, final float altitudeAdjustmentDuration) { - final CTimer timer = (CTimer) localStore.get(ABLocalStoreKeys.WAITING_ANIMATION); + final CTimer timer = localStore.get(ABLocalStoreKeys.WAITING_ANIMATION, CTimer.class); if (timer != null) { localStore.game.unregisterTimer(timer); }